From d03194717db5f58df222e2e8012ca64edc1c6d0d Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Wed, 20 Jan 2021 15:48:58 +0800
Subject: [PATCH] * Remove hourunit.

---
 module/block/view/programblock.html.php   | 2 +-
 module/block/view/scrumlistblock.html.php | 6 +++---
 module/block/view/taskblock.html.php      | 2 +-
 module/my/view/task.html.php              | 6 +++---
 module/program/config.php                 | 4 ++--
 module/program/model.php                  | 7 ++-----
 module/task/config.php                    | 6 +++---
 module/task/model.php                     | 6 +++---
 8 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/module/block/view/programblock.html.php b/module/block/view/programblock.html.php
index ac8589e48c..0308d121d2 100644
--- a/module/block/view/programblock.html.php
+++ b/module/block/view/programblock.html.php
@@ -35,7 +35,7 @@
         </td>
         <?php if($longBlock):?>
         <td><?php echo $project->teamCount;?></td>
-        <td><?php echo $project->consumed . ' ' . $config->hourUnit;?></td>
+        <td><?php echo $project->consumed;?></td>
         <td><?php echo $project->budget . ' ' . zget($lang->program->unitList, $project->budgetUnit);?></td>
         <td><?php echo $project->leftStories;?></td>
         <td><?php echo $project->leftTasks;?></td>
diff --git a/module/block/view/scrumlistblock.html.php b/module/block/view/scrumlistblock.html.php
index eeb84d76c3..1ef46160d8 100644
--- a/module/block/view/scrumlistblock.html.php
+++ b/module/block/view/scrumlistblock.html.php
@@ -51,9 +51,9 @@
           <span class="status-project status-<?php echo $execution->status?>" title='<?php echo $statusName;?>'><?php echo $statusName;?></span>
           <?php endif;?>
         </td>
-        <td class="c-hours"><?php echo $execution->hours->totalEstimate . ' ' . $config->hourUnit;?></td>
-        <td class="c-hours"><?php echo $execution->hours->totalConsumed . ' ' . $config->hourUnit;?></td>
-        <td class="c-hours"><?php echo $execution->hours->totalLeft . ' ' . $config->hourUnit;?></td>
+        <td class="c-hours"><?php echo $execution->hours->totalEstimate;?></td>
+        <td class="c-hours"><?php echo $execution->hours->totalConsumed;?></td>
+        <td class="c-hours"><?php echo $execution->hours->totalLeft;?></td>
         <?php endif;?>
         <td class="c-progress">
           <div class="progress progress-text-left">
diff --git a/module/block/view/taskblock.html.php b/module/block/view/taskblock.html.php
index 0455314f1a..814fa2bca1 100644
--- a/module/block/view/taskblock.html.php
+++ b/module/block/view/taskblock.html.php
@@ -46,7 +46,7 @@
         <td class='c-pri <?php if($longBlock) echo "c-pri-long"?>'><span class='label-pri label-pri-<?php echo $task->pri;?>' title='<?php echo zget($lang->task->priList, $task->pri, $task->pri)?>'><?php echo zget($lang->task->priList, $task->pri, $task->pri)?></span></td>
         <td class='c-name' style='color: <?php echo $task->color?>' title='<?php echo $task->name?>'><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', '', $task->PRJ), $task->name)?></td>
         <?php if($longBlock):?>
-        <td class='c-estimate text-center'><?php echo $task->estimate . ' ' . $config->hourUnit;?></td>
+        <td class='c-estimate text-center'><?php echo $task->estimate;?></td>
         <td class='c-deadline'><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
         <?php endif;?>
         <?php $status = $this->processStatus('task', $task);?>
diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php
index c36ac5e04d..ddca0e8fb7 100644
--- a/module/my/view/task.html.php
+++ b/module/my/view/task.html.php
@@ -99,9 +99,9 @@
           <?php if($type != 'finishedBy'): ?>
           <td class='c-user'><?php echo zget($users, $task->finishedBy);?></td>
           <?php endif;?>
-          <td class='c-hours'><?php echo round($task->estimate, 1) . ' ' . $config->hourUnit;?></td>
-          <td class='c-hours'><?php echo round($task->consumed, 1) . ' ' . $config->hourUnit;?></td>
-          <td class='c-hours'><?php echo round($task->left, 1) . ' ' . $config->hourUnit;?></td>
+          <td class='c-hours'><?php echo round($task->estimate, 1);?></td>
+          <td class='c-hours'><?php echo round($task->consumed, 1);?></td>
+          <td class='c-hours'><?php echo round($task->left, 1);?></td>
           <td class='c-status'>
             <?php $storyChanged = (!empty($task->storyStatus) and $task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion and !in_array($task->status, array('cancel', 'closed')));?>
             <?php !empty($storyChanged) ? print("<span class='status-story status-changed'>{$this->lang->my->storyChanged}</span>") : print("<span class='status-task status-{$task->status}'> " . $this->processStatus('task', $task) . "</span>");?>
diff --git a/module/program/config.php b/module/program/config.php
index 13fefe21ce..e597c769fe 100644
--- a/module/program/config.php
+++ b/module/program/config.php
@@ -94,13 +94,13 @@ $config->program->datatable->fieldList['teamCount']['sort']     = 'no';
 
 $config->program->datatable->fieldList['PRJEstimate']['title']    = 'PRJEstimate';
 $config->program->datatable->fieldList['PRJEstimate']['fixed']    = 'no';
-$config->program->datatable->fieldList['PRJEstimate']['width']    = '70';
+$config->program->datatable->fieldList['PRJEstimate']['width']    = '60';
 $config->program->datatable->fieldList['PRJEstimate']['required'] = 'no';
 $config->program->datatable->fieldList['PRJEstimate']['sort']     = 'no';
 
 $config->program->datatable->fieldList['PRJConsume']['title']    = 'PRJConsume';
 $config->program->datatable->fieldList['PRJConsume']['fixed']    = 'no';
-$config->program->datatable->fieldList['PRJConsume']['width']    = '70';
+$config->program->datatable->fieldList['PRJConsume']['width']    = '60';
 $config->program->datatable->fieldList['PRJConsume']['required'] = 'no';
 $config->program->datatable->fieldList['PRJConsume']['sort']     = 'no';
 
diff --git a/module/program/model.php b/module/program/model.php
index 26ab0fc724..fd032eb4e9 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -1729,9 +1729,6 @@ class programModel extends model
                 $title = "title='{$PRJProgram}'";
             }
 
-            if($id == 'PRJEstimate') $title = "title={$project->hours->totalEstimate}{$this->config->hourUnit}";
-            if($id == 'PRJConsume')  $title = "title={$project->hours->totalConsumed}{$this->config->hourUnit}";
-
             echo "<td class='c-name " . $class . "' $title>";
             switch($id)
             {
@@ -1769,10 +1766,10 @@ class programModel extends model
                     echo $project->teamCount;
                     break;
                 case 'PRJEstimate':
-                    echo $project->hours->totalEstimate . ' ' . $this->config->hourUnit;
+                    echo $project->hours->totalEstimate;
                     break;
                 case 'PRJConsume':
-                    echo $project->hours->totalConsumed . ' ' . $this->config->hourUnit;
+                    echo $project->hours->totalConsumed;
                     break;
                 case 'PRJSurplus':
                     echo $project->hours->totalLeft;
diff --git a/module/task/config.php b/module/task/config.php
index 70d3942a39..72529462d7 100644
--- a/module/task/config.php
+++ b/module/task/config.php
@@ -77,17 +77,17 @@ $config->task->datatable->fieldList['status']['required'] = 'no';
 
 $config->task->datatable->fieldList['estimate']['title']    = 'estimateAB';
 $config->task->datatable->fieldList['estimate']['fixed']    = 'no';
-$config->task->datatable->fieldList['estimate']['width']    = '80';
+$config->task->datatable->fieldList['estimate']['width']    = '60';
 $config->task->datatable->fieldList['estimate']['required'] = 'no';
 
 $config->task->datatable->fieldList['consumed']['title']    = 'consumedAB';
 $config->task->datatable->fieldList['consumed']['fixed']    = 'no';
-$config->task->datatable->fieldList['consumed']['width']    = '80';
+$config->task->datatable->fieldList['consumed']['width']    = '60';
 $config->task->datatable->fieldList['consumed']['required'] = 'no';
 
 $config->task->datatable->fieldList['left']['title']    = 'leftAB';
 $config->task->datatable->fieldList['left']['fixed']    = 'no';
-$config->task->datatable->fieldList['left']['width']    = '80';
+$config->task->datatable->fieldList['left']['width']    = '60';
 $config->task->datatable->fieldList['left']['required'] = 'no';
 
 $config->task->datatable->fieldList['progress']['title']    = 'progressAB';
diff --git a/module/task/model.php b/module/task/model.php
index 0e9d4e7189..85a54feb54 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -2963,13 +2963,13 @@ class taskModel extends model
                 $storyChanged ? print("<span class='status-story status-changed'>{$this->lang->story->changed}</span>") : print("<span class='status-task status-{$task->status}'> " . $this->processStatus('task', $task) . "</span>");
                 break;
             case 'estimate':
-                echo round($task->estimate, 1) . ' ' . $this->config->hourUnit;
+                echo round($task->estimate, 1);
                 break;
             case 'consumed':
-                echo round($task->consumed, 1) . ' ' . $this->config->hourUnit;
+                echo round($task->consumed, 1);
                 break;
             case 'left':
-                echo round($task->left, 1) . ' ' . $this->config->hourUnit;
+                echo round($task->left, 1);
                 break;
             case 'progress':
                 echo "{$task->progress}%";