From c6165b16d5c2cdc2144f7fa8285da22fab5dd8e4 Mon Sep 17 00:00:00 2001
From: pengjiangxiu <riverdream@yeah.net>
Date: Wed, 16 Aug 2017 15:47:57 +0800
Subject: [PATCH] * Finish task #1202.

---
 module/dev/control.php         |  1 -
 module/task/model.php          | 27 +++++++++++++++++++++++++--
 module/task/view/edit.html.php | 12 ++++++------
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/module/dev/control.php b/module/dev/control.php
index 4ff132fee8..30753cf929 100644
--- a/module/dev/control.php
+++ b/module/dev/control.php
@@ -46,7 +46,6 @@ class dev extends control
         $this->view->position[]    = $this->lang->dev->db;
 
         $this->view->tables        = $this->dev->getTables();
-        $this->view->tab           = 'db';
         $this->view->selectedTable = $table;
         $this->view->tab           = 'db';
         $this->view->fields        = $table ? $this->dev->getFields($table) : array();
diff --git a/module/task/model.php b/module/task/model.php
index 4a56ee16be..75bda48215 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -370,7 +370,10 @@ class taskModel extends model
                     if(!$task->finishedBy)   $task->finishedBy = $this->app->user->account;
                     if($task->closedReason)  $task->closedDate = $now;
                     $task->finishedDate = $oldTask->status == 'done' ?  $oldTask->finishedDate : $now;
-                    }
+
+                    $task->canceledBy   = '';
+                    $task->canceledDate = '';
+                }
                 break;
                 case 'cancel':
                 {
@@ -379,6 +382,9 @@ class taskModel extends model
 
                     if(!$task->canceledBy)   $task->canceledBy   = $this->app->user->account;
                     if(!$task->canceledDate) $task->canceledDate = $now;
+
+                    $task->finishedBy   = '';
+                    $task->finishedDate = '';
                 }
                 break;
                 case 'closed':
@@ -391,7 +397,24 @@ class taskModel extends model
                 {
                     if($task->consumed > 0 and $task->left > 0) $task->status = 'doing';
                     if($task->left == $oldTask->left and $task->consumed == 0) $task->left = $task->estimate;
+
+                    $task->canceledDate = '';
+                    $task->finishedDate = '';
+                    $task->closedDate   = '';
                 }
+                break;
+                case 'doing':
+                {
+                    $task->canceledDate = '';
+                    $task->finishedDate = '';
+                    $task->closedDate   = '';
+                }
+                break;
+                case 'pause':
+                {
+                    $task->finishedDate = ''; 
+                }
+
                 default:break;
             }
             if($task->assignedTo) $task->assignedDate = $now;
@@ -403,7 +426,7 @@ class taskModel extends model
                 ->checkIF($task->estimate != false, 'estimate', 'float')
                 ->checkIF($task->consumed != false, 'consumed', 'float')
                 ->checkIF($task->left     != false, 'left',     'float')
-                ->checkIF($task->left == 0 and $task->status != 'cancel' and $task->status != 'closed' and $task->consumed != 0, 'status', 'equal', 'done')
+                ->checkIF($task->left == 0 and $task->status != 'cancel' and $task->status != 'closed' and $task->status != 'wait' and $task->consumed != 0, 'status', 'equal', 'done')
 
                 ->batchCheckIF($task->status == 'wait' or $task->status == 'doing', 'finishedBy, finishedDate,canceledBy, canceledDate, closedBy, closedDate, closedReason', 'empty')
 
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index 5c371a5167..59a1159c6e 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -137,23 +137,23 @@
           </tr>
           <tr>
             <th><?php echo $lang->task->finishedBy;?></th>
-            <td><?php echo html::select('finishedBy', $members, $task->finishedBy, "class='form-control chosen'");?></td>
+            <td><?php echo html::select('finishedBy', $members, $task->finishedBy, "class='form-control'");?></td>
           </tr>
           <tr>
             <th><?php echo $lang->task->finishedDate;?></th>
-            <td><?php echo html::input('finishedDate', $task->finishedDate, 'class="form-control" autocomplete="off"');?></td>
+            <td><?php echo html::input('finishedDate', $task->finishedDate, 'class="form-control form-date"');?></td>
           </tr>
           <tr>
             <th><?php echo $lang->task->canceledBy;?></th>
-            <td><?php echo html::select('canceledBy', $users, $task->canceledBy, 'class="form-control chosen"');?></td>
+            <td><?php echo html::select('canceledBy', $users, $task->canceledBy, 'class="form-control"');?></td>
           </tr>
           <tr>
             <th><?php echo $lang->task->canceledDate;?></th>
-            <td><?php echo html::input('canceledDate', $task->canceledDate, 'class="form-control" autocomplete="off"');?></td>
+            <td><?php echo html::input('canceledDate', $task->canceledDate, 'class="form-control form-date"');?></td>
           </tr>
           <tr>
             <th><?php echo $lang->task->closedBy;?></th>
-            <td><?php echo html::select('closedBy', $users, $task->closedBy, 'class="form-control chosen"');?></td>
+            <td><?php echo html::select('closedBy', $users, $task->closedBy, 'class="form-control"');?></td>
           </tr>
           <tr>
             <th><?php echo $lang->task->closedReason;?></th>
@@ -161,7 +161,7 @@
           </tr>
           <tr>
             <th><?php echo $lang->task->closedDate;?></th>
-            <td><?php echo html::input('closedDate', $task->closedDate, 'class="form-control" autocomplete="off"');?></td>
+            <td><?php echo html::input('closedDate', $task->closedDate, 'class="form-control form-date"');?></td>
           </tr>
         </table>
       </fieldset>