Merge branch 'master' into 'sprint/master_fixbug'

# Conflicts: # module/project/model.php
2022-04-02 07:33:24 +00:00
parent b352dc9a86 388314c625
commit adb3a7ea72
94 changed files with 1290 additions and 624 deletions
@@ -2189,6 +2189,20 @@ class projectModel extends model
                if($task->status != 'cancel' and $task->status != 'closed') $hour->totalLeft += $task->left;
            }
            $hours[$executionID] = $hour;
+
+            if($executions[$executionID]->type == 'stage' and $executions[$executionID]->grade == 2)
+            {
+                $stageParent = $executions[$executionID]->parent;
+                if(!isset($hours[$stageParent]))
+                {
+                    $hours[$stageParent] = clone $hour;
+                    continue;
+                }
+
+                $hours[$stageParent]->totalEstimate += $hour->totalEstimate;
+                $hours[$stageParent]->totalConsumed += $hour->totalConsumed;
+                $hours[$stageParent]->totalLeft     += $hour->totalLeft;
+            }
        }

        /* Compute totalReal and progress. */