From f99dd1f01b74e3e7ad48a8797a17dd509ac2219d Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Tue, 9 Jul 2019 10:27:49 +0800
Subject: [PATCH] * Add code to task and case module for workflow.

---
 module/task/view/activate.html.php   | 1 +
 module/task/view/assignto.html.php   | 1 +
 module/task/view/cancel.html.php     | 1 +
 module/task/view/close.html.php      | 1 +
 module/task/view/create.html.php     | 1 +
 module/task/view/edit.html.php       | 3 +++
 module/task/view/finish.html.php     | 1 +
 module/task/view/pause.html.php      | 1 +
 module/task/view/start.html.php      | 1 +
 module/testcase/view/create.html.php | 1 +
 module/testcase/view/edit.html.php   | 2 ++
 module/testcase/view/review.html.php | 1 +
 12 files changed, 15 insertions(+)

diff --git a/module/task/view/activate.html.php b/module/task/view/activate.html.php
index 5c5662e32e..5201b56e84 100644
--- a/module/task/view/activate.html.php
+++ b/module/task/view/activate.html.php
@@ -41,6 +41,7 @@
             </div>
           </td>
         </tr>
+        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'table', 'columns=2');?>
         <tr>
           <th><?php echo $lang->comment;?></th>
           <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
diff --git a/module/task/view/assignto.html.php b/module/task/view/assignto.html.php
index 796196d08a..f692232a38 100644
--- a/module/task/view/assignto.html.php
+++ b/module/task/view/assignto.html.php
@@ -43,6 +43,7 @@
           <td><div class='input-group'><?php echo html::input('left', $task->left, "class='form-control'");?> <span class='input-group-addon'><?php echo $lang->task->hour;?></span></div></td><td></td>
         </tr>  
         <?php endif;?>
+        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'table', 'columns=2');?>
         <tr>
           <th><?php echo $lang->comment;?></th>
           <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control w-p98'");?></td>
diff --git a/module/task/view/cancel.html.php b/module/task/view/cancel.html.php
index 98f9adb7cf..888bcc0a73 100644
--- a/module/task/view/cancel.html.php
+++ b/module/task/view/cancel.html.php
@@ -26,6 +26,7 @@
 
     <form method='post' target='hiddenwin'>
       <table class='table table-form'>
+        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'table', 'columns=1');?>
         <tr>
           <th class='w-50px'><?php echo $lang->comment;?></th>
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
diff --git a/module/task/view/close.html.php b/module/task/view/close.html.php
index c2353be021..ef2e977468 100644
--- a/module/task/view/close.html.php
+++ b/module/task/view/close.html.php
@@ -26,6 +26,7 @@
     
     <form method='post' target='hiddenwin'>
       <table class='table table-form'>
+        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'table', 'columns=1');?>
         <tr>
           <th class='w-50px'><?php echo $lang->comment;?></th>
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index def7e99e55..a37748051d 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -205,6 +205,7 @@
             <?php echo html::textarea('desc', $task->desc, "rows='10' class='form-control'");?>
           </td>
         </tr>
+        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'table', 'columns=3');?>
         <tr>
           <th><?php echo $lang->files;?></th>
           <td colspan='3'><?php echo $this->fetch('file', 'buildform');?></td>
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index 721e2729c2..6bd6146a58 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -70,6 +70,7 @@
             <div class='detail-title'><?php echo $lang->comment;?></div>
             <div class='detail-content'><?php echo html::textarea('comment', '',  "rows='5' class='form-control'");?></div>
           </div>
+          <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'div', 'position=left&divCell=false');?>
           <div class='detail'>
             <div class='detail-title'><?php echo $lang->files;?></div>
             <div class='detail-content'><?php echo $this->fetch('file', 'buildform');?></div>
@@ -215,6 +216,7 @@
               </tr>
             </table>
           </div>
+          <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'div', 'position=right&divCell=false');?>
         </div>
       </div>
     </div>
@@ -273,6 +275,7 @@
             </tfoot>
           </table>
         </div>
+        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'div', 'position=left&divCell=false');?>
       </div>
     </div>
   </form>
diff --git a/module/task/view/finish.html.php b/module/task/view/finish.html.php
index 91ff0c36a5..477736705b 100644
--- a/module/task/view/finish.html.php
+++ b/module/task/view/finish.html.php
@@ -70,6 +70,7 @@
           <th><?php echo $lang->task->finishedDate;?></th>
           <td><div class='datepicker-wrapper'><?php echo html::input('finishedDate', helper::today(), "class='form-control form-date'");?></div></td><td></td>
         </tr>
+        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'table', 'columns=2');?>
         <tr>
           <th><?php echo $lang->files;?></th>
           <td colspan='2'><?php echo $this->fetch('file', 'buildform');?></td>
diff --git a/module/task/view/pause.html.php b/module/task/view/pause.html.php
index ea74b5b45f..15dd6c2339 100644
--- a/module/task/view/pause.html.php
+++ b/module/task/view/pause.html.php
@@ -34,6 +34,7 @@
 
     <form method='post' target='hiddenwin'>
       <table class='table table-form'>
+        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'table', 'columns=1');?>
         <tr>
           <th class='w-60px'><?php echo $lang->comment;?></th>
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
diff --git a/module/task/view/start.html.php b/module/task/view/start.html.php
index 96fc4d878a..b0967e32bc 100644
--- a/module/task/view/start.html.php
+++ b/module/task/view/start.html.php
@@ -61,6 +61,7 @@
             </div>
           </td>
         </tr>
+        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'table', 'columns=2');?> 
         <tr>
           <th><?php echo $lang->comment;?></th>
           <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php
index a05bd57a1b..ff9b522ac0 100644
--- a/module/testcase/view/create.html.php
+++ b/module/testcase/view/create.html.php
@@ -206,6 +206,7 @@
           <td colspan='2'><?php echo html::input('keywords', $keywords, "class='form-control'");?></td>
         </tr>
         <?php endif;?>
+        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'table', 'columns=2');?>
         <tr>
           <th><?php echo $lang->testcase->files;?></th>
           <td colspan='2'><?php echo $this->fetch('file', 'buildform');?></td>
diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php
index 9ee9fb39fa..a7beb35799 100644
--- a/module/testcase/view/edit.html.php
+++ b/module/testcase/view/edit.html.php
@@ -113,6 +113,7 @@
               </table>
             </div>
           </div>
+          <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'div', 'position=left&divCell=false');?>
           <div class='detail'>
             <div class='detail-title'><?php echo $lang->testcase->legendComment;?></div>
             <div class='detail-content'><?php echo html::textarea('comment', '',  "rows='5' class='form-control'");?></div>
@@ -246,6 +247,7 @@
               <?php endif;?>
             </table>
           </div>
+          <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'div', 'position=right&divCell=false');?>
           <div class='detail'>
             <div class='detail-title'><?php echo $lang->testcase->legendOpenAndEdit;?></div>
             <table class='table table-form'>
diff --git a/module/testcase/view/review.html.php b/module/testcase/view/review.html.php
index 483bf4c18f..ac14241d71 100644
--- a/module/testcase/view/review.html.php
+++ b/module/testcase/view/review.html.php
@@ -35,6 +35,7 @@
         <th><?php echo $lang->testcase->reviewedByAB;?></th>
         <td colspan='2'><?php echo html::select('reviewedBy[]', $users, $app->user->account, "class='form-control chosen' multiple");?></td>
       </tr>
+      <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, 'table', 'columns=2');?> 
       <tr>
         <th><?php echo $lang->comment;?></th>
         <td colspan='2'><?php echo html::textarea('comment', '', "rows='8' class='form-control'");?></td>