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

*Fixbug #20719

Browse Source
This commit is contained in:
sunjun
2022-04-01 15:10:54 +08:00
parent 83507debe8
commit 9cccd7ec3b
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/model.php
+23 -1
View File
@@ -2169,6 +2169,14 @@ class projectModel extends model
->andWhere('deleted')->eq(0)
->fetchGroup('execution', 'id');
$parentStage = array();
foreach($executions as $executionID => $execution)
{
if($execution->grade != 2) continue;
if(!isset($parentStage[$execution->parent])) $parentStage[$execution->parent] = array();
$parentStage[$execution->parent][$executionID] = $executionID;
}
/* Compute totalEstimate, totalConsumed, totalLeft. */
foreach($tasks as $executionID => $executionTasks)
{
@@ -2182,6 +2190,21 @@ class projectModel extends model
$hours[$executionID] = $hour;
}
foreach($parentStage as $executionID => $subExecutionID)
{
$hours[$executionID] = (object)$emptyHour;
foreach($subExecutionID as $subExe)
{
if(isset($hours[$subExe]))
{
$hours[$executionID]->totalEstimate += $hours[$subExe]->totalEstimate;
$hours[$executionID]->totalConsumed += $hours[$subExe]->totalConsumed;
$hours[$executionID]->totalLeft += $hours[$subExe]->totalLeft;
$hours[$executionID]->progress += $hours[$subExe]->progress;
}
}
}
/* Compute totalReal and progress. */
foreach($hours as $hour)
{
@@ -2191,7 +2214,6 @@ class projectModel extends model
$hour->totalReal = $hour->totalConsumed + $hour->totalLeft;
$hour->progress = $hour->totalReal ? round($hour->totalConsumed / $hour->totalReal * 100, 2) : 0;
}
return $hours;
}