From cf9275cbaee2ad8fe5cd7982d72f28019fc44072 Mon Sep 17 00:00:00 2001 From: zenggang Date: Thu, 22 Jul 2021 13:27:43 +0800 Subject: [PATCH] * Finisth task #40426 --- module/block/view/projectblock.html.php | 2 +- module/block/view/projectstatisticblock.html.php | 4 ++-- module/my/view/project.html.php | 2 +- module/product/view/project.html.php | 2 +- module/program/view/browsebylist.html.php | 2 +- module/project/model.php | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/module/block/view/projectblock.html.php b/module/block/view/projectblock.html.php index 6f79a93be2..f02a58fa89 100644 --- a/module/block/view/projectblock.html.php +++ b/module/block/view/projectblock.html.php @@ -34,7 +34,7 @@ teamCount;?> consumed . $lang->execution->workHourUnit;?> - app->getClientLang(), ['zh-cn','zh-tw']) ? round((float)$project->budget / 10000, 2) . $this->lang->project->tenThousand : round((float)$project->budget, 2);?> + app->getClientLang(), array('zh-cn','zh-tw')) ? round((float)$project->budget / 10000, 2) . $this->lang->project->tenThousand : round((float)$project->budget, 2);?> budget != 0 ? zget($lang->project->currencySymbol, $project->budgetUnit) . ' ' . $programBudget : $lang->project->future;?> leftStories;?> leftTasks;?> diff --git a/module/block/view/projectstatisticblock.html.php b/module/block/view/projectstatisticblock.html.php index fdf17551bb..fc32d4098f 100644 --- a/module/block/view/projectstatisticblock.html.php +++ b/module/block/view/projectstatisticblock.html.php @@ -221,7 +221,7 @@ $(function() project->budget . ':';?> app->getClientLang(), ['zh-cn','zh-tw']) ? round((float)$project->budget / 10000, 2) . $this->lang->project->tenThousand : round((float)$project->budget, 2); + $projectBudget = in_array($this->app->getClientLang(), array('zh-cn','zh-tw')) ? round((float)$project->budget / 10000, 2) . $this->lang->project->tenThousand : round((float)$project->budget, 2); echo $project->budget != 0 ? $projectBudget : $this->lang->project->future; ?> @@ -229,7 +229,7 @@ $(function()
- app->getClientLang(), ['zh-cn','zh-tw']);?> + app->getClientLang(), array('zh-cn','zh-tw'));?>
project->pv . '(' . $lang->project->pvTitle . ')' : $lang->project->pv; ?>
project->ev . '(' . $lang->project->evTitle . ')' : $lang->project->ev;?>
project->ac . '(' . $lang->project->acTitle . ')' : $lang->project->ac;?>
diff --git a/module/my/view/project.html.php b/module/my/view/project.html.php index 56eadc4e81..ee130213a6 100644 --- a/module/my/view/project.html.php +++ b/module/my/view/project.html.php @@ -64,7 +64,7 @@ begin;?> end == LONG_TIME ? $this->lang->project->longTime : $project->end;?> - app->getClientLang(), ['zh-cn','zh-tw']) ? round((float)$project->budget / 10000, 2) . $this->lang->project->tenThousand : round((float)$project->budget, 2);?> + app->getClientLang(), array('zh-cn','zh-tw')) ? round((float)$project->budget / 10000, 2) . $this->lang->project->tenThousand : round((float)$project->budget, 2);?> budget != 0 ? zget($lang->project->currencySymbol, $project->budgetUnit) . ' ' . $projectBudget : $lang->project->future;?> PM]) ? $PMList[$project->PM]->id : ''?> diff --git a/module/product/view/project.html.php b/module/product/view/project.html.php index 48e82067cb..567ac03de2 100644 --- a/module/product/view/project.html.php +++ b/module/product/view/project.html.php @@ -76,7 +76,7 @@ - app->getClientLang(), ['zh-cn','zh-tw']) ? round((float)$project->budget / 10000, 2) . $this->lang->project->tenThousand : round((float)$project->budget, 2);?> + app->getClientLang(), array('zh-cn','zh-tw')) ? round((float)$project->budget / 10000, 2) . $this->lang->project->tenThousand : round((float)$project->budget, 2);?> budget != 0 ? zget($this->lang->project->currencySymbol, $project->budgetUnit) . ' ' . $projectBudget : $this->lang->project->future;?> budget != 0 ? 'text-right' : 'text-center';?> diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php index aebfc2438d..be3e2844fe 100644 --- a/module/program/view/browsebylist.html.php +++ b/module/program/view/browsebylist.html.php @@ -57,7 +57,7 @@ PM]) ? $PMList[$program->PM]->id : ''?> PM)) echo html::a($this->createLink('user', 'profile', "userID=$userID", '', true), zget($users, $program->PM), '', "data-toggle='modal' data-type='iframe' data-width='600'");?> - app->getClientLang(), ['zh-cn','zh-tw']) ? round((float)$program->budget / 10000, 2) . $lang->project->tenThousand : round((float)$program->budget, 2);?> + app->getClientLang(), array('zh-cn','zh-tw')) ? round((float)$program->budget / 10000, 2) . $lang->project->tenThousand : round((float)$program->budget, 2);?> budget != 0 ? zget($lang->project->currencySymbol, $program->budgetUnit) . ' ' . $programBudget : $lang->project->future;?> project->statusList, $program->status, '');?> begin;?> diff --git a/module/project/model.php b/module/project/model.php index 3dc9101b06..034b5be454 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1324,7 +1324,7 @@ class projectModel extends model if($id == 'budget') { - $projectBudget = in_array($this->app->getClientLang(), ['zh-cn','zh-tw']) ? round((float)$project->budget / 10000, 2) . $this->lang->project->tenThousand : round((float)$project->budget, 2); + $projectBudget = in_array($this->app->getClientLang(), array('zh-cn','zh-tw')) ? round((float)$project->budget / 10000, 2) . $this->lang->project->tenThousand : round((float)$project->budget, 2); $budgetTitle = $project->budget != 0 ? zget($this->lang->project->currencySymbol, $project->budgetUnit) . ' ' . $projectBudget : $this->lang->project->future; $title = "title='$budgetTitle'";