Merge branch 'lyk_35042' into 'master'

* Finish story 35042.

See merge request easycorp/zentaopms!5340

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;}

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';

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';

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';

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';

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 个任务';

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 個任務';

module/weekly/view/index.html.php

@@ -90,6 +90,7 @@
         <?php endforeach;?>
       </tbody>
     </table>
+    <div class='table totalCount'><?php echo sprintf($lang->weekly->totalCount, count($finished));?></div>
 
     <div class='page-title'><h4><?php echo $lang->weekly->postponed;?></h4></div>
     <table class='table has-sort-head table-fixed'>
@@ -122,6 +123,7 @@
         <?php endforeach;?>
       </tbody>
     </table>
+    <div class='table totalCount'><?php echo sprintf($lang->weekly->totalCount, count($postponed));?></div>
 
     <div class='page-title'><h4><?php echo $lang->weekly->nextWeek;?></h4></div>
     <table class='table has-sort-head table-fixed'>
@@ -150,6 +152,7 @@
         <?php endforeach;?>
       </tbody>
     </table>
+    <div class='table totalCount'><?php echo sprintf($lang->weekly->totalCount, count($nextWeek));?></div>
 
     <div class='page-title'><h4><?php echo $lang->weekly->workloadByType;?></h4></div>
     <table class='table has-sort-head table-fixed'>