From c6b1ad5a8fa3c1a886d1db5d9f2b6d7436236af0 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 27 Feb 2017 13:49:47 +0800
Subject: [PATCH]  * finish task #2895.

---
 module/action/config.php                    |  1 +
 module/action/lang/zh-cn.php                |  2 +
 module/story/control.php                    |  1 +
 module/testcase/control.php                 |  6 ++-
 module/testcase/lang/zh-cn.php              |  1 +
 module/testcase/model.php                   | 44 +++++++++++++++++++--
 module/testcase/view/browsedata.html.php    |  2 +-
 module/testcase/view/caseheader.html.php    | 17 ++++++++
 module/testcase/view/datatabledata.html.php |  2 +-
 module/testsuite/lang/zh-cn.php             |  2 +-
 module/testsuite/model.php                  |  2 +-
 module/testsuite/view/browse.html.php       |  5 ++-
 module/testsuite/view/view.html.php         |  6 +--
 module/testtask/control.php                 | 35 +++++++++++-----
 module/testtask/lang/zh-cn.php              |  1 +
 module/testtask/view/linkcase.html.php      | 14 ++++++-
 16 files changed, 117 insertions(+), 24 deletions(-)

diff --git a/module/action/config.php b/module/action/config.php
index b89b15a1f0..4a5bfb6718 100755
--- a/module/action/config.php
+++ b/module/action/config.php
@@ -16,5 +16,6 @@ $config->action->objectNameFields['doclib']      = 'name';
 $config->action->objectNameFields['todo']        = 'name';
 $config->action->objectNameFields['branch']      = 'name';
 $config->action->objectNameFields['module']      = 'name';
+$config->action->objectNameFields['testsuite']   = 'name';
 
 $config->action->commonImgSize = 870;
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index 6eb35a5092..147ae780ff 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -61,6 +61,7 @@ $lang->action->objectTypes['doclib']      = '文档库';
 $lang->action->objectTypes['todo']        = '待办';
 $lang->action->objectTypes['branch']      = '分支';
 $lang->action->objectTypes['module']      = '模块';
+$lang->action->objectTypes['testsuite']   = '套件';
 
 /* 用来描述操作历史记录。*/
 $lang->action->desc = new stdclass();
@@ -196,6 +197,7 @@ $lang->action->search->objectTypeList['build']       = 'Build';
 $lang->action->search->objectTypeList['release']     = '发布';
 $lang->action->search->objectTypeList['productplan'] = '计划';
 $lang->action->search->objectTypeList['branch']      = '分支';
+$lang->action->search->objectTypeList['testsuite']   = '套件';
 
 /* 用来在动态显示中显示动作 */
 $lang->action->search->label['']                    = '';
diff --git a/module/story/control.php b/module/story/control.php
index 9f5d9f5032..506dff7892 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -1009,6 +1009,7 @@ class story extends control
         $this->view->users     = $this->user->getPairs('noletter');
         $this->view->productID = $productID;
         $this->view->orderBy   = $orderBy;
+        $this->view->suiteList = $this->loadModel('testsuite')->getSuites($productID);
         $this->display();
     }
 
diff --git a/module/testcase/control.php b/module/testcase/control.php
index fefafc9acb..2a23969c4d 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -72,9 +72,11 @@ class testcase extends control
             setcookie('caseModule', 0, $this->config->cookieLife, $this->config->webRoot);
         }
         if($browseType == 'bymodule') setcookie('caseModule', (int)$param, $this->config->cookieLife, $this->config->webRoot);
+        if($browseType == 'bysuite')  setcookie('caseSuite', (int)$param, $this->config->cookieLife, $this->config->webRoot);
         if($browseType != 'bymodule') $this->session->set('caseBrowseType', $browseType);
 
         $moduleID   = ($browseType == 'bymodule') ? (int)$param : ($browseType == 'bysearch' ? 0 : ($this->cookie->caseModule ? $this->cookie->caseModule : 0));
+        $suiteID    = ($browseType == 'bysuite') ? (int)$param : ($browseType == 'bymodule' ? ($this->cookie->caseSuite ? $this->cookie->caseSuite : 0) : 0);
         $queryID    = ($browseType == 'bysearch') ? (int)$param : 0;
 
         /* Set menu, save session. */
@@ -94,7 +96,7 @@ class testcase extends control
         $sort = $this->loadModel('common')->appendOrder($orderBy);
 
         /* Get test cases. */
-        $cases = $this->testcase->getTestCases($productID, $branch, $browseType, $queryID, $moduleID, $sort, $pager);
+        $cases = $this->testcase->getTestCases($productID, $branch, $browseType, $browseType == 'bysearch' ? $queryID : $suiteID, $moduleID, $sort, $pager);
 
         /* save session .*/
         $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'testcase', $browseType != 'bysearch' ? false : true);
@@ -130,6 +132,8 @@ class testcase extends control
         $this->view->cases         = $cases;
         $this->view->branch        = $branch;
         $this->view->branches      = $this->loadModel('branch')->getPairs($productID);
+        $this->view->suiteList     = $this->loadModel('testsuite')->getSuites($productID);
+        $this->view->suiteID       = $suiteID;
         $this->view->setShowModule = true;
 
 
diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php
index fd15e64286..093d8d2877 100644
--- a/module/testcase/lang/zh-cn.php
+++ b/module/testcase/lang/zh-cn.php
@@ -157,4 +157,5 @@ $lang->testcase->featureBar['browse']['all']         = $lang->testcase->allCases
 $lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm;
 $lang->testcase->featureBar['browse']['group']       = '分组查看';
 $lang->testcase->featureBar['browse']['zerocase']    = '零用例需求';
+$lang->testcase->featureBar['browse']['suite']       = '套件';
 $lang->testcase->featureBar['groupcase']             = $lang->testcase->featureBar['browse'];
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 3cba08e0ff..f8e7943e20 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -197,6 +197,31 @@ class testcaseModel extends model
             ->orderBy($orderBy)->page($pager)->fetchAll('id');
     }
 
+    /**
+     * Get by suite.
+     * 
+     * @param  int    $productID 
+     * @param  int    $branch 
+     * @param  int    $suiteID 
+     * @param  array  $moduleIdList 
+     * @param  string $orderBy 
+     * @param  object $pager 
+     * @access public
+     * @return void
+     */
+    public function getBySuite($productID, $branch = 0, $suiteID, $moduleIdList = 0, $orderBy = 'id_desc', $pager = null)
+    {
+        return $this->dao->select('t1.*, t2.title as storyTitle, t3.version as version')->from(TABLE_CASE)->alias('t1')
+            ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story=t2.id')
+            ->leftJoin(TABLE_SUITECASE)->alias('t3')->on('t1.id=t3.case')
+            ->where('t1.product')->eq((int)$productID)
+            ->andWhere('t3.suite')->eq((int)$suiteID)
+            ->beginIF($branch)->andWhere('t1.branch')->eq($branch)->fi()
+            ->beginIF($moduleIdList)->andWhere('t1.module')->in($moduleIdList)->fi()
+            ->andWhere('t1.deleted')->eq('0')
+            ->orderBy($orderBy)->page($pager)->fetchAll('id');
+    }
+
     /**
      * Get case info by ID.
      * 
@@ -285,6 +310,10 @@ class testcaseModel extends model
                 ->page($pager)
                 ->fetchAll();
         }
+        elseif($browseType == 'bysuite')
+        {
+            $cases = $this->getBySuite($productID, $branch, $queryID, $modules, $sort, $pager);
+        }
         /* By search. */
         elseif($browseType == 'bysearch')
         {
@@ -992,9 +1021,9 @@ class testcaseModel extends model
      * @access public
      * @return void
      */
-    public function printCell($col, $case, $users, $branches, $modulePairs = array())
+    public function printCell($col, $case, $users, $branches, $modulePairs = array(), $browseType = '')
     {
-        $caseLink = helper::createLink('testcase', 'view', "caseID=$case->id");
+        $caseLink = helper::createLink('testcase', 'view', "caseID=$case->id&version=$case->version");
         $account  = $this->app->user->account;
         $id = $col->id;
         if($col->show)
@@ -1030,7 +1059,16 @@ class testcaseModel extends model
                 foreach(explode(',', trim($case->stage, ',')) as $stage) echo $this->lang->testcase->stageList[$stage] . '<br />';
                 break;
             case 'status':
-                echo $this->lang->testcase->statusList[$case->status];
+                if($case->needconfirm)
+                {
+                    echo "(<span class='warning'>{$this->lang->story->changed}</span> ";
+                    echo html::a(helper::createLink('testcase', 'confirmStoryChange', "caseID=$case->id"), $this->lang->confirm, 'hiddenwin');
+                    echo ")";
+                }
+                else
+                {
+                    echo $this->lang->testcase->statusList[$case->status];
+                }
                 break;
             case 'story':
                 static $stories = array();
diff --git a/module/testcase/view/browsedata.html.php b/module/testcase/view/browsedata.html.php
index 337a9a2b63..65db0b862f 100644
--- a/module/testcase/view/browsedata.html.php
+++ b/module/testcase/view/browsedata.html.php
@@ -38,7 +38,7 @@
       <tbody>
       <?php foreach($cases as $case):?>
       <tr class='text-center'>
-        <?php $viewLink = inlink('view', "caseID=$case->id");?>
+        <?php $viewLink = inlink('view', "caseID=$case->id&version=$case->version");?>
         <td class='cell-id'>
           <input type='checkbox' name='caseIDList[]'  value='<?php echo $case->id;?>'/> 
           <?php echo html::a($viewLink, sprintf('%03d', $case->id));?>
diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php
index 1fe133668e..e56d5587a3 100644
--- a/module/testcase/view/caseheader.html.php
+++ b/module/testcase/view/caseheader.html.php
@@ -31,6 +31,23 @@
     {
         echo "<li id='{$menyType}Tab'>" . html::a($this->createLink('testcase', 'browse', "productid=$productID&branch=$branch&browseType=$menyType"), $menuItem->text) . "</li>";
     }
+    elseif($hasBrowsePriv and $menyType == 'suite')
+    {
+        echo "<li id='bysuiteTab' class='dropdown'>";
+        $currentSuiteID = isset($suiteID) ? (int)$suiteID : 0;
+        $currentSuite   = zget($suiteList, $currentSuiteID, '');
+        $currentName    = empty($currentSuite) ? $lang->testsuite->common : $currentSuite->name;
+        echo html::a('javascript:;', $currentName . " <span class='caret'></span>", '', "data-toggle='dropdown'");
+        echo "<ul class='dropdown-menu' style='max-height:240px; overflow-y:auto'>";
+        foreach ($suiteList as $suiteID => $suite)
+        {
+            echo '<li' . ($suiteID == (int)$currentSuiteID ? " class='active'" : '') . '>';
+            $suiteName = $suite->name;
+            if($suite->type == 'public') $suiteName .= " <span class='label label-info'>{$lang->testsuite->authorList[$suite->type]}</span>";
+            echo html::a($this->createLink('testcase', 'browse', "productID=$productID&branch=$branch&browseType=bySuite&param=$suiteID"), $suiteName);
+        }
+        echo '</ul></li>';
+    }
     elseif($hasGroupPriv and $menyType == 'group')
     {
         echo "<li id='groupTab' class='dropdown'>";
diff --git a/module/testcase/view/datatabledata.html.php b/module/testcase/view/datatabledata.html.php
index 4e2ad0a0c1..01713084e1 100644
--- a/module/testcase/view/datatabledata.html.php
+++ b/module/testcase/view/datatabledata.html.php
@@ -23,7 +23,7 @@ extract($widths);
       <tbody>
         <?php foreach($cases as $case):?>
         <tr class='text-center' data-id='<?php echo $case->id?>'>
-          <?php foreach($setting as $key => $value) $this->testcase->printCell($value, $case, $users, $branches, $modulePairs);?>
+          <?php foreach($setting as $key => $value) $this->testcase->printCell($value, $case, $users, $branches, $modulePairs, $browseType);?>
         </tr>
         <?php endforeach;?>
       </tbody>
diff --git a/module/testsuite/lang/zh-cn.php b/module/testsuite/lang/zh-cn.php
index f4f51ff916..966b71b8d5 100644
--- a/module/testsuite/lang/zh-cn.php
+++ b/module/testsuite/lang/zh-cn.php
@@ -23,7 +23,7 @@ $lang->testsuite->cases            = '用例';
 $lang->testsuite->pre              = '上一个';
 $lang->testsuite->next             = '下一个';
 
-$lang->testsuite->common         = '测试视图套件';
+$lang->testsuite->common         = '套件';
 $lang->testsuite->product        = '所属' . $lang->productCommon;
 $lang->testsuite->name           = '名称';
 $lang->testsuite->desc           = '描述';
diff --git a/module/testsuite/model.php b/module/testsuite/model.php
index b17cd71703..abf6b231e2 100644
--- a/module/testsuite/model.php
+++ b/module/testsuite/model.php
@@ -91,7 +91,7 @@ class testsuiteModel extends model
             ->andWhere("(`type` = 'public' OR (`type` = 'private' and addedBy = '{$this->app->user->account}'))")
             ->orderBy($orderBy)
             ->page($pager)
-            ->fetchAll();
+            ->fetchAll('id');
     }
 
     /**
diff --git a/module/testsuite/view/browse.html.php b/module/testsuite/view/browse.html.php
index 8de663202b..a51132ae10 100644
--- a/module/testsuite/view/browse.html.php
+++ b/module/testsuite/view/browse.html.php
@@ -32,7 +32,10 @@
   <?php foreach($suites as $suite):?>
   <tr class='text-left'>
     <td><?php echo sprintf('%03d', $suite->id);?></td>
-    <td class='text-left' title="<?php echo $suite->name?>"><?php echo html::a(inlink('view', "suiteID=$suite->id"), $suite->name);?></td>
+    <td class='text-left' title="<?php echo $suite->name?>">
+      <?php if($suite->type == 'public') echo "<span class='label label-info'>{$lang->testsuite->authorList['public']}</span> ";?>
+      <?php echo html::a(inlink('view', "suiteID=$suite->id"), $suite->name);?>
+    </td>
     <td><?php echo $suite->desc;?></td>
     <td><?php echo zget($users, $suite->addedBy);?></td>
     <td><?php echo $suite->addedDate;?></td>
diff --git a/module/testsuite/view/view.html.php b/module/testsuite/view/view.html.php
index b5a9de46b9..53e48ad48b 100644
--- a/module/testsuite/view/view.html.php
+++ b/module/testsuite/view/view.html.php
@@ -92,12 +92,12 @@
               <td><span class='<?php echo 'pri' . zget($lang->testcase->priList, $case->pri, $case->pri)?>'><?php echo zget($lang->testcase->priList, $case->pri, $case->pri)?></span></td>
               <td class='text-left nobr'>
                 <?php if($case->branch) echo "<span class='label label-info label-badge'>{$branches[$case->branch]}</span>"?>
-                <?php echo html::a($this->createLink('testcase', 'view', "caseID=$case->id&version=$case->caseVersion&from=testsuite"), $case->title, '_blank');?>
+                <?php echo html::a($this->createLink('testcase', 'view', "caseID=$case->id&version=$case->caseVersion"), $case->title, '_blank');?>
               </td>
               <td><?php echo $lang->testcase->typeList[$case->type];?></td>
               <td class='<?php echo $case->status;?>'><?php echo ($case->version < $case->caseVersion) ? "<span class='warning'>{$lang->testcase->changed}</span>" : $lang->testcase->statusList[$case->status];?></td>
-              <td><?php echo (common::hasPriv('testcase', 'bugs') and $case->bugs) ? html::a($this->createLink('testcase', 'bugs', "case={$case->id}&caseID={$case->case}"), $case->bugs, '', "class='iframe'") : $case->bugs;?></td>
-              <td><?php echo (common::hasPriv('testsuite', 'results') and $case->results) ? html::a($this->createLink('testsuite', 'results', "caseID={$case->id}&caseID={$case->case}"), $case->results, '', "class='iframe'") : $case->results;?></td>
+              <td><?php echo (common::hasPriv('testcase', 'bugs') and $case->bugs) ? html::a($this->createLink('testcase', 'bugs', "runID=0&caseID={$case->id}"), $case->bugs, '', "class='iframe'") : $case->bugs;?></td>
+              <td><?php echo (common::hasPriv('testtask', 'results') and $case->results) ? html::a($this->createLink('testtask', 'results', "runID=0&caseID={$case->id}"), $case->results, '', "class='iframe'") : $case->results;?></td>
               <td><?php echo $case->stepNumber;?></td>
               <td class='text-center'>
                 <?php
diff --git a/module/testtask/control.php b/module/testtask/control.php
index 46bb078415..8cf5a9f2f8 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -521,7 +521,7 @@ class testtask extends control
      * @access public
      * @return void
      */
-    public function linkCase($taskID, $param = 'all', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function linkCase($taskID, $type = 'all', $param = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         if(!empty($_POST))
         {
@@ -575,7 +575,7 @@ class testtask extends control
         if(strpos($query, $allProduct) !== false) $query = str_replace($allProduct, '1', $query);
 
         $linkedCases = $this->dao->select('`case`')->from(TABLE_TESTRUN)->where('task')->eq($taskID)->fetchPairs('case');
-        if($param == 'all')
+        if($type == 'all')
         {
             $cases = $this->dao->select('*')->from(TABLE_CASE)->where($query)
                 ->andWhere('id')->notIN($linkedCases)
@@ -585,7 +585,7 @@ class testtask extends control
                 ->page($pager)
                 ->fetchAll();
         }
-        if($param == 'bystory')
+        elseif($type == 'bystory')
         {
             $stories = $this->dao->select('stories')->from(TABLE_BUILD)->where('id')->eq($task->build)->fetch('stories');
             $cases   = array();
@@ -602,13 +602,13 @@ class testtask extends control
                     ->fetchAll();
             }
         }
-        if($param == 'bybug')
+        elseif($type == 'bybug')
         {
             $bugs  = $this->dao->select('bugs')->from(TABLE_BUILD)->where('id')->eq($task->build)->fetch('bugs');
             $cases = array();
             if($bugs)
             {
-                $cases = empty($bugs) ? array() : $this->dao->select('*')->from(TABLE_CASE)->where($query)
+                $cases = $this->dao->select('*')->from(TABLE_CASE)->where($query)
                     ->andWhere('product')->eq($productID)
                     ->beginIF($linkedCases)->andWhere('id')->notIN($linkedCases)->fi()
                     ->beginIF($task->branch)->andWhere('branch')->in("0,$task->branch")->fi()
@@ -619,11 +619,26 @@ class testtask extends control
                     ->fetchAll();
             }
         }
-        $this->view->users   = $this->loadModel('user')->getPairs('noletter');
-        $this->view->cases   = $cases;
-        $this->view->taskID  = $taskID;
-        $this->view->pager   = $pager;
-        $this->view->task    = $task;
+        if($type == 'bysuite')
+        {
+            $cases =  $this->dao->select('t1.*,t2.version as version')->from(TABLE_CASE)->alias('t1')
+                ->leftJoin(TABLE_SUITECASE)->alias('t2')->on('t1.id=t2.case')
+                ->where($query)
+                ->andWhere('t2.suite')->eq((int)$param)
+                ->andWhere('t1.product')->eq($productID)
+                ->beginIF($linkedCases)->andWhere('t1.id')->notIN($linkedCases)->fi()
+                ->beginIF($task->branch)->andWhere('t1.branch')->in("0,$task->branch")->fi()
+                ->andWhere('deleted')->eq(0)
+                ->orderBy('id_desc')
+                ->page($pager)
+                ->fetchAll();
+        }
+        $this->view->users     = $this->loadModel('user')->getPairs('noletter');
+        $this->view->cases     = $cases;
+        $this->view->taskID    = $taskID;
+        $this->view->pager     = $pager;
+        $this->view->task      = $task;
+        $this->view->suiteList = $this->loadModel('testsuite')->getSuites($task->product);
 
         $this->display();
     }
diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php
index 88901bc91f..26996ffaea 100644
--- a/module/testtask/lang/zh-cn.php
+++ b/module/testtask/lang/zh-cn.php
@@ -71,6 +71,7 @@ $lang->testtask->priList[4] = '4';
 $lang->testtask->unlinkedCases = '未关联';
 $lang->testtask->linkByStory   = '按需求关联';
 $lang->testtask->linkByBug     = '按Bug关联';
+$lang->testtask->linkBySuite   = '按套件关联';
 $lang->testtask->passAll       = '全部通过';
 $lang->testtask->pass          = '通过';
 $lang->testtask->fail          = '失败';
diff --git a/module/testtask/view/linkcase.html.php b/module/testtask/view/linkcase.html.php
index c748294ade..17b65ceeed 100644
--- a/module/testtask/view/linkcase.html.php
+++ b/module/testtask/view/linkcase.html.php
@@ -21,10 +21,20 @@
   <div class='actions'>
     <?php
     echo "<div class='btn-group'>";
+    echo "<span class='dropdown'>";
+    echo "<button class='btn' type='button' data-toggle='dropdown'><i class='icon icon-link'></i> {$lang->testtask->linkBySuite} <span class='caret'></span></button>";
+    echo "<ul class='dropdown-menu' style='max-height:240px;overflow-y:auto'>";
+    foreach($suiteList as $suiteID => $suite)
+    {
+        $suiteName = $suite->name;
+        if($suite->type == 'public') $suiteName .= " <span class='label label-info'>{$lang->testsuite->authorList[$suite->type]}</span>";
+        echo "<li>" . html::a(inlink('linkCase', "taskID=$taskID&type=bysuite&param=$suiteID"), $suiteName) . "</li>";
+    }
+    echo "</ul></span>";
     $lang->testtask->linkCase = $lang->testtask->linkByStory;
-    common::printIcon('testtask', 'linkCase', "taskID=$taskID&param=bystory", '', 'button', 'link');
+    common::printIcon('testtask', 'linkCase', "taskID=$taskID&type=bystory", '', 'button', 'link');
     $lang->testtask->linkCase = $lang->testtask->linkByBug;
-    common::printIcon('testtask', 'linkCase', "taskID=$taskID&param=bybug", '', 'button', 'link');
+    common::printIcon('testtask', 'linkCase', "taskID=$taskID&type=bybug", '', 'button', 'link');
     echo '</div>';
     echo "<div class='btn-group'>";
     common::printRPN($this->session->testtaskList);