*Finish task #48843.

2022-02-09 16:09:57 +08:00
parent 274b240b08
commit 31e2c020f7
1 changed files with 3 additions and 2 deletions
@@ -225,7 +225,8 @@ class programModel extends model
            ->andWhere('deleted')->eq(0)
            ->fetchGroup('execution', 'id');

-        $hours = $this->computeProgress($tasks);
+        $hours        = $this->computeProgress($tasks);
+        $projectHours = $this->getProgressList();

        /* Group data by product. */
        foreach($productGroup as $programID => $products)
@@ -249,7 +250,7 @@ class programModel extends model
                    }

                    $project->execution = $execution;
-                    $project->hours     = zget($hours, $project->id, array());
+                    $project->hours['progress']   = zget($projectHours, $project->id, array());
                    $product->projects[$status][] = $project;
                }
            }