From 5b2cb528a31aae45b70ede87cdc43414b8b7174c Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Mon, 28 Dec 2020 10:29:16 +0800
Subject: [PATCH] * Modify program budget type.

---
 module/program/model.php               | 8 ++++----
 module/program/view/pgmcreate.html.php | 2 +-
 module/program/view/pgmedit.html.php   | 2 +-
 module/program/view/prjcreate.html.php | 2 +-
 module/program/view/prjedit.html.php   | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/module/program/model.php b/module/program/model.php
index b5c30188a0..1d3b02faad 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -122,7 +122,7 @@ class programModel extends model
             ->setDefault('openedDate', helper::now())
             ->setIF($this->post->acl == 'open', 'whitelist', '')
             ->setIF($this->post->delta == 999, 'end', LONG_TIME)
-            ->setIF($this->post->budget != 0, 'budget', number_format($this->post->budget, 2))
+            ->setIF($this->post->budget != 0, 'budget', number_format((float)$this->post->budget, 2))
             ->add('type', 'program')
             ->join('whitelist', ',')
             ->stripTags($this->config->program->editor->pgmcreate['id'], $this->config->allowedTags)
@@ -234,7 +234,7 @@ class programModel extends model
             ->setIF($this->post->acl   == 'open', 'whitelist', '')
             ->setIF($this->post->delta == 999, 'end', LONG_TIME)
             ->setIF($this->post->future, 'budget', 0)
-            ->setIF($this->post->budget != 0, 'budget', number_format($this->post->budget, 2))
+            ->setIF($this->post->budget != 0, 'budget', number_format((float)$this->post->budget, 2))
             ->join('whitelist', ',')
             ->stripTags($this->config->program->editor->pgmedit['id'], $this->config->allowedTags)
             ->remove('uid,delta,future')
@@ -1264,7 +1264,7 @@ class programModel extends model
             ->setIF($this->post->delta == 999, 'end', LONG_TIME)
             ->setIF($this->post->delta == 999, 'days', 0)
             ->setIF($this->post->acl   == 'open', 'whitelist', '')
-            ->setIF($this->post->budget != 0, 'budget', number_format($this->post->budget, 2))
+            ->setIF($this->post->budget != 0, 'budget', number_format((float)$this->post->budget, 2))
             ->setDefault('openedBy', $this->app->user->account)
             ->setDefault('openedDate', helper::now())
             ->setDefault('team', substr($this->post->name, 0, 30))
@@ -1461,7 +1461,7 @@ class programModel extends model
             ->setIF($this->post->end   == '0000-00-00', 'end', '')
             ->setIF($this->post->acl   == 'open', 'whitelist', '')
             ->setIF($this->post->future, 'budget', 0)
-            ->setIF($this->post->budget != 0, 'budget', number_format($this->post->budget, 2))
+            ->setIF($this->post->budget != 0, 'budget', number_format((float)$this->post->budget, 2))
             ->join('whitelist', ',')
             ->stripTags($this->config->program->editor->prjedit['id'], $this->config->allowedTags)
             ->remove('products,branch,plans,delta,future')
diff --git a/module/program/view/pgmcreate.html.php b/module/program/view/pgmcreate.html.php
index 2b64f8f2dd..9445358c7e 100644
--- a/module/program/view/pgmcreate.html.php
+++ b/module/program/view/pgmcreate.html.php
@@ -61,7 +61,7 @@
           <th><?php echo $lang->program->PGMBudget;?></th>
           <td>
             <div class='input-group'>
-              <?php echo html::input('budget', '', "class='form-control'" . (strpos($requiredFields, 'budget') !== false ? ' required' : ''));?>
+              <?php echo html::number('budget', '', "class='form-control' min='0.00' step='0.01'" . (strpos($requiredFields, 'budget') !== false ? ' required' : ''));?>
               <span class='input-group-addon'></span>
               <?php echo html::select('budgetUnit', $lang->program->unitList, empty($parentProgram->budgetUnit) ? 'wanyuan' : $parentProgram->budgetUnit, "class='form-control'");?>
             </div>
diff --git a/module/program/view/pgmedit.html.php b/module/program/view/pgmedit.html.php
index 2e541980ff..bf62db6c70 100644
--- a/module/program/view/pgmedit.html.php
+++ b/module/program/view/pgmedit.html.php
@@ -40,7 +40,7 @@
           <th><?php echo $lang->program->PGMBudget;?></th>
           <td>
             <div class='input-group'>
-              <?php echo html::input('budget', $program->budget != 0 ? $program->budget : '', "class='form-control'" . (strpos($requiredFields, 'budget') !== false ? ' required' : '') . ($program->budget == 0 ? 'disabled' : ''));?>
+              <?php echo html::number('budget', $program->budget != 0 ? $program->budget : '', "class='form-control' min='0.00' step='0.01'" . (strpos($requiredFields, 'budget') !== false ? ' required' : '') . ($program->budget == 0 ? 'disabled' : ''));?>
               <span class='input-group-addon'></span>
               <?php echo html::select('budgetUnit', $lang->program->unitList, $program->budgetUnit, "class='form-control'");?>
             </div>
diff --git a/module/program/view/prjcreate.html.php b/module/program/view/prjcreate.html.php
index 2084286135..7b07331eaa 100644
--- a/module/program/view/prjcreate.html.php
+++ b/module/program/view/prjcreate.html.php
@@ -51,7 +51,7 @@
           <th><?php echo $lang->program->PRJBudget;?></th>
           <td>
             <div class='input-group'>
-              <?php echo html::input('budget', '', "class='form-control'" . (strpos($requiredFields, 'budget') !== false ? ' required' : ''));?>
+              <?php echo html::number('budget', '', "class='form-control' min='0.00' step='0.01'" . (strpos($requiredFields, 'budget') !== false ? ' required' : ''));?>
               <span class='input-group-addon'></span>
               <?php echo html::select('budgetUnit', $lang->program->unitList, empty($parentProgram->budgetUnit) ? 'wanyuan' : $parentProgram->budgetUnit, "class='form-control'");?>
             </div>
diff --git a/module/program/view/prjedit.html.php b/module/program/view/prjedit.html.php
index 3429a44337..226edd98e6 100644
--- a/module/program/view/prjedit.html.php
+++ b/module/program/view/prjedit.html.php
@@ -52,7 +52,7 @@
           <th><?php echo $lang->program->PRJBudget;?></th>
           <td>
             <div class='input-group'>
-              <?php echo html::input('budget', $project->budget != 0 ? $project->budget : '', "class='form-control'" . (strpos($requiredFields, 'budget') !== false ? ' required' : '') . ($project->budget == 0 ? 'disabled' : ''));?>
+              <?php echo html::number('budget', $project->budget != 0 ? $project->budget : '', "class='form-control' min='0.00' step='0.01'" . (strpos($requiredFields, 'budget') !== false ? ' required' : '') . ($project->budget == 0 ? 'disabled' : ''));?>
               <span class='input-group-addon'></span>
               <?php echo html::select('budgetUnit', $lang->program->unitList, $project->budgetUnit, "class='form-control'");?>
             </div>