From 0e596fff881ebdae8601b03215bf4e8b7f22920a Mon Sep 17 00:00:00 2001
From: z <wyd621@163.com>
Date: Wed, 9 Sep 2020 13:18:01 +0800
Subject: [PATCH]  * code for task #7846.

---
 module/my/view/task.html.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php
index 6053de6b68..d985664aea 100644
--- a/module/my/view/task.html.php
+++ b/module/my/view/task.html.php
@@ -48,8 +48,8 @@
           <th class='c-project'>          <?php common::printOrderLink('project',     $orderBy, $vars, $lang->task->project);?></th>
           <th class='c-name'>             <?php common::printOrderLink('name',        $orderBy, $vars, $lang->task->name);?></th>
           <th class='c-user w-90px'>      <?php common::printOrderLink('openedBy',    $orderBy, $vars, $lang->openedByAB);?></th>
-          <th class='w-80px'>             <?php common::printOrderLink('estStarted',  $orderBy, $vars, $lang->task->estStarted);?></th>
-          <th class='w-80px'>             <?php common::printOrderLink('deadline',    $orderBy, $vars, $lang->task->deadline);?></th>
+          <th class='w-80px'>             <?php echo $lang->task->start;?></th>
+          <th class='w-80px'>             <?php common::printOrderLink('deadline',    $orderBy, $vars, $lang->task->deadlineAB);?></th>
           <th class='w-90px c-assignedTo'><?php common::printOrderLink('assignedTo',  $orderBy, $vars, $lang->task->assignedTo);?></th>
           <th class='c-user w-100px'>     <?php common::printOrderLink('finishedBy',  $orderBy, $vars, $lang->task->finishedBy);?></th>
           <th class='c-hours w-50px'>     <?php common::printOrderLink('estimate',    $orderBy, $vars, $lang->task->estimateAB);?></th>
@@ -79,8 +79,15 @@
             <?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), $task->name, null, "style='color: $task->color'");?>
           </td>
           <td class='c-user'><?php echo zget($users, $task->openedBy);?></td>
-          <td><?php echo $task->estStarted;?></td>
-          <td><?php echo $task->deadline;?></td>
+          <td>
+            <?php
+            $startedDate = '';
+            if($task->estStarted != '0000-00-00')  $startedDate = $task->estStarted;
+            if($task->realStarted != '0000-00-00') $startedDate = $task->realStarted;
+            echo $startedDate;
+            ?>
+          </td>
+          <td <?php if(!empty($task->delay)) echo "class='delayed'";?>><?php if($task->deadline != '0000-00-00') echo $task->deadline;?></td>
           <td class="c-assignedTo has-btn"> <?php $this->task->printAssignedHtml($task, $users);?></td>
           <td class='c-user'><?php echo zget($users, $task->finishedBy);?></td>
           <td class='c-hours'><?php echo $task->estimate;?></td>