Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

*Code for code review.

Browse Source
This commit is contained in:
songchenxuan
2022-01-06 13:34:53 +08:00
parent 8927059720
commit 1cf45ada5c
5 changed files with 19 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
module/testreport/control.php
View File

@@ -299,8 +299,8 @@ class testreport extends control
$this->view->reportTitle = date('Y-m-d') . " EXECUTION#{$execution->id} {$execution->name} {$this->lang->testreport->common}";
}
$cases = $this->testreport->getTaskCases($tasks, $begin, $end);
$bugInfo = $this->testreport->getBugInfo($tasks, $productIdList, $begin, $end, $builds);
$cases = $this->testreport->getTaskCases($tasks, $begin, $end);
list($bugInfo, $bugSummary) = $this->testreport->getBugInfo($tasks, $productIdList, $begin, $end, $builds);
$this->view->begin = $begin;
$this->view->end = $end;
$this->view->members = $this->dao->select('DISTINCT lastRunner')->from(TABLE_TESTRUN)->where('task')->in(array_keys($tasks))->fetchPairs('lastRunner', 'lastRunner');
@@ -329,19 +329,7 @@ class testreport extends control
$this->view->datas['testTaskPerRunResult'] = $this->loadModel('report')->computePercent($perCaseResult);
$this->view->datas['testTaskPerRunner'] = $this->report->computePercent($perCaseRunner);
$this->view->legacyBugs = $bugInfo['legacyBugs'];
$bugSummary['foundBugs'] = $bugInfo['foundBugs'];
$bugSummary['activatedBugs'] = count($bugInfo['activatedBugs']);
$bugSummary['countBugByTask'] = $bugInfo['countBugByTask'];
$bugSummary['bugConfirmedRate'] = $bugInfo['bugConfirmedRate'];
$bugSummary['bugCreateByCaseRate'] = $bugInfo['bugCreateByCaseRate'];
unset($bugInfo['foundBugs']);
unset($bugInfo['legacyBugs']);
unset($bugInfo['activatedBugs']);
unset($bugInfo['countBugByTask']);
unset($bugInfo['bugConfirmedRate']);
unset($bugInfo['bugCreateByCaseRate']);
$this->view->legacyBugs = $bugSummary['legacyBugs'];
$this->view->bugInfo = $bugInfo;
$this->view->bugSummary = $bugSummary;
@@ -444,8 +432,8 @@ class testreport extends control
$bugs = $this->testreport->getBugs4Test($builds, $productIdList, $begin, $end, 'execution');
}
$cases = $this->testreport->getTaskCases($tasks, $begin, $end);
$bugInfo = $this->testreport->getBugInfo($tasks, $productIdList, $begin, $end, $builds);
$cases = $this->testreport->getTaskCases($tasks, $begin, $end);
list($bugInfo, $bugSummary) = $this->testreport->getBugInfo($tasks, $productIdList, $begin, $end, $builds);
$this->view->title = $report->title . $this->lang->testreport->edit;
@@ -470,19 +458,7 @@ class testreport extends control
$this->view->datas['testTaskPerRunResult'] = $this->loadModel('report')->computePercent($perCaseResult);
$this->view->datas['testTaskPerRunner'] = $this->report->computePercent($perCaseRunner);
$this->view->legacyBugs = $bugInfo['legacyBugs'];
$bugSummary['foundBugs'] = $bugInfo['foundBugs'];
$bugSummary['activatedBugs'] = count($bugInfo['activatedBugs']);
$bugSummary['countBugByTask'] = $bugInfo['countBugByTask'];
$bugSummary['bugConfirmedRate'] = $bugInfo['bugConfirmedRate'];
$bugSummary['bugCreateByCaseRate'] = $bugInfo['bugCreateByCaseRate'];
unset($bugInfo['foundBugs']);
unset($bugInfo['legacyBugs']);
unset($bugInfo['activatedBugs']);
unset($bugInfo['countBugByTask']);
unset($bugInfo['bugConfirmedRate']);
unset($bugInfo['bugCreateByCaseRate']);
$this->view->legacyBugs = $bugSummary['legacyBugs'];
$this->view->bugInfo = $bugInfo;
$this->view->bugSummary = $bugSummary;
@@ -553,7 +529,7 @@ class testreport extends control
$tasks = $report->tasks ? $this->testtask->getByList($report->tasks) : array();;
$builds = $report->builds ? $this->build->getByList($report->builds) : array();
$cases = $this->testreport->getTaskCases($tasks, $report->begin, $report->end);
$bugInfo = $this->testreport->getBugInfo($tasks, $report->product, $report->begin, $report->end, $builds);
list($bugInfo, $bugSummary) = $this->testreport->getBugInfo($tasks, $report->product, $report->begin, $report->end, $builds);
/* save session .*/
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'testcase', false);
@@ -590,19 +566,7 @@ class testreport extends control
$this->view->datas['testTaskPerRunResult'] = $this->loadModel('report')->computePercent($perCaseResult);
$this->view->datas['testTaskPerRunner'] = $this->report->computePercent($perCaseRunner);
$this->view->legacyBugs = $bugInfo['legacyBugs'];
$bugSummary['foundBugs'] = $bugInfo['foundBugs'];
$bugSummary['activatedBugs'] = count($bugInfo['activatedBugs']);
$bugSummary['countBugByTask'] = $bugInfo['countBugByTask'];
$bugSummary['bugConfirmedRate'] = $bugInfo['bugConfirmedRate'];
$bugSummary['bugCreateByCaseRate'] = $bugInfo['bugCreateByCaseRate'];
unset($bugInfo['foundBugs']);
unset($bugInfo['legacyBugs']);
unset($bugInfo['activatedBugs']);
unset($bugInfo['countBugByTask']);
unset($bugInfo['bugConfirmedRate']);
unset($bugInfo['bugCreateByCaseRate']);
$this->view->legacyBugs = $bugSummary['legacyBugs'];
$this->view->bugInfo = $bugInfo;
$this->view->bugSummary = $bugSummary;

9
module/testreport/model.php
View File

@@ -350,7 +350,14 @@ class testreportModel extends model
}
$bugInfo['bugResolvedByGroups'] = $data;
return $bugInfo;
$bugSummary = $bugInfo;
unset($bugInfo['foundBugs']);
unset($bugInfo['legacyBugs']);
unset($bugInfo['activatedBugs']);
unset($bugInfo['countBugByTask']);
unset($bugInfo['bugConfirmedRate']);
unset($bugInfo['bugCreateByCaseRate']);
return array($bugInfo, $bugSummary);
}
/**

2
module/testreport/view/create.html.php
View File

@@ -83,7 +83,7 @@
<?php
echo '<div>' . $storySummary . '</div>';
echo '<div>' . sprintf($lang->testreport->buildSummary, empty($builds) ? 1 : count($builds)) . $caseSummary . '</div>';
echo '<div>' . sprintf($lang->testreport->bugSummary, $bugSummary['foundBugs'], count($legacyBugs), $bugSummary['activatedBugs'], $bugSummary['countBugByTask'], $bugSummary['bugConfirmedRate'] . '%', $bugSummary['bugCreateByCaseRate'] . '%') . '</div>';
echo '<div>' . sprintf($lang->testreport->bugSummary, $bugSummary['foundBugs'], count($legacyBugs), count($bugSummary['activatedBugs']), $bugSummary['countBugByTask'], $bugSummary['bugConfirmedRate'] . '%', $bugSummary['bugCreateByCaseRate'] . '%') . '</div>';
?>
</td>
<td></td>

2
module/testreport/view/edit.html.php
View File

@@ -71,7 +71,7 @@
<?php
echo '<p>' . $storySummary . '</p>';
echo '<p>' . sprintf($lang->testreport->buildSummary, empty($builds) ? 1 : count($builds)) . $caseSummary . '</p>';
echo '<p>' . sprintf($lang->testreport->bugSummary, $bugSummary['foundBugs'], count($legacyBugs), $bugSummary['activatedBugs'], $bugSummary['countBugByTask'], $bugSummary['bugConfirmedRate'] . '%', $bugSummary['bugCreateByCaseRate'] . '%') . '</p>';
echo '<p>' . sprintf($lang->testreport->bugSummary, $bugSummary['foundBugs'], count($legacyBugs), count($bugSummary['activatedBugs']), $bugSummary['countBugByTask'], $bugSummary['bugConfirmedRate'] . '%', $bugSummary['bugCreateByCaseRate'] . '%') . '</p>';
?>
</td>
<td></td>

2
module/testreport/view/view.html.php
View File

@@ -78,7 +78,7 @@
<?php
echo '<p>' . $storySummary . '</p>';
echo '<p>' . sprintf($lang->testreport->buildSummary, empty($builds) ? 1 : count($builds)) . $caseSummary . '</p>';
echo '<p>' . sprintf($lang->testreport->bugSummary, $bugSummary['foundBugs'], count($legacyBugs), $bugSummary['activatedBugs'], $bugSummary['countBugByTask'], $bugSummary['bugConfirmedRate'] . '%', $bugSummary['bugCreateByCaseRate'] . '%') . '</p>';
echo '<p>' . sprintf($lang->testreport->bugSummary, $bugSummary['foundBugs'], count($legacyBugs), count($bugSummary['activatedBugs']), $bugSummary['countBugByTask'], $bugSummary['bugConfirmedRate'] . '%', $bugSummary['bugCreateByCaseRate'] . '%') . '</p>';
?>
</td>
</tr>