diff --git a/module/program/model.php b/module/program/model.php index ed1ba3289c..f1ca0d0cd3 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -1249,9 +1249,13 @@ class programModel extends model $hour = (object)$emptyHour; foreach($projectTasks as $task) { - $hour->totalConsumed += $task->consumed; - if(isset($executions[$task->execution])) $hour->totalEstimate += $task->estimate; - if($task->status != 'cancel' and $task->status != 'closed' and isset($executions[$task->execution])) $hour->totalLeft += $task->left; + if(isset($executions[$task->execution])) + { + $hour->totalConsumed += $task->consumed; + $hour->totalEstimate += $task->estimate; + + if(strpos('cancel,closed', $task->status) !== false) $hour->totalLeft += $task->left; + } } $hours[$projectID] = $hour; }