From 0578dd3cfbbe1a3748a12558b061288f777959dc Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Mon, 8 Aug 2022 06:40:19 +0000
Subject: [PATCH 1/3] *Finish task #35865.

---
 module/my/css/execution.css       | 2 +-
 module/my/view/execution.html.php | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/my/css/execution.css b/module/my/css/execution.css
index 98cba85497..6b9eab9b50 100644
--- a/module/my/css/execution.css
+++ b/module/my/css/execution.css
@@ -1 +1 @@
-.c-hours, .c-progress {width: 80px !important;} 
+.c-hours, .c-progress {width: 80px !important;}
diff --git a/module/my/view/execution.html.php b/module/my/view/execution.html.php
index 101cd0ea50..ac5b4ac4e7 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'><?php echo $lang->statusAB;?></th>
+        <th class='c-status text-center' style='padding-right: 8px'><?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>
@@ -53,13 +53,13 @@
       <tr class='text-left'>
         <td><?php echo html::a($link, sprintf('%03d', $execution->id));?></td>
         <td class='c-name text-left'>
-          <?php if($config->systemMode == 'new'):?>  
+          <?php if($config->systemMode == 'new'):?>
           <?php
           if($execution->type === 'stage') echo "<span class='project-type-label label label-outline label-warning'>{$lang->project->stage}</span> ";
           if($execution->type === 'sprint') echo "<span class='project-type-label label label-outline label-info'>{$lang->executionCommon}</span> ";
           if($execution->type === 'kanban') echo "<span class='project-type-label label label-outline label-info'>{$lang->execution->kanban}</span> ";
           ?>
-          <?php endif;?>  
+          <?php endif;?>
           <?php echo html::a($link, $execution->name, '', "title='$execution->name'");?>
         </td>
         <?php if($config->systemMode == 'new'):?>
@@ -69,7 +69,7 @@
         <?php endif;?>
         <td><?php echo $execution->begin;?></td>
         <td><?php echo $execution->end;?></td>
-        <td class="c-status">
+        <td class="c-status text-center">
           <?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:?>

From 2a5c5521fe6b5bc664a8e15061623016b17a302f Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Mon, 8 Aug 2022 08:37:08 +0000
Subject: [PATCH 2/3] *Finish task #35865.

---
 module/my/css/execution.css       | 1 +
 module/my/view/execution.html.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/my/css/execution.css b/module/my/css/execution.css
index 6b9eab9b50..f4869cbc17 100644
--- a/module/my/css/execution.css
+++ b/module/my/css/execution.css
@@ -1 +1,2 @@
 .c-hours, .c-progress {width: 80px !important;}
+th.c-status {padding-right: 8px !important;}
diff --git a/module/my/view/execution.html.php b/module/my/view/execution.html.php
index ac5b4ac4e7..c7516e8a12 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' style='padding-right: 8px'><?php echo $lang->statusAB;?></th>
+        <th class='c-status text-center'><?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>

From a2adce2bb67792f709a9e2bf247f7d69f109ca7c Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Mon, 8 Aug 2022 13:39:32 +0000
Subject: [PATCH 3/3] *Finish task #35865.

---
 module/execution/model.php             | 2 +-
 module/project/model.php               | 2 +-
 module/project/view/execution.html.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/execution/model.php b/module/execution/model.php
index e0aee7f9cc..3c193f895a 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -4385,7 +4385,7 @@ class executionModel extends model
         }
         echo empty($execution->children) ? html::a(helper::createLink('execution', 'view', "executionID=$execution->id"), $execution->name) : $execution->name;
         echo '<td>' . zget($users, $execution->PM) . '</td>';
-        echo "<td class='status-{$execution->status}'>" . zget($this->lang->project->statusList, $execution->status) . '</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>';
         if(!helper::isZeroDate($execution->end))
diff --git a/module/project/model.php b/module/project/model.php
index 89b3187662..19055eb525 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -2028,7 +2028,7 @@ class projectModel extends model
                     echo $project->end;
                     break;
                 case 'status':
-                    echo "<span class='status-task status-{$project->status}'> " . zget($this->lang->project->statusList, $project->status) . "</span>";
+                    echo "<span class='status-task text-center  status-{$project->status}'> " . zget($this->lang->project->statusList, $project->status) . "</span>";
                     break;
                 case 'budget':
                     echo $budgetTitle;
diff --git a/module/project/view/execution.html.php b/module/project/view/execution.html.php
index 22f4130f1d..dcc40d6fd8 100644
--- a/module/project/view/execution.html.php
+++ b/module/project/view/execution.html.php
@@ -72,7 +72,7 @@
           <?php echo $lang->nameAB;?>
           </th>
           <th class='c-user'><?php echo $lang->execution->owner;?></th>
-          <th class='c-status'><?php echo $lang->project->status;?></th>
+          <th class='c-status text-center'><?php echo $lang->project->status;?></th>
           <th class='c-hours'><?php echo $lang->project->progress;?></th>
           <th class='c-date'><?php echo $lang->programplan->begin;?></th>
           <th class='c-date'><?php echo $lang->programplan->end;?></th>