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

* Refactor the setChartDatas function.

Browse Source
This commit is contained in:
daitingting
2023-09-26 01:56:00 +00:00
parent 5ec0189b91
commit 985eb2a131
2 changed files with 57 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testreport/control.php
+2 -55
View File
@@ -273,11 +273,11 @@ class testreport extends control
if($report->objectType == 'testtask')
{
$this->setChartDatas($report->objectID);
$this->testreportZen->setChartDatas($report->objectID);
}
elseif($reportData['tasks'])
{
foreach($reportData['tasks'] as $task) $this->setChartDatas($task->id);
foreach($reportData['tasks'] as $task) $this->testreportZen->setChartDatas($task->id);
}
/* Load pager. */
@@ -313,57 +313,4 @@ class testreport extends control
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => $locateLink));
}
/**
* Set chart datas of cases.
*
* @param int $taskID
* @access public
* @return void
*/
public function setChartDatas($taskID)
{
$this->loadModel('report');
$task = $this->loadModel('testtask')->getByID($taskID);
foreach($this->lang->testtask->report->charts as $chart => $title)
{
if(strpos($chart, 'testTask') === false) continue;
$chartFunc = 'getDataOf' . $chart;
$chartData = $this->testtask->$chartFunc($taskID);
$chartOption = $this->testtask->mergeChartOption($chart);
if(isset($chartType) && !empty($chartType)) $chartOption->type = $chartType;
$this->view->charts[$chart] = $chartOption;
if(isset($this->view->datas[$chart]))
{
$existDatas = $this->view->datas[$chart];
$sum = 0;
foreach($chartData as $key => $data)
{
if(isset($existDatas[$key]))
{
$data->value += $existDatas[$key]->value;
unset($existDatas[$key]);
}
$sum += $data->value;
}
foreach($existDatas as $key => $data)
{
$sum += $data->value;
$chartData[$key] = $data;
}
if($sum)
{
foreach($chartData as $data) $data->percent = round($data->value / $sum, 2);
}
ksort($chartData);
$this->view->datas[$chart] = $chartData;
}
else
{
$this->view->datas[$chart] = $this->report->computePercent($chartData);
}
}
}
}
module/testreport/zen.php
+55
View File
@@ -401,4 +401,59 @@ class testreportZen extends testreport
return $projectID;
}
}
/**
* 设置用例的报告数据。
* Set chart datas of cases.
*
* @param int $taskID
* @access public
* @return void
*/
protected function setChartDatas(int $taskID): void
{
$this->loadModel('report');
foreach($this->lang->testtask->report->charts as $chart => $title)
{
if(strpos($chart, 'testTask') === false) continue;
$chartFunc = 'getDataOf' . $chart;
$chartData = $this->testtask->$chartFunc($taskID);
$chartOption = $this->testtask->mergeChartOption($chart);
$this->view->charts[$chart] = $chartOption;
if(isset($this->view->datas[$chart]))
{
$existDatas = $this->view->datas[$chart];
$sum = 0;
foreach($chartData as $key => $data)
{
if(isset($existDatas[$key]))
{
$data->value += $existDatas[$key]->value;
unset($existDatas[$key]);
}
$sum += $data->value;
}
foreach($existDatas as $key => $data)
{
$chartData[$key] = $data;
$sum += $data->value;
}
if($sum)
{
foreach($chartData as $data) $data->percent = round($data->value / $sum, 2);
}
ksort($chartData);
$this->view->datas[$chart] = $chartData;
}
else
{
$this->view->datas[$chart] = $this->report->computePercent($chartData);
}
}
}
}