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

* [refac bug #57595] Set estStarted and realStarted field for task tree.

Browse Source
This commit is contained in:
wangyidong
2024-11-29 10:47:25 +08:00
committed by 孙广明
parent 9fb60509d6
commit bf069ccba9
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+7 -2
View File
@@ -4464,7 +4464,9 @@ class executionModel extends model
switch($tree->type)
{
case 'task':
$label = $tree->parent > 0 ? $this->lang->task->children : $this->lang->task->common;
$label = $this->lang->task->common;
if($tree->parent > 0 && !$tree->isParent) $label = $this->lang->task->children;
if($tree->isParent) $label = $this->lang->task->parent;
$treeData[$index]['url'] = $canViewTask ? helper::createLink('execution', 'treeTask', "taskID={$tree->id}") : '';
$treeData[$index]['content'] = array(
'html' => "<div class='tree-link'><span class='label gray-pale rounded-full align-sub'>{$label}</span><span class='ml-4 align-sub'>{$tree->id}</span><span class='title ml-4 " . ($canViewTask ? 'text-primary' : '') . " align-sub' title='{$tree->title}'>" . $tree->title . '</span>'. $assigedToHtml . '</div>',
@@ -4515,9 +4517,12 @@ class executionModel extends model
{
if($tree->type == 'task')
{
$label = $this->lang->task->common;
if($tree->parent > 0 && !$tree->isParent) $label = $this->lang->task->children;
if($tree->isParent) $label = $this->lang->task->parent;
$treeData[$index]['url'] = $canViewTask ? helper::createLink('execution', 'treeTask', "taskID={$tree->id}") : '';
$treeData[$index]['content'] = array(
'html' => "<div class='tree-link'><span class='label gray-pale rounded-full align-sub'>{$this->lang->task->common}</span><span class='ml-4 align-sub'>{$tree->id}</span><span class='title ml-4 " . ($canViewTask ? 'text-primary' : '') . " align-sub' title='{$tree->title}'>" . $tree->title . '</span>'. $assigedToHtml . '</div>',
'html' => "<div class='tree-link'><span class='label gray-pale rounded-full align-sub'>{$label}</span><span class='ml-4 align-sub'>{$tree->id}</span><span class='title ml-4 " . ($canViewTask ? 'text-primary' : '') . " align-sub' title='{$tree->title}'>" . $tree->title . '</span>'. $assigedToHtml . '</div>',
);
}
$treeData[$index]['items'] = $this->buildTree($tree->children, $hasProduct, $gradeGroup);
module/execution/tao.php
+3
View File
@@ -781,6 +781,9 @@ class executionTao extends executionModel
$taskItem->pri = (int)$task->pri;
$taskItem->status = $task->status;
$taskItem->parent = $task->parent;
$taskItem->isParent = $task->isParent;
$taskItem->estStarted = $task->estStarted;
$taskItem->realStarted = $task->realStarted;
$taskItem->estimate = $task->estimate;
$taskItem->consumed = $task->consumed;
$taskItem->left = $task->left;
module/task/model.php
+1
View File
@@ -2587,6 +2587,7 @@ class taskModel extends model
}
/* Process parent-child task info. */
$parentIdList = array();
foreach($tasks as $task)
{
if($task->parent > 0) $parentIdList[] = $task->parent;