From dafb68b70c41346debc61a11a3c43587dabb6d49 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Mon, 18 Jan 2021 10:49:39 +0800
Subject: [PATCH 1/4] * Code for hour unit.

---
 module/block/view/programblock.html.php    | 2 +-
 module/block/view/storyblock.html.php      | 2 +-
 module/block/view/taskblock.html.php       | 2 +-
 module/my/view/task.html.php               | 6 +++---
 module/productplan/view/linkstory.html.php | 2 +-
 module/productplan/view/view.html.php      | 2 +-
 module/release/view/linkstory.html.php     | 2 +-
 module/release/view/view.html.php          | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/module/block/view/programblock.html.php b/module/block/view/programblock.html.php
index 0308d121d2..ac8589e48c 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;?></td>
+        <td><?php echo $project->consumed . ' ' . $config->hourUnit;?></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/storyblock.html.php b/module/block/view/storyblock.html.php
index 59c1cc13f5..91d5c467fe 100644
--- a/module/block/view/storyblock.html.php
+++ b/module/block/view/storyblock.html.php
@@ -54,7 +54,7 @@
         <td class="c-pri"><span class="label-pri label-pri-<?php echo $story->pri?>" title="<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>"><?php echo zget($lang->story->priList, $story->pri, $story->pri)?></span></td>
         <td class="c-name" style='color: <?php echo $story->color?>' title='<?php echo $story->title?>'><?php echo $story->title?></td>
         <?php if($longBlock):?>
-        <td class='c-estimate text-center'><?php echo $story->estimate?></td>
+        <td class='c-estimate text-center'><?php echo $story->estimate . ' ' . $config->hourUnit?></td>
         <?php endif;?>
         <?php $status = $this->processStatus('story', $story);?>
         <td class='c-status' title='<?php echo $status;?>'>
diff --git a/module/block/view/taskblock.html.php b/module/block/view/taskblock.html.php
index 1f3ecfedc5..0455314f1a 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'><?php echo $task->estimate . ' ' . $config->hourUnit;?></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 ddca0e8fb7..c36ac5e04d 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);?></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-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-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/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php
index 8c45bf552c..7020df7766 100644
--- a/module/productplan/view/linkstory.html.php
+++ b/module/productplan/view/linkstory.html.php
@@ -56,7 +56,7 @@
           </td>
           <td><?php echo zget($users, $story->openedBy);?></td>
           <td><?php echo zget($users, $story->assignedTo);?></td>
-          <td><?php echo $story->estimate . ' ' . $lang->story->hour;?></td>
+          <td><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
           <td>
             <span class='status-story status-<?php echo $story->status?>'>
               <?php echo $this->processStatus('story', $story);?>
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index b9e9827658..3a9b8cb18d 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -154,7 +154,7 @@
                 </td>
                 <td><?php echo zget($users, $story->openedBy);?></td>
                 <td><?php echo zget($users, $story->assignedTo);?></td>
-                <td><?php echo $story->estimate . ' ' . $lang->story->hour;?></td>
+                <td><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
                 <td>
                   <span class='status-story status-<?php echo $story->status?>'>
                     <?php echo $this->processStatus('story', $story);?>
diff --git a/module/release/view/linkstory.html.php b/module/release/view/linkstory.html.php
index 19bf623609..4bfaeb5fa1 100644
--- a/module/release/view/linkstory.html.php
+++ b/module/release/view/linkstory.html.php
@@ -56,7 +56,7 @@
           </td>
           <td><?php echo zget($users, $story->openedBy);?></td>
           <td><?php echo zget($users, $story->assignedTo);?></td>
-          <td><?php echo $story->estimate;?></td>
+          <td><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
           <td><span class='status-story status-<?php echo $story->status?>'><?php echo $this->processStatus('story', $story);?></span></td>
           <td><?php echo zget($lang->story->stageList, $story->stage);?></td>
         </tr>
diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
index b718b7ada9..673d23b267 100644
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -115,7 +115,7 @@
                       ?>
                     </td>
                     <td><?php echo zget($users, $story->openedBy);?></td>
-                    <td><?php echo $story->estimate;?></td>
+                    <td><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
                     <td>
                       <span class='status-story status-<?php echo $story->status;?>'><?php echo $this->processStatus('story', $story);?></span>
                     </td>

From 8faf4a6c406fa09f639fa173e998f95088d590e9 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Mon, 18 Jan 2021 11:10:07 +0800
Subject: [PATCH 2/4] * Finish task #8972/

---
 module/program/view/pgmbrowsebylist.html.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/program/view/pgmbrowsebylist.html.php b/module/program/view/pgmbrowsebylist.html.php
index d5a1020315..aec71e55b6 100644
--- a/module/program/view/pgmbrowsebylist.html.php
+++ b/module/program/view/pgmbrowsebylist.html.php
@@ -87,8 +87,8 @@
             </ul>
           </div>
           <?php common::printIcon('program', 'PRJEdit', "projectID=$program->id&programID=$program->parent&from=pgmbrowse", $program, 'list', 'edit', '', '', '', "data-group='program'");?>
-          <?php common::printIcon('program', 'PRJManageMembers', "projectID=$program->id", $program, 'list', 'group');?>
-          <?php common::printIcon('program', 'PRJGroup',         "projectID=$program->id", $program, 'list', 'lock');?>
+          <?php common::printIcon('program', 'PRJManageMembers', "projectID=$program->id", $program, 'list', 'group', '', '', '', 'data-group="program"');?>
+          <?php common::printIcon('program', 'PRJGroup',         "projectID=$program->id", $program, 'list', 'lock', '', '', '', 'data-group="program"');?>
           <div class='btn-group'>
             <button type='button' class='btn dropdown-toggle' data-toggle='dropdown' title="<?php echo $this->lang->more;?>"><i class='icon-more-alt'></i></button>
             <ul class='dropdown-menu pull-right text-center' role='menu'>

From f3d06bde9c449694d00be2a66e24576703cc5e1c Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Mon, 18 Jan 2021 11:12:05 +0800
Subject: [PATCH 3/4] * Add hour unit to project all.

---
 module/project/view/all.html.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/project/view/all.html.php b/module/project/view/all.html.php
index 2244e2de97..b54efb6a2b 100644
--- a/module/project/view/all.html.php
+++ b/module/project/view/all.html.php
@@ -97,9 +97,9 @@
           <td class='c-status' title='<?php echo $projectStatus;?>'>
             <span class="status-project status-<?php echo $execution->status?>"><?php echo $projectStatus;?></span>
           </td>
-          <td><?php echo $execution->hours->totalEstimate;?></td>
-          <td><?php echo $execution->hours->totalConsumed;?></td>
-          <td><?php echo $execution->hours->totalLeft;?></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="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;?>%">

From bfe7766a3d2c8636d38e8d0dd23d8b598f4c719d Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Mon, 18 Jan 2021 11:32:36 +0800
Subject: [PATCH 4/4] * Fix bug.

---
 module/program/model.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/program/model.php b/module/program/model.php
index aebdd879d6..ebd50d0e23 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -1243,7 +1243,8 @@ class programModel extends model
             ->beginIF($type == 'list')->andWhere('type')->eq('program')->fi()
             ->beginIF($type == 'dropmenu')->andWhere('type')->in('program,project')->fi()
             ->andWhere('status')->ne('closed')
-            ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->programs)->fi()
+            ->beginIF(!$this->app->user->admin and $type == 'list')->andWhere('id')->in($this->app->user->view->programs)->fi()
+            O->beginIF(!$this->app->user->admin and $type == 'dropmenu')->andWhere('id')->in($this->app->user->view->programs . ',' . $this->app->user->view->projects)->fi()
             ->beginIF($projectID > 0)->andWhere('path')->like($path . '%')->fi()
             ->orderBy('grade desc, `order`')
             ->get();