diff --git a/api/v1/entries/programs.php b/api/v1/entries/programs.php index 7e3f9833ad..afb520ff73 100644 --- a/api/v1/entries/programs.php +++ b/api/v1/entries/programs.php @@ -48,7 +48,8 @@ class programsEntry extends Entry unset($program->desc); $program->end = $program->end == LONG_TIME ? $this->lang->program->longTime : $program->end; - $programBudget = in_array($this->app->getClientLang(), array('zh-cn','zh-tw')) ? round((float)$program->budget / 10000, 2) . $this->lang->project->tenThousand : round((float)$program->budget, 2); + $programBudget = $this->loadModel('project')->budgetUnit($program->budget); + $program->labelBudget = $program->budget != 0 ? zget($this->lang->project->currencySymbol, $program->budgetUnit) . ' ' . $programBudget : $this->lang->project->future; if(empty($program->parent)) $result[$program->id] = $program; diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php index efc038415a..ee208754c0 100644 --- a/module/program/view/browsebylist.html.php +++ b/module/program/view/browsebylist.html.php @@ -72,7 +72,7 @@ createLink('user', 'profile', "userID=$userID", '', true), $userName, '', "title='{$userName}' data-toggle='modal' data-type='iframe' data-width='600'");?> - app->getClientLang(), array('zh-cn','zh-tw')) ? round((float)$program->budget / 10000, 2) . $lang->project->tenThousand : round((float)$program->budget, 2);?> + loadModel('project')->budgetUnit($program->budget);?> budget != 0 ? zget($lang->project->currencySymbol, $program->budgetUnit) . ' ' . $programBudget : $lang->project->future;?> begin;?> end == LONG_TIME ? $lang->program->longTime : $program->end;?> diff --git a/module/project/model.php b/module/project/model.php index 55689e9115..902c306f7a 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1659,22 +1659,7 @@ class projectModel extends model if($id == 'budget') { - if($project->budget < 10000) - { - $budget = round((float)$project->budget, 2); - $unit = ''; - } - elseif($project->budget < 100000000 and $project->budget >= 10000) - { - $budget = round((float)$project->budget/10000, 2); - $unit = $this->lang->project->tenThousand; - } - else - { - $budget = round((float)$project->budget/100000000, 2); - $unit = $this->lang->project->hundredMillion; - } - $projectBudget = in_array($this->app->getClientLang(), array('zh-cn','zh-tw')) ? $budget . $unit : round((float)$project->budget, 2); + $projectBudget = $this->budgetUnit($project->budget); $budgetTitle = $project->budget != 0 ? zget($this->lang->project->currencySymbol, $project->budgetUnit) . ' ' . $projectBudget : $this->lang->project->future; $title = "title='$budgetTitle'"; @@ -1803,6 +1788,35 @@ class projectModel extends model } } + /** + * Conversion budget unit + * + * @param int $budget + * @access public + * @return void + */ + public function budgetUnit($budget) + { + if($budget < 10000) + { + $budget = round((float)$budget, 2); + $unit = ''; + } + elseif($budget < 100000000 and $budget >= 10000) + { + $budget = round((float)$budget/10000, 2); + $unit = $this->lang->project->tenThousand; + } + else + { + $budget = round((float)$budget/100000000, 2); + $unit = $this->lang->project->hundredMillion; + } + + $projectBudget = in_array($this->app->getClientLang(), array('zh-cn','zh-tw')) ? $budget . $unit : round((float)$budget, 2); + return $projectBudget; + } + /** * Update products of a project. *