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

* [bug#55485,done,0.5h] fix delay info error.

Browse Source
This commit is contained in:
tianshujie
2024-10-09 09:08:46 +08:00
committed by 刘刚
parent c5d2424466
commit 875ccb0fc9
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/programplan/tao.php
+9 -4
View File
@@ -271,7 +271,8 @@ class programplanTao extends programplanModel
foreach($tasks as $task)
{
$dateLimit = $this->getTaskDateLimit($task, zget($plans, $task->execution, null));
$plan = zget($plans, $task->execution, null);
$dateLimit = $this->getTaskDateLimit($task, $plan);
$data = $this->buildTaskDataForGantt($task, $dateLimit);
$data->id = $task->execution . '-' . $task->id;
$data->parent = $task->parent > 0 ? $task->execution . '-' . $task->parent : $task->execution;
@@ -280,10 +281,14 @@ class programplanTao extends programplanModel
/* Determines if the object is delay. */
$data->delay = $this->lang->programplan->delayList[0];
$data->delayDays = 0;
if($today > $dateLimit['end'])
if($today > $dateLimit['end'] && $plan->status != 'closed')
{
$data->delay = $this->lang->programplan->delayList[1];
$data->delayDays = helper::diffDate($today, $dateLimit['end']);
$delayDays = helper::diffDate(($task->status == 'done' || $task->status == 'closed') ? substr($task->finishedDate, 0, 10) : $today, substr($dateLimit['end'], 0, 10));
if($delayDays > 0)
{
$data->delayDays = $delayDays;
$data->delay = $this->lang->programplan->delayList[1];
}
}
/* If multi task then show the teams. */