Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix program and project budget.

Browse Source
This commit is contained in:
sgm0422
2021-01-03 14:08:37 +08:00
parent 670ea7c68a
commit 6c6161562a
6 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/program/css/prjedit.css
+1
View File
@@ -1 +1,2 @@
#budget {border-right:0px;}
#budgetUnit {border-left: 0px;}
module/program/model.php
+4 -4
View File
@@ -156,7 +156,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((float)$this->post->budget, 2))
->setIF($this->post->budget != 0, 'budget', round($this->post->budget, 2))
->add('type', 'program')
->join('whitelist', ',')
->stripTags($this->config->program->editor->pgmcreate['id'], $this->config->allowedTags)
@@ -268,7 +268,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((float)$this->post->budget, 2))
->setIF($this->post->budget != 0, 'budget', round($this->post->budget, 2))
->join('whitelist', ',')
->stripTags($this->config->program->editor->pgmedit['id'], $this->config->allowedTags)
->remove('uid,delta,future')
@@ -1309,7 +1309,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((float)$this->post->budget, 2))
->setIF($this->post->budget != 0, 'budget', round($this->post->budget, 2))
->setDefault('openedBy', $this->app->user->account)
->setDefault('openedDate', helper::now())
->setDefault('team', substr($this->post->name, 0, 30))
@@ -1507,7 +1507,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((float)$this->post->budget, 2))
->setIF($this->post->budget != 0, 'budget', round($this->post->budget, 2))
->join('whitelist', ',')
->stripTags($this->config->program->editor->prjedit['id'], $this->config->allowedTags)
->remove('products,branch,plans,delta,future')
module/program/view/pgmcreate.html.php
+1 -1
View File
@@ -61,7 +61,7 @@
<th><?php echo $lang->program->PGMBudget;?></th>
<td>
<div class='input-group'>
<?php echo html::number('budget', '', "class='form-control' min='0.00' step='0.01'" . (strpos($requiredFields, 'budget') !== false ? ' required' : ''));?>
<?php echo html::input('budget', '', "class='form-control' " . (strpos($requiredFields, 'budget') !== false ? ' required' : ''));?>
<span class='input-group-addon fix-border'></span>
<?php echo html::select('budgetUnit', $lang->program->unitList, empty($parentProgram->budgetUnit) ? 'wanyuan' : $parentProgram->budgetUnit, "class='form-control'");?>
</div>
module/program/view/pgmedit.html.php
+1 -1
View File
@@ -44,7 +44,7 @@
<th><?php echo $lang->program->PGMBudget;?></th>
<td>
<div class='input-group'>
<?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' : ''));?>
<?php echo html::input('budget', $program->budget != 0 ? $program->budget : '', "class='form-control' " . (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>
module/program/view/prjcreate.html.php
+1 -1
View File
@@ -51,7 +51,7 @@
<th><?php echo $lang->program->PRJBudget;?></th>
<td>
<div class='input-group'>
<?php echo html::number('budget', '', "class='form-control' min='0.00' step='0.01'" . (strpos($requiredFields, 'budget') !== false ? ' required' : ''));?>
<?php echo html::input('budget', '', "class='form-control' " . (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>
module/program/view/prjedit.html.php
+1 -1
View File
@@ -52,7 +52,7 @@
<th><?php echo $lang->program->PRJBudget;?></th>
<td>
<div class='input-group'>
<?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' : ''));?>
<?php echo html::input('budget', $project->budget != 0 ? $project->budget : '', "class='form-control' " . (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>