From 87f5637648f909bc33a707366dccb46c060b23e2 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Thu, 7 Nov 2024 09:07:55 +0800
Subject: [PATCH]  * [perf story #69159] display consumed and left fields for
 restart parent task.

---
 module/task/model.php           | 4 +++-
 module/task/ui/restart.html.php | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/module/task/model.php b/module/task/model.php
index 2a4d9044ce..eef10c32f2 100755
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -325,7 +325,9 @@ class taskModel extends model
         if($oldTask->parent > 0) $this->computeBeginAndEnd($oldTask->parent);
 
         /* Create related dynamic and record. */
-        $action = $left == 0 ? 'Finished' : 'Started';
+        $action = 'Started';
+        if($oldTask->status == 'pause') $action = 'Restarted';
+        if($left == 0) $action = 'Finished';
         $this->afterChangeStatus($oldTask, $changes, $action, $output);
 
         /* Send Webhook notifications and synchronize status to execution, project and program. */
diff --git a/module/task/ui/restart.html.php b/module/task/ui/restart.html.php
index ab2793246f..1979cfd8a8 100644
--- a/module/task/ui/restart.html.php
+++ b/module/task/ui/restart.html.php
@@ -99,9 +99,10 @@ else
                     (
                         set::name('consumed'),
                         set::value(!empty($currentTeam) ? (float)$currentTeam->consumed : $task->consumed),
-                        set::disabled(!empty($currentTeam) ? true : false),
+                        set::disabled((!empty($currentTeam) || $task->isParent) ? true : false),
                     ),
                     !empty($currentTeam) ? formHidden('consumed', (float)$currentTeam->consumed) : null,
+                    $task->isParent      ? formHidden('consumed', (float)$task->consumed)        : null,
                     to::suffix($lang->task->suffixHour),
                     set::suffixWidth(20)
                 )
@@ -116,7 +117,9 @@ else
                     (
                         set::name('left'),
                         set::value(!empty($currentTeam) ? (float)$currentTeam->left : $task->left),
+                        set::disabled($task->isParent ? true : false),
                     ),
+                    $task->isParent ? formHidden('left', $task->left) : null,
                     to::suffix($lang->task->suffixHour),
                     set::suffixWidth(20)
                 )