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

* Compute hours for grouptasks like as browse page.

Browse Source
This commit is contained in:
daitingting
2018-07-13 10:22:57 +08:00
parent 157aac7269
commit 526f392155
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/view/grouptask.html.php
+14 -4
View File
@@ -142,11 +142,21 @@
$groupSum = 0;
foreach($groupTasks as $taskKey => $task)
{
if(!$task->parent && $task->status != 'cancel')
if($groupBy == 'story')
{
$groupEstimate += $task->estimate;
$groupConsumed += $task->consumed;
$groupLeft += ($task->status == 'cancel' ? 0 : $task->left);
if(!$task->parent)
{
$groupEstimate += $task->estimate;
$groupConsumed += $task->consumed;
if($task->status != 'cancel' && $task->status != 'closed') $groupLeft += $task->left;
}
}
else
{
$groupEstimate += $task->estimate;
$groupConsumed += $task->consumed;
if($groupBy == 'status' || ($task->status != 'cancel' && $task->status != 'closed')) $groupLeft += $task->left;
}
if($task->status == 'wait') $groupWait++;