From e9abe8c682d0b57eb71dd8b9337a01ea8ab0a4a6 Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Sun, 2 Sep 2012 01:25:50 +0000
Subject: [PATCH]  * adjust the batchEdit page.  + add module field when batch
 edit tasks.

---
 module/task/control.php             |  7 ++--
 module/task/model.php               | 54 ++++++++++++++++-------------
 module/task/view/batchedit.html.php | 38 ++++++++++----------
 3 files changed, 52 insertions(+), 47 deletions(-)

diff --git a/module/task/control.php b/module/task/control.php
index 0fe10c509b..80779e7d5a 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -75,9 +75,9 @@ class task extends control
         $stories = $this->story->getProjectStoryPairs($projectID);
         $members = $this->project->getTeamMemberPairs($projectID, 'nodeleted');
         $moduleOptionMenu = $this->tree->getOptionMenu($projectID, $viewType = 'task');
-        $header['title'] = $project->name . $this->lang->colon . $this->lang->task->create;
-        $position[]      = html::a($taskLink, $project->name);
-        $position[]      = $this->lang->task->create;
+        $header['title']  = $project->name . $this->lang->colon . $this->lang->task->create;
+        $position[]       = html::a($taskLink, $project->name);
+        $position[]       = $this->lang->task->create;
         $this->view->header   = $header;
         $this->view->position = $position;
         $this->view->project  = $project;
@@ -260,6 +260,7 @@ class task extends control
 
             if($showSuhosinInfo) $this->view->suhosinInfo = $this->lang->suhosinInfo;
             $this->view->projectID   = $project->id;
+            $this->view->modules     = $this->tree->getOptionMenu($projectID, $viewType = 'task');
             $this->view->editedTasks = $editedTasks;
             $this->view->users       = $this->loadModel('user')->getPairs('noletter');
             $this->view->members     = $this->project->getTeamMemberPairs($projectID, 'nodeleted');
diff --git a/module/task/model.php b/module/task/model.php
index ca7465e497..fef11e98cf 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -230,6 +230,7 @@ class taskModel extends model
                 $oldTask = $this->getById($taskID);
 
                 $task->name           = htmlspecialchars($this->post->names[$taskID]);
+                $task->module         = $this->post->modules[$taskID];
                 $task->assignedTo     = $this->post->assignedTos[$taskID];
                 $task->type           = $this->post->types[$taskID];
                 $task->status         = $this->post->statuses[$taskID];
@@ -248,36 +249,39 @@ class taskModel extends model
                 $task->lastEditedDate = $now;
                 if(isset($this->post->assignedTos[$taskID])) 
                 {
-                    $task->assignedDate   = $this->post->assignedTos[$taskID] == $oldTask->assignedTo ? $oldTask->assignedDate : $now;
+                    $task->assignedDate = $this->post->assignedTos[$taskID] == $oldTask->assignedTo ? $oldTask->assignedDate : $now;
                 }
 
                 switch($task->status)
                 {
-                  case 'done':
-                  {
-                    $task->left = 0;
-                    if(!$task->finishedBy)   $task->finishedBy = $this->app->user->account;
-                    if(!$task->finishedDate) $task->finishedDate = $now;
-                  }break;
-                  case 'cancel':
-                  {
-                    $task->assignedTo   = $oldTask->openedBy;
-                    $task->assignedDate = $now;
+                    case 'done':
+                    {
+                        $task->left = 0;
+                        if(!$task->finishedBy)   $task->finishedBy = $this->app->user->account;
+                        if(!$task->finishedDate) $task->finishedDate = $now;
+                    }
+                    break;
+                    case 'cancel':
+                    {
+                        $task->assignedTo   = $oldTask->openedBy;
+                        $task->assignedDate = $now;
 
-                    if(!$task->canceledBy)   $task->canceledBy   = $this->app->user->account;
-                    if(!$task->canceledDate) $task->canceledDate = $now;
-                  }break;
-                  case 'closed':
-                  {
-                    if(!$task->closedBy)   $task->closedBy   = $this->app->user->account;
-                    if(!$task->closedDate) $task->closedDate = $now;
-                  }break;
-                  case 'wait':
-                  {
-                    if($task->consumed > 0 and $task->left > 0) $task->status = 'doing';
-                    if($task->left == $oldTask->left and $task->consumed == 0) $task->left = $task->estimate;
-                  }
-                  default:break;
+                        if(!$task->canceledBy)   $task->canceledBy   = $this->app->user->account;
+                        if(!$task->canceledDate) $task->canceledDate = $now;
+                    }
+                    break;
+                    case 'closed':
+                    {
+                        if(!$task->closedBy)   $task->closedBy   = $this->app->user->account;
+                        if(!$task->closedDate) $task->closedDate = $now;
+                    }
+                    break;
+                    case 'wait':
+                    {
+                        if($task->consumed > 0 and $task->left > 0) $task->status = 'doing';
+                        if($task->left == $oldTask->left and $task->consumed == 0) $task->left = $task->estimate;
+                    }
+                    default:break;
                 }
                 if($task->assignedTo) $task->assignedDate = $now;
 
diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php
index 93ca360a20..8bbce7e7da 100755
--- a/module/task/view/batchedit.html.php
+++ b/module/task/view/batchedit.html.php
@@ -16,40 +16,40 @@
     <caption><?php echo $lang->task->common . $lang->colon . $lang->task->batchEdit;?></caption>
     <tr>
       <th class='w-20px'><?php echo $lang->idAB;?></th> 
-      <th class='w-300px'> <?php echo $lang->task->name;?></th>
-      <th class='w-60px'><?php echo $lang->task->assignedTo;?></th>
-      <th class='w-40px'><?php echo $lang->typeAB;?></th>
-      <th class='w-45px'><?php echo $lang->task->status;?></th>
-      <th class='w-30px'><?php echo $lang->task->pri;?></th>
-      <th class='w-20px'><?php echo $lang->task->estimateAB;?></th>
-      <th class='w-20px'><?php echo $lang->task->consumedAB;?></th>
-      <th class='w-20px'><?php echo $lang->task->leftAB;?></th>
-      <th class='w-60px'><?php echo $lang->task->finishedBy;?></th>
-      <th class='w-60px'><?php echo $lang->task->canceledBy;?></th>
-      <th class='w-60px'><?php echo $lang->task->closedBy;?></th>
-      <th class='w-40px'><?php echo $lang->task->closedReason;?></th>
+      <th class='red'>   <?php echo $lang->task->name?></th>
+      <th class='w-80px'><?php echo $lang->task->module;?></th>
+      <th class='w-80px'><?php echo $lang->task->assignedTo;?></th>
+      <th class='w-60px'><?php echo $lang->typeAB;?></th>
+      <th class='w-70px'><?php echo $lang->task->status;?></th>
+      <th class='w-40px'><?php echo $lang->task->pri;?></th>
+      <th class='w-30px red'><?php echo $lang->task->estimateAB?></th>
+      <th class='w-30px red'><?php echo $lang->task->consumedAB?></th>
+      <th class='w-30px red'><?php echo $lang->task->leftAB?></th>
+      <th class='w-80px'><?php echo $lang->task->finishedBy;?></th>
+      <th class='w-80px'><?php echo $lang->task->closedBy;?></th>
+      <th class='w-80px'><?php echo $lang->task->closedReason;?></th>
     </tr>
     <?php foreach($editedTasks as $task):?>
     <tr class='a-center'>
       <td><?php echo $task->id . html::hidden("taskIDList[$task->id]", $task->id);?></td>
-      <td><?php echo html::input("names[$task->id]",          $task->name, 'class=text-1'); echo "<span class='star'>*</span>";?></td>
+      <td><?php echo html::input("names[$task->id]",          $task->name, 'class=text-1');?></td>
+      <td><?php echo html::select("modules[$task->id]",       $modules, $task->module, 'class=select-1');?></td>
       <td><?php echo html::select("assignedTos[$task->id]",   $members, $task->assignedTo, 'class=select-1');?></td>
       <td><?php echo html::select("types[$task->id]",         $lang->task->typeList, $task->type, 'class=select-1');?></td>
       <td><?php echo html::select("statuses[$task->id]",      $lang->task->statusList, $task->status, 'class=select-1');?></td>
       <td><?php echo html::select("pris[$task->id]",          (array)$lang->task->priList, $task->pri, 'class=select-1');?></td>
-      <td><?php echo html::input("estimates[$task->id]",      $task->estimate, 'class=text-1'); echo "<span class='star'>*</span>";?></td>
-      <td><?php echo html::input("consumeds[$task->id]",      $task->consumed, 'class=text-1'); echo "<span class='star'>*</span>";?></td>
-      <td><?php echo html::input("lefts[$task->id]",          $task->left, 'class=text-1'); echo "<span class='star'>*</span>";?></td>
+      <td><?php echo html::input("estimates[$task->id]",      $task->estimate, 'class=text-1');?></td>
+      <td><?php echo html::input("consumeds[$task->id]",      $task->consumed, 'class=text-1');?></td>
+      <td><?php echo html::input("lefts[$task->id]",          $task->left, 'class=text-1');?></td>
       <td><?php echo html::select("finishedBys[$task->id]",   $members, $task->finishedBy, 'class=select-1');?></td>
-      <td><?php echo html::select("canceledBys[$task->id]",   $members, $task->canceledBy, 'class=select-1');?></td>
       <td><?php echo html::select("closedBys[$task->id]",     $members, $task->closedBy, 'class=select-1');?></td>
       <td><?php echo html::select("closedReasons[$task->id]", $lang->task->reasonList, $task->closedReason, 'class=select-1');?></td>
     </tr>  
     <?php endforeach;?>
     <?php if(isset($suhosinInfo)):?>
-    <tr><td colspan='13'><div class='f-left blue'><?php echo $suhosinInfo;?></div></td></tr>
+    <tr><td colspan='12'><div class='f-left blue'><?php echo $suhosinInfo;?></div></td></tr>
     <?php endif;?>
-    <tr><td colspan='13' class='a-center'><?php echo html::submitButton();?></td></tr>
+    <tr><td colspan='12' class='a-center'><?php echo html::submitButton();?></td></tr>
   </table>
 </form>
 <?php include '../../common/view/footer.html.php';?>