diff --git a/module/metric/calc/execution/scale/count_of_finished_dev_task_in_execution_when_closing.php b/module/metric/calc/execution/scale/count_of_finished_dev_task_in_execution_when_closing.php index c5fff9b59d..ec4f911757 100755 --- a/module/metric/calc/execution/scale/count_of_finished_dev_task_in_execution_when_closing.php +++ b/module/metric/calc/execution/scale/count_of_finished_dev_task_in_execution_when_closing.php @@ -31,13 +31,11 @@ class count_of_finished_dev_task_in_execution_when_closing extends baseCalc public function calculate($row) { $finishedDate = $this->isDate($row->finishedDate) ? $row->finishedDate : $row->closedDate; - if(!helper::isZeroDate($row->executionClosedDate)) + if(helper::isZeroDate($row->executionClosedDate) || $row->type == 'devel') return; + if($row->status == 'done' || ($row->status == 'closed' && $row->closedReason == 'done') && $finishedDate <= $row->executionClosedDate) { - if($row->type == 'devel' && ($row->status == 'done' || ($row->status == 'closed' && $row->closedReason == 'done')) && $finishedDate <= $row->executionClosedDate) - { - if(!isset($this->result[$row->execution])) $this->result[$row->execution] = 0; - $this->result[$row->execution] ++; - } + if(!isset($this->result[$row->execution])) $this->result[$row->execution] = 0; + $this->result[$row->execution] ++; } }