Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* adjust style of report.

Browse Source
This commit is contained in:
zhujinyong
2012-06-29 10:35:26 +00:00
parent 598c6e9fdc
commit b3442e2038
4 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/report/view/bugsummary.html.php
+2 -2
View File
@@ -41,14 +41,14 @@
<tr class="a-center">
<td><?php echo $user;?></td>
<td><?php echo $bug['all'];?></td>
<td><?php echo $bug[''];?></td>
<td><?php echo isset($bug['']) ? $bug[''] : 0;?></td>
<td><?php echo isset($bug['bydesign']) ? $bug['bydesign'] : 0;?></td>
<td><?php echo isset($bug['duplicate']) ? $bug['duplicate'] : 0;?></td>
<td><?php echo isset($bug['external']) ? $bug['external'] : 0;?></td>
<td><?php echo isset($bug['fixed']) ? $bug['fixed'] : 0;?></td>
<td><?php echo isset($bug['notrepro']) ? $bug['notrepro'] : 0;?></td>
<td><?php echo isset($bug['postponed']) ? $bug['postponed'] : 0;?></td>
<td><?php echo isset($bug['willnotfix']) ? $bug['wllnotfix'] : 0;?></td>
<td><?php echo isset($bug['willnotfix']) ? $bug['willnotfix'] : 0;?></td>
<td><?php echo isset($bug['tostory']) ? $bug['tostory'] : 0;?></td>
</tr>
<?php endforeach;?>
module/report/view/productinfo.html.php
+8 -12
View File
@@ -17,23 +17,19 @@
<table class='table-1 fixed colored tablesorter datatable border-sep' id='product'>
<thead>
<tr class='colhead'>
<th><?php echo $lang->product->name;?></th>
<th class="w-80px"><?php echo $lang->product->code;?></th>
<th class="w-80px"><?php echo $lang->product->PO;?></th>
<th><?php echo $lang->productplan->common;?></th>
<th width='150'><?php echo $lang->product->name;?></th>
<th class="w-100px"><?php echo $lang->productplan->common;?></th>
<th><?php echo $lang->productplan->desc;?></th>
<th class="w-80px"><?php echo $lang->productplan->begin;?></th>
<th class="w-80px"><?php echo $lang->productplan->end;?></th>
<th width="250" colspan='4'><?php echo $lang->report->details;?></th>
<th width="300" colspan='4'><?php echo $lang->report->details;?></th>
</tr>
</thead>
<tbody>
<?php foreach($products as $product):?>
<tr class="a-center">
<?php $count = isset($product->plans) ? count($product->plans) : 1;?>
<td align='left' rowspan="<?php echo $count;?>"><?php echo $product->name;?></td>
<td align='left' rowspan="<?php echo $count;?>"><?php echo $product->code;?></td>
<td rowspan="<?php echo $count;?>"><?php echo $product->PO;?></td>
<td align='left' rowspan="<?php echo $count;?>"><?php echo '<p>' . $product->name . "</p><p>{$lang->product->PO}: " . $product->PO . '</p>';?></td>
<?php if(isset($product->plans)):?>
<?php foreach($product->plans as $id => $plan):?>
<?php if($id != 0) echo "<tr class='a-center'>"?>
@@ -41,10 +37,10 @@
<td align='left'><?php echo $plan->desc;?></td>
<td><?php echo $plan->begin;?></td>
<td><?php echo $plan->end;?></td>
<td><?php echo $lang->story->statusList['draft'] . ' : ' . (isset($plan->status['draft']) ? $plan->status['draft'] : 0);?></td>
<td><?php echo $lang->story->statusList['active'] . ' : ' . (isset($plan->status['active']) ? $plan->status['active'] : 0);?></td>
<td><?php echo $lang->story->statusList['closed'] . ' : ' . (isset($plan->status['closed']) ? $plan->status['closed'] : 0);?></td>
<td><?php echo $lang->story->statusList['changed'] . ' : ' . (isset($plan->status['changed']) ? $plan->status['changed'] : 0);?></td>
<td align='left'><?php echo $lang->story->statusList['draft'] . ' : ' . (isset($plan->status['draft']) ? $plan->status['draft'] : 0);?></td>
<td align='left'><?php echo $lang->story->statusList['active'] . ' : ' . (isset($plan->status['active']) ? $plan->status['active'] : 0);?></td>
<td align='left'><?php echo $lang->story->statusList['closed'] . ' : ' . (isset($plan->status['closed']) ? $plan->status['closed'] : 0);?></td>
<td align='left'><?php echo $lang->story->statusList['changed'] . ' : ' . (isset($plan->status['changed']) ? $plan->status['changed'] : 0);?></td>
<?php if($id != 0) echo "</tr>"?>
<?php endforeach;?>
<?php else:?>
module/report/view/projectdeviation.html.php
+7 -5
View File
@@ -1,4 +1,5 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/colorize.html.php';?>
<table class="cont-lt1">
<tr valign='top'>
<td class='side'>
@@ -15,7 +16,7 @@
<thead>
<tr class='colhead'>
<th class='w-id'><?php echo $lang->report->id;?></th>
<th><?php echo $lang->report->project;?></th>
<th class="w-200px"><?php echo $lang->report->project;?></th>
<th><?php echo $lang->report->stories;?></th>
<th><?php echo $lang->report->bugs;?></th>
<th><?php echo $lang->report->devConsumed;?></th>
@@ -31,17 +32,18 @@
<?php foreach($projects as $project):?>
<tr class="a-center">
<td><?php echo $project->id;?></td>
<td><?php echo $project->name;?></td>
<td align="left"><?php echo $project->name;?></td>
<td><?php echo $project->stories;?></td>
<td><?php echo $project->bugs;?></td>
<td><?php echo $project->devConsumed;?></td>
<td><?php echo $project->testConsumed;?></td>
<td><?php echo $project->devConsumed . ' : ' . $project->testConsumed;?></td>
<td><?php echo round($project->devConsumed / (($project->testConsumed < 1) ? 1 : $project->testConsumed), 1);?></td>
<td><?php echo $project->estimate;?></td>
<td><?php echo $project->consumed;?></td>
<td><?php echo ($project->consumed - $project->estimate) > 0 ? '+' . ($project->consumed - $project->estimate) : ($project->consumed - $project->estimate);?></td>
<?php $deviation = $project->consumed - $project->estimate;?>
<td><?php echo $deviation > 0 ? ('+' . $deviation) : ($deviation);?></td>
<td>
<?php echo (($project->consumed - $project->estimate) > 0 ? '+' : '') . round(abs($project->consumed - $project->estimate) / $project->consumed * 100, 2) . '%';?>
<?php echo ($deviation > 0 ? '+' : '-') . round(abs($deviation) / $project->estimate * 100, 2) . '%';?>
</td>
</tr>
<?php endforeach;?>
module/report/view/workload.html.php
+1 -3
View File
@@ -1,4 +1,5 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/ext/view/datepicker.html.php';?>
<style>
.choose-date span, .dp-choose-date{ display:block; float:left; margin:0 10px;}
.dp-applied{float:left;}
@@ -16,9 +17,6 @@
</td>
<td class='divider'></td>
<td>
<div class="choose-date mb-10px f-left">
<?php echo html::input('date', $begin, "class='select-7 date' onchange='changeDate(this.value, \"$end\")'") . "<span> {$lang->report->to} </span>" . html::input('date', $end, "class='select-7 date' onchange='changeDate(\"$begin\", this.value)'");?>
</div>
<table class='table-1 fixed colored tablesorter datatable border-sep'>
<thead>
<tr class='colhead'>