From a19de161237a0524f2cffb23acdb1adee4915e68 Mon Sep 17 00:00:00 2001
From: Yagami <sgm0422@qq.com>
Date: Fri, 25 Jan 2019 09:56:48 +0800
Subject: [PATCH] * Finish task #5246.

---
 module/project/view/grouptask.html.php   |  3 +--
 module/testcase/lang/en.php              |  5 +----
 module/testcase/lang/zh-cn.php           |  4 +---
 module/testcase/lang/zh-tw.php           |  5 +----
 module/testcase/view/caseheader.html.php | 16 ++--------------
 5 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/module/project/view/grouptask.html.php b/module/project/view/grouptask.html.php
index 3ee37981e3..7e0505fe07 100644
--- a/module/project/view/grouptask.html.php
+++ b/module/project/view/grouptask.html.php
@@ -160,9 +160,8 @@
               {
                   $groupEstimate += $task->estimate;
                   $groupConsumed += $task->consumed;
+                  if($groupBy == 'status' || ($task->status != 'cancel' && $task->status != 'closed')) $groupLeft += $task->left;
               }
-
-              if($groupBy == 'status' || ($task->status != 'cancel' && $task->status != 'closed')) $groupLeft += $task->left;
           }
 
           if($task->status == 'wait')   $groupWait++;
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index 7479b0c541..a89a21d2e9 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -83,6 +83,7 @@ $lang->testcase->edit                    = "Edit";
 $lang->testcase->batchEdit               = "Batch Edit ";
 $lang->testcase->batchChangeModule       = "Batch Change Module";
 $lang->testcase->batchChangeBranch       = "Batch Change Branch";
+$lang->testcase->groupByStories          = 'Group by Story';
 $lang->testcase->delete                  = "Delete";
 $lang->testcase->batchDelete             = "Batch Delete ";
 $lang->testcase->batchConfirmStoryChange = "Batch Confirm";
@@ -170,10 +171,6 @@ $lang->testcase->reviewResultList['']        = '';
 $lang->testcase->reviewResultList['pass']    = 'Pass';
 $lang->testcase->reviewResultList['clarify'] = 'Clarify';
 
-$lang->testcase->groups['']           = 'Group ';
-$lang->testcase->groups['story']      = 'Group by Story';
-$lang->testcase->groups['assignedTo'] = 'Group by Assignee';
-
 $lang->testcase->statusList['']            = '';
 $lang->testcase->statusList['wait']        = 'Wait';
 $lang->testcase->statusList['normal']      = 'Normal';
diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php
index dc74f6d72d..9a7a72e512 100644
--- a/module/testcase/lang/zh-cn.php
+++ b/module/testcase/lang/zh-cn.php
@@ -83,6 +83,7 @@ $lang->testcase->edit                    = "编辑";
 $lang->testcase->batchEdit               = "批量编辑 ";
 $lang->testcase->batchChangeModule       = "批量修改模块";
 $lang->testcase->batchChangeBranch       = "批量修改分支";
+$lang->testcase->groupByStories          = '需求分组';
 $lang->testcase->delete                  = "删除";
 $lang->testcase->batchDelete             = "批量删除 ";
 $lang->testcase->batchConfirmStoryChange = "批量确认变更";
@@ -170,9 +171,6 @@ $lang->testcase->reviewResultList['']        = '';
 $lang->testcase->reviewResultList['pass']    = '确认通过';
 $lang->testcase->reviewResultList['clarify'] = '继续完善';
 
-$lang->testcase->groups['']           = '分组查看';
-$lang->testcase->groups['story']      = '需求分组';
-$lang->testcase->groups['assignedTo'] = '指派分组';
 
 $lang->testcase->statusList['']            = '';
 $lang->testcase->statusList['wait']        = '待评审';
diff --git a/module/testcase/lang/zh-tw.php b/module/testcase/lang/zh-tw.php
index b40c77db18..c96cfc4a3d 100644
--- a/module/testcase/lang/zh-tw.php
+++ b/module/testcase/lang/zh-tw.php
@@ -83,6 +83,7 @@ $lang->testcase->edit                    = "編輯";
 $lang->testcase->batchEdit               = "批量編輯 ";
 $lang->testcase->batchChangeModule       = "批量修改模組";
 $lang->testcase->batchChangeBranch       = "批量修改分支";
+$lang->testcase->groupByStories          = '需求分組';
 $lang->testcase->delete                  = "刪除";
 $lang->testcase->batchDelete             = "批量刪除 ";
 $lang->testcase->batchConfirmStoryChange = "批量確認變更";
@@ -170,10 +171,6 @@ $lang->testcase->reviewResultList['']        = '';
 $lang->testcase->reviewResultList['pass']    = '確認通過';
 $lang->testcase->reviewResultList['clarify'] = '繼續完善';
 
-$lang->testcase->groups['']           = '分組查看';
-$lang->testcase->groups['story']      = '需求分組';
-$lang->testcase->groups['assignedTo'] = '指派分組';
-
 $lang->testcase->statusList['']            = '';
 $lang->testcase->statusList['wait']        = '待評審';
 $lang->testcase->statusList['normal']      = '正常';
diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php
index 5e7d41e261..acefe66d7a 100644
--- a/module/testcase/view/caseheader.html.php
+++ b/module/testcase/view/caseheader.html.php
@@ -89,22 +89,10 @@
     {
         $groupBy  = isset($groupBy)  ? $groupBy : '';
         $active   = !empty($groupBy) ? 'btn-active-text' : '';
-        $current  = zget($lang->testcase->groups, isset($groupBy) ? $groupBy : '', '');
-        if(empty($current)) $current = $lang->testcase->groups[''];
 
         echo "<div id='groupTab' class='btn-group'>";
-        echo html::a('javascript:;', "<span class='text'>{$current}</span>" . " <span class='caret'></span>", '', "class='btn btn-link {$active}' data-toggle='dropdown'");
-        echo "<ul class='dropdown-menu'>";
-
-        foreach($lang->testcase->groups as $key => $value)
-        {
-            if($key == '') continue;
-            echo '<li' . ($key == $groupBy ? " class='active'" : '') . '>';
-            echo html::a($this->createLink('testcase', 'groupCase', "productID=$productID&branch=$branch&groupBy=$key"), $value);
-            echo "</li>";
-        }
-
-        echo '</ul></div>';
+        echo html::a($this->createLink('testcase', 'groupCase', "productID=$productID&branch=$branch&groupBy=story"), "<span class='text'>{$lang->testcase->groupByStories}</span>", '', "class='btn btn-link $active'");
+        echo '</div>';
     }
     elseif($hasZeroPriv and $menuType == 'zerocase')
     {