Merge branch 'master' of github.com:easysoft/zentaopms

module/testcase/lang/en.php

@@ -164,8 +164,9 @@ $lang->testcase->reviewResultList['']        = '';
 $lang->testcase->reviewResultList['pass']    = 'Pass';
 $lang->testcase->reviewResultList['clarify'] = 'Clarify';
 
-$lang->testcase->groups['']      = 'Group ';
-$lang->testcase->groups['story'] = 'Story Group';
+$lang->testcase->groups['']           = 'Group ';
+$lang->testcase->groups['story']      = 'Story Group';
+$lang->testcase->groups['assignedTo'] = 'Assign Group';
 
 $lang->testcase->statusList['']            = '';
 $lang->testcase->statusList['wait']        = 'ToReview';

module/testcase/lang/zh-cn.php

@@ -164,8 +164,9 @@ $lang->testcase->reviewResultList['']        = '';
 $lang->testcase->reviewResultList['pass']    = '确认通过';
 $lang->testcase->reviewResultList['clarify'] = '继续完善';
 
-$lang->testcase->groups['']      = '分组查看';
-$lang->testcase->groups['story'] = '需求分组';
+$lang->testcase->groups['']           = '分组查看';
+$lang->testcase->groups['story']      = '需求分组';
+$lang->testcase->groups['assignedTo'] = '指派分组';
 
 $lang->testcase->statusList['']            = '';
 $lang->testcase->statusList['wait']        = '待评审';

module/testtask/control.php

@@ -251,11 +251,9 @@ class testtask extends control
         }
         if($browseType == 'bymodule') setcookie('taskCaseModule', (int)$param, $this->config->cookieLife, $this->config->webRoot);
         if($browseType != 'bymodule') $this->session->set('taskCaseBrowseType', $browseType);
-        if($browseType == 'account') $this->session->set('taskCaseAccount', $param);
 
         $moduleID = ($browseType == 'bymodule') ? (int)$param : ($browseType == 'bysearch' ? 0 : ($this->cookie->taskCaseModule ? $this->cookie->taskCaseModule : 0));
         $queryID  = ($browseType == 'bysearch') ? (int)$param : 0;
-        $account  = ($browseType == 'account')  ? $param : 'all';
 
         /* Append id for secend sort. */
         $sort = $this->loadModel('common')->appendOrder($orderBy, 't2.id');
@@ -302,7 +300,6 @@ class testtask extends control
         $this->view->moduleName    = $moduleID ? $this->tree->getById($moduleID)->name : $this->lang->tree->all;
         $this->view->treeClass     = $browseType == 'bymodule' ? '' : 'hidden';
         $this->view->pager         = $pager;
-        $this->view->account       = $account;
         $this->view->branches      = $this->loadModel('branch')->getPairs($productID);
         $this->view->setShowModule = false;
 
@@ -390,6 +387,11 @@ class testtask extends control
                 $groupCases[$run->story][] = $run;
                 $groupByList[$run->story]  = $run->storyTitle;
             }
+            elseif($groupBy == 'assignedTo')
+            {
+                if(empty($run->assignedTo)) continue;
+                $groupCases[$run->assignedTo][] = $run;
+            }
         }
 
         $this->view->title      = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->cases;

module/testtask/js/cases.js

@@ -6,16 +6,3 @@ $(document).ready(function()
     setTimeout(function(){fixedTheadOfList('#caseList')}, 100);
     if($('#caseList thead th.w-title').width() < 150) $('#caseList thead th.w-title').width(150);
 });
-
-function changeUser(account, taskID)
-{
-    if(account == '')
-    {
-        link = createLink('testtask', 'cases', 'taskID=' + taskID + '&browseType=all');
-    }
-    else
-    {
-        link = createLink('testtask', 'cases', 'taskID=' + taskID + '&browseType=account&param=' + account);
-    }
-    location.href = link;
-}

module/testtask/model.php

@@ -758,10 +758,6 @@ class testtaskModel extends model
         {
             $runs = $this->getUserRuns($task->id, $this->session->user->account, $modules, $sort, $pager);
         }
-        elseif($browseType == 'account')
-        {
-            $runs = $this->getUserRuns($task->id, $this->session->taskCaseAccount, $modules, $sort, $pager);
-        }
         /* By search. */
         elseif($browseType == 'bysearch')
         {

module/testtask/view/caseheader.html.php

@@ -39,7 +39,6 @@
             echo html::a($this->inlink('groupCase', "taskID=$taskID&groupBy=$key"), $value);
         }
         echo '</ul></li>';
-        echo "<li id='account' class='w-150px'>" . html::select('account', $users, $account, "onchange='changeUser(this.value, $taskID)' class='form-control chosen'") . '</li>';
     }
 
     if($this->methodName == 'cases') echo "<li id='bysearchTab'><a href='#'><i class='icon-search icon'></i>&nbsp;{$lang->testcase->bySearch}</a></li> ";

module/testtask/view/groupcase.html.php

@@ -17,7 +17,7 @@
 <table class='table table-fixed' id='treetable'>
   <thead>
     <tr>
-      <th class='w-50px'></th>
+      <th class='w-<?php echo $groupBy == 'story' ? '50' : '100';?>px'></th>
       <th><?php echo $lang->testcase->title;?></th>
       <th class='w-pri'>  <?php echo $lang->priAB;?></th>
       <th class='w-80px'> <?php echo $lang->typeAB;?></th>
@@ -34,9 +34,9 @@
   </thead>
   <?php $i = 0;?>
   <?php foreach($cases as $groupKey => $groupCases):?>
-  <?php $groupClass = ($i % 2 == 0) ? 'even' : 'highlight-warning'; $i ++;?>
+  <?php $groupClass = ($i % 2 == 0) ? 'even' : 'highlight-warning'; $i++;?>
   <tr id='node-<?php echo $groupKey;?>' class='actie-disabled group-title'>
-    <td class='text-right <?php echo $groupClass;?> text-left large strong group-name'><?php echo $groupKey;?></td>
+    <td class='text-right <?php echo $groupClass;?> large strong group-name'><?php echo $groupKey;?></td>
     <td colspan='12' class='text-left'><?php if($groupByList) echo $groupByList[$groupKey];?></td>
   </tr>
   <?php foreach($groupCases as $run):?>