* finish task #820.

module/report/control.php

@@ -105,6 +105,7 @@ class report extends control
         $this->view->users         = $this->loadModel('user')->getPairs('noletter|noclosed');
         $this->display(); 
     }
+
     /**
      * Workload report.
      * 

module/report/css/common.css

@@ -6,6 +6,7 @@ ul#report-list{margin:0px;}
 ul li{list-style:none;}
 #product td, tr, th{ border:1px solid #E4E4E4;}
 #workload td, tr, th{ border:1px solid #E4E4E4;}
+#bug td, tr, th{ border:1px solid #E4E4E4;}
 #product p{margin:2px 0;}
 
 .proversion {text-align:center; margin-top:10px;}

module/report/lang/en.php

@@ -36,6 +36,7 @@ $lang->report->singleColor[] = 'F6BD0F';
 $lang->report->projectDeviation = 'Project deviation';
 $lang->report->productInfo      = 'Product information';
 $lang->report->bugSummary       = 'Bug summary';
+$lang->report->bugAssign        = 'Bug assign';
 $lang->report->workload         = 'Workload';
 
 $lang->reportList->project->lists[10] = 'Project deviation|report|projectdeviation';
@@ -64,7 +65,8 @@ $lang->report->devTestRate   = 'Dev/Test';
 $lang->report->details       = 'Details';
 $lang->report->total         = 'Total';
 $lang->report->to            = 'to';
-$lang->report->taskTotal     = "%s Tasks, %s Manhours";
+$lang->report->taskTotal     = "Task Total";
+$lang->report->manhourTotal  = "Manhour Total";
 $lang->report->bugTotal      = "%s Bugs";
 
 $lang->report->proVersion = '<a href="http://www.zentao.net/goto.php?item=proversion&from=reportpage" target="_blank">Try pro version for more!</a>';

module/report/lang/zh-cn.php

@@ -65,7 +65,8 @@ $lang->report->devTestRate   = '开发/测试';
 $lang->report->details       = '详情';
 $lang->report->total         = '总计';
 $lang->report->to            = '至';
-$lang->report->taskTotal     = "共%s个任务，需%s工时";
+$lang->report->taskTotal     = "总任务数";
+$lang->report->manhourTotal  = "总工时";
 $lang->report->bugTotal      = "共%s个Bug";
 
 $lang->report->proVersion = '<a href="http://www.zentao.net/goto.php?item=proversion&from=reportpage" target="_blank">更多精彩，尽在专业版！</a>';

module/report/model.php

@@ -372,6 +372,7 @@ EOT;
             ->on('t1.project = t2.id')
             ->where('t1.deleted')->eq(0)
             ->andWhere('t1.status')->notin('cancel, closed, done')
+            ->andWhere('t2.deleted')->eq(0)
             ->fetchGroup('assignedTo');
         $workload = array();
         foreach($tasks as $user => $userTasks)
@@ -405,6 +406,7 @@ EOT;
             ->on('t1.product = t2.id')
             ->where('t1.deleted')->eq(0)
             ->andWhere('t1.status')->eq('active')
+            ->andWhere('t2.deleted')->eq(0)
             ->fetchGroup('assignedTo');
         $assign = array();
         foreach($bugs as $user => $userBugs)

module/report/view/bugsummary.html.php

@@ -10,7 +10,7 @@
     <div class="choose-date mb-10px f-left">
         <?php echo html::input('date', $begin, "class='select-7 date' onchange='changeDate(this.value, \"$end\")'") . "<span> {$lang->report->to} </span>" . html::input('date', $end, "class='select-7 date' onchange='changeDate(\"$begin\", this.value)'");?>
     </div>
-      <table class='table-1 fixed colored tablesorter datatable border-sep'>
+      <table class='table-1 fixed colored tablesorter datatable border-sep' id="bug">
         <thead>
         <tr class='colhead'>
           <th><?php echo $lang->bug->openedBy;?></th>

module/report/view/productinfo.html.php

@@ -18,6 +18,7 @@
           <th width="w-50px"><?php echo $lang->story->statusList['draft'];?></th>
           <th width="w-50px"><?php echo $lang->story->statusList['active'];?></th>
           <th width="w-50px"><?php echo $lang->story->statusList['changed'];?></th>
+          <th width="w-50px"><?php echo $lang->story->statusList['closed'];?></th>
         </tr>
         </thead>
         <tbody>
@@ -36,6 +37,7 @@
               <td><?php echo (isset($plan->status['draft']) ? $plan->status['draft'] : 0);?></td>
               <td><?php echo (isset($plan->status['active']) ? $plan->status['active'] : 0);?></td>
               <td><?php echo (isset($plan->status['changed']) ? $plan->status['changed'] : 0);?></td>
+              <td><?php echo (isset($plan->status['closed']) ? $plan->status['closed'] : 0);?></td>
             <?php if($id != 1) echo "</tr>"?>
             <?php $id ++;?>
             <?php endforeach;?>
@@ -46,6 +48,7 @@
               <td></td>
               <td></td>
               <td></td>
+              <td></td>
             <?php endif;?>
           </tr>
         <?php endforeach;?>

module/report/view/workload.html.php

@@ -13,7 +13,8 @@
           <th><?php echo $lang->report->project;?></th>
           <th><?php echo $lang->report->task;?></th>
           <th><?php echo $lang->report->remain;?></th>
-          <th><?php echo $lang->report->total;?></th>
+          <th><?php echo $lang->report->taskTotal;?></th>
+          <th><?php echo $lang->report->manhourTotal;?></th>
         </tr>
         </thead>
         <tbody>
@@ -28,7 +29,10 @@
             <td><?php echo $info['manhour'];?></td>
             <?php if($id == 1):?>
             <td rowspan="<?php echo count($load['task']);?>">
-                <?php printf($lang->report->taskTotal, $load['total']['count'], $load['total']['manhour']);?>
+                <?php echo $load['total']['count'];?>
+            </td>
+            <td rowspan="<?php echo count($load['task']);?>">
+                <?php echo $load['total']['manhour'];?>
             </td>
             <?php endif;?>
             <?php if($id != 1) echo '</tr>'; $id ++;?>