diff --git a/module/testreport/control.php b/module/testreport/control.php index b699f63ab2..d988165187 100644 --- a/module/testreport/control.php +++ b/module/testreport/control.php @@ -183,7 +183,6 @@ class testreport extends control $cases = $this->testreport->getTaskCases($tasks); $bugInfo = $this->testreport->getBugInfo($tasks, $productIdList, $begin, $end, $builds); - $this->view->begin = $begin; $this->view->end = $end; $this->view->members = $this->dao->select('lastRunner')->from(TABLE_TESTRESULT)->where('run')->in(array_keys($tasks))->fetchPairs('lastRunner', 'lastRunner'); diff --git a/module/testreport/lang/en.php b/module/testreport/lang/en.php index 778ce45e56..a73d954e22 100644 --- a/module/testreport/lang/en.php +++ b/module/testreport/lang/en.php @@ -42,6 +42,7 @@ $lang->testreport->legendComment = 'Sum up'; $lang->testreport->legendMore = 'More'; $lang->testreport->bugSeverityGroups = 'Bug Severity Distribution'; +$lang->testreport->bugTypeGroups = 'Bug Type Distribution'; $lang->testreport->bugStatusGroups = 'Bug Status Distribution'; $lang->testreport->bugOpenedByGroups = 'Bug CreatedBy Distribution'; $lang->testreport->bugResolvedByGroups = 'Bug ResolvedBy Distribution'; diff --git a/module/testreport/lang/zh-cn.php b/module/testreport/lang/zh-cn.php index 3609073879..cc38fe3b45 100644 --- a/module/testreport/lang/zh-cn.php +++ b/module/testreport/lang/zh-cn.php @@ -42,6 +42,7 @@ $lang->testreport->legendComment = '总结'; $lang->testreport->legendMore = '更多功能'; $lang->testreport->bugSeverityGroups = 'Bug严重级别分布'; +$lang->testreport->bugTypeGroups = 'Bug类型别分布'; $lang->testreport->bugStatusGroups = 'Bug状态分布'; $lang->testreport->bugOpenedByGroups = 'Bug创建者分布'; $lang->testreport->bugResolvedByGroups = 'Bug解决者分布'; diff --git a/module/testreport/lang/zh-tw.php b/module/testreport/lang/zh-tw.php index a50f9e33e6..abdbe569a0 100644 --- a/module/testreport/lang/zh-tw.php +++ b/module/testreport/lang/zh-tw.php @@ -42,6 +42,7 @@ $lang->testreport->legendComment = '總結'; $lang->testreport->legendMore = '更多功能'; $lang->testreport->bugSeverityGroups = 'Bug嚴重級別分佈'; +$lang->testreport->bugTypeGroups = 'Bug類型別分布'; $lang->testreport->bugStatusGroups = 'Bug狀態分佈'; $lang->testreport->bugOpenedByGroups = 'Bug創建者分佈'; $lang->testreport->bugResolvedByGroups = 'Bug解決者分佈'; diff --git a/module/testreport/model.php b/module/testreport/model.php index 74fe5758bd..af9306e8df 100644 --- a/module/testreport/model.php +++ b/module/testreport/model.php @@ -187,14 +187,15 @@ class testreportModel extends model public function getBugInfo($tasks, $productIdList, $begin, $end, $builds) { $bugsByTask = $this->dao->select('*')->from(TABLE_BUG)->where('testtask')->in(array_keys($tasks))->andWhere('testtask')->ne(0)->andWhere('deleted')->eq(0)->fetchAll('id'); - $severityGroups = $statusGroups = $openedByGroups = $resolvedByGroups = $resolutionGroups = $moduleGroups = array(); + $severityGroups = $statusGroups = $openedByGroups = $resolvedByGroups = $resolutionGroups = $moduleGroups = $typeGroups = array(); $resolvedBugs = 0; foreach($bugsByTask as $bug) { - $severityGroups[$bug->severity] = isset($severityGroups[$bug->severity]) ? $severityGroups[$bug->severity] + 1 : 1; - $statusGroups[$bug->status] = isset($statusGroups[$bug->status]) ? $statusGroups[$bug->status] + 1 : 1; - $openedByGroups[$bug->openedBy] = isset($openedByGroups[$bug->openedBy]) ? $openedByGroups[$bug->openedBy] + 1 : 1; - $moduleGroups[$bug->module] = isset($moduleGroups[$bug->module]) ? $moduleGroups[$bug->module] + 1 : 1; + $severityGroups[$bug->severity] = isset($severityGroups[$bug->severity]) ? $severityGroups[$bug->severity] + 1 : 1; + $typeGroups[$bug->type] = isset($typeGroups[$bug->type]) ? $typeGroups[$bug->type] + 1 : 1; + $statusGroups[$bug->status] = isset($statusGroups[$bug->status]) ? $statusGroups[$bug->status] + 1 : 1; + $openedByGroups[$bug->openedBy] = isset($openedByGroups[$bug->openedBy]) ? $openedByGroups[$bug->openedBy] + 1 : 1; + $moduleGroups[$bug->module] = isset($moduleGroups[$bug->module]) ? $moduleGroups[$bug->module] + 1 : 1; if($bug->resolvedBy) $resolvedByGroups[$bug->resolvedBy] = isset($resolvedByGroups[$bug->resolvedBy]) ? $resolvedByGroups[$bug->resolvedBy] + 1 : 1; if($bug->resolution) $resolutionGroups[$bug->resolution] = isset($resolutionGroups[$bug->resolution]) ? $resolutionGroups[$bug->resolution] + 1 : 1; if($bug->status == 'resolved' or $bug->status == 'closed') $resolvedBugs ++; @@ -226,6 +227,15 @@ class testreportModel extends model } $bugInfo['bugSeverityGroups'] = $data; + $data = array(); + foreach($typeGroups as $type => $count) + { + $data[$type] = new stdclass(); + $data[$type]->name = zget($this->lang->bug->typeList, $type); + $data[$type]->value = $count; + } + $bugInfo['bugTypeGroups'] = $data; + $data = array(); foreach($statusGroups as $status => $count) {