From ea9cc9cb2f3cfc188b06dbb1dcf51a3598d3d9b8 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Wed, 31 Mar 2021 13:22:46 +0800 Subject: [PATCH] * Finish task #37099. --- framework/router.class.php | 2 +- module/execution/css/story.css | 1 + module/execution/css/task.css | 1 + module/execution/lang/zh-cn.php | 2 +- module/execution/view/all.html.php | 7 ++++--- module/execution/view/grouptask.html.php | 6 +++--- module/execution/view/story.html.php | 2 +- module/my/css/requirement.css | 1 + module/my/css/story.css | 1 + module/my/css/task.css | 1 + module/my/view/requirement.html.php | 4 ++-- module/my/view/story.html.php | 4 ++-- module/my/view/task.html.php | 6 +++--- module/product/css/browse.css | 1 + module/product/view/project.html.php | 4 ++-- module/project/model.php | 6 +++--- module/story/model.php | 2 +- module/task/model.php | 6 +++--- module/user/view/execution.html.php | 6 +++--- module/user/view/story.html.php | 5 ++++- module/user/view/task.html.php | 6 +++--- 21 files changed, 42 insertions(+), 32 deletions(-) diff --git a/framework/router.class.php b/framework/router.class.php index de2e00e5f4..886f787f23 100755 --- a/framework/router.class.php +++ b/framework/router.class.php @@ -202,7 +202,7 @@ class router extends baseRouter $config->systemScore = $score; /* Record hour unit. */ - $config->hourUnit = 'H'; + $config->hourUnit = 'h'; if($hourKey == STORYPOINT_KEY) $config->hourUnit = 'SP'; if($hourKey == FUNCTIONPOINT_KEY) $config->hourUnit = 'FP'; diff --git a/module/execution/css/story.css b/module/execution/css/story.css index f92f123804..add1b9840f 100644 --- a/module/execution/css/story.css +++ b/module/execution/css/story.css @@ -1,5 +1,6 @@ #linkButton {border-radius: 4px !important;} tbody > tr > td > .btn-icon {margin-right: 4px;} +.table td.c-estimate {padding-right: 12px;} #modules a.active {color: #0c64eb;} @media (max-width: 1200px) {#storyList .c-user, #storyList .c-estimate {display: none !important;};} @media (max-width: 1000px) {#storyList .c-status, #storyList .c-pri {display: none !important;};} diff --git a/module/execution/css/task.css b/module/execution/css/task.css index 03ab54a640..c821cffd61 100644 --- a/module/execution/css/task.css +++ b/module/execution/css/task.css @@ -2,6 +2,7 @@ td.delayed {background: #e84e0f !important; color: white;} #int-dropdown {margin-left: -8px; border-radius: 4px; border: 1px solid #0c64eb;} #projectTaskForm table tbody tr td {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} th.c-deadline {text-align: center;} +.table td.c-estimate, .table td.c-consumed, .table td.c-left {padding-right: 12px;} .c-estimate {text-align: right;} .c-consumed {text-align: right;} .c-left {text-align: right;} diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php index 63ef45675d..8d11d8c59f 100644 --- a/module/execution/lang/zh-cn.php +++ b/module/execution/lang/zh-cn.php @@ -35,7 +35,7 @@ $lang->execution->to = '至'; $lang->execution->days = '可用工作日'; $lang->execution->day = '天'; $lang->execution->workHour = '工时'; -$lang->execution->workHourUnit = 'H'; +$lang->execution->workHourUnit = 'h'; $lang->execution->totalHours = '可用工时'; $lang->execution->totalDays = '可用工日'; $lang->execution->status = $lang->executionCommon . '状态'; diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php index 22a20e5efc..f9fee5686d 100644 --- a/module/execution/view/all.html.php +++ b/module/execution/view/all.html.php @@ -21,6 +21,7 @@ .table td.has-child > .plan-toggle > .icon {font-size: 16px; display: inline-block; transition: transform .2s; -ms-transform:rotate(-90deg); -moz-transform:rotate(-90deg); -o-transform:rotate(-90deg); -webkit-transform:rotate(-90deg); transform: rotate(-90deg);} .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);} +.table td.hours {padding-right: 12px;} .main-table tbody > tr.table-children > td:first-child::before {width: 3px;} .hours {text-align: right; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} @-moz-document url-prefix() {.main-table tbody > tr.table-children > td:first-child::before {width: 4px;}} @@ -103,9 +104,9 @@ - lang->execution->workHour;?>'>hours->totalEstimate . ' ' . $this->lang->execution->workHourUnit;?> - lang->execution->workHour;?>'>hours->totalConsumed . ' ' . $this->lang->execution->workHourUnit;?> - lang->execution->workHour;?>'>hours->totalLeft . ' ' . $this->lang->execution->workHourUnit;?> + lang->execution->workHour;?>'>hours->totalEstimate . $this->lang->execution->workHourUnit;?> + lang->execution->workHour;?>'>hours->totalConsumed . $this->lang->execution->workHourUnit;?> + lang->execution->workHour;?>'>hours->totalLeft . $this->lang->execution->workHourUnit;?>
hours->progress;?>
diff --git a/module/execution/view/grouptask.html.php b/module/execution/view/grouptask.html.php index 749cd277b0..fd8c055a84 100644 --- a/module/execution/view/grouptask.html.php +++ b/module/execution/view/grouptask.html.php @@ -202,9 +202,9 @@ processStatus('task', $task);?> " . $task->assignedToRealName . "";?> finishedBy);?> - estimate . ' ' . $lang->execution->workHourUnit;?> - consumed . ' ' . $lang->execution->workHourUnit;?> - left . ' ' . $lang->execution->workHourUnit;?> + estimate . $lang->execution->workHourUnit;?> + consumed . $lang->execution->workHourUnit;?> + left . $lang->execution->workHourUnit;?> progress . '%';?> task->typeList, $task->type);?> '>deadline, 0, 4) > 0) echo $task->deadline;?> diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php index 59e9328548..23935c7498 100644 --- a/module/execution/view/story.html.php +++ b/module/execution/view/story.html.php @@ -179,7 +179,7 @@ openedBy);?> assignedTo);?> - estimate . ' ' . $config->hourUnit;?> + estimate . $config->hourUnit;?> processStatus('story', $story);?> diff --git a/module/my/css/requirement.css b/module/my/css/requirement.css index b1d19f43ad..13919b8117 100644 --- a/module/my/css/requirement.css +++ b/module/my/css/requirement.css @@ -7,5 +7,6 @@ .table td.has-child > .story-toggle > .icon {font-size: 16px; display: inline-block; transition: transform .2s; -ms-transform: rotate(-90deg); -moz-transform: rotate(-90deg); -o-transform: rotate(-90deg); -webkit-transform: rotate(-90deg); transform: rotate(-90deg);} .table td.has-child > .story-toggle > .icon:before {text-align: left;} .table td.has-child > .story-toggle.collapsed > .icon {-ms-transform: rotate(90deg); -moz-transform: rotate(90deg); -o-transform: rotate(90deg); -webkit-transform: rotate(90deg); transform: rotate(90deg);} +.table td.c-hours {padding-right: 12px;} .main-table tbody > tr.table-children > td:first-child::before {width: 3px;} @-moz-document url-prefix() {.main-table tbody > tr.table-children > td:first-child::before {width: 4px;};} diff --git a/module/my/css/story.css b/module/my/css/story.css index b1d19f43ad..13919b8117 100644 --- a/module/my/css/story.css +++ b/module/my/css/story.css @@ -7,5 +7,6 @@ .table td.has-child > .story-toggle > .icon {font-size: 16px; display: inline-block; transition: transform .2s; -ms-transform: rotate(-90deg); -moz-transform: rotate(-90deg); -o-transform: rotate(-90deg); -webkit-transform: rotate(-90deg); transform: rotate(-90deg);} .table td.has-child > .story-toggle > .icon:before {text-align: left;} .table td.has-child > .story-toggle.collapsed > .icon {-ms-transform: rotate(90deg); -moz-transform: rotate(90deg); -o-transform: rotate(90deg); -webkit-transform: rotate(90deg); transform: rotate(90deg);} +.table td.c-hours {padding-right: 12px;} .main-table tbody > tr.table-children > td:first-child::before {width: 3px;} @-moz-document url-prefix() {.main-table tbody > tr.table-children > td:first-child::before {width: 4px;};} diff --git a/module/my/css/task.css b/module/my/css/task.css index 0bc7243a39..36edf036e5 100644 --- a/module/my/css/task.css +++ b/module/my/css/task.css @@ -10,5 +10,6 @@ td.delayed {background: #e84e0f !important; color: white;} .table td.has-child > .task-toggle > .icon:before {text-align: left;} .table td.has-child > .task-toggle.collapsed {top: 2px;} .table td.has-child > .task-toggle.collapsed > .icon {-ms-transform: rotate(90deg); -moz-transform: rotate(90deg); -o-transform: rotate(90deg); -webkit-transform: rotate(90deg); transform: rotate(90deg);} +.table td.c-hours {padding-right: 12px;} .main-table tbody > tr.table-children > td:first-child::before {width: 3px;} @-moz-document url-prefix() {.main-table tbody > tr.table-children > td:first-child::before {width: 4px;};} diff --git a/module/my/view/requirement.html.php b/module/my/view/requirement.html.php index bb732a38c3..79903679b3 100644 --- a/module/my/view/requirement.html.php +++ b/module/my/view/requirement.html.php @@ -86,7 +86,7 @@ productTitle;?> openedBy);?> - estimate . ' ' . $config->hourUnit;?> + estimate . $config->hourUnit;?> processStatus('story', $story);?> story->stageList, $story->stage);?> @@ -125,7 +125,7 @@ productTitle;?> openedBy);?> - estimate . ' ' . $config->hourUnit;?> + estimate . $config->hourUnit;?> processStatus('story', $child);?> story->stageList, $child->stage);?> diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php index 99a2092fe4..938f05c3f3 100644 --- a/module/my/view/story.html.php +++ b/module/my/view/story.html.php @@ -88,7 +88,7 @@ productTitle;?> planTitle;?> openedBy);?> - estimate . ' ' . $config->hourUnit;?> + estimate . $config->hourUnit;?> processStatus('story', $story);?> story->stageList, $story->stage);?> @@ -128,7 +128,7 @@ productTitle;?> planTitle;?> openedBy);?> - estimate . ' ' . $config->hourUnit;?> + estimate . $config->hourUnit;?> processStatus('story', $child);?> story->stageList, $child->stage);?> diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php index bce950f9ee..01ab6ec139 100644 --- a/module/my/view/task.html.php +++ b/module/my/view/task.html.php @@ -99,9 +99,9 @@ finishedBy);?> - estimate, 1) . ' ' . $lang->execution->workHourUnit;?> - consumed, 1) . ' ' . $lang->execution->workHourUnit;?> - left, 1) . ' ' . $lang->execution->workHourUnit;?> + estimate, 1) . $lang->execution->workHourUnit;?> + consumed, 1) . $lang->execution->workHourUnit;?> + left, 1) . $lang->execution->workHourUnit;?> storyStatus) and $task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion and !in_array($task->status, array('cancel', 'closed')));?> {$this->lang->my->storyChanged}") : print(" " . $this->processStatus('task', $task) . "");?> diff --git a/module/product/css/browse.css b/module/product/css/browse.css index e947e7d442..76e4e5f962 100644 --- a/module/product/css/browse.css +++ b/module/product/css/browse.css @@ -25,5 +25,6 @@ a.removeModule:hover {color: red;} .table td.has-child > .story-toggle > .icon {font-size: 16px; display: inline-block; transition: transform .2s; -ms-transform: rotate(-90deg); -moz-transform: rotate(-90deg); -o-transform: rotate(-90deg); -webkit-transform: rotate(-90deg); transform: rotate(-90deg);} .table td.has-child > .story-toggle > .icon:before {text-align: left;} .table td.has-child > .story-toggle.collapsed > .icon {-ms-transform: rotate(90deg); -moz-transform: rotate(90deg); -o-transform: rotate(90deg); -webkit-transform: rotate(90deg); transform: rotate(90deg);} +.table td.c-estimate {padding-right: 12px;} .main-table tbody > tr.table-children > td:first-child::before {width: 3px;} @-moz-document url-prefix() {.main-table tbody > tr.table-children > td:first-child::before {width: 4px;};} diff --git a/module/product/view/project.html.php b/module/product/view/project.html.php index 16c8f9a8cc..64167eea91 100644 --- a/module/product/view/project.html.php +++ b/module/product/view/project.html.php @@ -79,8 +79,8 @@ app->getClientLang(), ['zh-cn','zh-tw']) ? number_format((float)$project->budget / 10000, 2) . $this->lang->project->tenThousand : number_format((float)$project->budget, 2);?> budget != 0 ? zget($this->lang->project->currencySymbol, $project->budgetUnit) . ' ' . $projectBudget : $this->lang->project->future;?> - hours->totalEstimate . ' ' . $lang->execution->workHourUnit;?> - hours->totalConsumed . ' ' . $lang->execution->workHourUnit;?> + hours->totalEstimate . $lang->execution->workHourUnit;?> + hours->totalConsumed . $lang->execution->workHourUnit;?>
hours->progress;?>
diff --git a/module/project/model.php b/module/project/model.php index ec5eeaa2e8..04b820635b 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1307,13 +1307,13 @@ class projectModel extends model echo $project->teamCount; break; case 'estimate': - echo $project->hours->totalEstimate . ' ' . $this->lang->execution->workHourUnit; + echo $project->hours->totalEstimate . $this->lang->execution->workHourUnit; break; case 'consume': - echo $project->hours->totalConsumed . ' ' . $this->lang->execution->workHourUnit; + echo $project->hours->totalConsumed . $this->lang->execution->workHourUnit; break; case 'surplus': - echo $project->hours->totalLeft . ' ' . $this->lang->execution->workHourUnit; + echo $project->hours->totalLeft . $this->lang->execution->workHourUnit; break; case 'progress': echo "
{$project->hours->progress}
"; diff --git a/module/story/model.php b/module/story/model.php index 7573db139f..9ded344386 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -3389,7 +3389,7 @@ class storyModel extends model echo ''; break; case 'estimate': - echo $story->estimate . ' ' . $this->config->hourUnit; + echo $story->estimate . $this->config->hourUnit; break; case 'stage': if(isset($storyStages[$story->id]) and !empty($branches)) diff --git a/module/task/model.php b/module/task/model.php index f9be8e6344..3a5617ef0b 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -2972,13 +2972,13 @@ class taskModel extends model $storyChanged ? print("{$this->lang->story->changed}") : print(" " . $this->processStatus('task', $task) . ""); break; case 'estimate': - echo round($task->estimate, 1) . ' ' . $this->lang->execution->workHourUnit; + echo round($task->estimate, 1) . $this->lang->execution->workHourUnit; break; case 'consumed': - echo round($task->consumed, 1) . ' ' . $this->lang->execution->workHourUnit; + echo round($task->consumed, 1) . $this->lang->execution->workHourUnit; break; case 'left': - echo round($task->left, 1) . ' ' . $this->lang->execution->workHourUnit; + echo round($task->left, 1) . $this->lang->execution->workHourUnit; break; case 'progress': echo round($task->progress, 2) . '%'; diff --git a/module/user/view/execution.html.php b/module/user/view/execution.html.php index 184b0f3181..2e98b00913 100644 --- a/module/user/view/execution.html.php +++ b/module/user/view/execution.html.php @@ -22,11 +22,11 @@ idAB);?> user->name);?> statusAB);?> - team->role;?> + team->role;?> execution->begin);?> execution->end);?> - team->join;?> - team->hours;?> + team->join;?> + team->hours;?> diff --git a/module/user/view/story.html.php b/module/user/view/story.html.php index cecfc2fac8..beba3f78a2 100644 --- a/module/user/view/story.html.php +++ b/module/user/view/story.html.php @@ -13,6 +13,9 @@ +