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

* [bug,done,0.3h] add delay data.

Browse Source
This commit is contained in:
tianshujie
2025-06-05 13:07:23 +08:00
parent 53a559c04f
commit 2541d79da0
1 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/programplan/model.php
+28
View File
@@ -216,8 +216,23 @@ class programplanModel extends model
/* Judge whether to display tasks under the stage. */
if(empty($selectCustom)) $selectCustom = $this->loadModel('setting')->getItem("owner={$this->app->user->account}&module=programplan&section=browse&key=stageCustom");
$begin = $end = helper::today();
$deadlineList = array();
foreach($tasksGroup as $group => $tasks)
{
foreach($tasks as $taskID => $task)
{
$deadline = helper::isZeroDate($task->deadline) && !empty($plans[$task->execution]->end) ? $plans[$task->execution]->end : $task->deadline;
if(helper::isZeroDate($deadline)) continue;
$begin = $deadline < $begin ? $deadline : $begin;
$deadlineList[$taskID] = $deadline;
}
}
$groupID = 0;
$datas['data'] = array();
$workingDays = $this->loadModel('holiday')->getActualWorkingDays($begin, $end);
foreach($tasksGroup as $group => $tasks)
{
$groupID ++;
@@ -247,6 +262,19 @@ class programplanModel extends model
$stageIndex[$groupKey]['totalConsumed'] += $task->consumed;
$stageIndex[$groupKey]['totalReal'] += $task->left + $task->consumed;
$stageIndex[$groupKey]['totalEstimate'] += $task->estimate;
/* Delayed or not?. */
$isNotCancel = !in_array($task->status, array('cancel', 'closed')) || ($task->status == 'closed' && !helper::isZeroDate($task->finishedDate) && $task->closedReason != 'cancel');
$isComputeDelay = $isNotCancel && !empty($deadlineList[$taskID]);
if($isComputeDelay) $task = $this->task->computeDelay($task, $deadlineList[$taskID], $workingDays);
$data->delay = $this->lang->programplan->delayList[0];
$data->delayDays = 0;
if(isset($task->delay) && $task->delay > 0)
{
$data->delay = $this->lang->programplan->delayList[1];
$data->delayDays = $task->delay;
}
}
/* Calculate group realBegan and realEnd. */