* task#622.

module/project/control.php

@@ -214,13 +214,13 @@ class project extends control
         $users = $this->loadModel('user')->getPairs('noletter');
         foreach($tasks as $task)
         {
-            if($groupBy == 'story')
-            { 
+            if($groupBy == '')
+            {
                 $groupTasks[$task->story][] = $task;
                 $groupByList[$task->story]  = $task->storyTitle;
             }
-            elseif($groupBy == '')
-            {
+            elseif($groupBy == 'story')
+            { 
                 $groupTasks[$task->story][] = $task;
                 $groupByList[$task->story]  = $task->storyTitle;
             }
@@ -255,6 +255,7 @@ class project extends control
         }
 
         /* Assign. */
+        $this->view->members     = $this->project->getTeamMembers($projectID);
         $this->view->tasks       = $groupTasks;
         $this->view->tabID       = 'task';
         $this->view->groupByList = $groupByList;

module/project/css/grouptask.css

@@ -0,0 +1 @@
+.groupdivider{border-bottom:1px solid black}

module/project/lang/en.php

@@ -103,7 +103,7 @@ $lang->project->statusDoing         = 'Doing';
 $lang->project->statusDone          = 'Done';
 $lang->project->statusClosed        = 'Closed';
 $lang->project->delayed             = 'Delayed';
-$lang->project->groups['']          = 'Group by view';
+$lang->project->groups['']          = 'Group View';
 $lang->project->groups['story']     = 'Group by story';
 $lang->project->groups['status']    = 'Group by status';
 $lang->project->groups['pri']       = 'Group by priority';
@@ -126,10 +126,11 @@ $lang->project->allProject          = 'All projects';
 $lang->project->selectProject   = "Select project";
 $lang->project->beginAndEnd     = 'Begin and end';
 $lang->project->lblStats        = 'Stats';
-$lang->project->stats           = 'Total estimate is『%s』hours,<br />confused『%s』hours<br />left『%s』hours';
+$lang->project->stats           = 'Total work hours is 『%s』hours, <br />Total estimate is『%s』hours,<br />Total confused is『%s』hours<br />Total left is『%s』hours';
 $lang->project->oneLineStats    = "Project『%s』, code is『%s』, products is『%s』,begin from『%s』to 『%s』,total estimate『%s』hours,consumed『%s』hours,left『%s』hours.";
 $lang->project->taskSummary     = "<strong>%s</strong> tasks this page, wait:<strong>%s</strong>, doing:<strong>%s</strong>, estimate <strong>%s</strong>, consumed <strong>%s</strong>, left <strong>%s</strong> hours.";
-$lang->project->groupSummary    = "<strong>%s</strong> tasks this group, wait:<strong>%s</strong>, doing:<strong>%s</strong>, estimate <strong>%s</strong>, consumed <strong>%s</strong>, left <strong>%s</strong> hours.";
+$lang->project->groupSummary    = "<strong>%s</strong> tasks in this group, wait:<strong>%s</strong>, doing:<strong>%s</strong>, estimate <strong>%s</strong>, consumed <strong>%s</strong>, left <strong>%s</strong> hours.";
+$lang->project->memberHours     = "%s has <strong>%s</strong> workhours, ";
 $lang->project->wbs             = "WBS";
 $lang->project->largeBurnChart  = 'View large';
 $lang->project->howToUpdateBurn = "<a href='%s' class='helplink'><i>How?</i></a>";

module/project/lang/zh-cn.php

@@ -126,9 +126,10 @@ $lang->project->allProject          = '所有项目';
 $lang->project->selectProject   = "请选择项目";
 $lang->project->beginAndEnd     = '起止时间';
 $lang->project->lblStats        = '工时统计';
-$lang->project->stats           = '总共预计<strong>%s</strong>工时<br />已经消耗<strong>%s</strong>工时<br />预计剩余<strong>%s</strong>工时';
+$lang->project->stats           = '可用工时<strong>%s</strong>工时<br />总共预计<strong>%s</strong>工时<br />已经消耗<strong>%s</strong>工时<br />预计剩余<strong>%s</strong>工时';
 $lang->project->oneLineStats    = "项目<strong>%s</strong>, 代号为<strong>%s</strong>, 相关产品为<strong>%s</strong>，<strong>%s</strong>开始，<strong>%s</strong>结束，总预计<strong>%s</strong>工时，已消耗<strong>%s</strong>工时，预计剩余<strong>%s</strong>工时。";
 $lang->project->taskSummary     = "本页共 <strong>%s</strong> 个任务，未开始<strong>%s</strong>，进行中<strong>%s</strong>，总预计<strong>%s</strong>工时，已消耗<strong>%s</strong>工时，剩余<strong>%s</strong>工时。";
+$lang->project->memberHours     = "%s共有 <strong>%s</strong> 个可用工时，";
 $lang->project->groupSummary    = "本组共 <strong>%s</strong> 个任务，未开始<strong>%s</strong>，进行中<strong>%s</strong>，总预计<strong>%s</strong>工时，已消耗<strong>%s</strong>工时，剩余<strong>%s</strong>工时。";
 $lang->project->wbs             = "分解任务";
 $lang->project->largeBurnChart  = '点击查看大图';

module/project/model.php

@@ -423,6 +423,7 @@ class projectModel extends model
             ->andWhere('deleted')->eq(0)
             ->fetch();
         $project->days          = $project->days ? $project->days : '';
+        $project->totalHours    = $this->dao->select('sum(days * hours) AS totalHours')->from(TABLE_TEAM)->where('project')->eq($project->id)->fetch('totalHours');
         $project->totalEstimate = round($total->totalEstimate, 1);
         $project->totalConsumed = round($total->totalConsumed, 1);
         $project->totalLeft     = round($total->totalLeft, 1);
@@ -735,11 +736,11 @@ class projectModel extends model
      */
     public function getTeamMembers($projectID)
     {
-        return $this->dao->select('t1.*, t2.realname')->from(TABLE_TEAM)->alias('t1')
+        return $this->dao->select('t1.*, t1.hours * t1.days AS totalHours, t2.realname')->from(TABLE_TEAM)->alias('t1')
             ->leftJoin(TABLE_USER)->alias('t2')->on('t1.account = t2.account')
             ->where('t1.project')->eq((int)$projectID)
             ->andWHere('t2.company')->eq($this->app->company->id)
-            ->fetchAll();
+            ->fetchAll('account');
     }
 
     /**

module/project/view/grouptask.html.php

@@ -106,7 +106,12 @@
       </td>
     </tr>
     <?php endforeach;?>
-    <tr class='child-of-node-<?php echo $groupKey;?> <?php echo $groupClass;?>'><td colspan='12' class='a-right'><?php printf($lang->project->groupSummary, $groupSum, $groupWait, $groupDoing, $groupEstimate, $groupConsumed, $groupLeft);?></td></tr>
+    <tr class='child-of-node-<?php echo $groupKey;?> <?php echo $groupClass;?>'>
+      <td colspan='12' class='a-right groupdivider'>
+        <?php if($groupBy == 'assignedto' and isset($members[$task->assignedTo])) printf($lang->project->memberHours, $users[$task->assignedTo], $members[$task->assignedTo]->totalHours);?>
+        <?php printf($lang->project->groupSummary, $groupSum, $groupWait, $groupDoing, $groupEstimate, $groupConsumed, $groupLeft);?></div>
+      </td>
+    </tr>
   <?php endforeach;?>
 </table>
 <script language='Javascript'>$('#<?php echo $browseType;?>Tab').addClass('active');</script>

module/project/view/view.html.php

@@ -59,7 +59,7 @@
   </tr>
   <tr>
     <th class='rowhead'><?php echo $lang->project->lblStats;?></th>
-    <td><?php printf($lang->project->stats, $project->totalEstimate, $project->totalConsumed, $project->totalLeft, 10)?></td>
+    <td><?php printf($lang->project->stats, $project->totalHours, $project->totalEstimate, $project->totalConsumed, $project->totalLeft, 10)?></td>
   </tr>
   <tr>
     <th class='rowhead'><?php echo $lang->project->products;?></th>