From 4e2ea0020cef1697f89c8b32319455d968ddc40e Mon Sep 17 00:00:00 2001 From: liumengyi Date: Tue, 4 Jul 2023 13:44:43 +0800 Subject: [PATCH] * Add long time project tip. --- module/block/lang/de.php | 3 ++- module/block/lang/en.php | 3 ++- module/block/lang/fr.php | 3 ++- module/block/lang/zh-cn.php | 3 ++- module/block/ui/projectstatisticblock.html.php | 8 ++++---- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/module/block/lang/de.php b/module/block/lang/de.php index cab2e86ab5..531e8da6c3 100644 --- a/module/block/lang/de.php +++ b/module/block/lang/de.php @@ -556,7 +556,8 @@ $lang->block->projectstatistic->leftDaysPre = 'Before the end of the projec $lang->block->projectstatistic->existRisks = 'Existing Risks:'; $lang->block->projectstatistic->existIssues = 'Existing Issues:'; $lang->block->projectstatistic->lastestExecution = 'Lastest Execution'; -$lang->block->projectstatistic->projectClosed = 'Project Has been closed.'; +$lang->block->projectstatistic->projectClosed = "{$lang->projectCommon} has been closed."; +$lang->block->projectstatistic->longTimeProject = "Long Time {$lang->projectCommon}"; $lang->block->productoverview = new stdclass(); $lang->block->productoverview->totalProductCount = 'Total Product Count'; diff --git a/module/block/lang/en.php b/module/block/lang/en.php index 6561d6a0db..4615a9d97c 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -556,7 +556,8 @@ $lang->block->projectstatistic->leftDaysPre = 'Before the end of the projec $lang->block->projectstatistic->existRisks = 'Existing Risks:'; $lang->block->projectstatistic->existIssues = 'Existing Issues:'; $lang->block->projectstatistic->lastestExecution = 'Lastest Execution'; -$lang->block->projectstatistic->projectClosed = 'Project Has been closed.'; +$lang->block->projectstatistic->projectClosed = "{$lang->projectCommon} has been closed."; +$lang->block->projectstatistic->longTimeProject = "Long Time {$lang->projectCommon}"; $lang->block->productoverview = new stdclass(); $lang->block->productoverview->totalProductCount = 'Total Product Count'; diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php index 7515c3524f..bab13172a7 100644 --- a/module/block/lang/fr.php +++ b/module/block/lang/fr.php @@ -556,7 +556,8 @@ $lang->block->projectstatistic->leftDaysPre = 'Before the end of the projec $lang->block->projectstatistic->existRisks = 'Existing Risks:'; $lang->block->projectstatistic->existIssues = 'Existing Issues:'; $lang->block->projectstatistic->lastestExecution = 'Lastest Execution'; -$lang->block->projectstatistic->projectClosed = 'Project Has been closed.'; +$lang->block->projectstatistic->projectClosed = "{$lang->projectCommon} has been closed."; +$lang->block->projectstatistic->longTimeProject = "Long Time {$lang->projectCommon}"; $lang->block->productoverview = new stdclass(); $lang->block->productoverview->totalProductCount = 'Total Product Count'; diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index f02860eb52..cc3895a871 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -558,7 +558,8 @@ $lang->block->projectstatistic->leftDaysPre = '距项目结束还剩'; $lang->block->projectstatistic->existRisks = '存在风险:'; $lang->block->projectstatistic->existIssues = '存在问题:'; $lang->block->projectstatistic->lastestExecution = '最新执行'; -$lang->block->projectstatistic->projectClosed = '项目已关闭'; +$lang->block->projectstatistic->projectClosed = "{$lang->projectCommon}已关闭"; +$lang->block->projectstatistic->longTimeProject = "长期{$lang->projectCommon}"; $lang->block->productoverview = new stdclass(); $lang->block->productoverview->totalProductCount = '产品总数'; diff --git a/module/block/ui/projectstatisticblock.html.php b/module/block/ui/projectstatisticblock.html.php index 18847012a6..964b8c6b2f 100644 --- a/module/block/ui/projectstatisticblock.html.php +++ b/module/block/ui/projectstatisticblock.html.php @@ -24,7 +24,7 @@ foreach($projects as $project) $projectOverview[] = cell ( setClass('text-left mr-6'), - $project->status != 'closed' ? span + $project->status != 'closed' && $project->end != LONG_TIME ? span ( setClass('text-gray'), $lang->block->projectstatistic->leftDaysPre, @@ -37,7 +37,7 @@ foreach($projects as $project) ) : span ( setClass('text-gray'), - $lang->block->projectStatistic->projectClosed + $project->status == 'closed' ? $lang->block->projectstatistic->projectClosed : $lang->block->projectstatistic->longTimeProject ), ); $projectOverview[] = $config->edition != 'open' ? cell @@ -67,7 +67,7 @@ foreach($projects as $project) ) : ''; $lastestExecution = (!empty($project->executions) && $project->multiple) ? cell ( - setClass('flex-1' . ($longBlock && $config->edition != 'open' ? ' text-left' : ' text-right')), + setClass('flex-1' . (!$longBlock && $config->edition != 'open' ? ' text-left' : ' text-right')), span ( setClass('text-gray'), @@ -133,7 +133,7 @@ foreach($projects as $project) ( div ( - setClass('flex flex-wrap bg-white leading-6 px-2 py-1 my-2 mx-0.5 shadow items-center' . ($longBlock ? ' h-10' : 'h-20')), + setClass('flex flex-wrap bg-white leading-6 px-2 py-1 my-4 mx-0.5 shadow items-center' . ($longBlock ? ' h-10' : 'h-20')), $projectOverview, $lastestExecution, ),