diff --git a/module/program/js/common.js b/module/program/js/common.js
index 16b71084dd..59e8c3eb05 100644
--- a/module/program/js/common.js
+++ b/module/program/js/common.js
@@ -295,11 +295,10 @@ $(function()
function setBudgetTipsAndAclList(parentID)
{
var selectedProgramID = $('#parent').val();
- var budget = $('#budget').val();
if(parentID != 0)
{
- $.get(createLink('project', 'ajaxGetProgramInformation', "objectType=program&objectID=" + parentID + "&selectedProgramID=" + selectedProgramID + "&budget=" + budget), function(data)
+ $.get(createLink('project', 'ajaxGetParentInfor', "objectType=program&objectID=" + parentID + "&selectedProgramID=" + selectedProgramID), function(data)
{
var data = JSON.parse(data);
parentProgram = programList[parentID];
@@ -338,7 +337,7 @@ function budgetOverrunTips()
}
if(typeof(programID) == 'undefined') programID = 0;
- $.get(createLink('project', 'ajaxGetProgramInformation', 'objectType=program&objectID=' + programID + "&selectedProgramID=" + selectedProgramID + "&budget=" + budget), function(data)
+ $.get(createLink('project', 'ajaxGetParentInfor', 'objectType=program&objectID=' + programID + "&selectedProgramID=" + selectedProgramID), function(data)
{
var data = JSON.parse(data);
diff --git a/module/project/control.php b/module/project/control.php
index c2719f788e..4b6dcdb4ea 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -225,11 +225,10 @@ class project extends control
* @param str $objectType
* @param int $objectID
* @param int $selectedProgramID
- * @param int $budget
* @access public
* @return void
*/
- public function ajaxGetProgramInformation($objectType, $objectID, $selectedProgramID, $budget)
+ public function ajaxGetParentInfor($objectType, $objectID, $selectedProgramID)
{
if(!empty($objectID))
{
@@ -244,7 +243,7 @@ class project extends control
$availableBudget = $this->program->getBudgetLeft($selectedProgram);
}
- $data = array('selectedProgramBegin' => $selectedProgram->begin, 'selectedProgramEnd' => $selectedProgram->end, 'availableBudget' => number_format($availableBudget, 2), 'budgetUnit' => $selectedProgram->budgetUnit);
+ $data = array('selectedProgramBegin' => $selectedProgram->begin, 'selectedProgramEnd' => $selectedProgram->end, 'availableBudget' => $availableBudget, 'budgetUnit' => $selectedProgram->budgetUnit);
echo json_encode($data);
}
diff --git a/module/project/js/common.js b/module/project/js/common.js
index 0c4fd9bb17..ad28526f9a 100644
--- a/module/project/js/common.js
+++ b/module/project/js/common.js
@@ -335,17 +335,17 @@ function budgetOverrunTips()
}
if(typeof(projectID) == 'undefined') projectID = 0;
- $.get(createLink('project', 'ajaxGetProgramInformation', 'objectType=project&objectID=' + projectID + "&selectedProgramID=" + selectedProgramID + "&budget=" + budget), function(data)
+ $.get(createLink('project', 'ajaxGetParentInfor', 'objectType=project&objectID=' + projectID + "&selectedProgramID=" + selectedProgramID), function(data)
{
var data = JSON.parse(data);
var tip = "";
- if(budget !=0 && budget !== null && budget > data.availableBudget) tip = "" + budgetOverrun + currencySymbol[data.budgetUnit] + data.availableBudget + ""
+ if(budget != 0 && budget !== null && budget > data.availableBudget) tip = "" + budgetOverrun + currencySymbol[data.budgetUnit] + data.availableBudget.toFixed(2) + ""
if($('#beyondBudgetTip').length > 0) $('#beyondBudgetTip').remove();
$('#budgetBox').after(tip);
var placeholder = '';
- if(selectedProgramID) placeholder = parentBudget + currencySymbol[data.budgetUnit] + data.availableBudget;
+ if(selectedProgramID) placeholder = parentBudget + currencySymbol[data.budgetUnit] + data.availableBudget.toFixed(2);
if($('#budget').attr('placeholder')) $('#budget').removeAttr('placeholder')
$('#budget').attr('placeholder', placeholder);
});