From 74a1d60d910b3f86996febdc3342ec19d06b5a37 Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Thu, 1 Apr 2021 10:55:35 +0800 Subject: [PATCH] * Finish task#37011. --- module/block/view/projectblock.html.php | 2 +- 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 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/module/block/view/projectblock.html.php b/module/block/view/projectblock.html.php index 8d5cd06af9..6f79a93be2 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']) ? number_format((float)$project->budget / 10000, 2) . $this->lang->project->tenThousand : number_format((float)$project->budget, 2);?> + app->getClientLang(), ['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/my/view/project.html.php b/module/my/view/project.html.php index 19adc5e855..3d42736020 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']) ? number_format((float)$project->budget / 10000, 2) . $this->lang->project->tenThousand : number_format((float)$project->budget, 2);?> + app->getClientLang(), ['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 64167eea91..fce5ba8ed7 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']) ? number_format((float)$project->budget / 10000, 2) . $this->lang->project->tenThousand : number_format((float)$project->budget, 2);?> + app->getClientLang(), ['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;?> hours->totalEstimate . $lang->execution->workHourUnit;?> diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php index dde9b8cd81..5e91d301cc 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']) ? number_format((float)$program->budget / 10000, 2) . $lang->project->tenThousand : number_format((float)$program->budget, 2);?> + app->getClientLang(), ['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 76f51dab37..be2dcfaf30 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1260,7 +1260,7 @@ class projectModel extends model if($id == 'budget') { - $projectBudget = in_array($this->app->getClientLang(), ['zh-cn','zh-tw']) ? number_format((float)$project->budget / 10000, 2) . $this->lang->project->tenThousand : number_format((float)$project->budget, 2); + $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); $budgetTitle = $project->budget != 0 ? zget($this->lang->project->currencySymbol, $project->budgetUnit) . ' ' . $projectBudget : $this->lang->project->future; $title = "title='$budgetTitle'";