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

* finish task #7499.

Browse Source
This commit is contained in:
wangyidong
2019-03-08 14:48:50 +08:00
parent ad09223066
commit 487e802420
7 changed files with 98 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/control.php
+48 -2
View File
@@ -283,11 +283,57 @@ class project extends control
}
elseif($groupBy == 'assignedTo')
{
$groupTasks[$task->assignedToRealName][] = $task;
if(isset($task->team))
{
foreach($task->team as $team)
{
$cloneTask = clone $task;
$cloneTask->assignedTo = $team->account;
$cloneTask->estimate = $team->estimate;
$cloneTask->consumed = $team->consumed;
$cloneTask->left = $team->left;
if($team->left == 0) $cloneTask->status = 'done';
$realname = zget($users, $team->account);
$cloneTask->assignedToRealName = $realname;
$groupTasks[$realname][] = $cloneTask;
}
}
else
{
$groupTasks[$task->assignedToRealName][] = $task;
}
}
elseif($groupBy == 'finishedBy')
{
$groupTasks[$users[$task->finishedBy]][] = $task;
if(isset($task->team))
{
$task->consumed = $task->estimate = $task->left = 0;
foreach($task->team as $team)
{
if($team->left != 0)
{
$task->estimate += $team->estimate;
$task->consumed += $team->consumed;
$task->left += $team->left;
continue;
}
$cloneTask = clone $task;
$cloneTask->finishedBy = $team->account;
$cloneTask->estimate = $team->estimate;
$cloneTask->consumed = $team->consumed;
$cloneTask->left = $team->left;
$cloneTask->status = 'done';
$realname = zget($users, $team->account);
$groupTasks[$realname][] = $cloneTask;
}
if(!empty($task->left)) $groupTasks[$users[$task->finishedBy]][] = $task;
}
else
{
$groupTasks[$users[$task->finishedBy]][] = $task;
}
}
elseif($groupBy == 'closedBy')
{