From 76a08d3b344714ac4dd76d2ade9ecfc844c065ba Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Wed, 3 Mar 2021 08:33:36 +0800 Subject: [PATCH] * Finish task#36328. --- module/program/control.php | 90 +++++++++++++------------- module/program/js/common.js | 4 +- module/program/lang/de.php | 2 +- module/program/lang/en.php | 2 +- module/program/lang/fr.php | 2 +- module/program/lang/vi.php | 2 +- module/program/model.php | 20 +++--- 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 +- 11 files changed, 65 insertions(+), 65 deletions(-) diff --git a/module/program/control.php b/module/program/control.php index f91252d57b..058976701d 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -170,14 +170,14 @@ class program extends control $this->view->title = $this->lang->program->PGMCreate; $this->view->position[] = $this->lang->program->PGMCreate; - $this->view->pmUsers = $this->loadModel('user')->getPairs('noclosed|nodeleted|pmfirst'); - $this->view->poUsers = $this->user->getPairs('noclosed|nodeleted|pofirst'); - $this->view->users = $this->user->getPairs('noclosed|nodeleted'); - $this->view->parentProgram = $parentProgram; - $this->view->parents = $this->program->getParentPairs(); - $this->view->PGMList = $this->program->getPGMList(); - $this->view->budgetUnitList = $this->program->getBudgetUnitList(); - $this->view->remainBudget = $this->program->getParentRemainBudget($parentProgram); + $this->view->pmUsers = $this->loadModel('user')->getPairs('noclosed|nodeleted|pmfirst'); + $this->view->poUsers = $this->user->getPairs('noclosed|nodeleted|pofirst'); + $this->view->users = $this->user->getPairs('noclosed|nodeleted'); + $this->view->parentProgram = $parentProgram; + $this->view->parents = $this->program->getParentPairs(); + $this->view->PGMList = $this->program->getPGMList(); + $this->view->budgetUnitList = $this->program->getBudgetUnitList(); + $this->view->availableBudget = $this->program->getAvailableBudget($parentProgram); $this->display(); } @@ -214,15 +214,15 @@ class program extends control $this->view->title = $this->lang->program->PGMEdit; $this->view->position[] = $this->lang->program->PGMEdit; - $this->view->pmUsers = $this->loadModel('user')->getPairs('noclosed|nodeleted|pmfirst', $program->PM); - $this->view->poUsers = $this->user->getPairs('noclosed|nodeleted|pofirst'); - $this->view->users = $this->user->getPairs('noclosed|nodeleted'); - $this->view->program = $program; - $this->view->parents = $parents; - $this->view->PGMList = $this->program->getPGMList(); - $this->view->budgetUnitList = $this->program->getBudgetUnitList(); - $this->view->parentProgram = $parentProgram; - $this->view->remainBudget = $this->program->getParentRemainBudget($parentProgram) + (float)$program->budget; + $this->view->pmUsers = $this->loadModel('user')->getPairs('noclosed|nodeleted|pmfirst', $program->PM); + $this->view->poUsers = $this->user->getPairs('noclosed|nodeleted|pofirst'); + $this->view->users = $this->user->getPairs('noclosed|nodeleted'); + $this->view->program = $program; + $this->view->parents = $parents; + $this->view->PGMList = $this->program->getPGMList(); + $this->view->budgetUnitList = $this->program->getBudgetUnitList(); + $this->view->parentProgram = $parentProgram; + $this->view->availableBudget = $this->program->getAvailableBudget($parentProgram) + (float)$program->budget; $this->display(); } @@ -724,17 +724,17 @@ class program extends control } /** - * Ajax get parent remain budget. + * Ajax get available budget. * * @param int $parentProgramID * @access public * @return void */ - public function ajaxGetParentRemainBudget($parentProgramID) + public function ajaxGetAvailableBudget($parentProgramID) { - $parentProgram = $this->program->getPGMByID($parentProgramID); - $remainBudget = $this->program->getParentRemainBudget($parentProgram); - echo number_format($remainBudget, 2); + $parentProgram = $this->program->getPGMByID($parentProgramID); + $availableBudget = $this->program->getAvailableBudget($parentProgram); + echo number_format($availableBudget, 2); } /** @@ -921,28 +921,28 @@ class program extends control $this->view->title = $this->lang->program->PRJCreate; $this->view->position[] = $this->lang->program->PRJCreate; - $this->view->pmUsers = $this->loadModel('user')->getPairs('noclosed|nodeleted|pmfirst'); - $this->view->users = $this->user->getPairs('noclosed|nodeleted'); - $this->view->copyProjects = $this->program->getPRJPairsByModel(); - $this->view->products = $products; - $this->view->allProducts = array('0' => '') + $this->program->getPGMProductPairs($programID); - $this->view->productPlans = array('0' => '') + $productPlans; - $this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($products)); - $this->view->programID = $programID; - $this->view->model = $model; - $this->view->name = $name; - $this->view->code = $code; - $this->view->team = $team; - $this->view->acl = $acl; - $this->view->auth = $auth; - $this->view->whitelist = $whitelist; - $this->view->copyProjectID = $copyProjectID; - $this->view->from = $from; - $this->view->programList = $this->program->getParentPairs(); - $this->view->parentProgram = $parentProgram; - $this->view->URSRPairs = $this->loadModel('custom')->getURSRPairs(); - $this->view->remainBudget = $this->program->getParentRemainBudget($parentProgram); - $this->view->budgetUnitList = $this->program->getBudgetUnitList(); + $this->view->pmUsers = $this->loadModel('user')->getPairs('noclosed|nodeleted|pmfirst'); + $this->view->users = $this->user->getPairs('noclosed|nodeleted'); + $this->view->copyProjects = $this->program->getPRJPairsByModel(); + $this->view->products = $products; + $this->view->allProducts = array('0' => '') + $this->program->getPGMProductPairs($programID); + $this->view->productPlans = array('0' => '') + $productPlans; + $this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($products)); + $this->view->programID = $programID; + $this->view->model = $model; + $this->view->name = $name; + $this->view->code = $code; + $this->view->team = $team; + $this->view->acl = $acl; + $this->view->auth = $auth; + $this->view->whitelist = $whitelist; + $this->view->copyProjectID = $copyProjectID; + $this->view->from = $from; + $this->view->programList = $this->program->getParentPairs(); + $this->view->parentProgram = $parentProgram; + $this->view->URSRPairs = $this->loadModel('custom')->getURSRPairs(); + $this->view->availableBudget = $this->program->getAvailableBudget($parentProgram); + $this->view->budgetUnitList = $this->program->getBudgetUnitList(); $this->display(); } @@ -1043,7 +1043,7 @@ class program extends control $this->view->URSRPairs = $this->loadModel('custom')->getURSRPairs(); $this->view->from = $from; $this->view->parentProgram = $parentProgram; - $this->view->remainBudget = $this->program->getParentRemainBudget($parentProgram) + (float)$project->budget; + $this->view->availableBudget = $this->program->getAvailableBudget($parentProgram) + (float)$project->budget; $this->view->budgetUnitList = $this->program->getBudgetUnitList(); $this->display(); diff --git a/module/program/js/common.js b/module/program/js/common.js index 207146ffb7..b7c8ce0f56 100644 --- a/module/program/js/common.js +++ b/module/program/js/common.js @@ -293,13 +293,13 @@ function setBudgetTipsAndAclList(parentProgramID) { if(parentProgramID != 0) { - $.get(createLink('program', 'ajaxGetParentRemainBudget', "parentProgramID=" + parentProgramID), function(remainBudget) + $.get(createLink('program', 'ajaxGetAvailableBudget', "parentProgramID=" + parentProgramID), function(availableBudget) { parentProgram = PGMList[parentProgramID]; programBudget = parentProgram.budget; PGMBudgetUnit = currencySymbol[parentProgram.budgetUnit]; - budgetNotes = programBudget != 0 ? (PGMParentBudget + PGMBudgetUnit + remainBudget) : ''; + budgetNotes = programBudget != 0 ? (PGMParentBudget + PGMBudgetUnit + availableBudget) : ''; $('#budget').attr('placeholder', budgetNotes); }); $('.aclBox').html($('#subPGMAcl').html()); diff --git a/module/program/lang/de.php b/module/program/lang/de.php index ee0a757377..bee0f335ff 100644 --- a/module/program/lang/de.php +++ b/module/program/lang/de.php @@ -243,7 +243,7 @@ $lang->program->stakeholderType = 'Stakeholder type'; $lang->program->isStakeholderKey = 'Key stakeholder'; $lang->program->importStakeholder = 'Import program'; $lang->program->PGMManageMembers = 'Program Team'; -$lang->program->PGMParentBudget = 'Parent program remain budget：'; +$lang->program->PGMParentBudget = 'Parent program surplus budget：'; $lang->program->beyondParentBudget = 'The remaining budget of the owned program has been exceeded.'; $lang->program->PGMBeginLetterParent = "Parent begin date: %s, begin date should be > = parent begin date."; $lang->program->PGMEndGreaterParent = "Parent end date: %s, end date should be < = parent end date."; diff --git a/module/program/lang/en.php b/module/program/lang/en.php index ffabf69b6f..85d1d6bbe3 100644 --- a/module/program/lang/en.php +++ b/module/program/lang/en.php @@ -243,7 +243,7 @@ $lang->program->stakeholderType = 'Stakeholder type'; $lang->program->isStakeholderKey = 'Key stakeholder'; $lang->program->importStakeholder = 'Import program'; $lang->program->PGMManageMembers = 'Program Team'; -$lang->program->PGMParentBudget = 'Parent program remain budget：'; +$lang->program->PGMParentBudget = 'Parent program surplus budget：'; $lang->program->beyondParentBudget = 'The remaining budget of the owned program has been exceeded.'; $lang->program->PGMBeginLetterParent = "Parent begin date: %s, begin date should be > = parent begin date."; $lang->program->PGMEndGreaterParent = "Parent end date: %s, end date should be < = parent end date."; diff --git a/module/program/lang/fr.php b/module/program/lang/fr.php index 47fe2dd866..5f741f461e 100644 --- a/module/program/lang/fr.php +++ b/module/program/lang/fr.php @@ -243,7 +243,7 @@ $lang->program->stakeholderType = 'Stakeholder type'; $lang->program->isStakeholderKey = 'Key stakeholder'; $lang->program->importStakeholder = 'Import program'; $lang->program->PGMManageMembers = 'Program Team'; -$lang->program->PGMParentBudget = 'Parent program remain budget：'; +$lang->program->PGMParentBudget = 'Parent program surplus budget：'; $lang->program->beyondParentBudget = 'The remaining budget of the owned program has been exceeded.'; $lang->program->PGMBeginLetterParent = "Parent begin date: %s, begin date should be > = parent begin date."; $lang->program->PGMEndGreaterParent = "Parent end date: %s, end date should be < = parent end date."; diff --git a/module/program/lang/vi.php b/module/program/lang/vi.php index 47fe2dd866..5f741f461e 100644 --- a/module/program/lang/vi.php +++ b/module/program/lang/vi.php @@ -243,7 +243,7 @@ $lang->program->stakeholderType = 'Stakeholder type'; $lang->program->isStakeholderKey = 'Key stakeholder'; $lang->program->importStakeholder = 'Import program'; $lang->program->PGMManageMembers = 'Program Team'; -$lang->program->PGMParentBudget = 'Parent program remain budget：'; +$lang->program->PGMParentBudget = 'Parent program surplus budget：'; $lang->program->beyondParentBudget = 'The remaining budget of the owned program has been exceeded.'; $lang->program->PGMBeginLetterParent = "Parent begin date: %s, begin date should be > = parent begin date."; $lang->program->PGMEndGreaterParent = "Parent end date: %s, end date should be < = parent end date."; diff --git a/module/program/model.php b/module/program/model.php index 7bffd842be..a5921d597a 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -182,8 +182,8 @@ class programModel extends model $program->budgetUnit = $parentProgram->budgetUnit; if(isset($program->budget) and $parentProgram->budget != 0) { - $parentRemainBudget = $this->getParentRemainBudget($parentProgram); - if($program->budget > $parentRemainBudget) dao::$errors['budget'] = $this->lang->program->beyondParentBudget; + $availableBudget = $this->getAvailableBudget($parentProgram); + if($program->budget > $availableBudget) dao::$errors['budget'] = $this->lang->program->beyondParentBudget; } if(dao::isError()) return false; @@ -297,8 +297,8 @@ class programModel extends model $program->budgetUnit = $parentProgram->budgetUnit; if($program->budget != 0 and $parentProgram->budget != 0) { - $parentRemainBudget = $this->getParentRemainBudget($parentProgram); - if($program->budget > $parentRemainBudget + $oldProgram->budget) dao::$errors['budget'] = $this->lang->program->beyondParentBudget; + $availableBudget = $this->getAvailableBudget($parentProgram); + if($program->budget > $availableBudget + $oldProgram->budget) dao::$errors['budget'] = $this->lang->program->beyondParentBudget; } } if(dao::isError()) return false; @@ -715,13 +715,13 @@ class programModel extends model } /** - * Get parent remain budget. + * Get available budget. * * @param object $parentProgram * @access public * @return int */ - public function getParentRemainBudget($parentProgram) + public function getAvailableBudget($parentProgram) { if(empty($parentProgram)) return; @@ -1508,8 +1508,8 @@ class programModel extends model $project->budgetUnit = $parentProgram->budgetUnit; if(isset($project->budget) and $parentProgram->budget != 0) { - $parentRemainBudget = $this->getParentRemainBudget($parentProgram); - if($project->budget > $parentRemainBudget) dao::$errors['budget'] = $this->lang->program->beyondParentBudget; + $availableBudget = $this->getAvailableBudget($parentProgram); + if($project->budget > $availableBudget) dao::$errors['budget'] = $this->lang->program->beyondParentBudget; } /* Judge products not empty. */ @@ -1692,8 +1692,8 @@ class programModel extends model $project->budgetUnit = $parentProgram->budgetUnit; if($project->budget != 0 and $parentProgram->budget != 0) { - $parentRemainBudget = $this->getParentRemainBudget($parentProgram); - if($project->budget > $parentRemainBudget + $oldProject->budget) dao::$errors['budget'] = $this->lang->program->beyondParentBudget; + $availableBudget = $this->availableBudget($parentProgram); + if($project->budget > $availableBudget + $oldProject->budget) dao::$errors['budget'] = $this->lang->program->beyondParentBudget; } } diff --git a/module/program/view/pgmcreate.html.php b/module/program/view/pgmcreate.html.php index 36adf35b00..8959ee7d60 100644 --- a/module/program/view/pgmcreate.html.php +++ b/module/program/view/pgmcreate.html.php @@ -66,7 +66,7 @@ program->PGMBudget;?>
- budget != 0) ? 'placeholder=' . $lang->program->PGMParentBudget . zget($lang->program->currencySymbol, $parentProgram->budgetUnit) . $remainBudget : '';?> + budget != 0) ? 'placeholder=' . $lang->program->PGMParentBudget . zget($lang->program->currencySymbol, $parentProgram->budgetUnit) . $availableBudget : '';?> budgetUnit);?> diff --git a/module/program/view/pgmedit.html.php b/module/program/view/pgmedit.html.php index c0130dd4ae..73641ff0a7 100644 --- a/module/program/view/pgmedit.html.php +++ b/module/program/view/pgmedit.html.php @@ -44,7 +44,7 @@ program->PGMBudget;?>
- budget != 0) ? 'placeholder=' . $lang->program->PGMParentBudget . zget($lang->program->currencySymbol, $parentProgram->budgetUnit) . $remainBudget : '';?> + budget != 0) ? 'placeholder=' . $lang->program->PGMParentBudget . zget($lang->program->currencySymbol, $parentProgram->budgetUnit) . $availableBudget : '';?> budget != 0 ? $program->budget : '', "class='form-control' " . (strpos($requiredFields, 'budget') !== false ? 'required ' : '') . ($program->budget == 0 ? 'disabled ' : '') . $placeholder);?> budgetUnit);?> diff --git a/module/program/view/prjcreate.html.php b/module/program/view/prjcreate.html.php index 06192e1fb0..7af8dfc260 100644 --- a/module/program/view/prjcreate.html.php +++ b/module/program/view/prjcreate.html.php @@ -51,7 +51,7 @@ program->PRJBudget;?>
- budget != 0) ? 'placeholder=' . $lang->program->PGMParentBudget . zget($lang->program->currencySymbol, $parentProgram->budgetUnit) . $remainBudget : '';?> + budget != 0) ? 'placeholder=' . $lang->program->PGMParentBudget . zget($lang->program->currencySymbol, $parentProgram->budgetUnit) . $availableBudget : '';?> budgetUnit);?> diff --git a/module/program/view/prjedit.html.php b/module/program/view/prjedit.html.php index cf577331c3..639b11575e 100644 --- a/module/program/view/prjedit.html.php +++ b/module/program/view/prjedit.html.php @@ -49,7 +49,7 @@ program->PRJBudget;?>
- budget != 0) ? 'placeholder=' . $lang->program->PGMParentBudget . zget($lang->program->currencySymbol, $parentProgram->budgetUnit) . $remainBudget : '';?> + budget != 0) ? 'placeholder=' . $lang->program->PGMParentBudget . zget($lang->program->currencySymbol, $parentProgram->budgetUnit) . $availableBudget : '';?> budget != 0 ? $project->budget : '', "class='form-control' " . (strpos($requiredFields, 'budget') !== false ? 'required ' : '') . ($project->budget == 0 ? 'disabled ' : '') . $placeholder);?> budgetUnit);?>