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

* Adjust the problem of sonar detection.

Browse Source
This commit is contained in:
caoyanyi
2023-05-17 11:06:35 +08:00
parent fbfd7ba982
commit 2256e592c1
1 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/control.php
+29 -29
View File
@@ -1483,39 +1483,39 @@ class task extends control
foreach($tasks as $task)
{
$task->storyTitle = isset($stories[$task->story]) ? $stories[$task->story]->title : '';
if(isset($task->team))
{
if($orderBy == 'finishedBy') $task->consumed = $task->estimate = $task->left = 0;
foreach($task->team as $team)
{
if($orderBy == 'finishedBy' and $team->left != 0)
{
$task->estimate += $team->estimate;
$task->consumed += $team->consumed;
$task->left += $team->left;
continue;
}
$cloneTask = clone $task;
$cloneTask->estimate = $team->estimate;
$cloneTask->consumed = $team->consumed;
$cloneTask->left = $team->left;
if($team->left == 0) $cloneTask->status = 'done';
if($orderBy == 'assignedTo')
{
$cloneTask->assignedToRealName = zget($users, $team->account);
$cloneTask->assignedTo = $team->account;
}
if($orderBy == 'finishedBy')$cloneTask->finishedBy = $team->account;
$groupTasks[$team->account][] = $cloneTask;
}
if(!empty($task->left) and $orderBy == 'finishedBy') $groupTasks[$task->finishedBy][] = $task;
}
else
if(!isset($task->team))
{
$groupTasks[$task->$orderBy][] = $task;
continue;
}
if($orderBy == 'finishedBy') $task->consumed = $task->estimate = $task->left = 0;
foreach($task->team as $team)
{
if($orderBy == 'finishedBy' and $team->left != 0)
{
$task->estimate += $team->estimate;
$task->consumed += $team->consumed;
$task->left += $team->left;
continue;
}
$cloneTask = clone $task;
$cloneTask->estimate = $team->estimate;
$cloneTask->consumed = $team->consumed;
$cloneTask->left = $team->left;
if($team->left == 0) $cloneTask->status = 'done';
if($orderBy == 'assignedTo')
{
$cloneTask->assignedToRealName = zget($users, $team->account);
$cloneTask->assignedTo = $team->account;
}
if($orderBy == 'finishedBy')$cloneTask->finishedBy = $team->account;
$groupTasks[$team->account][] = $cloneTask;
}
if(!empty($task->left) and $orderBy == 'finishedBy') $groupTasks[$task->finishedBy][] = $task;
}
$tasks = array();