From e9d271127560b3bd9b27b8989ee8fddb0f1aea9c Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Wed, 27 Jan 2021 11:23:24 +0800
Subject: [PATCH] * Finish task#9094.

---
 module/block/view/programblock.html.php       |  4 ++--
 module/block/view/programteamblock.html.php   |  2 +-
 module/block/view/projectblock.html.php       |  6 +++---
 module/block/view/scrumlistblock.html.php     |  6 +++---
 module/block/view/scrumoverviewblock.html.php | 11 ++++++-----
 module/block/view/taskblock.html.php          |  2 +-
 module/program/model.php                      | 10 +++++++---
 module/project/css/grouptask.css              |  1 +
 module/project/view/grouptask.html.php        |  8 ++++----
 module/project/view/preview.html.php          |  2 +-
 module/task/view/recordestimate.html.php      |  4 ++--
 module/user/control.php                       |  1 +
 module/user/css/task.css                      |  1 +
 module/user/view/task.html.php                |  6 +++---
 14 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/module/block/view/programblock.html.php b/module/block/view/programblock.html.php
index 0308d121d2..613b95c471 100644
--- a/module/block/view/programblock.html.php
+++ b/module/block/view/programblock.html.php
@@ -35,8 +35,8 @@
         </td>
         <?php if($longBlock):?>
         <td><?php echo $project->teamCount;?></td>
-        <td><?php echo $project->consumed;?></td>
-        <td><?php echo $project->budget . ' ' . zget($lang->program->unitList, $project->budgetUnit);?></td>
+        <td title="<?php echo $project->consumed . ' ' . $lang->project->workHour;?>"><?php echo $project->consumed . ' ' . $lang->project->workHourUnit;?></td>
+        <td><?php echo $project->budget != 0 ? zget($lang->program->currencySymbol, $project->budgetUnit) . number_format($project->budget, 2) : $lang->program->future;?></td>
         <td><?php echo $project->leftStories;?></td>
         <td><?php echo $project->leftTasks;?></td>
         <td><?php echo $project->leftBugs;?></td>
diff --git a/module/block/view/programteamblock.html.php b/module/block/view/programteamblock.html.php
index ce451d09da..bb89a6860b 100644
--- a/module/block/view/programteamblock.html.php
+++ b/module/block/view/programteamblock.html.php
@@ -37,7 +37,7 @@ $maxConsumed  = 0;
           <div class='chart-col-item'>
             <div class='progress'>
               <div class='progress-bar' style='width: <?php echo $maxConsumed ? (100 * $project->consumed / $maxConsumed) : 0; ?>%'>
-                <div class='progress-text'><?php echo $project->consumed;?></div>
+                <div class='progress-text' title="<?php echo $project->consumed . $lang->project->workHour;?>"><?php echo $project->consumed . $lang->project->workHourUnit;?></div>
               </div>
             </div>
           </div>
diff --git a/module/block/view/projectblock.html.php b/module/block/view/projectblock.html.php
index df642f9424..711b5fa8e5 100644
--- a/module/block/view/projectblock.html.php
+++ b/module/block/view/projectblock.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;?></td>
-        <td class="c-hours"><?php echo $execution->hours->totalConsumed;?></td>
-        <td class="c-hours"><?php echo $execution->hours->totalLeft;?></td>
+        <td class="c-hours" title="<?php echo $execution->hours->totalEstimate . ' ' . $lang->project->workHour;?>"><?php echo $execution->hours->totalEstimate . ' ' . $lang->project->workHourUnit;?></td>
+        <td class="c-hours" title="<?php echo $execution->hours->totalConsumed . ' ' . $lang->project->workHour;?>"><?php echo $execution->hours->totalConsumed . ' ' . $lang->project->workHourUnit;?></td>
+        <td class="c-hours" title="<?php echo $execution->hours->totalLeft     . ' ' . $lang->project->workHour;?>"><?php echo $execution->hours->totalLeft     . ' ' . $lang->project->workHourUnit;?></td>
         <?php endif;?>
         <td class="c-progress">
           <div class="progress progress-text-left">
diff --git a/module/block/view/scrumlistblock.html.php b/module/block/view/scrumlistblock.html.php
index 1ef46160d8..28721607fc 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;?></td>
-        <td class="c-hours"><?php echo $execution->hours->totalConsumed;?></td>
-        <td class="c-hours"><?php echo $execution->hours->totalLeft;?></td>
+        <td class="c-hours" title="<?php echo $execution->hours->totalEstimate . ' ' . $lang->project->workHour;?>"><?php echo $execution->hours->totalEstimate . ' ' . $lang->project->workHourUnit;?></td>
+        <td class="c-hours" title="<?php echo $execution->hours->totalConsumed . ' ' . $lang->project->workHour;?>"><?php echo $execution->hours->totalConsumed . ' ' . $lang->project->workHourUnit;?></td>
+        <td class="c-hours" title="<?php echo $execution->hours->totalLeft     . ' ' . $lang->project->workHour;?>"><?php echo $execution->hours->totalLeft     . ' ' . $lang->project->workHourUnit;?></td>
         <?php endif;?>
         <td class="c-progress">
           <div class="progress progress-text-left">
diff --git a/module/block/view/scrumoverviewblock.html.php b/module/block/view/scrumoverviewblock.html.php
index d5ac5ada73..341de826fa 100644
--- a/module/block/view/scrumoverviewblock.html.php
+++ b/module/block/view/scrumoverviewblock.html.php
@@ -37,18 +37,19 @@
         </div>
         <div class="col-4 tile">
           <div class="overview-title"><i class="icon icon-clock"></i> <?php echo $lang->block->consumedHours;?></div>
-          <div class="tile-amount">
-          <?php echo $totalData[$projectID]->consumed ? html::a($this->createLink('project', 'index', 'locate=no'), $totalData[$projectID]->consumed) : 0;?>
+          <div class="tile-amount" title="<?php echo $totalData[$projectID]->consumed . $lang->project->workHour;?>">
+          <?php echo $totalData[$projectID]->consumed ? html::a($this->createLink('project', 'index', 'locate=no'), $totalData[$projectID]->consumed . $lang->project->workHourUnit) : 0;?>
           </div>
           <div class="tile-info">
-          <span class="extra-tips"><?php echo $lang->block->estimatedHours;?> <?php echo $totalData[$projectID]->estimate;?></span>
+          <span class="extra-tips"><?php echo $lang->block->estimatedHours . ' ' . $totalData[$projectID]->estimate . $lang->project->workHour;?></span>
           </div>
         </div>
         <div class="col-4 tile">
           <div class="overview-title"><i class="icon icon-cost"></i> <?php echo $lang->block->spent;?></div>
-          <div class="tile-amount">￥0</div>
+          <?php $budget = $totalData[$projectID]->budget != 0 ? zget($lang->program->currencySymbol, $totalData[$projectID]->budgetUnit) . number_format($totalData[$projectID]->budget, 2) : $lang->program->future;?>
+          <div class="tile-amount"><?php echo $budget;?></div>
           <div class="tile-info">
-          <span class="extra-tips"><?php echo $lang->block->budget;?> ￥<?php echo $totalData[$projectID]->budget . ' ' . zget($lang->program->unitList, $totalData[$projectID]->budgetUnit);?></span>
+          <span class="extra-tips"><?php echo $lang->block->budget . ' ' . $budget;?></span>
           </div>
         </div>
       </div>
diff --git a/module/block/view/taskblock.html.php b/module/block/view/taskblock.html.php
index 814fa2bca1..f6c8778f45 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;?></td>
+        <td class='c-estimate text-center' title="<?php echo $task->estimate . ' ' . $lang->project->workHour;?>"><?php echo $task->estimate . ' ' . $lang->project->workHourUnit;?></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/program/model.php b/module/program/model.php
index df4e8fc047..ec9d835f3d 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -1743,6 +1743,10 @@ class programModel extends model
                 $title = "title='{$PRJProgram}'";
             }
 
+            if($id == 'PRJEstimate') $title = "title='{$project->hours->totalEstimate} {$this->lang->project->workHour}'";
+            if($id == 'PRJConsume')  $title = "title='{$project->hours->totalConsumed} {$this->lang->project->workHour}'";
+            if($id == 'PRJSurplus')  $title = "title='{$project->hours->totalLeft} {$this->lang->project->workHour}'";
+
             echo "<td class='c-name " . $class . "' $title>";
             switch($id)
             {
@@ -1780,13 +1784,13 @@ class programModel extends model
                     echo $project->teamCount;
                     break;
                 case 'PRJEstimate':
-                    echo $project->hours->totalEstimate;
+                    echo $project->hours->totalEstimate . ' ' . $this->lang->project->workHourUnit;
                     break;
                 case 'PRJConsume':
-                    echo $project->hours->totalConsumed;
+                    echo $project->hours->totalConsumed . ' ' . $this->lang->project->workHourUnit;
                     break;
                 case 'PRJSurplus':
-                    echo $project->hours->totalLeft;
+                    echo $project->hours->totalLeft     . ' ' . $this->lang->project->workHourUnit;
                     break;
                 case 'PRJProgress':
                     echo "<div class='progress-pie' data-doughnut-size='80' data-color='#00da88' data-value='{$project->hours->progress}' data-width='24' data-height='24' data-back-color='#e8edf3'><div class='progress-info'>{$project->hours->progress}%</div></div>";
diff --git a/module/project/css/grouptask.css b/module/project/css/grouptask.css
index db07791412..364fa01e70 100644
--- a/module/project/css/grouptask.css
+++ b/module/project/css/grouptask.css
@@ -24,3 +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;}
diff --git a/module/project/view/grouptask.html.php b/module/project/view/grouptask.html.php
index 47cb024004..8fa760f102 100644
--- a/module/project/view/grouptask.html.php
+++ b/module/project/view/grouptask.html.php
@@ -184,7 +184,7 @@
             <div class='groupSummary small'>
 
             <?php if($groupBy == 'assignedTo' and isset($members[$task->assignedTo])) printf($lang->project->memberHoursAB, zget($users, $task->assignedTo), $members[$task->assignedTo]->totalHours);?>
-            <?php printf($lang->project->groupSummaryAB, $groupSum, $groupWait, $groupDoing, $groupEstimate, $groupConsumed, $groupLeft);?>
+            <?php printf($lang->project->groupSummaryAB, $groupSum, $groupWait, $groupDoing, $groupEstimate . $lang->project->workHourUnit, $groupConsumed . $lang->project->workHourUnit, $groupLeft . $lang->project->workHourUnit);?>
             </div>
           </div>
         </td>
@@ -202,9 +202,9 @@
         <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"><?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"><?php echo $task->estimate;?></td>
-        <td class="c-hours em"><?php echo $task->consumed;?></td>
-        <td class="c-hours em"><?php echo $task->left;?></td>
+        <td class="c-hours em" title="<?php echo $task->estimate . ' ' . $lang->project->workHour;?>"><?php echo $task->estimate . ' ' . $lang->project->workHourUnit;?></td>
+        <td class="c-hours em" title="<?php echo $task->consumed . ' ' . $lang->project->workHour;?>"><?php echo $task->consumed . ' ' . $lang->project->workHourUnit;?></td>
+        <td class="c-hours em" title="<?php echo $task->left     . ' ' . $lang->project->workHour;?>"><?php echo $task->left     . ' ' . $lang->project->workHourUnit;?></td>
         <td class="c-num em"><?php echo $task->progress . '%';?></td>
         <td class="c-type"><?php echo zget($lang->task->typeList, $task->type);?></td>
         <td class='c-date <?php if(isset($task->delay)) echo 'delayed';?>'><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
diff --git a/module/project/view/preview.html.php b/module/project/view/preview.html.php
index 8ca08d6f3a..d88faf9c60 100644
--- a/module/project/view/preview.html.php
+++ b/module/project/view/preview.html.php
@@ -128,7 +128,7 @@ $dataType = '';
             </tr>
             <tr>
               <td align='center'><?php echo $lang->task->leftThisTime?></td>
-              <td align='center'><?php if($content->left) echo $content->left?></td>
+              <td align='center'><?php if($content->left) echo $content->left . $lang->project->workHourUnit;?></td>
               <td></td>
               <td></td>
               <td></td>
diff --git a/module/task/view/recordestimate.html.php b/module/task/view/recordestimate.html.php
index 398a6bacc4..a6e624436a 100644
--- a/module/task/view/recordestimate.html.php
+++ b/module/task/view/recordestimate.html.php
@@ -53,8 +53,8 @@
           <tr class="text-center">
             <td><?php echo $estimate->id;?></td>
             <td><?php echo $estimate->date;?></td>
-            <td><?php echo $estimate->consumed;?></td>
-            <td><?php echo $estimate->left;?></td>
+            <td title="<?php echo $estimate->consumed . ' ' . $lang->project->workHour;?>"><?php echo $estimate->consumed . ' ' . $lang->project->workHourUnit;?></td>
+            <td title="<?php echo $estimate->left     . ' ' . $lang->project->workHour;?>"><?php echo $estimate->left     . ' ' . $lang->project->workHourUnit;?></td>
             <td class="text-left" title="<?php echo $estimate->work;?>"><?php echo $estimate->work;?></td>
             <?php if(empty($task->team) or $task->assignedTo == $this->app->user->account):?>
             <td align='center' class='c-actions'>
diff --git a/module/user/control.php b/module/user/control.php
index aa6cdb1f6a..8601353aea 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -25,6 +25,7 @@ class user extends control
         $this->loadModel('company')->setMenu();
         $this->loadModel('dept');
         $this->loadModel('todo');
+        $this->app->loadLang('project');
         $this->app->loadModuleConfig($this->moduleName);//Finish task #5118.(Fix bug #2271)
     }
 
diff --git a/module/user/css/task.css b/module/user/css/task.css
index 8b66169867..48577511db 100644
--- a/module/user/css/task.css
+++ b/module/user/css/task.css
@@ -1 +1,2 @@
 td.delayed{color:#fff; background: #e84e0f!important;}
+.hours {white-space:nowrap; overflow:hidden; text-overflow:ellipsis;}
diff --git a/module/user/view/task.html.php b/module/user/view/task.html.php
index 8b82f83ca4..8b3042a14f 100644
--- a/module/user/view/task.html.php
+++ b/module/user/view/task.html.php
@@ -62,9 +62,9 @@
             <?php if($task->parent > 0) echo '<span class="label label-badge label-light">' . $this->lang->task->childrenAB . '</span> ';?>
             <?php echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', false, $task->PRJ), $task->name, null, "style='color: $task->color'");?>
           </td>
-          <td><?php echo $task->estimate;?></td>
-          <td><?php echo $task->consumed;?></td>
-          <td><?php echo $task->left;?></td>
+          <td class='hours' title="<?php echo $task->estimate . ' ' . $lang->project->workHour;?>"><?php echo $task->estimate . ' ' . $lang->project->workHourUnit;?></td>
+          <td class='hours' title="<?php echo $task->consumed . ' ' . $lang->project->workHour;?>"><?php echo $task->consumed . ' ' . $lang->project->workHourUnit;?></td>
+          <td class='hours' title="<?php echo $task->left     . ' ' . $lang->project->workHour;?>"><?php echo $task->left     . ' ' . $lang->project->workHourUnit;?></td>
           <td class=<?php if(isset($task->delay)) echo 'delayed';?>><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
           <td class='<?php echo $task->status;?>'><?php echo $this->processStatus('task', $task);?></td>
         </tr>