* Finish task #3223.

This commit is contained in:
pengjiangxiu
2017-09-11 16:10:50 +08:00
parent acd00ec17c
commit 40a3419f05
5 changed files with 18 additions and 6 deletions
-1
View File
@@ -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');
+1
View File
@@ -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';
+1
View File
@@ -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解决者分布';
+1
View File
@@ -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解決者分佈';
+15 -5
View File
@@ -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)
{