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

* [bug#51355,done,0.5h] fix progress_of_task_in_execution.

Browse Source
This commit is contained in:
qixinzhi
2024-06-20 09:47:50 +08:00
committed by 周鑫
parent a764e9c13b
commit 5438d4f38f
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/metric/calc/execution/rate/progress_of_task_in_execution.php
+6 -14
View File
@@ -20,31 +20,23 @@
*/
class progress_of_task_in_execution extends baseCalc
{
public $dataset = 'getTasks';
public $dataset = 'getExecutions';
public $fieldList = array('t1.consumed', 't1.left', 't1.execution');
public $fieldList = array('t1.id', 't1.progress');
public $result = array();
public function calculate($row)
{
$consumed = !empty($row->consumed) ? $row->consumed : 0;
$left = !empty($row->left) ? $row->left : 0;
$execution = $row->id;
$progress = $row->progress;
if(!isset($this->result[$row->execution])) $this->result[$row->execution] = array('consumed' => 0, 'left' => 0);
$this->result[$row->execution]['consumed'] += $consumed;
$this->result[$row->execution]['left'] += $left;
$this->result[$execution] = (float)$progress / 100;
}
public function getResult($options = array())
{
$records = array();
foreach($this->result as $execution => $taskInfo)
{
$total = $taskInfo['consumed'] + $taskInfo['left'];
$progress = $total ? round($taskInfo['consumed'] / $total, 4) : 0;
$records[] = array('execution' => $execution, 'value' => $progress);
}
$records = $this->getRecords(array('execution', 'value'));
return $this->filterByOptions($records, $options);
}
}