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

Merge branch 'release/21.7.2' into feature/projecttpl

Browse Source
This commit is contained in:
wangyuting
2025-06-04 03:16:26 +00:00
parent 5ea8c7eb75 0cbe7fe9ac
commit 72fc1765f7
83 changed files with 5412 additions and 3640 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+21 -35
View File
@@ -1873,11 +1873,14 @@ class executionModel extends model
public function getChildExecutions(int $executionID, string $orderBy = 'id_desc', string $type = 'child'): array
{
$executionID = (int)$executionID;
$path = '';
if($type != 'child') $path = $this->dao->select('path')->from(TABLE_EXECUTION)->where('id')->eq($executionID)->fetch('path');
if(empty($executionID)) return array();
if($type != 'child' && empty($path)) return array();
$path = '';
if($type != 'child')
{
$path = $this->dao->select('path')->from(TABLE_EXECUTION)->where('id')->eq($executionID)->fetch('path');
if(empty($path)) return array();
}
return $this->dao->select('*')->from(TABLE_EXECUTION)
->where('deleted')->eq(0)
@@ -2036,9 +2039,7 @@ class executionModel extends model
->orderBy('t1.order_asc, t1.id_desc')
->fetchGroup('execution', 'id');
$today = helper::today();
$begin = $today;
$end = $today;
$begin = $end = helper::today();
$taskIdList = array();
foreach($executionTasks as $tasks)
{
@@ -2060,19 +2061,9 @@ class executionModel extends model
if(isset($teamGroups[$task->id])) $task->team = $teamGroups[$task->id];
/* Delayed or not?. */
if(!empty($workingDays) && !empty($task->deadline) && !helper::isZeroDate($task->deadline))
{
$endDate = $today;
if(($task->status == 'done' || $task->status == 'closed') && !helper::isZeroDate($task->finishedDate) && $task->finishedDate < $today) $endDate = substr($task->finishedDate, 0, 10);
$betweenDays = $this->holiday->getDaysBetween($task->deadline, $endDate);
if($betweenDays)
{
$delayDays = array_intersect($betweenDays, $workingDays);
$delay = count($delayDays) - 1;
if($delay > 0) $task->delay = $delay;
}
}
$isNotCancel = !in_array($task->status, array('cancel', 'closed')) || ($task->status == 'closed' && !helper::isZeroDate($task->finishedDate) && $task->closedReason != 'cancel');
$isComputeDelay = !helper::isZeroDate($task->deadline) && $isNotCancel;
if($isComputeDelay) $task = $this->task->computeDelay($task, $task->deadline, $workingDays);
/* Story changed or not. */
$task->storyVersion = zget($storyVersionPairs, $task->id, $task->storyVersion);
@@ -5214,33 +5205,28 @@ class executionModel extends model
*
* @param array $executions
* @param array $parentExecutions
* @param int $projectID
* @param array $childExecutions
* @access public
* @return array
*/
public function resetExecutionSorts(array $executions, array $parentExecutions = array(), int $projectID = 0): array
public function resetExecutionSorts(array $executions, array $parentExecutions = array(), array $childExecutions = array()): array
{
if(empty($executions)) return array();
if(empty($parentExecutions))
if(empty($parentExecutions) && empty($childExecutions))
{
$execution = current($executions);
$projectID = isset($execution->project) ? $execution->project : $projectID;
$parentExecutions = $this->dao->select('*')->from(TABLE_EXECUTION)
->where('deleted')->eq(0)
->andWhere('type')->in('kanban,sprint,stage')
->andWhere('grade')->eq(1)
->andWhere('project')->eq($projectID)
->orderBy('order_asc')
->fetchAll('id');
foreach($executions as $execution)
{
if($execution->grade == 1) $parentExecutions[$execution->id] = $execution;
if($execution->grade > 1 && $execution->parent) $childExecutions[$execution->parent][$execution->id] = $execution;
}
}
$sortedExecutions = array();
foreach($parentExecutions as $executionID => $execution)
{
if(!isset($sortedExecutions[$executionID]) and isset($executions[$executionID])) $sortedExecutions[$executionID] = $executions[$executionID];
$children = $this->getChildExecutions($executionID, 'order_asc');
if(!empty($children)) $sortedExecutions += $this->resetExecutionSorts($executions, $children);
if(!empty($childExecutions[$executionID])) $sortedExecutions += $this->resetExecutionSorts($executions, $childExecutions[$executionID], $childExecutions);
}
return $sortedExecutions;
}