From 96cf29a7ef23ac65e21669392e6fcbc124f5d41e Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 11 Oct 2022 11:27:34 +0800
Subject: [PATCH] * Finish task #71888.

---
 module/testtask/lang/de.php          |  2 ++
 module/testtask/lang/en.php          |  2 ++
 module/testtask/lang/fr.php          |  2 ++
 module/testtask/lang/zh-cn.php       |  2 ++
 module/testtask/view/browse.html.php | 19 +++++++++++++++----
 5 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/module/testtask/lang/de.php b/module/testtask/lang/de.php
index 54d304cf8b..ff147f50dc 100644
--- a/module/testtask/lang/de.php
+++ b/module/testtask/lang/de.php
@@ -105,6 +105,8 @@ $lang->testtask->caseCount        = 'Case Count';
 $lang->testtask->passCount        = 'Pass';
 $lang->testtask->failCount        = 'Fail';
 $lang->testtask->summary          = '%s cases, %s failures, %s time.';
+$lang->testtask->pageSummary      = 'Total testtasks: <strong>%s</strong>.';
+$lang->testtask->allSummary       = 'Total testtasks: <strong>%s</strong>, Wait: <strong>%s</strong>, Testing: <strong>%s</strong>, Blocked: <strong>%s</strong>.';
 
 $lang->testtask->beginAndEnd = 'Datum';
 $lang->testtask->to          = 'An';
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index 155b847a7e..225ffaa1af 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -105,6 +105,8 @@ $lang->testtask->caseCount        = 'Case Count';
 $lang->testtask->passCount        = 'Pass';
 $lang->testtask->failCount        = 'Fail';
 $lang->testtask->summary          = '%s cases, %s failures, %s time.';
+$lang->testtask->pageSummary      = 'Total testtasks: <strong>%s</strong>.';
+$lang->testtask->allSummary       = 'Total testtasks: <strong>%s</strong>, Wait: <strong>%s</strong>, Testing: <strong>%s</strong>, Blocked: <strong>%s</strong>.';
 
 $lang->testtask->beginAndEnd = 'Duration';
 $lang->testtask->to          = 'To';
diff --git a/module/testtask/lang/fr.php b/module/testtask/lang/fr.php
index 4d45d59966..f5aea60bec 100644
--- a/module/testtask/lang/fr.php
+++ b/module/testtask/lang/fr.php
@@ -105,6 +105,8 @@ $lang->testtask->caseCount        = 'Compteur CasTest';
 $lang->testtask->passCount        = 'Pass';
 $lang->testtask->failCount        = 'Fail';
 $lang->testtask->summary          = '%s CasTest, %s échecs, %s heures.';
+$lang->testtask->pageSummary      = 'Total testtasks: <strong>%s</strong>.';
+$lang->testtask->allSummary       = 'Total testtasks: <strong>%s</strong>, Wait: <strong>%s</strong>, Testing: <strong>%s</strong>, Blocked: <strong>%s</strong>.';
 
 $lang->testtask->beginAndEnd = 'Durée';
 $lang->testtask->to          = 'à';
diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php
index 863099cbfe..694fcf816d 100644
--- a/module/testtask/lang/zh-cn.php
+++ b/module/testtask/lang/zh-cn.php
@@ -105,6 +105,8 @@ $lang->testtask->caseCount        = '用例数';
 $lang->testtask->passCount        = '成功';
 $lang->testtask->failCount        = '失败';
 $lang->testtask->summary          = '有%s个用例，失败%s个，耗时%s。';
+$lang->testtask->pageSummary      = '本页共 <strong>%s</strong> 个测试单。';
+$lang->testtask->allSummary       = '本页共 <strong>%s</strong> 个测试单， 待测试测试单 <strong>%s</strong>， 测试中测试单 <strong>%s</strong>， 被阻塞测试单 <strong>%s</strong>。';
 
 $lang->testtask->beginAndEnd = '起止时间';
 $lang->testtask->to          = '至';
diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php
index f6c1afa48b..9134efc2be 100644
--- a/module/testtask/view/browse.html.php
+++ b/module/testtask/view/browse.html.php
@@ -75,17 +75,25 @@ $status = $this->session->testTaskVersionStatus;
       </tr>
     </thead>
     <tbody>
+    <?php
+    $waitCount    = 0;
+    $testingCount = 0;
+    $blockedCount = 0;
+    ?>
     <?php foreach($tasks as $task):?>
+    <?php if($task->status == 'wait')    $waitCount ++;?>
+    <?php if($task->status == 'doing')   $testingCount ++;?>
+    <?php if($task->status == 'blocked') $blockedCount ++;?>
     <tr class='text-left'>
       <td><?php echo html::a(inlink('cases', "taskID=$task->id"), sprintf('%03d', $task->id));?></td>
       <td class='c-name' title="<?php echo $task->name?>"><?php echo html::a(inlink('cases', "taskID=$task->id"), $task->name);?></td>
       <td class='c-name' title="<?php echo $task->buildName?>"><?php echo ($task->build == 'trunk' || empty($task->buildName)) ? $lang->trunk : html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName, '', "data-group=execution");?></td>
       <td class='c-name' title="<?php echo $task->productName?>"><?php echo $task->productName?></td>
       <td class='c-name' title="<?php echo $task->executionName?>"><?php echo $task->executionName?></td>
-      <?php $status = $this->processStatus('testtask', $task);?>
-      <td title='<?php echo $status;?>'>
+      <?php $statusName = $this->processStatus('testtask', $task);?>
+      <td title='<?php echo $statusName;?>'>
         <span class='status-task status-<?php echo $task->status?>'>
-          <?php echo $status;?>
+          <?php echo $statusName;?>
         </span>
       </td>
       <td title="<?php echo zget($users, $task->owner);?>"><?php echo zget($users, $task->owner);?></td>
@@ -100,7 +108,10 @@ $status = $this->session->testTaskVersionStatus;
     <?php endforeach;?>
     </tbody>
   </table>
-  <div class='table-footer'><?php $pager->show('right', 'pagerjs');?></div>
+  <div class='table-footer'>
+    <div class="table-statistic"><?php echo $status == 'totalstatus' ? sprintf($lang->testtask->allSummary, count($tasks), $waitCount, $testingCount, $blockedCount) : sprintf($lang->testtask->pageSummary, count($tasks));?></div>
+    <?php $pager->show('right', 'pagerjs');?>
+  </div>
   <?php endif;?>
 </div>
 <script>$(function(){$("#" + status + "Tab").addClass('btn-active-text').append(" <span class='label label-light label-badge'><?php echo $pager->recTotal;?></span>")})</script>