From ec01a855f3d87816ff89ba0624f5fc491973d2e9 Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Thu, 11 Mar 2021 15:27:21 +0800
Subject: [PATCH] * Finish task #36438.

---
 module/execution/css/grouptask.css       |  2 +-
 module/execution/view/all.html.php       | 19 ++++++++++---------
 module/execution/view/grouptask.html.php | 10 +++++-----
 module/story/view/view.html.php          |  2 +-
 module/user/css/task.css                 |  2 +-
 module/user/view/story.html.php          | 18 +++++++++---------
 module/user/view/task.html.php           |  6 +++---
 7 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/module/execution/css/grouptask.css b/module/execution/css/grouptask.css
index 3b1ba4eed2..c886b84612 100644
--- a/module/execution/css/grouptask.css
+++ b/module/execution/css/grouptask.css
@@ -24,4 +24,4 @@
 .is-firefox .group-header:before {content: ' '; position: absolute; top: 0; right: 0; left: 0; bottom: 0; background: #fff; z-index: 0;}
 .is-firefox .group-header > a,
 .is-firefox .group-header > .groupSummary {position: relative; z-index: 1;}
-.c-hours {white-space: nowrap; overflow: hidden; text-overflow: ellipsis;}
+.c-hours {white-space: nowrap; overflow: hidden; text-overflow: ellipsis; text-align: right;}
diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php
index 17c9c5e10a..4f42de0e5d 100644
--- a/module/execution/view/all.html.php
+++ b/module/execution/view/all.html.php
@@ -22,6 +22,7 @@
 .table td.has-child > .plan-toggle > .icon:before {text-align: left;}
 .table td.has-child > .plan-toggle.collapsed > .icon {-ms-transform:rotate(90deg); -moz-transform:rotate(90deg); -o-transform:rotate(90deg); -webkit-transform:rotate(90deg); transform: rotate(90deg);}
 .main-table tbody > tr.table-children > td:first-child::before {width: 3px;}
+.hours {text-align: right;}
 @-moz-document url-prefix() {.main-table tbody > tr.table-children > td:first-child::before {width: 4px;}}
 </style>
 <div id='mainMenu' class='clearfix'>
@@ -75,9 +76,9 @@
           <th class='thWidth'><?php common::printOrderLink('PM', $orderBy, $vars, $lang->execution->PM);?></th>
           <th class='w-90px'><?php common::printOrderLink('end', $orderBy, $vars, $lang->execution->end);?></th>
           <th class='w-90px'><?php common::printOrderLink('status', $orderBy, $vars, $lang->execution->status);?></th>
-          <th class='w-70px'><?php echo $lang->execution->totalEstimate;?></th>
-          <th class='w-70px'><?php echo $lang->execution->totalConsumed;?></th>
-          <th class='w-70px'><?php echo $lang->execution->totalLeft;?></th>
+          <th class='w-70px hours'><?php echo $lang->execution->totalEstimate;?></th>
+          <th class='w-70px hours'><?php echo $lang->execution->totalConsumed;?></th>
+          <th class='w-70px hours'><?php echo $lang->execution->totalLeft;?></th>
           <th class='w-150px'><?php echo $lang->execution->progress;?></th>
           <th class='w-100px'><?php echo $lang->execution->burn;?></th>
           <?php if($canOrder):?>
@@ -113,9 +114,9 @@
           <td class='c-status' title='<?php echo $executionStatus;?>'>
             <span class="status-execution status-<?php echo $execution->status?>"><?php echo $executionStatus;?></span>
           </td>
-          <td><?php echo $execution->hours->totalEstimate . ' ' . $config->hourUnit;?></td>
-          <td><?php echo $execution->hours->totalConsumed . ' ' . $config->hourUnit;?></td>
-          <td><?php echo $execution->hours->totalLeft . ' ' . $config->hourUnit;?></td>
+          <td class='hours'><?php echo $execution->hours->totalEstimate . ' ' . $config->hourUnit;?></td>
+          <td class='hours'><?php echo $execution->hours->totalConsumed . ' ' . $config->hourUnit;?></td>
+          <td class='hours'><?php echo $execution->hours->totalLeft . ' ' . $config->hourUnit;?></td>
           <td class="c-progress">
             <div class="progress progress-text-left">
               <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?php echo $execution->hours->progress;?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $execution->hours->progress;?>%">
@@ -157,9 +158,9 @@
              <td class='c-status' title='<?php echo $executionStatus;?>'>
                <span class="status-execution status-<?php echo $child->status?>"><?php echo $executionStatus;?></span>
              </td>
-             <td><?php echo $child->hours->totalEstimate;?></td>
-             <td><?php echo $child->hours->totalConsumed;?></td>
-             <td><?php echo $child->hours->totalLeft;?></td>
+             <td class='hours'><?php echo $child->hours->totalEstimate;?></td>
+             <td class='hours'><?php echo $child->hours->totalConsumed;?></td>
+             <td class='hours'><?php echo $child->hours->totalLeft;?></td>
              <td class="c-progress">
                <div class="progress progress-text-left">
                  <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?php echo $child->hours->progress;?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $child->hours->progress;?>%">
diff --git a/module/execution/view/grouptask.html.php b/module/execution/view/grouptask.html.php
index 9c3f9b0842..77843350d7 100644
--- a/module/execution/view/grouptask.html.php
+++ b/module/execution/view/grouptask.html.php
@@ -90,7 +90,7 @@
     </p>
   </div>
   <?php else:?>
-  <table class="table table-grouped text-center">
+  <table class="table table-grouped">
     <thead>
       <tr class="<?php if($allCount) echo 'divider';?>">
         <th class="c-side text-left has-btn group-menu">
@@ -117,9 +117,9 @@
         <th class="c-status"><?php echo $lang->task->status;?></th>
         <th class="text-left w-60px"><?php echo $lang->task->assignedTo;?></th>
         <th class="w-90px"><?php echo $lang->task->finishedBy;?></th>
-        <th class="w-60px text-right"><?php echo $lang->task->estimateAB;?></th>
-        <th class="w-50px"><?php echo $lang->task->consumedAB;?></th>
-        <th class="w-50px"><?php echo $lang->task->leftAB;?></th>
+        <th class="w-60px c-hours"><?php echo $lang->task->estimateAB;?></th>
+        <th class="w-50px c-hours"><?php echo $lang->task->consumedAB;?></th>
+        <th class="w-50px c-hours"><?php echo $lang->task->leftAB;?></th>
         <th class="w-50px" title='<?php echo $lang->task->progress;?>'><?php echo $lang->task->progressAB;?></th>
         <th class="c-type"><?php echo $lang->typeAB;?></th>
         <th class="c-date"><?php echo $lang->task->deadlineAB;?></th>
@@ -202,7 +202,7 @@
         <td class="c-status"><span class='status-task status-<?php echo $task->status;?>'> <?php echo $this->processStatus('task', $task);?></span></td>
         <td class="c-assign text-left"><?php echo "<span class='$assignedToClass'>" . $task->assignedToRealName . "</span>";?></td>
         <td class='c-user'><?php echo zget($users, $task->finishedBy);?></td>
-        <td class="c-hours em text-right" title="<?php echo $task->estimate . ' ' . $lang->execution->workHour;?>"><?php echo $task->estimate . ' ' . $lang->execution->workHourUnit;?></td>
+        <td class="c-hours em" title="<?php echo $task->estimate . ' ' . $lang->execution->workHour;?>"><?php echo $task->estimate . ' ' . $lang->execution->workHourUnit;?></td>
         <td class="c-hours em" title="<?php echo $task->consumed . ' ' . $lang->execution->workHour;?>"><?php echo $task->consumed . ' ' . $lang->execution->workHourUnit;?></td>
         <td class="c-hours em" title="<?php echo $task->left     . ' ' . $lang->execution->workHour;?>"><?php echo $task->left     . ' ' . $lang->execution->workHourUnit;?></td>
         <td class="c-num em"><?php echo $task->progress . '%';?></td>
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index 938cc23420..638b236e07 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -141,7 +141,7 @@
                 <th class='w-40px'> <?php echo $lang->priAB;?></th>
                 <th>                <?php echo $lang->story->title;?></th>
                 <th class='w-100px'><?php echo $lang->story->assignedTo;?></th>
-                <th class='w-80px'> <?php echo $lang->story->estimate;?></th>
+                <th class='w-90px'> <?php echo $lang->story->estimate;?></th>
                 <th class='w-80px'> <?php echo $lang->story->status;?></th>
                 <th class='w-200px'><?php echo $lang->actions;?></th>
               </tr>
diff --git a/module/user/css/task.css b/module/user/css/task.css
index 10e45907d3..f963fb9a73 100644
--- a/module/user/css/task.css
+++ b/module/user/css/task.css
@@ -1,2 +1,2 @@
 td.delayed {color: #fff; background: #e84e0f !important;}
-.hours {white-space: nowrap; overflow: hidden; text-overflow: ellipsis;}
+.hours {white-space: nowrap; overflow: hidden; text-overflow: ellipsis; text-align: right;}
diff --git a/module/user/view/story.html.php b/module/user/view/story.html.php
index 01a69ad966..f96046215f 100644
--- a/module/user/view/story.html.php
+++ b/module/user/view/story.html.php
@@ -37,15 +37,15 @@
     <table class='table has-sort-head tablesorter'>
       <thead>
         <tr class='colhead'>
-          <th class='w-id'>    <?php echo $lang->idAB;?></th>
-          <th class='w-pri'>   <?php echo $lang->priAB;?></th>
-          <th class='w-200px'> <?php echo $lang->story->product;?></th>
-          <th>                 <?php echo $lang->story->title;?></th>
-          <th class='w-150px'> <?php echo $lang->story->plan;?></th>
-          <th class='w-90px'>  <?php echo $lang->openedByAB;?></th>
-          <th class='w-80px'>  <?php echo $lang->story->estimateAB;?></th>
+          <th class='w-id'><?php echo $lang->idAB;?></th>
+          <th class='w-pri'><?php echo $lang->priAB;?></th>
+          <th class='w-200px'><?php echo $lang->story->product;?></th>
+          <th><?php echo $lang->story->title;?></th>
+          <th class='w-150px'><?php echo $lang->story->plan;?></th>
+          <th class='w-90px'><?php echo $lang->openedByAB;?></th>
+          <th class='w-80px text-right'><?php echo $lang->story->estimateAB;?></th>
           <th class='w-status'><?php echo $lang->statusAB;?></th>
-          <th class='w-100px'> <?php echo $lang->story->stageAB;?></th>
+          <th class='w-100px'><?php echo $lang->story->stageAB;?></th>
         </tr>
       </thead>
       <tbody>
@@ -58,7 +58,7 @@
           <td class='text-left nobr'><?php echo html::a($storyLink, $story->title);?></td>
           <td title='<?php echo $story->planTitle;?>'><?php echo $story->planTitle;?></td>
           <td><?php echo zget($users, $story->openedBy);?></td>
-          <td><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
+          <td class='text-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
           <td class='story-<?php echo $story->status;?>'><?php echo $this->processStatus('story', $story);?></td>
           <td><?php echo $lang->story->stageList[$story->stage];?></td>
         </tr>
diff --git a/module/user/view/task.html.php b/module/user/view/task.html.php
index 7c7dd7e512..68c41078f3 100644
--- a/module/user/view/task.html.php
+++ b/module/user/view/task.html.php
@@ -44,9 +44,9 @@
           <th class='w-pri'><?php echo $lang->priAB;?></th>
           <th><?php echo $lang->task->execution;?></th>
           <th><?php echo $lang->task->name;?></th>
-          <th class='w-70px'><?php echo $lang->task->estimateAB;?></th>
-          <th class='w-70px'><?php echo $lang->task->consumedAB;?></th>
-          <th class='w-hour'><?php echo $lang->task->leftAB;?></th>
+          <th class='w-70px hours'><?php echo $lang->task->estimateAB;?></th>
+          <th class='w-70px hours'><?php echo $lang->task->consumedAB;?></th>
+          <th class='w-hour hours'><?php echo $lang->task->leftAB;?></th>
           <th class='w-date'><?php echo $lang->task->deadlineAB;?></th>
           <th class='w-70px'><?php echo $lang->statusAB;?></th>
         </tr>