diff --git a/module/report/control.php b/module/report/control.php index af0f96fed7..f9534e5157 100644 --- a/module/report/control.php +++ b/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. * diff --git a/module/report/css/common.css b/module/report/css/common.css index 37957cad35..a7dc66d138 100644 --- a/module/report/css/common.css +++ b/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;} diff --git a/module/report/lang/en.php b/module/report/lang/en.php index ce200d7496..117b3107c1 100644 --- a/module/report/lang/en.php +++ b/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 = 'Try pro version for more!'; diff --git a/module/report/lang/zh-cn.php b/module/report/lang/zh-cn.php index 73d1b88fd4..df199dfcde 100644 --- a/module/report/lang/zh-cn.php +++ b/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 = '更多精彩,尽在专业版!'; diff --git a/module/report/model.php b/module/report/model.php index 0d01429ecd..2e03866a03 100644 --- a/module/report/model.php +++ b/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) diff --git a/module/report/view/bugsummary.html.php b/module/report/view/bugsummary.html.php index 45d5219f5b..79c3a199f4 100644 --- a/module/report/view/bugsummary.html.php +++ b/module/report/view/bugsummary.html.php @@ -10,7 +10,7 @@
| bug->openedBy;?> | diff --git a/module/report/view/productinfo.html.php b/module/report/view/productinfo.html.php index f8ea37499c..4ed683c183 100644 --- a/module/report/view/productinfo.html.php +++ b/module/report/view/productinfo.html.php @@ -18,6 +18,7 @@story->statusList['draft'];?> | story->statusList['active'];?> | story->statusList['changed'];?> | +story->statusList['closed'];?> | status['draft']) ? $plan->status['draft'] : 0);?> | status['active']) ? $plan->status['active'] : 0);?> | status['changed']) ? $plan->status['changed'] : 0);?> | +status['closed']) ? $plan->status['closed'] : 0);?> | "?> @@ -46,6 +48,7 @@+ | diff --git a/module/report/view/workload.html.php b/module/report/view/workload.html.php index 2f23b70dd0..f59ed23044 100644 --- a/module/report/view/workload.html.php +++ b/module/report/view/workload.html.php @@ -13,7 +13,8 @@ | report->project;?> | report->task;?> | report->remain;?> | -report->total;?> | +report->taskTotal;?> | +report->manhourTotal;?> | @@ -28,7 +29,10 @@- report->taskTotal, $load['total']['count'], $load['total']['manhour']);?> + + | ++ | '; $id ++;?>
|---|