From 04d06bb2b583718a1332364288598e96a2c55746 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 29 Sep 2022 14:48:09 +0800 Subject: [PATCH 1/3] * Finish task #70494. --- module/productplan/lang/de.php | 2 ++ module/productplan/lang/en.php | 2 ++ module/productplan/lang/fr.php | 2 ++ module/productplan/lang/zh-cn.php | 2 ++ module/productplan/view/browsebylist.html.php | 35 +++++++++++++++++-- 5 files changed, 41 insertions(+), 2 deletions(-) diff --git a/module/productplan/lang/de.php b/module/productplan/lang/de.php index e87334e50d..059127b47b 100644 --- a/module/productplan/lang/de.php +++ b/module/productplan/lang/de.php @@ -73,6 +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 plans on this page, Parent Plan %s ,Child Plan %s."; +$lang->productplan->checkedSummary = "Seleted %total% plans, Parent Plan %parent%, Child Plan %child%."; $lang->productplan->id = 'ID'; $lang->productplan->product = $lang->productCommon; diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php index da23bd9127..12de3ade68 100644 --- a/module/productplan/lang/en.php +++ b/module/productplan/lang/en.php @@ -73,6 +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 plans on this page, Parent Plan %s ,Child Plan %s."; +$lang->productplan->checkedSummary = "Seleted %total% plans, Parent Plan %parent%, Child Plan %child%."; $lang->productplan->id = 'ID'; $lang->productplan->product = $lang->productCommon; diff --git a/module/productplan/lang/fr.php b/module/productplan/lang/fr.php index 8b45ee16bf..e73340276e 100644 --- a/module/productplan/lang/fr.php +++ b/module/productplan/lang/fr.php @@ -73,6 +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 plans on this page, Parent Plan %s ,Child Plan %s."; +$lang->productplan->checkedSummary = "Seleted %total% plans, Parent Plan %parent%, Child Plan %child%."; $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 4a93f1a59d..1c4abdb050 100644 --- a/module/productplan/lang/zh-cn.php +++ b/module/productplan/lang/zh-cn.php @@ -73,6 +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->id = '编号'; $lang->productplan->product = $lang->productCommon; diff --git a/module/productplan/view/browsebylist.html.php b/module/productplan/view/browsebylist.html.php index e488ec94f8..8c9fab7c55 100644 --- a/module/productplan/view/browsebylist.html.php +++ b/module/productplan/view/browsebylist.html.php @@ -33,6 +33,8 @@
+ +

@@ -43,7 +45,7 @@

-
id&branch=$branch")?>'> + id&branch=$branch")?>'> recTotal}&recPerPage={$pager->recPerPage}"; ?> @@ -89,10 +91,13 @@ { $parent = $plan->id; $children = isset($plan->children) ? $plan->children : 0; + + $totalParent ++; } if($plan->parent == 0) $parent = 0; if(!empty($parent) and $plan->parent > 0 and $plan->parent != $parent) $parent = 0; if($plan->parent <= 0) $i = 0; + if($plan->parent > 0) $totalChild ++; $class = ''; if(!empty($parent) and $plan->parent == $parent) @@ -103,7 +108,7 @@ $i++; } ?> - +
id => ''), '', $attribute) . html::a(helper::createLink('productplan', 'view', "planID=$plan->id"), sprintf('%03d', $plan->id));?> @@ -179,8 +184,34 @@ +
productplan->summary, count($plans), $totalParent, $totalChild);?>
show('right', 'pagerjs');?> + From 57df99f43e88a2629d06d206e565e1efea8902b9 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 29 Sep 2022 16:34:40 +0800 Subject: [PATCH 2/3] * Finish task #70494. --- module/productplan/lang/de.php | 4 ++-- module/productplan/lang/en.php | 4 ++-- module/productplan/lang/fr.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/module/productplan/lang/de.php b/module/productplan/lang/de.php index 059127b47b..7e9c896693 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 plans on this page, Parent Plan %s ,Child Plan %s."; -$lang->productplan->checkedSummary = "Seleted %total% plans, Parent Plan %parent%, Child Plan %child%."; +$lang->productplan->summary = "Total: %s, Parent: %s, Child: %s."; +$lang->productplan->checkedSummary = "Seleted: %total%, Parent: %parent%, Child: %child%."; $lang->productplan->id = 'ID'; $lang->productplan->product = $lang->productCommon; diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php index 12de3ade68..c33d14f9fc 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 plans on this page, Parent Plan %s ,Child Plan %s."; -$lang->productplan->checkedSummary = "Seleted %total% plans, Parent Plan %parent%, Child Plan %child%."; +$lang->productplan->summary = "Total: %s, Parent: %s, Child: %s."; +$lang->productplan->checkedSummary = "Seleted: %total%, Parent: %parent%, Child: %child%."; $lang->productplan->id = 'ID'; $lang->productplan->product = $lang->productCommon; diff --git a/module/productplan/lang/fr.php b/module/productplan/lang/fr.php index e73340276e..6f690d6b89 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 plans on this page, Parent Plan %s ,Child Plan %s."; -$lang->productplan->checkedSummary = "Seleted %total% plans, Parent Plan %parent%, Child Plan %child%."; +$lang->productplan->summary = "Total: %s, Parent: %s, Child: %s."; +$lang->productplan->checkedSummary = "Seleted: %total%, Parent: %parent%, Child: %child%."; $lang->productplan->id = 'ID'; $lang->productplan->product = $lang->productCommon; From d2568442eb0b91608dacd30a33428e6e375f8117 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 29 Sep 2022 16:54:35 +0800 Subject: [PATCH 3/3] * Finish task #70494. --- module/productplan/lang/de.php | 4 ++-- module/productplan/lang/en.php | 4 ++-- module/productplan/lang/fr.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/module/productplan/lang/de.php b/module/productplan/lang/de.php index 7e9c896693..088f41c66b 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, Parent: %s, Child: %s."; -$lang->productplan->checkedSummary = "Seleted: %total%, Parent: %parent%, Child: %child%."; +$lang->productplan->summary = "Total: %s, Parents: %s, Children: %s."; +$lang->productplan->checkedSummary = "Seleted: %total%, Parents: %parent%, Children: %child%."; $lang->productplan->id = 'ID'; $lang->productplan->product = $lang->productCommon; diff --git a/module/productplan/lang/en.php b/module/productplan/lang/en.php index c33d14f9fc..2807a5eddc 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, Parent: %s, Child: %s."; -$lang->productplan->checkedSummary = "Seleted: %total%, Parent: %parent%, Child: %child%."; +$lang->productplan->summary = "Total: %s, Parents: %s, Children: %s."; +$lang->productplan->checkedSummary = "Seleted: %total%, Parents: %parent%, Children: %child%."; $lang->productplan->id = 'ID'; $lang->productplan->product = $lang->productCommon; diff --git a/module/productplan/lang/fr.php b/module/productplan/lang/fr.php index 6f690d6b89..3f9b50d086 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, Parent: %s, Child: %s."; -$lang->productplan->checkedSummary = "Seleted: %total%, Parent: %parent%, Child: %child%."; +$lang->productplan->summary = "Total: %s, Parents: %s, Children: %s."; +$lang->productplan->checkedSummary = "Seleted: %total%, Parents: %parent%, Children: %child%."; $lang->productplan->id = 'ID'; $lang->productplan->product = $lang->productCommon;