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

*Finish task #7738.

Browse Source
This commit is contained in:
qiyu-xie
2020-08-31 13:37:20 +08:00
parent 98446b359e
commit 19847b99f8
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testreport/control.php
+4 -4
View File
@@ -448,7 +448,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, $report->cases, $pager);
$totalCases = $this->testreport->getTaskCases($tasks, $report->begin, $report->end, $report->cases);
$caseIDList = $this->testreport->getCaseIDList($reportID);
$bugInfo = $this->testreport->getBugInfo($tasks, $report->product, $report->begin, $report->end, $builds);
if($report->objectType == 'testtask')
@@ -476,10 +476,10 @@ class testreport extends control
$this->view->actions = $this->loadModel('action')->getList('testreport', $reportID);
$this->view->storySummary = $this->product->summary($stories);
$this->view->caseSummary = $this->testreport->getResultSummary($tasks, $totalCases, $report->begin, $report->end);
$this->view->caseSummary = $this->testreport->getResultSummary($tasks, $caseIDList, $report->begin, $report->end);
$perCaseResult = $this->testreport->getPerCaseResult4Report($tasks, $totalCases, $report->begin, $report->end);
$perCaseRunner = $this->testreport->getPerCaseRunner4Report($tasks, $totalCases, $report->begin, $report->end);
$perCaseResult = $this->testreport->getPerCaseResult4Report($tasks, $caseIDList, $report->begin, $report->end);
$perCaseRunner = $this->testreport->getPerCaseRunner4Report($tasks, $caseIDList, $report->begin, $report->end);
$this->view->datas['testTaskPerRunResult'] = $this->loadModel('report')->computePercent($perCaseResult);
$this->view->datas['testTaskPerRunner'] = $this->report->computePercent($perCaseRunner);
module/testreport/model.php
+16
View File
@@ -288,6 +288,22 @@ class testreportModel extends model
return $bugInfo;
}
/**
* Get caseID list
*
* @param int $reportID
* @access public
* @return void
*/
public function getCaseIDList($reportID)
{
$task = $this->dao->select('tasks')->from(TABLE_TESTREPORT)->where('id')->eq($reportID)->andWhere('deleted')->eq(0)->fetch('tasks');
$caseIDList = $this->dao->select('`case`')->from(TABLE_TESTRUN)->where('task')->eq($task)->fetchAll('case');
return $caseIDList;
}
/**
* Get task cases.
*