From bb9aa91422b807300a8e6772ab96f9045d5b904b Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Wed, 14 Sep 2022 17:34:28 +0800
Subject: [PATCH]  * adjust for finish page style.

---
 module/task/control.php          |  6 ++---
 module/task/js/view.js           | 31 ++++++++++++-------------
 module/task/view/finish.html.php | 40 +++++++++++++++++++++++---------
 3 files changed, 47 insertions(+), 30 deletions(-)

diff --git a/module/task/control.php b/module/task/control.php
index 0862950065..e5dc0d5de7 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -1152,7 +1152,7 @@ class task extends control
                     $kanbanData    = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', 0, $execGroupBy, $rdSearchValue);
                     $kanbanData    = json_encode($kanbanData);
 
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
+                    return print(js::reload('parent') . js::execute("parent.parent.updateKanban($kanbanData)"));
                 }
                 if($from == 'taskkanban')
                 {
@@ -1162,9 +1162,9 @@ class task extends control
                     $kanbanData      = $kanbanData[$kanbanType];
                     $kanbanData      = json_encode($kanbanData);
 
-                    return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban(\"task\", $kanbanData)"));
+                    return print(js::reload('parent') . js::execute("parent.parent.updateKanban(\"task\", $kanbanData)"));
                 }
-                return print(js::reload('parent'));
+                return print(js::reload('parent') . js::execute("if(typeof(parent.parent.ajaxRefresh) == 'function') parent.parent.ajaxRefresh()"));
             }
             return print(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
         }
diff --git a/module/task/js/view.js b/module/task/js/view.js
index 28768c9858..45c9d15b55 100644
--- a/module/task/js/view.js
+++ b/module/task/js/view.js
@@ -1,6 +1,7 @@
 $(function()
 {
     if(config.onlybody == 'yes') $('.main-actions').css('width', '100%');
+    limitIframeLevel();
 });
 
 function assign(taskID, assignedTo)
@@ -10,22 +11,20 @@ function assign(taskID, assignedTo)
   $('.assign').load(createLink('user', 'ajaxGetUser', 'taskID=' + taskID + '&assignedTo=' + assignedTo));
 }
 
-$(document).ready(function()
+/**
+ * Ajax refresh
+ *
+ * @access public
+ * @return void
+ */
+function ajaxRefresh()
 {
-    limitIframeLevel();
-    /* Ajax refresh view page when close effort modal. */
-    $(document).on('mousedown', '#triggerModal .modal-header button.close', function()
+    $.get(location.href, function(data)
     {
-        var href = $(this).closest('#triggerModal').attr('ref').toLowerCase();
-        if(href.indexOf('recordestimate') < 0 && href.indexOf('createforobject') < 0) return;
+        $data = $(data);
+        $('#actionbox ol.histories-list').html($data.find('#actionbox ol.histories-list').html());
+        $('.side-col').html($data.find('.side-col').html());
 
-        $.get(location.href, function(data)
-        {
-            $data = $(data);
-            $('#actionbox ol.histories-list').html($data.find('#actionbox ol.histories-list').html());
-            $('.side-col').html($data.find('.side-col').html());
-
-            if($('#actionbox ol.histories-list #lastComment').length > 0) $('#actionbox ol.histories-list #lastComment').kindeditor();
-        });
-    })
-});
+        if($('#actionbox ol.histories-list #lastComment').length > 0) $('#actionbox ol.histories-list #lastComment').kindeditor();
+    });
+}
diff --git a/module/task/view/finish.html.php b/module/task/view/finish.html.php
index 8ed4fbaf2a..42f5af056e 100644
--- a/module/task/view/finish.html.php
+++ b/module/task/view/finish.html.php
@@ -47,7 +47,7 @@
         </tr>
         <?php if(!empty($task->team)):?>
         <tr>
-          <th class='thWidth'><?php echo $lang->task->hasConsumed;?></th>
+          <th class='thWidth'><?php echo $lang->task->my . $lang->task->hasConsumed;?></th>
           <td class='w-p25-f'><?php echo (float)$task->myConsumed;?> <?php echo $lang->workingHour;?></td><td></td>
         </tr>
         <?php endif;?>
@@ -56,19 +56,23 @@
           <td>
             <div class='input-group'><?php echo html::input('currentConsumed', 0, "class='form-control'");?> <span class='input-group-addon'><?php echo $lang->task->hour;?></span></div>
           </td>
-        </tr>
-        <tr>
-          <th><?php echo empty($task->team) ? $lang->task->consumed : $lang->task->myConsumed;?></th>
           <td>
-          <?php $consumed = empty($task->team) ? $task->consumed : (float)$task->myConsumed;?>
-          <?php
-          echo "<span id='totalConsumed'>" . (float)$consumed . "</span> " . $lang->workingHour . html::hidden('consumed', $consumed);
-          js::set('consumed', $consumed);
-          ?>
+            <div class='table-row'>
+              <div class='table-col strong w-80px text-right' style='padding-right:10px'><?php echo empty($task->team) ? $lang->task->consumed : $lang->task->myConsumed;?> </div>
+              <div class='table-col'>
+                <?php $consumed = empty($task->team) ? $task->consumed : (float)$task->myConsumed;?>
+                <?php
+                echo "<span id='totalConsumed'>" . (float)$consumed . "</span> " . $lang->workingHour . html::hidden('consumed', $consumed);
+                js::set('consumed', $consumed);
+                ?>
+              </div>
+            </div>
           </td>
         </tr>
+        <tr>
+        </tr>
         <tr class='<?php if($task->mode == 'multi') echo 'hidden'?>'>
-          <th><?php echo (!empty($task->team) and $task->mode == 'linear') ? $lang->task->transferTo : $lang->task->assign;?></th>
+          <th><?php echo $lang->task->assign;?></th>
           <td>
             <?php
             if(!empty($task->team) and $task->mode == 'linear')
@@ -84,7 +88,21 @@
         </tr>
         <tr>
           <th><?php echo $lang->task->realStarted;?></th>
-          <td><div class='datepicker-wrapper'><?php echo html::input('realStarted', $task->realStarted != '0000-00-00 00:00:00' ? $task->realStarted : '', "class='form-control form-datetime'");?></div></td><td></td>
+          <td>
+            <div class='datepicker-wrapper'>
+            <?php
+            $realStarted = $task->realStarted;
+            $readonly    = 'readonly';
+            if(helper::isZeroDate($realStarted))
+            {
+                $realStarted = '';
+                $readonly    = '';
+            }
+            ?>
+            <?php echo html::input('realStarted', $realStarted, "class='form-control" . ($readonly ? '' : ' form-datetime') . "' $readonly");?>
+            </div>
+          </td>
+          <td></td>
         </tr>
         <tr>
           <th><?php echo $lang->task->finishedDate;?></th>