From 18c3f1637fb59fe695dd0142e76a779edffb4ecd Mon Sep 17 00:00:00 2001
From: liuyongkai <liuyongkai@easycorp.ltd>
Date: Thu, 15 Sep 2022 03:14:23 +0000
Subject: [PATCH] * Finish story 35042.

---
 module/weekly/css/index.css       |  1 +
 module/weekly/lang/de.php         |  2 ++
 module/weekly/lang/en.php         |  2 ++
 module/weekly/lang/fr.php         |  2 ++
 module/weekly/lang/vi.php         |  2 ++
 module/weekly/lang/zh-cn.php      |  2 ++
 module/weekly/lang/zh-tw.php      |  2 ++
 module/weekly/view/index.html.php | 12 +++++++++---
 8 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/module/weekly/css/index.css b/module/weekly/css/index.css
index fe916f0ecb..ecb9d045b5 100644
--- a/module/weekly/css/index.css
+++ b/module/weekly/css/index.css
@@ -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;}
diff --git a/module/weekly/lang/de.php b/module/weekly/lang/de.php
index 8f87280b74..c34bd92dc5 100644
--- a/module/weekly/lang/de.php
+++ b/module/weekly/lang/de.php
@@ -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';
diff --git a/module/weekly/lang/en.php b/module/weekly/lang/en.php
index 18608dd719..cd0a4ff031 100644
--- a/module/weekly/lang/en.php
+++ b/module/weekly/lang/en.php
@@ -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';
diff --git a/module/weekly/lang/fr.php b/module/weekly/lang/fr.php
index 8f87280b74..c34bd92dc5 100644
--- a/module/weekly/lang/fr.php
+++ b/module/weekly/lang/fr.php
@@ -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';
diff --git a/module/weekly/lang/vi.php b/module/weekly/lang/vi.php
index 18608dd719..cd0a4ff031 100644
--- a/module/weekly/lang/vi.php
+++ b/module/weekly/lang/vi.php
@@ -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';
diff --git a/module/weekly/lang/zh-cn.php b/module/weekly/lang/zh-cn.php
index a57fd3b190..53364d712c 100644
--- a/module/weekly/lang/zh-cn.php
+++ b/module/weekly/lang/zh-cn.php
@@ -37,3 +37,5 @@ $lang->weekly->ev = '实际完成的工作(EV)';
 $lang->weekly->ac = '实际花费的成本(AC)';
 $lang->weekly->sv = '进度偏差率(SV%)';
 $lang->weekly->cv = '成本偏差率（CV%）';
+
+$lang->weekly->totalCount = '总计 : %u 个任务';
diff --git a/module/weekly/lang/zh-tw.php b/module/weekly/lang/zh-tw.php
index 68dfbf19ae..45bdcfe74b 100644
--- a/module/weekly/lang/zh-tw.php
+++ b/module/weekly/lang/zh-tw.php
@@ -37,3 +37,5 @@ $lang->weekly->ev = '實際完成的工作(EV)';
 $lang->weekly->ac = '實際花費的成本(AC)';
 $lang->weekly->sv = '進度偏差率(SV%)';
 $lang->weekly->cv = '成本偏差率（CV%）';
+
+$lang->weekly->totalCount = '總計 : %u 個任務';
diff --git a/module/weekly/view/index.html.php b/module/weekly/view/index.html.php
index 9ccb5ec4e5..aa0882abc2 100644
--- a/module/weekly/view/index.html.php
+++ b/module/weekly/view/index.html.php
@@ -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'>