From 703b1256877cf3dd7feb225c4885236b3a7da7dd Mon Sep 17 00:00:00 2001
From: "liukmqd@gmail.com" <liukmqd@gmail.com>
Date: Sun, 1 May 2011 01:04:17 +0000
Subject: [PATCH] * Formated part code.

---
 module/project/view/grouptask.html.php | 100 ++++++++++++-------------
 module/story/lang/en.php               |   2 +-
 2 files changed, 49 insertions(+), 53 deletions(-)

diff --git a/module/project/view/grouptask.html.php b/module/project/view/grouptask.html.php
index bccfa8086b..fb52f028b6 100644
--- a/module/project/view/grouptask.html.php
+++ b/module/project/view/grouptask.html.php
@@ -28,14 +28,14 @@
     <th colspan='2' class='a-left'><?php echo $lang->task->status;?></th>
   </tr>
   <?php  
-         $taskSum       = 0;
-         $statusWait    = 0;
-         $statusDone    = 0;
-         $statusDoing   = 0;
-         $statusCancel  = 0;  
-         $totalEstimate = 0.0;
-         $totalConsumed = 0.0;
-         $totalLeft     = 0.0;
+    $taskSum       = 0;
+    $statusWait    = 0;
+    $statusDone    = 0;
+    $statusDoing   = 0;
+    $statusCancel  = 0;  
+    $totalEstimate = 0.0;
+    $totalConsumed = 0.0;
+    $totalLeft     = 0.0;
   ?>
   <?php $i = 0;?>
   <?php foreach($tasks as $groupKey => $groupTasks):?>
@@ -45,49 +45,49 @@
     <td colspan='10'><?php if($groupByList) echo $groupByList[$groupKey];?></td>
   </tr>
   <?php
-         $groupWait    = 0;
-         $groupDone    = 0;
-         $groupDoing   = 0;
-         $groupCancel  = 0;  
-         $groupEstimate = 0.0;
-         $groupConsumed = 0.0;
-         $groupLeft     = 0.0;
+    $groupWait    = 0;
+    $groupDone    = 0;
+    $groupDoing   = 0;
+    $groupCancel  = 0;  
+    $groupEstimate = 0.0;
+    $groupConsumed = 0.0;
+    $groupLeft     = 0.0;
   ?>
   <?php foreach($groupTasks as $task):?>
   <?php $assignedToClass = $task->assignedTo == $app->user->account ? 'style=color:red' : '';?>
-  <?php $class           = $task->assignedTo == $app->user->account ? 'style=color:red' : '';?>
-  <?php $taskLink        = $this->createLink('task','view',"taskID=$task->id");
-        $totalEstimate  += $task->estimate;
-        $totalConsumed  += $task->consumed;
-        $totalLeft      += $task->left;
+  <?php $taskLink        = $this->createLink('task','view',"taskID=$task->id"); ?>
+  <?php  
+    $totalEstimate  += $task->estimate;
+    $totalConsumed  += $task->consumed;
+    $totalLeft      += $task->left;
 
-        $groupEstimate  += $task->estimate;
-        $groupConsumed  += $task->consumed;
-        $groupLeft      += $task->left;
+    $groupEstimate  += $task->estimate;
+    $groupConsumed  += $task->consumed;
+    $groupLeft      += $task->left;
 
-       if($task->status == 'wait')
-       {
-           $statusWait++;
-           $groupWait++;
-       }
-       elseif($task->status == 'doing')
-       {
-           $statusDoing++;
-           $groupDoing++;
-       }
-       elseif($task->status == 'done')
-       {
-           $statusDone++;
-           $groupDone++;
-       }
-       else
-       {
-           $statusCancel++;
-           $groupCancel++;
-       }
-       $groupSum = count($groupTasks);
-       $taskSum += count($tasks);
-     ?>
+    if($task->status == 'wait')
+    {
+        $statusWait++;
+        $groupWait++;
+    }
+    elseif($task->status == 'doing')
+    {
+        $statusDoing++;
+        $groupDoing++;
+    }
+    elseif($task->status == 'done')
+    {
+        $statusDone++;
+        $groupDone++;
+    }
+    else
+    {
+        $statusCancel++;
+        $groupCancel++;
+    }
+    $groupSum = count($groupTasks);
+    $taskSum += count($tasks);
+   ?>
     <tr id='<?php echo $task->id;?>' class='a-center child-of-node-<?php echo $groupKey;?>'>
       <td class='<?php echo $groupClass;?>'></td>
       <td class='a-left'>&nbsp;<?php echo $task->id . $lang->colon; if(common::hasPriv('task', 'view')) echo html::a($this->createLink('task', 'view', "task=$task->id"), $task->name); else echo $task->name;?></td>
@@ -106,12 +106,8 @@
       </td>
     </tr>
       <?php endforeach;?>
-    <tr><td colspan = 12  class ='a-right'><?php printf($lang->project->taskSummaryAll, $groupSum, $groupWait,$groupDoing,$groupDone,$groupCancel,$groupEstimate,$groupConsumed,$groupLeft);?></td></tr>
-    <?php endforeach;?>
-        <?php 
-              if(count($tasks) == 0) $taskSum = 0;
-              else                   $taskSum = $taskSum/count($tasks);
-        ?>
+    <tr><td colspan='12' class='a-right'><?php printf($lang->project->taskSummaryAll, $groupSum, $groupWait,$groupDoing,$groupDone,$groupCancel,$groupEstimate,$groupConsumed,$groupLeft);?></td></tr>
+  <?php endforeach;?>
 </table>
 <script language='Javascript'>$('#<?php echo $browseType;?>Tab').addClass('active');</script>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index a9a7b29650..dc29d50ef8 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -116,7 +116,7 @@ $lang->story->legendProjectAndTask = 'Project & task';
 $lang->story->legendLinkStories    = 'Related story';
 $lang->story->legendChildStories   = 'Child story';
 $lang->story->legendSpec           = 'Spec';
-$lang->story->legendVerify         = 'Verified standard';
+$lang->story->legendVerify         = 'Verify standard';
 $lang->story->legendHistory        = 'History';
 $lang->story->legendVersion        = 'Versions';
 $lang->story->legendMisc           = 'Misc';