From 531f5d2cb8842658595b98d1f8fccbf353d31a45 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Mon, 10 Oct 2022 14:14:55 +0800 Subject: [PATCH] * Finish task #71905. --- module/project/lang/de.php | 4 ++ module/project/lang/en.php | 4 ++ module/project/lang/fr.php | 4 ++ module/project/lang/zh-cn.php | 4 ++ module/project/view/browsebylist.html.php | 55 +++++++++++++++++++++-- 5 files changed, 68 insertions(+), 3 deletions(-) diff --git a/module/project/lang/de.php b/module/project/lang/de.php index 9f5a4f4173..b00209d457 100644 --- a/module/project/lang/de.php +++ b/module/project/lang/de.php @@ -200,6 +200,10 @@ $lang->project->productTip = 'After clicking New Product, the projec $lang->project->noDevStage = 'There is no R&D stage under this project, or you do not have access permissions. The creation of builds is not supported at the moment.'; $lang->project->budgetOverrun = "The project's budget exceeds the remaining budget of the parent program:"; $lang->project->disabledInputTip = 'Please cancel %s first'; +$lang->project->summary = 'Total projects: %s.'; +$lang->project->allSummary = 'Total projects: %s, Wait: %s, Doing: %s, Suspended: %s, Closed: %s.'; +$lang->project->checkedSummary = 'Seleted: %total%.'; +$lang->project->checkedAllSummary = 'Seleted: %total%, Wait: %wait%, Doing: %doing%, Suspended: %suspended%, Closed: %closed%.'; $lang->project->tenThousand = ''; $lang->project->hundredMillion = 'Hundred Million'; diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 09edd1ef37..544f00918f 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -200,6 +200,10 @@ $lang->project->productTip = 'After clicking New Product, the projec $lang->project->noDevStage = 'There is no R&D stage under this project, or you do not have access permissions. The creation of builds is not supported at the moment.'; $lang->project->budgetOverrun = "The project's budget exceeds the remaining budget of the parent program:"; $lang->project->disabledInputTip = 'Please cancel %s first'; +$lang->project->summary = 'Total projects: %s.'; +$lang->project->allSummary = 'Total projects: %s, Wait: %s, Doing: %s, Suspended: %s, Closed: %s.'; +$lang->project->checkedSummary = 'Seleted: %total%.'; +$lang->project->checkedAllSummary = 'Seleted: %total%, Wait: %wait%, Doing: %doing%, Suspended: %suspended%, Closed: %closed%.'; $lang->project->tenThousand = 'Ten Thousand'; $lang->project->hundredMillion = 'Hundred Million'; diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php index 6a23ce3d6a..7168356f4d 100644 --- a/module/project/lang/fr.php +++ b/module/project/lang/fr.php @@ -200,6 +200,10 @@ $lang->project->productTip = 'After clicking New Product, the projec $lang->project->noDevStage = "Il n'y a pas de phase R&D dans ce projet, ou vous n'avez pas la permission d'accès. La version ne peut pas être créée pour le moment."; $lang->project->budgetOverrun = "Le budget du projet a dépassé le budget restant du programme parent:"; $lang->project->disabledInputTip = 'Please cancel %s first'; +$lang->project->summary = 'Total projects: %s.'; +$lang->project->allSummary = 'Total projects: %s, Wait: %s, Doing: %s, Suspended: %s, Closed: %s.'; +$lang->project->checkedSummary = 'Seleted: %total%.'; +$lang->project->checkedAllSummary = 'Seleted: %total%, Wait: %wait%, Doing: %doing%, Suspended: %suspended%, Closed: %closed%.'; $lang->project->tenThousand = ''; $lang->project->hundredMillion = 'Hundred Million'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 1c566719c3..1d0e642dd1 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -200,6 +200,10 @@ $lang->project->productTip = '点击新建产品后，项目将不 $lang->project->noDevStage = '该项目下没有研发类型的阶段，或者您没有权限访问，暂时不支持创建版本。'; $lang->project->budgetOverrun = '项目的预算超出了父项目集的剩余预算：'; $lang->project->disabledInputTip = '请先取消%s'; +$lang->project->summary = '本页共 %s 个项目。'; +$lang->project->allSummary = '本页共 %s 个项目，未开始 %s，进行中 %s，已挂起 %s，已关闭 %s 。'; +$lang->project->checkedSummary = '选中 %total% 个项目。'; +$lang->project->checkedAllSummary = '选中 %total% 个项目，未开始 %wait%，进行中 %doing%，已挂起 %suspended%，已关闭 %closed% 。'; $lang->project->tenThousand = '万'; $lang->project->hundredMillion = '亿'; diff --git a/module/project/view/browsebylist.html.php b/module/project/view/browsebylist.html.php index 94f7ac1c41..34d17c17e4 100644 --- a/module/project/view/browsebylist.html.php +++ b/module/project/view/browsebylist.html.php @@ -84,7 +84,7 @@

-
+
@@ -94,6 +94,10 @@ $useDatatable = (!commonModel::isTutorialMode() and (isset($config->datatable->$datatableId->mode) and $config->datatable->$datatableId->mode == 'datatable')); $setting = $this->datatable->getSetting('project'); $fixedFieldsWidth = $this->datatable->setFixedFieldWidth($setting); + $waitCount = 0; + $doingCount = 0; + $suspendedCount = 0; + $closedCount = 0; if($useDatatable) include dirname(dirname(dirname(__FILE__))) . '/common/view/datatable.html.php'; ?> @@ -115,7 +119,11 @@ from = 'project';?> - + status == 'wait') $waitCount ++;?> + status == 'doing') $doingCount ++;?> + status == 'suspended') $suspendedCount ++;?> + status == 'closed') $closedCount ++;?> + project->printCell($value, $project, $users, $programID);?> @@ -136,10 +144,51 @@ } ?> +
project->allSummary, count($projectStats), $waitCount, $doingCount, $suspendedCount, $closedCount) : sprintf($lang->project->summary, count($projectStats));?>
show('right', 'pagerjs');?>
- +project->summary, count($projectStats))); +js::set('allSummary', sprintf($lang->project->allSummary, count($projectStats), $waitCount, $doingCount, $suspendedCount, $closedCount)); +js::set('checkedSummary', $lang->project->checkedSummary); +js::set('checkedAllSummary', $lang->project->checkedAllSummary); +?> +