From 42e4aec31f27ff0a869f7e3d8824401c0e63d33e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= Date: Tue, 19 Dec 2017 15:01:10 +0800 Subject: [PATCH] * Fix Bug --- module/project/model.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/module/project/model.php b/module/project/model.php index 8fc4dea38d..7e527a037a 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1681,7 +1681,7 @@ class projectModel extends model * * @param int $projectID * @access public - * @return void + * @return array */ public function getBurnDataFlot($projectID = 0) { @@ -1835,7 +1835,7 @@ class projectModel extends model */ public function summary($tasks) { - $taskSum = $statusWait = $statusDone = $statusDoing = $statusClosed = $statusCancel = $statusPause = 0; + $taskSum = $statusWait = $statusDone = $statusDoing = $statusClosed = $statusCancel = $statusPause = 0; $totalEstimate = $totalConsumed = $totalLeft = 0.0; foreach($tasks as $task) @@ -1845,7 +1845,13 @@ class projectModel extends model $totalLeft += (($task->status == 'cancel' or $task->closedReason == 'cancel') ? 0 : $task->left); $statusVar = 'status' . ucfirst($task->status); $$statusVar ++; - if(!empty($task->children)) $taskSum += count($task->children); + if(!empty($task->children)){ + $taskSum += count($task->children); + foreach($task->children as $child) + { + if($child->status == 'wait') $statusWait ++; + } + } $taskSum ++; }