* Finish story 35042.

This commit is contained in:
liuyongkai
2022-09-15 03:14:23 +00:00
parent a7469ef72a
commit 18c3f1637f
8 changed files with 22 additions and 3 deletions
+1
View File
@@ -1,3 +1,4 @@
#mainContent td.projectName {white-space: nowrap; overflow-x: hidden;}
.main-table tbody>tr:nth-child(odd) {background-color:#fff;}
#pageNav .angle-btn:first-child a.btn {max-width: 300px; overflow: hidden;}
.totalCount {margin-top: 15px !important; font-weight: bold; text-align: right; padding: 8px 50px 8px 8px;}
+2
View File
@@ -37,3 +37,5 @@ $lang->weekly->ev = 'Earned Value(EV)';
$lang->weekly->ac = 'Actual Cost(AC)';
$lang->weekly->sv = 'Schedule Variance(SV%)';
$lang->weekly->cv = 'Cost Variance(CV%)';
$lang->weekly->totalCount = 'Total : %u tasks';
+2
View File
@@ -37,3 +37,5 @@ $lang->weekly->ev = 'Earned Value(EV)';
$lang->weekly->ac = 'Actual Cost(AC)';
$lang->weekly->sv = 'Schedule Variance(SV%)';
$lang->weekly->cv = 'Cost Variance(CV%)';
$lang->weekly->totalCount = 'Total : %u tasks';
+2
View File
@@ -37,3 +37,5 @@ $lang->weekly->ev = 'Earned Value(EV)';
$lang->weekly->ac = 'Actual Cost(AC)';
$lang->weekly->sv = 'Schedule Variance(SV%)';
$lang->weekly->cv = 'Cost Variance(CV%)';
$lang->weekly->totalCount = 'Total : %u tasks';
+2
View File
@@ -37,3 +37,5 @@ $lang->weekly->ev = 'Earned Value(EV)';
$lang->weekly->ac = 'Actual Cost(AC)';
$lang->weekly->sv = 'Schedule Variance(SV%)';
$lang->weekly->cv = 'Cost Variance(CV%)';
$lang->weekly->totalCount = 'Total : %u tasks';
+2
View File
@@ -37,3 +37,5 @@ $lang->weekly->ev = '实际完成的工作(EV)';
$lang->weekly->ac = '实际花费的成本(AC)';
$lang->weekly->sv = '进度偏差率(SV%)';
$lang->weekly->cv = '成本偏差率(CV%';
$lang->weekly->totalCount = '总计 : %u 个任务';
+2
View File
@@ -37,3 +37,5 @@ $lang->weekly->ev = '實際完成的工作(EV)';
$lang->weekly->ac = '實際花費的成本(AC)';
$lang->weekly->sv = '進度偏差率(SV%)';
$lang->weekly->cv = '成本偏差率(CV%';
$lang->weekly->totalCount = '總計 : %u 個任務';
+9 -3
View File
@@ -74,10 +74,11 @@
</tr>
</thead>
<tbody>
<?php $totalCount = 0;?>
<?php foreach($finished as $task):?>
<tr data-id='<?php echo $task->id ?>'>
<td class='c-id'>
<?php printf('%03d', $task->id);?>
<?php printf('%03d', $task->id); $totalCount++;?>
</td>
<td class='text-left' title='<?php echo $task->name?>'>
<?php echo html::a($this->createLink('task', 'view', 'id=' . $task->id), $task->name); ?>
@@ -90,6 +91,7 @@
<?php endforeach;?>
</tbody>
</table>
<div class='table totalCount'><?php echo sprintf($lang->weekly->totalCount, $totalCount);?></div>
<div class='page-title'><h4><?php echo $lang->weekly->postponed;?></h4></div>
<table class='table has-sort-head table-fixed'>
@@ -105,10 +107,11 @@
</tr>
</thead>
<tbody>
<?php $totalCount = 0;?>
<?php foreach($postponed as $task):?>
<tr data-id='<?php echo $task->id ?>'>
<td class='c-id'>
<?php printf('%03d', $task->id);?>
<?php printf('%03d', $task->id); $totalCount++;?>
</td>
<td class='text-left' title='<?php echo $task->name?>'>
<?php echo html::a($this->createLink('task', 'view', 'id=' . $task->id), $task->name); ?>
@@ -122,6 +125,7 @@
<?php endforeach;?>
</tbody>
</table>
<div class='table totalCount'><?php echo sprintf($lang->weekly->totalCount, $totalCount);?></div>
<div class='page-title'><h4><?php echo $lang->weekly->nextWeek;?></h4></div>
<table class='table has-sort-head table-fixed'>
@@ -135,10 +139,11 @@
</tr>
</thead>
<tbody>
<?php $totalCount = 0;?>
<?php foreach($nextWeek as $task):?>
<tr data-id='<?php echo $task->id ?>'>
<td class='c-id'>
<?php printf('%03d', $task->id);?>
<?php printf('%03d', $task->id); $totalCount++;?>
</td>
<td class='text-left' title='<?php echo $task->name?>'>
<?php echo html::a($this->createLink('task', 'view', 'id=' . $task->id), $task->name); ?>
@@ -150,6 +155,7 @@
<?php endforeach;?>
</tbody>
</table>
<div class='table totalCount'><?php echo sprintf($lang->weekly->totalCount, $totalCount);?></div>
<div class='page-title'><h4><?php echo $lang->weekly->workloadByType;?></h4></div>
<table class='table has-sort-head table-fixed'>