From bc803e56c8f288467ca2e975f2b57a817d871f5e Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Wed, 1 Jun 2022 07:34:04 +0000
Subject: [PATCH] * Finish task #55676.

---
 module/datatable/config.php          |   1 +
 module/execution/control.php         |   1 +
 module/execution/view/story.html.php |  84 +++++++++++++------
 module/story/config.php              |  21 ++++-
 module/story/lang/en.php             |   1 +
 module/story/lang/zh-cn.php          |   1 +
 module/story/model.php               | 116 ++++++++++++++++++++++++---
 7 files changed, 187 insertions(+), 38 deletions(-)

diff --git a/module/datatable/config.php b/module/datatable/config.php
index fb535f0f36..0c2c0fdbb0 100644
--- a/module/datatable/config.php
+++ b/module/datatable/config.php
@@ -1,5 +1,6 @@
 <?php
 $config->datatable->moduleAlias['product-browse']     = 'story';
+$config->datatable->moduleAlias['execution-story']    = 'story';
 $config->datatable->moduleAlias['execution-task']     = 'task';
 $config->datatable->moduleAlias['testtask-cases']     = 'testcase';
 $config->datatable->moduleAlias['program-project']    = 'project';
diff --git a/module/execution/control.php b/module/execution/control.php
index dd82569951..cee16e5a2d 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -855,6 +855,7 @@ class execution extends control
         $this->view->branchGroups      = $branchGroups;
         $this->view->canBeChanged      = common::canModify('execution', $execution); // Determines whether an object is editable.
         $this->view->showBranch        = $showBranch;
+        $this->view->storyStages     = $this->product->batchGetStoryStage($stories);
 
         $this->display();
     }
diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index f0018a653a..3b1286ae7e 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -161,6 +161,9 @@
   </div>
   <div class="main-col">
     <div id='queryBox' data-module='executionStory' class='cell <?php if($type =='bysearch') echo 'show';?>'></div>
+      <div class="table-header fixed-right">
+        <nav class="btn-toolbar pull-right setting"></nav>
+      </div>
     <?php if(empty($stories)):?>
     <div class="table-empty-tip">
       <p>
@@ -172,25 +175,44 @@
     </div>
     <?php else:?>
     <form class='main-table table-story skip-iframe-modal' method='post' id='executionStoryForm'>
-      <div class="table-header fixed-right">
-        <nav class="btn-toolbar pull-right"></nav>
-      </div>
-      <table class='table tablesorter has-sort-head' id='storyList'>
+      <?php
+      $datatableId  = $this->moduleName . ucfirst($this->methodName);
+      $useDatatable = (isset($config->datatable->$datatableId->mode) and $config->datatable->$datatableId->mode == 'datatable');
+      $vars = "executionID={$execution->id}&orderBy=%s&type=$type&param=$param&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";
+
+      if($useDatatable) include '../../common/view/datatable.html.php';
+      $setting = $this->datatable->getSetting('execution');
+      $widths  = $this->datatable->setFixedFieldWidth($setting);
+      $columns = 0;
+
+      $checkObject = new stdclass();
+      $checkObject->execution = $execution->id;
+
+      $totalEstimate       = 0;
+      $canBatchEdit        = common::hasPriv('story', 'batchEdit');
+      $canBatchClose       = common::hasPriv('story', 'batchClose');
+      $canBatchChangeStage = common::hasPriv('story', 'batchChangeStage');
+      $canBatchUnlink      = common::hasPriv('execution', 'batchUnlinkStory');
+      $canBatchToTask      = common::hasPriv('story', 'batchToTask', $checkObject);
+      $canBatchAction      = ($canBeChanged and ($canBatchEdit or $canBatchClose or $canBatchChangeStage or $canBatchUnlink or $canBatchToTask));
+      ?>
+      <?php if(!$useDatatable) echo '<div class="table-responsive">';?>
+      <table class='table tablesorter has-sort-head<?php if($useDatatable) echo ' datatable';?>' id='storyList' data-fixed-left-width='<?php echo $widths['leftWidth']?>' data-fixed-right-width='<?php echo $widths['rightWidth']?>'>
         <thead>
           <tr>
           <?php
-          $checkObject = new stdclass();
-          $checkObject->execution = $execution->id;
-
-          $totalEstimate       = 0;
-          $canBatchEdit        = common::hasPriv('story', 'batchEdit');
-          $canBatchClose       = common::hasPriv('story', 'batchClose');
-          $canBatchChangeStage = common::hasPriv('story', 'batchChangeStage');
-          $canBatchUnlink      = common::hasPriv('execution', 'batchUnlinkStory');
-          $canBatchToTask      = common::hasPriv('story', 'batchToTask', $checkObject);
-          $canBatchAction      = ($canBeChanged and ($canBatchEdit or $canBatchClose or $canBatchChangeStage or $canBatchUnlink or $canBatchToTask));
+          foreach($setting as $key => $value)
+          {
+              if($value->show)
+              {
+                  $this->datatable->printHead($value, $orderBy, $vars, $canBatchAction);
+                  $columns ++;
+              }
+          }
           ?>
-          <?php $vars = "executionID={$execution->id}&orderBy=%s&type=$type&param=$param&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
+          </tr>
+<!--
+          <tr>
             <th class='c-id {sorter:false}'>
               <?php if($canBatchAction):?>
               <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
@@ -200,21 +222,22 @@
               <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
             </th>
             <?php if($canOrder):?>
-            <th class='c-sort {sorter:false}'><?php common::printOrderLink('order', $orderBy, $vars, $lang->execution->orderAB);?></th>
+            <th class='c-sort'><?php common::printOrderLink('order', $orderBy, $vars, $lang->execution->orderAB);?></th>
             <?php endif;?>
-            <th class='c-pri {sorter:false}' title=<?php echo $lang->execution->pri;?>><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
-            <th class='c-name {sorter:false}'><?php common::printOrderLink('title', $orderBy, $vars, $lang->execution->storyTitle);?></th>
-            <th class='c-category {sorter:false}'><?php common::printOrderLink('category', $orderBy, $vars, $lang->story->category);?></th>
-            <th class='c-user {sorter:false}'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
-            <th class='c-assignedTo {sorter:false} text-center'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
-            <th class='c-estimate {sorter:false} text-right'> <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
-            <th class='c-status {sorter:false}'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
-            <th class='c-stage {sorter:false}'> <?php common::printOrderLink('stage', $orderBy, $vars, $lang->story->stageAB);?></th>
+            <th class='c-pri' title=<?php echo $lang->execution->pri;?>><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
+            <th class='c-name'><?php common::printOrderLink('title', $orderBy, $vars, $lang->execution->storyTitle);?></th>
+            <th class='c-category'><?php common::printOrderLink('category', $orderBy, $vars, $lang->story->category);?></th>
+            <th class='c-user'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
+            <th class='c-assignedTo text-center'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
+            <th class='c-estimate text-right'> <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
+            <th class='c-status'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
+            <th class='c-stage'> <?php common::printOrderLink('stage', $orderBy, $vars, $lang->story->stageAB);?></th>
             <th title='<?php echo $lang->story->taskCount?>' class='c-count'><?php echo $lang->story->taskCountAB;?></th>
             <th title='<?php echo $lang->story->bugCount?>'  class='c-count'><?php echo $lang->story->bugCountAB;?></th>
             <th title='<?php echo $lang->story->caseCount?>' class='c-count'><?php echo $lang->story->caseCountAB;?></th>
-            <th class='c-actions-7 text-center {sorter:false}'><?php echo $lang->actions;?></th>
+            <th class='c-actions-7 text-center'><?php echo $lang->actions;?></th>
           </tr>
+-->
         </thead>
         <tbody id='storyTableList' class='sortable'>
           <?php foreach($stories as $key => $story):?>
@@ -223,6 +246,12 @@
           $totalEstimate += $story->estimate;
           ?>
           <tr id="story<?php echo $story->id;?>" data-id='<?php echo $story->id;?>' data-order='<?php echo $story->order ?>' data-estimate='<?php echo $story->estimate?>' data-cases='<?php echo zget($storyCases, $story->id, 0)?>'>
+          <?php foreach($setting as $key => $value)
+          {
+              $this->story->printCell($value, $story, $users, '', $storyStages, $modulePairs, $storyTasks, $storyBugs, $storyCases, $useDatatable ? 'datatable' : 'table', '', $execution, $showBranch, $productID);
+          }
+          ?>
+<!--
             <td class='cell-id'>
               <?php if($canBatchAction):?>
               <?php echo html::checkbox('storyIdList', array($story->id => '')) . html::a(helper::createLink('story', 'view', "storyID=$story->id&version=$story->version&from=execution&param=$execution->id"), sprintf('%03d', $story->id), null, "data-app='execution'");?>
@@ -322,11 +351,13 @@
                   }
               }
               ?>
+-->
             </td>
           </tr>
           <?php endforeach;?>
         </tbody>
       </table>
+      <?php if(!$useDatatable) echo '</div>';?>
       <div class='table-footer'>
         <?php if($canBatchAction):?>
         <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
@@ -491,6 +522,9 @@ function handleLinkButtonClick()
   var xxcUrl = "xxc:openInApp/zentao-integrated/" + encodeURIComponent(window.location.href.replace(/.display=card/, '').replace(/\.xhtml/, '.html'));
   window.open(xxcUrl);
 }
+<?php if(!empty($useDatatable)):?>
+$(function(){$('#executionStoryForm').table();})
+<?php endif;?>
 </script>
 <?php if(commonModel::isTutorialMode()): ?>
 <style>
diff --git a/module/story/config.php b/module/story/config.php
index b3a7816cc3..13992a4a8c 100644
--- a/module/story/config.php
+++ b/module/story/config.php
@@ -50,14 +50,32 @@ $config->story->custom->createFields      = $config->story->list->customCreateFi
 $config->story->custom->batchCreateFields = 'module,plan,spec,pri,estimate,review,%s';
 $config->story->custom->batchEditFields   = 'branch,module,plan,estimate,pri,source,stage,closedBy,closedReason';
 
+global $lang, $app;
 $config->story->datatable = new stdclass();
-$config->story->datatable->defaultField = array('id', 'pri', 'title', 'plan', 'openedBy', 'assignedTo', 'estimate', 'status', 'stage', 'taskCount', 'actions');
+if($app->tab == 'execution')
+{
+    $config->story->datatable->defaultField = array('id','order', 'pri', 'title', 'plan', 'openedBy', 'assignedTo', 'estimate', 'status', 'stage', 'taskCount', 'actions');
+}
+else
+{
+    $config->story->datatable->defaultField = array('id', 'pri', 'title', 'plan', 'openedBy', 'assignedTo', 'estimate', 'status', 'stage', 'taskCount', 'actions');
+}
 
 $config->story->datatable->fieldList['id']['title']    = 'idAB';
 $config->story->datatable->fieldList['id']['fixed']    = 'left';
 $config->story->datatable->fieldList['id']['width']    = '60';
 $config->story->datatable->fieldList['id']['required'] = 'yes';
 
+if($app->tab == 'execution')
+{
+    $config->story->datatable->fieldList['order']['title']    = 'order';
+    $config->story->datatable->fieldList['order']['fixed']    = 'left';
+    $config->story->datatable->fieldList['order']['width']    = '60';
+    $config->story->datatable->fieldList['order']['sort']     = 'no';
+    $config->story->datatable->fieldList['order']['required'] = 'no';
+    $config->story->datatable->fieldList['order']['name']     = $this->lang->story->order;
+}
+
 $config->story->datatable->fieldList['pri']['title']    = 'priAB';
 $config->story->datatable->fieldList['pri']['fixed']    = 'left';
 $config->story->datatable->fieldList['pri']['width']    = '50';
@@ -194,7 +212,6 @@ $config->story->datatable->fieldList['version']['fixed']    = 'no';
 $config->story->datatable->fieldList['version']['width']    = '60';
 $config->story->datatable->fieldList['version']['required'] = 'no';
 
-global $lang, $app;
 $config->story->datatable->fieldList['taskCount']['title']    = 'T';
 $config->story->datatable->fieldList['taskCount']['fixed']    = 'no';
 $config->story->datatable->fieldList['taskCount']['width']    = '30';
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index a1230ac20a..77f3a2789a 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -67,6 +67,7 @@ $lang->story->toTask             = 'Convert to Task';
 $lang->story->batchToTask        = 'Batch Convert to Task';
 $lang->story->convertRelations   = 'Convert Relations';
 $lang->story->undetermined       = 'undetermined';
+$lang->story->order              = 'Order';
 
 $lang->story->editAction      = "Edit {$lang->SRCommon}";
 $lang->story->changeAction    = "Change {$lang->SRCommon}";
diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index e93141a2b5..ce3c57d13f 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -67,6 +67,7 @@ $lang->story->toTask             = '转任务';
 $lang->story->batchToTask        = '批量转任务';
 $lang->story->convertRelations   = '换算关系';
 $lang->story->undetermined       = '待定';
+$lang->story->order              = '排序';
 
 $lang->story->editAction      = "编辑{$lang->SRCommon}";
 $lang->story->changeAction    = "变更{$lang->SRCommon}";
diff --git a/module/story/model.php b/module/story/model.php
index 5cab21203e..4c62d40a89 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -3806,7 +3806,7 @@ class storyModel extends model
      * @access public
      * @return string
      */
-    public function buildOperateMenu($story, $type = 'view')
+    public function buildOperateMenu($story, $type = 'view', $execution = '', $productID = 0)
     {
         $menu   = '';
         $params = "storyID=$story->id";
@@ -3884,6 +3884,63 @@ class storyModel extends model
             $menu .= $this->buildMenu('story', 'delete', $params, $story, 'button', 'trash', 'hiddenwin', 'showinonlybody', true);
         }
 
+        if($type == 'execution')
+        {
+            $hasDBPriv    = common::hasDBPriv($execution, 'execution');
+            $canBeChanged = common::canModify('execution', $execution);
+            if($canBeChanged)
+            {
+                $param = "executionID={$execution->id}&story={$story->id}&moduleID={$story->module}";
+
+                $story->reviewer  = isset($story->reviewer)  ? $story->reviewer  : array();
+                $story->notReview = isset($story->notReview) ? $story->notReview : array();
+
+                if(common::hasPriv('story', 'review'))
+                {
+                    $reviewDisabled = in_array($this->app->user->account, $story->notReview) and ($story->status == 'draft' or $story->status == 'changed') ? '' : 'disabled';
+                    $story->from = 'execution';
+                    $menu .= common::printIcon('story', 'review', "story={$story->id}&from=story", $story, 'list', 'search', '', $reviewDisabled, false, "data-group=execution");
+                }
+
+                if(common::hasPriv('story', 'recall'))
+                {
+                    $recallDisabled = empty($story->reviewedBy) and strpos('draft,changed', $story->status) !== false and !empty($story->reviewer) ? '' : 'disabled';
+                    $menu .= common::printIcon('story', 'recall', "story={$story->id}", $story, 'list', 'undo', 'hiddenwin', $recallDisabled, '', '', $this->lang->story->recall);
+                }
+
+                $this->lang->task->create = $this->lang->execution->wbs;
+                $toTaskDisabled = strpos('draft,closed', $story->status) !== false ? 'disabled' : '';
+                if(commonModel::isTutorialMode())
+                {
+                    $wizardParams = helper::safe64Encode($param);
+                    $menu .=  html::a(helper::createLink('tutorial', 'wizard', "module=task&method=create&params=$wizardParams"), "<i class='icon-plus'></i>",'', "class='btn btn-task-create' title='{$this->lang->execution->wbs}' data-app='execution'");
+                }
+                else
+                {
+                    if($hasDBPriv) $menu .= common::printIcon('task', 'create', $param, '', 'list', 'plus', '', 'btn-task-create ' . $toTaskDisabled);
+                }
+
+                $this->lang->task->batchCreate = $this->lang->execution->batchWBS;
+                if($hasDBPriv) $menu .= common::printIcon('task', 'batchCreate', "executionID={$execution->id}&story={$story->id}", '', 'list', 'pluses', '', $toTaskDisabled);
+
+                $this->lang->testcase->batchCreate = $this->lang->testcase->create;
+                if($productID and $hasDBPriv and common::hasPriv('testcase', 'create'))
+                {
+                    $menu .= html::a(helper::createLink('testcase', 'create', "productID=$story->product&branch=$story->branch&moduleID=$story->module&form=&param=0&storyID=$story->id"), '<i class="icon-testcase-create icon-sitemap"></i>', '', "class='btn' title='{$this->lang->testcase->create}' data-app='qa'");
+                }
+
+                if($canBeChanged and common::hasPriv('execution', 'storyEstimate', $execution))
+                {
+                    $menu .= common::printIcon('execution', 'storyEstimate', "executionID=$execution->id&storyID=$story->id", '', 'list', 'estimate', '', 'iframe', true, "data-width='600px'");
+                }
+
+                if($canBeChanged and common::hasPriv('execution', 'unlinkStory', $execution))
+                {
+                    $menu .= common::printIcon('execution', 'unlinkStory', "executionID=$execution->id&storyID=$story->id&confirm=no", '', 'list', 'unlink', 'hiddenwin');
+                }
+            }
+        }
+
         return $menu;
     }
 
@@ -4047,10 +4104,17 @@ class storyModel extends model
      * @access public
      * @return void
      */
-    public function printCell($col, $story, $users, $branches, $storyStages, $modulePairs = array(), $storyTasks = array(), $storyBugs = array(), $storyCases = array(), $mode = 'datatable', $storyType = 'story')
+    public function printCell($col, $story, $users, $branches, $storyStages, $modulePairs = array(), $storyTasks = array(), $storyBugs = array(), $storyCases = array(), $mode = 'datatable', $storyType = 'story', $execution = '', $isShowBranch = '', $productID = 0)
     {
+        $module    = $this->app->rawModule == 'product' ? 'story' : $this->app->rawModule;
+        $canView   = common::hasPriv($module, 'view');
+        $tab       = $this->app->tab;
+        $storyLink = $tab == 'execution' ? helper::createLink('story', 'view', "storyID=$story->id&version=$story->version&from=execution&param=$execution->id") : helper::createLink($module, 'view', "storyID=$story->id");
+        $account   = $this->app->user->account;
+
         /* Check the product is closed. */
         $canBeChanged = common::canBeChanged('story', $story);
+        $canOrder     = common::hasPriv('execution', 'storySort');
 
         $canBatchEdit         = common::hasPriv('story',        'batchEdit');
         $canBatchClose        = common::hasPriv('story',        'batchClose');
@@ -4061,15 +4125,25 @@ class storyModel extends model
         $canBatchChangePlan   = common::hasPriv('story',        'batchChangePlan');
         $canBatchAssignTo     = common::hasPriv('story',        'batchAssignTo');
         $canBatchUnlinkStory  = common::hasPriv('projectstory', 'batchUnlinkStory');
+        $canBatchUnlink       = common::hasPriv('execution',    'batchUnlinkStory');
 
-        $canBatchAction       = ($canBatchEdit or $canBatchClose or $canBatchReview or $canBatchChangeStage or $canBatchChangeBranch or $canBatchChangeModule or $canBatchChangePlan or $canBatchAssignTo or $canBatchUnlinkStory);
+        if($tab == 'execution')
+        {
+            $checkObject = new stdclass();
+            $checkObject->execution = $execution->id;
+            $canBatchToTask       = common::hasPriv('story', 'batchToTask', $checkObject);
+        }
 
-        $module    = $this->app->rawModule == 'projectstory' ? 'projectstory' : 'story';
-        $canView   = common::hasPriv($module, 'view');
-        $tab       = $this->app->rawModule == 'projectstory' ? 'project' : 'product';
-        $storyLink = helper::createLink($module, 'view', "storyID=$story->id");
-        $account   = $this->app->user->account;
-        $id        = $col->id;
+        if($tab == 'execution')
+        {
+            $canBatchAction = ($canBeChanged and ($canBatchEdit or $canBatchClose or $canBatchChangeStage or $canBatchUnlink or $canBatchToTask));
+        }
+        else
+        {
+            $canBatchAction = ($canBatchEdit or $canBatchClose or $canBatchReview or $canBatchChangeStage or $canBatchChangeBranch or $canBatchChangeModule or $canBatchChangePlan or $canBatchAssignTo or $canBatchUnlinkStory);
+        }
+
+        $id = $col->id;
         if($col->show)
         {
             $class = "c-{$id}";
@@ -4140,6 +4214,10 @@ class storyModel extends model
             {
                 $class .= ' text-center';
             }
+            elseif($id == 'order')
+            {
+                $class = 'sort-handler c-sort';
+            }
 
             echo "<td class='" . $class . "' title='$title' style='$style'>";
             if($this->config->edition != 'open') $this->loadModel('flow')->printFlowCell('story', $story, $id);
@@ -4155,16 +4233,23 @@ class storyModel extends model
                     printf('%03d', $story->id);
                 }
                 break;
+            case 'order':
+                echo "<i class='icon-move'>";
+                break;
             case 'pri':
                 echo "<span class='label-pri label-pri-" . $story->pri . "' title='" . zget($this->lang->story->priList, $story->pri, $story->pri) . "'>";
                 echo zget($this->lang->story->priList, $story->pri, $story->pri);
                 echo "</span>";
                 break;
             case 'title':
-                if($this->app->tab == 'project')
+                if($tab == 'project')
                 {
                     $showBranch = isset($this->config->projectstory->story->showBranch) ? $this->config->projectstory->story->showBranch : 1;
                 }
+                elseif($tab == 'execution')
+                {
+                    if($isShowBranch) $showBranch = isset($this->config->execution->story->showBranch) ? $this->config->execution->story->showBranch : 1;
+                }
                 else
                 {
                     $showBranch = isset($this->config->product->browse->showBranch) ? $this->config->product->browse->showBranch : 1;
@@ -4291,7 +4376,16 @@ class storyModel extends model
                 echo $story->version;
                 break;
             case 'actions':
-                echo $this->buildOperateMenu($story, 'browse');
+                if($tab == 'execution')
+                {
+                    $menuType = 'execution';
+                }
+                else
+                {
+                    $menuType = 'browse';
+                    $execution = '';
+                }
+                echo $this->buildOperateMenu($story, $menuType, $execution, $productID);
                 break;
             }
             echo '</td>';