From f017fddb67201fb63dd98e6016b6d7a7c72ccffb Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Thu, 10 Nov 2022 15:37:08 +0800 Subject: [PATCH 01/13] * Add gantt icon. --- module/programplan/view/gantt.html.php | 21 +-------------------- module/project/view/execution.html.php | 2 +- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/module/programplan/view/gantt.html.php b/module/programplan/view/gantt.html.php index 94e9786aac..6bcbef11b0 100755 --- a/module/programplan/view/gantt.html.php +++ b/module/programplan/view/gantt.html.php @@ -103,29 +103,10 @@ form {display: block; margin-top: 0em; margin-block-end: 1em;} -
-
- rawModule != 'review') echo html::commonButton($lang->programplan->full, 'id="fullScreenBtn"', 'btn btn-primary btn-sm')?> - rawModule == 'review') unset($lang->programplan->stageCustom->date); ?> - programplan->stageCustom, $selectCustom);?> -
- execution->gantt->format . '：';?> - execution->gantt->zooming, 'day', "onchange='zoomTasks(this)'");?> -
- -
-
createLink('project', 'execution', "status=all&projectID=$projectID"),"  ", '', "class='btn btn-icon switchBtn' title='{$lang->project->bylist}'");?> -  ", '', "class='btn btn-icon text-primary switchBtn' title='{$lang->programplan->gantt}'");?> +  ", '', "class='btn btn-icon text-primary switchBtn' title='{$lang->programplan->gantt}'");?>
programplan->full;?>
diff --git a/module/project/view/execution.html.php b/module/project/view/execution.html.php index 5ca8ad4f9d..1f95f153f7 100644 --- a/module/project/view/execution.html.php +++ b/module/project/view/execution.html.php @@ -44,7 +44,7 @@
 ", '', "class='btn btn-icon text-primary switchBtn' title='{$lang->project->bylist}'");?> - createLink('programplan', 'browse', "projectID=$projectID&productID=$productID&type=gantt"), "  ", '', "class='btn btn-icon switchBtn' title='{$lang->programplan->gantt}'");?> + createLink('programplan', 'browse', "projectID=$projectID&productID=$productID&type=gantt"), "  ", '', "class='btn btn-icon switchBtn' title='{$lang->programplan->gantt}'");?>
" . $lang->export, '', "class='btn btn-link export'")?> From 2f5e0ac70d43449f7169a5da7076189089d771f5 Mon Sep 17 00:00:00 2001 From: wangyuting <851424971@qq.com> Date: Fri, 11 Nov 2022 00:46:54 +0000 Subject: [PATCH 02/13] * Finish task #75239. --- module/build/control.php | 1 + module/build/lang/de.php | 1 + module/build/lang/en.php | 1 + module/build/lang/fr.php | 1 + module/build/lang/vi.php | 1 + module/build/lang/zh-cn.php | 1 + module/build/view/create.html.php | 2 +- module/build/view/edit.html.php | 2 +- module/build/view/view.html.php | 17 +++++++++++++++++ module/upgrade/model.php | 4 ++-- 10 files changed, 27 insertions(+), 4 deletions(-) diff --git a/module/build/control.php b/module/build/control.php index dfad9d95c4..f7a63aa99a 100644 --- a/module/build/control.php +++ b/module/build/control.php @@ -316,6 +316,7 @@ class build extends control $this->view->build = $build; $this->view->buildPairs = $this->build->getBuildPairs(0, 'all', 'noempty,notrunk', $objectID, $objectType); $this->view->builds = $this->build->getByList(array_keys($this->view->buildPairs)); + $this->view->executions = $executions; $this->view->actions = $this->loadModel('action')->getList('build', $buildID); $this->view->link = $link; $this->view->param = $param; diff --git a/module/build/lang/de.php b/module/build/lang/de.php index 92cb1f847c..102f2a399f 100644 --- a/module/build/lang/de.php +++ b/module/build/lang/de.php @@ -33,6 +33,7 @@ $lang->build->project = 'Project'; $lang->build->branch = 'Platform/Branch'; $lang->build->branchName = '%s'; $lang->build->execution = $lang->executionCommon; +$lang->build->builds = 'Linked Builds'; $lang->build->name = 'Name'; $lang->build->date = 'Datum'; $lang->build->builder = 'Builder'; diff --git a/module/build/lang/en.php b/module/build/lang/en.php index c82634972b..2cad705a92 100644 --- a/module/build/lang/en.php +++ b/module/build/lang/en.php @@ -33,6 +33,7 @@ $lang->build->project = 'Project'; $lang->build->branch = 'Platform/Branch'; $lang->build->branchName = '%s'; $lang->build->execution = $lang->executionCommon; +$lang->build->builds = 'Linked Builds'; $lang->build->name = 'Name'; $lang->build->date = 'Date'; $lang->build->builder = 'Builder'; diff --git a/module/build/lang/fr.php b/module/build/lang/fr.php index 82e060e09b..5bf136f09b 100644 --- a/module/build/lang/fr.php +++ b/module/build/lang/fr.php @@ -33,6 +33,7 @@ $lang->build->project = 'Project'; $lang->build->branch = 'Plateforme/Branche'; $lang->build->branchName = '%s'; $lang->build->execution = $lang->executionCommon; +$lang->build->builds = 'Linked Builds'; $lang->build->name = 'Nom'; $lang->build->date = 'Date'; $lang->build->builder = 'Builder'; diff --git a/module/build/lang/vi.php b/module/build/lang/vi.php index 3342240d41..c5a6f474d1 100644 --- a/module/build/lang/vi.php +++ b/module/build/lang/vi.php @@ -31,6 +31,7 @@ $lang->build->id = 'ID'; $lang->build->product = $lang->productCommon; $lang->build->branch = 'Platform/Branch'; $lang->build->execution = $lang->executionCommon; +$lang->build->builds = 'Linked Builds'; $lang->build->name = 'Tên'; $lang->build->date = 'Ngày'; $lang->build->builder = 'Builder'; diff --git a/module/build/lang/zh-cn.php b/module/build/lang/zh-cn.php index af15c07dae..b1bbf9d7ca 100644 --- a/module/build/lang/zh-cn.php +++ b/module/build/lang/zh-cn.php @@ -33,6 +33,7 @@ $lang->build->project = '所属项目'; $lang->build->branch = '平台/分支'; $lang->build->branchName = '所属%s'; $lang->build->execution = '所属' . $lang->executionCommon; +$lang->build->builds = '关联版本'; $lang->build->name = '名称编号'; $lang->build->date = '打包日期'; $lang->build->builder = '构建者'; diff --git a/module/build/view/create.html.php b/module/build/view/create.html.php index be80d8aa27..3297178af4 100644 --- a/module/build/view/create.html.php +++ b/module/build/view/create.html.php @@ -44,7 +44,7 @@ tab == 'project' && !empty($multipleProject)):?> - build->common;?> + build->builds;?> diff --git a/module/build/view/edit.html.php b/module/build/view/edit.html.php index 90a95c2b75..8fc810e5aa 100644 --- a/module/build/view/edit.html.php +++ b/module/build/view/edit.html.php @@ -45,7 +45,7 @@ execution):?> - build->common;?> + build->builds;?> builds, "class='form-control chosen' multiple $disabled");?> build->notice->changeBuilds;?> diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php index 3307531361..1a0815fb6a 100644 --- a/module/build/view/view.html.php +++ b/module/build/view/view.html.php @@ -328,6 +328,23 @@ tbody tr td:first-child input {display: none;} + execution):?> + + build->execution;?> + execution);?> + + + + build->builds;?> + + + builds) as $buildID):?> + createLink('build', 'view', "buildID=$buildID") . "#app={$app->tab}", zget($buildPairs, $buildID)) . $lang->comma;?> + + comma);?> + + + build->name;?> name;?> diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 5cc2414591..d161a596a1 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -7525,8 +7525,8 @@ class upgradeModel extends model $project->status = $sprint->status; $project->begin = $sprint->begin; $project->end = isset($sprint->end) ? $sprint->end : LONG_TIME; - $project->realBegan = $sprint->realBegan; - $project->realEnd = $sprint->realEnd; + $project->realBegan = zget($sprint, 'realBegan', ''); + $project->realEnd = zget($sprint, 'realEnd', ''); $project->days = $this->computeDaysDelta($project->begin, $project->end); $project->PM = $sprint->PM; $project->auth = 'extend'; From 2c75eaf8f67c425444afd33d6e39b7303f07455b Mon Sep 17 00:00:00 2001 From: tianshujie Date: Fri, 11 Nov 2022 09:04:31 +0800 Subject: [PATCH 03/13] * Modify the statistics of the plan list. --- module/productplan/lang/de.php | 4 ++-- module/productplan/lang/en.php | 4 ++-- module/productplan/lang/fr.php | 4 ++-- module/productplan/lang/zh-cn.php | 4 ++-- module/productplan/view/browsebylist.html.php | 13 ++++++++----- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/module/productplan/lang/de.php b/module/productplan/lang/de.php index 088f41c66b..0776e1a3be 100644 --- a/module/productplan/lang/de.php +++ b/module/productplan/lang/de.php @@ -73,8 +73,8 @@ $lang->productplan->cannotDeleteParent = 'Cannot delete parent plan'; $lang->productplan->selectProjects = "Please select the project"; $lang->productplan->projectNotEmpty = 'Project cannot be empty.'; $lang->productplan->nextStep = "Next step"; -$lang->productplan->summary = "Total: %s, Parents: %s, Children: %s."; -$lang->productplan->checkedSummary = "Seleted: %total%, Parents: %parent%, Children: %child%."; +$lang->productplan->summary = "Total: %s, Parents: %s, Children: %s，Independent: %s."; +$lang->productplan->checkedSummary = "Seleted: %total%, Parents: %parent%, Children: %child%, Independent: %independent%."; $lang->productplan->id = 'ID'; $lang->productplan->product = $lang->productCommon; diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php index 2807a5eddc..41b5fe348c 100644 --- a/module/productplan/lang/en.php +++ b/module/productplan/lang/en.php @@ -73,8 +73,8 @@ $lang->productplan->cannotDeleteParent = 'Cannot delete parent plan'; $lang->productplan->selectProjects = "Please select the project"; $lang->productplan->projectNotEmpty = 'Project cannot be empty.'; $lang->productplan->nextStep = "Next step"; -$lang->productplan->summary = "Total: %s, Parents: %s, Children: %s."; -$lang->productplan->checkedSummary = "Seleted: %total%, Parents: %parent%, Children: %child%."; +$lang->productplan->summary = "Total: %s, Parents: %s, Children: %s，Independent: %s."; +$lang->productplan->checkedSummary = "Seleted: %total%, Parents: %parent%, Children: %child%, Independent: %independent%."; $lang->productplan->id = 'ID'; $lang->productplan->product = $lang->productCommon; diff --git a/module/productplan/lang/fr.php b/module/productplan/lang/fr.php index 3f9b50d086..dc5390ac80 100644 --- a/module/productplan/lang/fr.php +++ b/module/productplan/lang/fr.php @@ -73,8 +73,8 @@ $lang->productplan->cannotDeleteParent = 'Impossible de supprimer le plan parent $lang->productplan->selectProjects = "Please select the project"; $lang->productplan->projectNotEmpty = 'Project cannot be empty.'; $lang->productplan->nextStep = "Next step"; -$lang->productplan->summary = "Total: %s, Parents: %s, Children: %s."; -$lang->productplan->checkedSummary = "Seleted: %total%, Parents: %parent%, Children: %child%."; +$lang->productplan->summary = "Total: %s, Parents: %s, Children: %s，Independent: %s."; +$lang->productplan->checkedSummary = "Seleted: %total%, Parents: %parent%, Children: %child%, Independent: %independent%."; $lang->productplan->id = 'ID'; $lang->productplan->product = $lang->productCommon; diff --git a/module/productplan/lang/zh-cn.php b/module/productplan/lang/zh-cn.php index 1c4abdb050..119714e9de 100644 --- a/module/productplan/lang/zh-cn.php +++ b/module/productplan/lang/zh-cn.php @@ -73,8 +73,8 @@ $lang->productplan->cannotDeleteParent = "不能删除父计划"; $lang->productplan->selectProjects = "请选择所属项目"; $lang->productplan->projectNotEmpty = '所属项目不能为空。'; $lang->productplan->nextStep = "下一步"; -$lang->productplan->summary = "本页共 %s 个计划，父计划 %s，子计划 %s。"; -$lang->productplan->checkedSummary = "共选中 %total% 个计划，父计划 %parent%，子计划 %child%。"; +$lang->productplan->summary = "本页共 %s 个计划，父计划 %s，子计划 %s，独立计划 %s。"; +$lang->productplan->checkedSummary = "共选中 %total% 个计划，父计划 %parent%，子计划 %child%，独立计划 %independent%。"; $lang->productplan->id = '编号'; $lang->productplan->product = $lang->productCommon; diff --git a/module/productplan/view/browsebylist.html.php b/module/productplan/view/browsebylist.html.php index d0f97ca141..a81c574f0e 100644 --- a/module/productplan/view/browsebylist.html.php +++ b/module/productplan/view/browsebylist.html.php @@ -44,8 +44,9 @@
- - + + +

@@ -118,6 +119,7 @@ if(!empty($parent) and $plan->parent > 0 and $plan->parent != $parent) $parent = 0; if($plan->parent <= 0) $i = 0; if($plan->parent > 0) $totalChild ++; + if($plan->parent == 0) $totalIndependent ++; $class = ''; if(!empty($parent) and $plan->parent == $parent) @@ -229,7 +231,7 @@

-
productplan->summary, count($plans), $totalParent, $totalChild);?>
+
productplan->summary, count($plans), $totalParent, $totalChild, $totalIndependent);?>
show('right', 'pagerjs');?>
@@ -238,7 +240,7 @@