From 930d72178ea49a6874f15dc3f2db7d5535ae76ac Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Tue, 9 Aug 2022 22:39:41 +0800
Subject: [PATCH] * Code for task#63790.

---
 module/execution/css/all.css      |  2 +-
 module/execution/css/task.css     |  2 +-
 module/execution/model.php        |  6 +++---
 module/my/css/execution.css       |  2 +-
 module/my/view/execution.html.php | 10 +++++-----
 module/my/view/todo.html.php      | 16 ++++++++--------
 module/project/css/execution.css  |  1 +
 module/story/model.php            | 10 +++++-----
 8 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/module/execution/css/all.css b/module/execution/css/all.css
index c111722e41..872a6e1219 100644
--- a/module/execution/css/all.css
+++ b/module/execution/css/all.css
@@ -28,7 +28,7 @@ td.flex span.project-type-label {min-width: 40px;}
 .has-child > span {margin-right: 5px;}
 .c-name > .text-ellipsis {text-overflow: clip;}
 .c-code, .c-project {overflow: hidden; white-space: nowrap;}
-th.c-status {text-align: center}
+th.c-status, .c-begin, .c-end, .c-realBegan, .c-realEnd {text-align: center;}
 
 .c-project{text-overflow: unset !important;}
 canvas {height: 28px;}
diff --git a/module/execution/css/task.css b/module/execution/css/task.css
index df5a1d9368..42eda4f7e7 100644
--- a/module/execution/css/task.css
+++ b/module/execution/css/task.css
@@ -1,10 +1,10 @@
 td.delayed {background: #e84e0f !important; color: white;}
 #int-dropdown {margin-left: -8px; border-radius: 4px; border: 1px solid #0c64eb;}
 #projectTaskForm table tbody tr td {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
-th.c-deadline {text-align: center;}
 .table td.c-estimate, .table td.c-consumed, .table td.c-left {padding-right: 12px;}
 .c-estimate {text-align: right;}
 .c-consumed {text-align: right;}
+.c-deadline {text-align: center;}
 .c-left {text-align: right;}
 .table-footer {z-index: 1;}
 .btn-toolbar > .btn {margin-right: 5px !important;}
diff --git a/module/execution/model.php b/module/execution/model.php
index b04ced0a78..90704f6e09 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -4371,16 +4371,16 @@ class executionModel extends model
         echo '<td>' . zget($users, $execution->PM) . '</td>';
         echo "<td class='status-{$execution->status} text-center'>" . zget($this->lang->project->statusList, $execution->status) . '</td>';
         echo '<td>' . html::ring($execution->hours->progress) . '</td>';
-        echo helper::isZeroDate($execution->begin) ? '<td></td>' : '<td>' . $execution->begin . '</td>';
+        echo helper::isZeroDate($execution->begin) ? '<td></td>' : '<td class="c-date">' . $execution->begin . '</td>';
         if(!helper::isZeroDate($execution->end))
         {
             if($execution->status != 'closed')
             {
-                echo strtotime($today) > strtotime($execution->end) ? '<td class="delayed" title="' . $this->lang->execution->delayed . '">' . $execution->end . '</td>' : '<td>' . $execution->end . '</td>';
+                echo strtotime($today) > strtotime($execution->end) ? '<td class="delayed c-date" title="' . $this->lang->execution->delayed . '">' . $execution->end . '</td>' : '<td class="c-date">' . $execution->end . '</td>';
             }
             else
             {
-                echo '<td>' . $execution->end . '</td>';
+                echo '<td class="c-date">' . $execution->end . '</td>';
             }
         }
         else
diff --git a/module/my/css/execution.css b/module/my/css/execution.css
index f4869cbc17..0c3f52f231 100644
--- a/module/my/css/execution.css
+++ b/module/my/css/execution.css
@@ -1,2 +1,2 @@
 .c-hours, .c-progress {width: 80px !important;}
-th.c-status {padding-right: 8px !important;}
+.c-status, .c-date {padding-right: 8px !important; text-align: center;}
diff --git a/module/my/view/execution.html.php b/module/my/view/execution.html.php
index c7516e8a12..1b95627d6e 100644
--- a/module/my/view/execution.html.php
+++ b/module/my/view/execution.html.php
@@ -39,7 +39,7 @@
         <?php endif;?>
         <th class='c-date'><?php echo $lang->execution->begin;?></th>
         <th class='c-date'><?php echo $lang->execution->end;?></th>
-        <th class='c-status text-center'><?php echo $lang->statusAB;?></th>
+        <th class='c-status'><?php echo $lang->statusAB;?></th>
         <th class='c-user'><?php echo $lang->team->role;?></th>
         <th class='c-date'><?php echo $lang->team->join;?></th>
         <th class='c-hours'><?php echo $lang->my->hours;?></th>
@@ -67,9 +67,9 @@
           <?php echo isset($execution->projectName) ? html::a($this->createLink('project', 'index', "id=$execution->project", '', '', $execution->project), $execution->projectName, '', "title='$execution->projectName'") : '';?>
         </td>
         <?php endif;?>
-        <td><?php echo $execution->begin;?></td>
-        <td><?php echo $execution->end;?></td>
-        <td class="c-status text-center">
+        <td class='c-date'><?php echo $execution->begin;?></td>
+        <td class='c-date'><?php echo $execution->end;?></td>
+        <td class="c-status">
           <?php if(isset($execution->delay)):?>
           <span class="status-project status-delayed" title='<?php echo $lang->execution->delayed;?>'><?php echo $lang->execution->delayed;?></span>
           <?php else:?>
@@ -78,7 +78,7 @@
           <?php endif;?>
         </td>
         <td><?php echo $execution->role;?></td>
-        <td><?php echo $execution->join;?></td>
+        <td class='c-date'><?php echo $execution->join;?></td>
         <td><?php echo $execution->hours;?></td>
         <td><?php echo $execution->assignedToMeTasks;?></td>
         <td>
diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php
index b40d3042f8..a672b419a5 100644
--- a/module/my/view/todo.html.php
+++ b/module/my/view/todo.html.php
@@ -87,15 +87,15 @@
             <?php endif;?>
             <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
           </th>
-          <th class="c-date">     <?php common::printOrderLink('date',       $orderBy, $vars, $lang->todo->date);?></th>
-          <th class="c-type">     <?php common::printOrderLink('type',       $orderBy, $vars, $lang->todo->type);?></th>
+          <th class="c-date text-center"><?php common::printOrderLink('date',       $orderBy, $vars, $lang->todo->date);?></th>
+          <th class="c-type"><?php common::printOrderLink('type',       $orderBy, $vars, $lang->todo->type);?></th>
           <?php $style = $this->app->clientLang == 'en' ? "style='width:80px'" : '';?>
           <th class="c-pri" <?php echo $style;?> title=<?php echo $lang->todo->pri;?>> <?php common::printOrderLink('pri',    $orderBy, $vars, $lang->priAB);?></th>
-          <th class="c-name">     <?php common::printOrderLink('name',       $orderBy, $vars, $lang->todo->name);?></th>
-          <th class="c-user">     <?php common::printOrderLink('assignedBy', $orderBy, $vars, $lang->todo->assignedBy);?></th>
-          <th class="c-begin">    <?php common::printOrderLink('begin',      $orderBy, $vars, $lang->todo->beginAB);?></th>
-          <th class="c-end">      <?php common::printOrderLink('end',        $orderBy, $vars, $lang->todo->endAB);?></th>
-          <th class="c-status">   <?php common::printOrderLink('status',     $orderBy, $vars, $lang->todo->status);?></th>
+          <th class="c-name">   <?php common::printOrderLink('name',       $orderBy, $vars, $lang->todo->name);?></th>
+          <th class="c-user">   <?php common::printOrderLink('assignedBy', $orderBy, $vars, $lang->todo->assignedBy);?></th>
+          <th class="c-begin">  <?php common::printOrderLink('begin',      $orderBy, $vars, $lang->todo->beginAB);?></th>
+          <th class="c-end">    <?php common::printOrderLink('end',        $orderBy, $vars, $lang->todo->endAB);?></th>
+          <th class="c-status"> <?php common::printOrderLink('status',     $orderBy, $vars, $lang->todo->status);?></th>
           <th class="c-actions-5"><?php echo $lang->actions;?></th>
         </tr>
       </thead>
@@ -111,7 +111,7 @@
             <?php endif;?>
             <?php echo $todo->id?>
           </td>
-          <td class="c-date"><?php echo $todo->date == '2030-01-01' ? $lang->todo->periods['future'] : $todo->date;?></td>
+          <td class="c-date text-center"><?php echo $todo->date == '2030-01-01' ? $lang->todo->periods['future'] : $todo->date;?></td>
           <td class="c-type"><?php echo zget($lang->todo->typeList, $todo->type, '');?></td>
           <td class="c-pri"><span title="<?php echo zget($lang->todo->priList, $todo->pri);?>" class='label-pri <?php echo 'label-pri-' . $todo->pri;?>' title='<?php echo zget($lang->todo->priList, $todo->pri, $todo->pri);?>'><?php echo zget($lang->todo->priList, $todo->pri)?></span></td>
           <td class="c-name" title="<?php echo $todo->name;?>"><?php echo html::a($this->createLink('todo', 'view', "id=$todo->id&from=my", '', true), $todo->name, '', "data-toggle='modal' data-width='80%' data-type='iframe' data-title='" . $lang->todo->view . "' data-icon='check'");?></td>
diff --git a/module/project/css/execution.css b/module/project/css/execution.css
index 62600ca993..7b59058feb 100644
--- a/module/project/css/execution.css
+++ b/module/project/css/execution.css
@@ -7,3 +7,4 @@
 th.table-nest-title-edit {padding-left: 50px !important;}
 th.table-nest-title-edit .table-nest-toggle {left: 28px;}
 th.table-nest-title .check-all {position: absolute; left: 15px; top: 7px;}
+.c-date {text-align: center;}
diff --git a/module/story/model.php b/module/story/model.php
index bc342f887b..59d0c1491c 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -4637,25 +4637,25 @@ class storyModel extends model
                 echo zget($users, $story->openedBy, $story->openedBy);
                 break;
             case 'openedDate':
-                echo substr($story->openedDate, 5, 11);
+                echo helper::isZeroDate($story->openedDate) ? '' : substr($story->openedDate, 5, 11);
                 break;
             case 'assignedTo':
                 $this->printAssignedHtml($story, $users);
                 break;
             case 'assignedDate':
-                echo substr($story->assignedDate, 5, 11);
+                echo helper::isZeroDate($story->assignedDate) ? '' : substr($story->assignedDate, 5, 11);
                 break;
             case 'reviewedBy':
                 echo $story->reviewedBy;
                 break;
             case 'reviewedDate':
-                echo substr($story->reviewedDate, 5, 11);
+                echo helper::isZeroDate($story->reviewedDate) ? '' : substr($story->reviewedDate, 5, 11);
                 break;
             case 'closedBy':
                 echo zget($users, $story->closedBy, $story->closedBy);
                 break;
             case 'closedDate':
-                echo substr($story->closedDate, 5, 11);
+                echo helper::isZeroDate($story->closedDate) ? '' : substr($story->closedDate, 5, 11);
                 break;
             case 'closedReason':
                 echo zget($this->lang->story->reasonList, $story->closedReason, $story->closedReason);
@@ -4664,7 +4664,7 @@ class storyModel extends model
                 echo zget($users, $story->lastEditedBy, $story->lastEditedBy);
                 break;
             case 'lastEditedDate':
-                echo substr($story->lastEditedDate, 5, 11);
+                echo helper::isZeroDate($story->lastEditedDate) ? '' : substr($story->lastEditedDate, 5, 11);
                 break;
             case 'feedbackBy':
                 echo $story->feedbackBy;