From 80ad23f3b4be5c458ee507a1ce97ea0491f80d45 Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Tue, 9 Mar 2021 09:42:43 +0800 Subject: [PATCH 1/2] * Finish task#36474. --- module/datatable/model.php | 2 +- module/my/view/execution.html.php | 4 ++-- module/product/view/project.html.php | 4 ++-- module/project/model.php | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/module/datatable/model.php b/module/datatable/model.php index dca133dd43..d37b0db5c6 100644 --- a/module/datatable/model.php +++ b/module/datatable/model.php @@ -153,7 +153,7 @@ class datatableModel extends model $title = (isset($col->name) and $col->name) ? "title='$col->name'" : $title; if($id == 'id' and (int)$width < 90) $width = '90px'; $width = "data-width='$width' style='width:$width'"; - $align = ($id == 'actions' || $id == 'progress') ? 'text-center' : ''; + $align = $id == 'actions' ? 'text-center' : ''; echo ""; if($id == 'actions') diff --git a/module/my/view/execution.html.php b/module/my/view/execution.html.php index e00f93cb0d..c2402101a9 100644 --- a/module/my/view/execution.html.php +++ b/module/my/view/execution.html.php @@ -70,8 +70,8 @@ hours;?> assignedToMeTasks;?> -
-
progress;?>%
+
+
progress;?>
diff --git a/module/product/view/project.html.php b/module/product/view/project.html.php index 916e60599d..5f640f87ee 100644 --- a/module/product/view/project.html.php +++ b/module/product/view/project.html.php @@ -65,8 +65,8 @@ hours->totalEstimate . ' ' . $lang->execution->workHourUnit;?> hours->totalConsumed . ' ' . $lang->execution->workHourUnit;?> -
-
hours->progress;?>%
+
+
hours->progress;?>
diff --git a/module/project/model.php b/module/project/model.php index 0c6e9576b3..a4170a3a19 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1131,7 +1131,7 @@ class projectModel extends model echo $project->hours->totalLeft . ' ' . $this->lang->execution->workHourUnit; break; case 'progress': - echo "
{$project->hours->progress}%
"; + echo "
{$project->hours->progress}
"; break; case 'actions': if($project->status == 'wait' || $project->status == 'suspended') common::printIcon('project', 'start', "projectID=$project->id", $project, 'list', 'play', '', 'iframe', true); From f6bc489e36d6d6f13c214a30e0fea2f6d3bceeed Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Tue, 9 Mar 2021 09:50:19 +0800 Subject: [PATCH 2/2] * Finish task #36492. --- module/common/lang/de.php | 2 +- module/common/lang/en.php | 2 +- module/common/lang/fr.php | 2 +- module/common/lang/menuOrder.php | 6 +++--- module/common/lang/vi.php | 2 +- module/common/lang/zh-cn.php | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/module/common/lang/de.php b/module/common/lang/de.php index c436ddcd1a..be070adb1a 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -332,7 +332,7 @@ $lang->my->dividerMenu = ',myProject,team,'; $lang->todo = new stdclass(); $lang->todo->menu = $lang->my->menu; -$lang->product->dividerMenu = ',plan,project,dashboard,'; +$lang->product->dividerMenu = ',requirement,set,'; $lang->story = new stdclass(); diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 6da25aed3d..468fe3ed3a 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -332,7 +332,7 @@ $lang->my->dividerMenu = ',myProject,team,'; $lang->todo = new stdclass(); $lang->todo->menu = $lang->my->menu; -$lang->product->dividerMenu = ',plan,project,dashboard,'; +$lang->product->dividerMenu = ',requirement,set,'; $lang->story = new stdclass(); diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index 815911f9dc..31d8c8c37e 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -332,7 +332,7 @@ $lang->my->dividerMenu = ',myProject,team,'; $lang->todo = new stdclass(); $lang->todo->menu = $lang->my->menu; -$lang->product->dividerMenu = ',plan,project,dashboard,'; +$lang->product->dividerMenu = ',requirement,set,'; $lang->story = new stdclass(); diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php index 7c0b13c82d..e5c8bbbe78 100644 --- a/module/common/lang/menuOrder.php +++ b/module/common/lang/menuOrder.php @@ -60,15 +60,15 @@ $lang->my->menuOrder[55] = 'contacts'; $lang->todo->menuOrder = $lang->my->menuOrder; /* product menu order. */ -$lang->product->menuOrder[5] = 'requirement'; +$lang->product->menuOrder[5] = 'dashboard'; $lang->product->menuOrder[10] = 'story'; $lang->product->menuOrder[15] = 'plan'; +$lang->product->menuOrder[30] = 'project'; $lang->product->menuOrder[20] = 'release'; $lang->product->menuOrder[25] = 'roadmap'; -$lang->product->menuOrder[30] = 'project'; +$lang->product->menuOrder[30] = 'requirement'; $lang->product->menuOrder[35] = 'track'; $lang->product->menuOrder[40] = 'doc'; -$lang->product->menuOrder[45] = 'dashboard'; $lang->product->menuOrder[50] = 'dynamic'; $lang->product->menuOrder[55] = 'setting'; $lang->product->menuOrder[60] = 'create'; diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php index 100f5738b6..e990ab10e6 100644 --- a/module/common/lang/vi.php +++ b/module/common/lang/vi.php @@ -332,7 +332,7 @@ $lang->my->dividerMenu = ',myProject,team,'; $lang->todo = new stdclass(); $lang->todo->menu = $lang->my->menu; -$lang->product->dividerMenu = ',plan,project,dashboard,'; +$lang->product->dividerMenu = ',requirement,set,'; $lang->story = new stdclass(); diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 109b6b43bc..10ff3db517 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -332,7 +332,7 @@ $lang->my->dividerMenu = ',myProject,team,'; $lang->todo = new stdclass(); $lang->todo->menu = $lang->my->menu; -$lang->product->dividerMenu = ',plan,project,dashboard,'; +$lang->product->dividerMenu = ',requirement,set,'; $lang->story = new stdclass();