diff --git a/module/my/view/project.html.php b/module/my/view/project.html.php
index 654a9c242e..1a35922d15 100644
--- a/module/my/view/project.html.php
+++ b/module/my/view/project.html.php
@@ -60,7 +60,7 @@
begin;?> |
end == '0000-00-00' ? '' : $project->end;?> |
- budget . ' ' . zget($lang->program->unitList, $project->budgetUnit);?> |
+ budget != 0 ? zget($lang->program->currencySymbol, $project->budgetUnit) . number_format($project->budget, 2) : $lang->program->future;?> |
PM]) ? $PMList[$project->PM]->id : ''?>
PM)) echo html::a($this->createLink('user', 'profile', "userID=$userID", '', true), zget($users, $project->PM), '', "data-toggle='modal' data-type='iframe' data-width='600'");?>
diff --git a/module/program/control.php b/module/program/control.php
index 0f2dc009f1..26964cf0eb 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -721,6 +721,20 @@ class program extends control
echo $html;
}
+ /**
+ * Ajax get parent remain budget.
+ *
+ * @param int $parentProgramID
+ * @access public
+ * @return void
+ */
+ public function ajaxGetParentRemainBudget($parentProgramID)
+ {
+ $parentProgram = $this->program->getPGMByID($parentProgramID);
+ $remainBudget = $this->program->getParentRemainBudget($parentProgram);
+ echo number_format($remainBudget, 2);
+ }
+
/**
* Update program order.
*
diff --git a/module/program/js/common.js b/module/program/js/common.js
index 5a7ff92d58..207146ffb7 100644
--- a/module/program/js/common.js
+++ b/module/program/js/common.js
@@ -293,12 +293,15 @@ function setBudgetTipsAndAclList(parentProgramID)
{
if(parentProgramID != 0)
{
- parentProgram = PGMList[parentProgramID];
- programBudget = parentProgram.budget;
- PGMBudgetUnit = budgetUnitList[parentProgram.budgetUnit];
+ $.get(createLink('program', 'ajaxGetParentRemainBudget', "parentProgramID=" + parentProgramID), function(remainBudget)
+ {
+ parentProgram = PGMList[parentProgramID];
+ programBudget = parentProgram.budget;
+ PGMBudgetUnit = currencySymbol[parentProgram.budgetUnit];
- budgetNotes = programBudget != 0 ? (programBudget + PGMBudgetUnit) : future;
- $('#budget').attr('placeholder', PGMParentBudget + budgetNotes);
+ budgetNotes = programBudget != 0 ? (PGMParentBudget + PGMBudgetUnit + remainBudget) : '';
+ $('#budget').attr('placeholder', budgetNotes);
+ });
$('.aclBox').html($('#subPGMAcl').html());
}
else
diff --git a/module/program/lang/de.php b/module/program/lang/de.php
index d66de6fd8f..a64779f08c 100644
--- a/module/program/lang/de.php
+++ b/module/program/lang/de.php
@@ -92,23 +92,41 @@ $lang->program->morePRJ = 'More Project';
$lang->program->productNotEmpty = 'Please link products or create products.';
$lang->program->existProductName = 'Product name already exists.';
-$lang->program->unitList['CNY'] = 'RMB ¥';
-$lang->program->unitList['USD'] = 'USD $';
-$lang->program->unitList['HKD'] = 'HKD $';
-$lang->program->unitList['NTD'] = 'New Taiwan $';
-$lang->program->unitList['EUR'] = 'Euro €';
+$lang->program->unitList['CNY'] = 'RMB';
+$lang->program->unitList['USD'] = 'USD';
+$lang->program->unitList['HKD'] = 'HKD';
+$lang->program->unitList['NTD'] = 'New Taiwan';
+$lang->program->unitList['EUR'] = 'Euro';
$lang->program->unitList['DEM'] = 'Deutsche Mark';
$lang->program->unitList['CHF'] = 'Swiss Franc';
$lang->program->unitList['FRF'] = 'French Franc';
-$lang->program->unitList['GBP'] = 'Pound £';
+$lang->program->unitList['GBP'] = 'Pound';
$lang->program->unitList['NLG'] = 'Florin';
-$lang->program->unitList['CAD'] = 'Canadian $';
+$lang->program->unitList['CAD'] = 'Canadian';
$lang->program->unitList['RUR'] = 'Russian Ruble';
-$lang->program->unitList['INR'] = 'Indian ₹';
-$lang->program->unitList['AUD'] = 'Australian $';
-$lang->program->unitList['NZD'] = 'New Zealand $';
+$lang->program->unitList['INR'] = 'Indian';
+$lang->program->unitList['AUD'] = 'Australian';
+$lang->program->unitList['NZD'] = 'New Zealand';
$lang->program->unitList['THB'] = 'Thai Baht';
-$lang->program->unitList['SGD'] = 'Singapore $';
+$lang->program->unitList['SGD'] = 'Singapore';
+
+$lang->program->currencySymbol['CNY'] = '¥';
+$lang->program->currencySymbol['USD'] = '$';
+$lang->program->currencySymbol['HKD'] = 'HK$';
+$lang->program->currencySymbol['NTD'] = 'NT$';
+$lang->program->currencySymbol['EUR'] = '€';
+$lang->program->currencySymbol['DEM'] = 'DEM';
+$lang->program->currencySymbol['CHF'] = '₣';
+$lang->program->currencySymbol['FRF'] = '₣';
+$lang->program->currencySymbol['GBP'] = '£';
+$lang->program->currencySymbol['NLG'] = 'ƒ';
+$lang->program->currencySymbol['CAD'] = '$';
+$lang->program->currencySymbol['RUR'] = '₽';
+$lang->program->currencySymbol['INR'] = '₹';
+$lang->program->currencySymbol['AUD'] = 'A$';
+$lang->program->currencySymbol['NZD'] = 'NZ$';
+$lang->program->currencySymbol['THB'] = '฿';
+$lang->program->currencySymbol['SGD'] = 'S$';
$lang->program->modelList['scrum'] = "Scrum";
$lang->program->modelList['waterfall'] = "CMMI";
diff --git a/module/program/lang/en.php b/module/program/lang/en.php
index 67072cfd48..969f40d7cd 100644
--- a/module/program/lang/en.php
+++ b/module/program/lang/en.php
@@ -92,23 +92,41 @@ $lang->program->morePRJ = 'More Project';
$lang->program->productNotEmpty = 'Please link products or create products.';
$lang->program->existProductName = 'Product name already exists.';
-$lang->program->unitList['CNY'] = 'RMB ¥';
-$lang->program->unitList['USD'] = 'USD $';
-$lang->program->unitList['HKD'] = 'HKD $';
-$lang->program->unitList['NTD'] = 'New Taiwan $';
-$lang->program->unitList['EUR'] = 'Euro €';
+$lang->program->unitList['CNY'] = 'RMB';
+$lang->program->unitList['USD'] = 'USD';
+$lang->program->unitList['HKD'] = 'HKD';
+$lang->program->unitList['NTD'] = 'New Taiwan';
+$lang->program->unitList['EUR'] = 'Euro';
$lang->program->unitList['DEM'] = 'Deutsche Mark';
$lang->program->unitList['CHF'] = 'Swiss Franc';
$lang->program->unitList['FRF'] = 'French Franc';
-$lang->program->unitList['GBP'] = 'Pound £';
+$lang->program->unitList['GBP'] = 'Pound';
$lang->program->unitList['NLG'] = 'Florin';
-$lang->program->unitList['CAD'] = 'Canadian $';
+$lang->program->unitList['CAD'] = 'Canadian';
$lang->program->unitList['RUR'] = 'Russian Ruble';
-$lang->program->unitList['INR'] = 'Indian ₹';
-$lang->program->unitList['AUD'] = 'Australian $';
-$lang->program->unitList['NZD'] = 'New Zealand $';
+$lang->program->unitList['INR'] = 'Indian';
+$lang->program->unitList['AUD'] = 'Australian';
+$lang->program->unitList['NZD'] = 'New Zealand';
$lang->program->unitList['THB'] = 'Thai Baht';
-$lang->program->unitList['SGD'] = 'Singapore $';
+$lang->program->unitList['SGD'] = 'Singapore';
+
+$lang->program->currencySymbol['CNY'] = '¥';
+$lang->program->currencySymbol['USD'] = '$';
+$lang->program->currencySymbol['HKD'] = 'HK$';
+$lang->program->currencySymbol['NTD'] = 'NT$';
+$lang->program->currencySymbol['EUR'] = '€';
+$lang->program->currencySymbol['DEM'] = 'DEM';
+$lang->program->currencySymbol['CHF'] = '₣';
+$lang->program->currencySymbol['FRF'] = '₣';
+$lang->program->currencySymbol['GBP'] = '£';
+$lang->program->currencySymbol['NLG'] = 'ƒ';
+$lang->program->currencySymbol['CAD'] = '$';
+$lang->program->currencySymbol['RUR'] = '₽';
+$lang->program->currencySymbol['INR'] = '₹';
+$lang->program->currencySymbol['AUD'] = 'A$';
+$lang->program->currencySymbol['NZD'] = 'NZ$';
+$lang->program->currencySymbol['THB'] = '฿';
+$lang->program->currencySymbol['SGD'] = 'S$';
$lang->program->modelList['scrum'] = "Scrum";
$lang->program->modelList['waterfall'] = "CMMI";
diff --git a/module/program/lang/fr.php b/module/program/lang/fr.php
index 45d02f9bb8..1b092b14a2 100644
--- a/module/program/lang/fr.php
+++ b/module/program/lang/fr.php
@@ -92,23 +92,41 @@ $lang->program->morePRJ = 'More Projects';
$lang->program->productNotEmpty = 'Please link products or create products.';
$lang->program->existProductName = 'Product name already exists.';
-$lang->program->unitList['CNY'] = 'RMB ¥';
-$lang->program->unitList['USD'] = 'USD $';
-$lang->program->unitList['HKD'] = 'HKD $';
-$lang->program->unitList['NTD'] = 'New Taiwan $';
-$lang->program->unitList['EUR'] = 'Euro €';
+$lang->program->unitList['CNY'] = 'RMB';
+$lang->program->unitList['USD'] = 'USD';
+$lang->program->unitList['HKD'] = 'HKD';
+$lang->program->unitList['NTD'] = 'New Taiwan';
+$lang->program->unitList['EUR'] = 'Euro';
$lang->program->unitList['DEM'] = 'Deutsche Mark';
$lang->program->unitList['CHF'] = 'Swiss Franc';
$lang->program->unitList['FRF'] = 'French Franc';
-$lang->program->unitList['GBP'] = 'Pound £';
+$lang->program->unitList['GBP'] = 'Pound';
$lang->program->unitList['NLG'] = 'Florin';
-$lang->program->unitList['CAD'] = 'Canadian $';
+$lang->program->unitList['CAD'] = 'Canadian';
$lang->program->unitList['RUR'] = 'Russian Ruble';
-$lang->program->unitList['INR'] = 'Indian ₹';
-$lang->program->unitList['AUD'] = 'Australian $';
-$lang->program->unitList['NZD'] = 'New Zealand $';
+$lang->program->unitList['INR'] = 'Indian';
+$lang->program->unitList['AUD'] = 'Australian';
+$lang->program->unitList['NZD'] = 'New Zealand';
$lang->program->unitList['THB'] = 'Thai Baht';
-$lang->program->unitList['SGD'] = 'Singapore $';
+$lang->program->unitList['SGD'] = 'Singapore';
+
+$lang->program->currencySymbol['CNY'] = '¥';
+$lang->program->currencySymbol['USD'] = '$';
+$lang->program->currencySymbol['HKD'] = 'HK$';
+$lang->program->currencySymbol['NTD'] = 'NT$';
+$lang->program->currencySymbol['EUR'] = '€';
+$lang->program->currencySymbol['DEM'] = 'DEM';
+$lang->program->currencySymbol['CHF'] = '₣';
+$lang->program->currencySymbol['FRF'] = '₣';
+$lang->program->currencySymbol['GBP'] = '£';
+$lang->program->currencySymbol['NLG'] = 'ƒ';
+$lang->program->currencySymbol['CAD'] = '$';
+$lang->program->currencySymbol['RUR'] = '₽';
+$lang->program->currencySymbol['INR'] = '₹';
+$lang->program->currencySymbol['AUD'] = 'A$';
+$lang->program->currencySymbol['NZD'] = 'NZ$';
+$lang->program->currencySymbol['THB'] = '฿';
+$lang->program->currencySymbol['SGD'] = 'S$';
$lang->program->modelList['scrum'] = "Scrum";
$lang->program->modelList['waterfall'] = "CMMI";
diff --git a/module/program/lang/vi.php b/module/program/lang/vi.php
index 45d02f9bb8..1b092b14a2 100644
--- a/module/program/lang/vi.php
+++ b/module/program/lang/vi.php
@@ -92,23 +92,41 @@ $lang->program->morePRJ = 'More Projects';
$lang->program->productNotEmpty = 'Please link products or create products.';
$lang->program->existProductName = 'Product name already exists.';
-$lang->program->unitList['CNY'] = 'RMB ¥';
-$lang->program->unitList['USD'] = 'USD $';
-$lang->program->unitList['HKD'] = 'HKD $';
-$lang->program->unitList['NTD'] = 'New Taiwan $';
-$lang->program->unitList['EUR'] = 'Euro €';
+$lang->program->unitList['CNY'] = 'RMB';
+$lang->program->unitList['USD'] = 'USD';
+$lang->program->unitList['HKD'] = 'HKD';
+$lang->program->unitList['NTD'] = 'New Taiwan';
+$lang->program->unitList['EUR'] = 'Euro';
$lang->program->unitList['DEM'] = 'Deutsche Mark';
$lang->program->unitList['CHF'] = 'Swiss Franc';
$lang->program->unitList['FRF'] = 'French Franc';
-$lang->program->unitList['GBP'] = 'Pound £';
+$lang->program->unitList['GBP'] = 'Pound';
$lang->program->unitList['NLG'] = 'Florin';
-$lang->program->unitList['CAD'] = 'Canadian $';
+$lang->program->unitList['CAD'] = 'Canadian';
$lang->program->unitList['RUR'] = 'Russian Ruble';
-$lang->program->unitList['INR'] = 'Indian ₹';
-$lang->program->unitList['AUD'] = 'Australian $';
-$lang->program->unitList['NZD'] = 'New Zealand $';
+$lang->program->unitList['INR'] = 'Indian';
+$lang->program->unitList['AUD'] = 'Australian';
+$lang->program->unitList['NZD'] = 'New Zealand';
$lang->program->unitList['THB'] = 'Thai Baht';
-$lang->program->unitList['SGD'] = 'Singapore $';
+$lang->program->unitList['SGD'] = 'Singapore';
+
+$lang->program->currencySymbol['CNY'] = '¥';
+$lang->program->currencySymbol['USD'] = '$';
+$lang->program->currencySymbol['HKD'] = 'HK$';
+$lang->program->currencySymbol['NTD'] = 'NT$';
+$lang->program->currencySymbol['EUR'] = '€';
+$lang->program->currencySymbol['DEM'] = 'DEM';
+$lang->program->currencySymbol['CHF'] = '₣';
+$lang->program->currencySymbol['FRF'] = '₣';
+$lang->program->currencySymbol['GBP'] = '£';
+$lang->program->currencySymbol['NLG'] = 'ƒ';
+$lang->program->currencySymbol['CAD'] = '$';
+$lang->program->currencySymbol['RUR'] = '₽';
+$lang->program->currencySymbol['INR'] = '₹';
+$lang->program->currencySymbol['AUD'] = 'A$';
+$lang->program->currencySymbol['NZD'] = 'NZ$';
+$lang->program->currencySymbol['THB'] = '฿';
+$lang->program->currencySymbol['SGD'] = 'S$';
$lang->program->modelList['scrum'] = "Scrum";
$lang->program->modelList['waterfall'] = "CMMI";
diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php
index 9de7a196a8..a004d49276 100644
--- a/module/program/lang/zh-cn.php
+++ b/module/program/lang/zh-cn.php
@@ -110,6 +110,24 @@ $lang->program->unitList['NZD'] = '新西兰元';
$lang->program->unitList['THB'] = '泰国铢';
$lang->program->unitList['SGD'] = '新加坡元';
+$lang->program->currencySymbol['CNY'] = '¥';
+$lang->program->currencySymbol['USD'] = '$';
+$lang->program->currencySymbol['HKD'] = 'HK$';
+$lang->program->currencySymbol['NTD'] = 'NT$';
+$lang->program->currencySymbol['EUR'] = '€';
+$lang->program->currencySymbol['DEM'] = 'DEM';
+$lang->program->currencySymbol['CHF'] = '₣';
+$lang->program->currencySymbol['FRF'] = '₣';
+$lang->program->currencySymbol['GBP'] = '£';
+$lang->program->currencySymbol['NLG'] = 'ƒ';
+$lang->program->currencySymbol['CAD'] = '$';
+$lang->program->currencySymbol['RUR'] = '₽';
+$lang->program->currencySymbol['INR'] = '₹';
+$lang->program->currencySymbol['AUD'] = 'A$';
+$lang->program->currencySymbol['NZD'] = 'NZ$';
+$lang->program->currencySymbol['THB'] = '฿';
+$lang->program->currencySymbol['SGD'] = 'S$';
+
$lang->program->modelList['scrum'] = "Scrum";
$lang->program->modelList['waterfall'] = "瀑布";
diff --git a/module/program/lang/zh-tw.php b/module/program/lang/zh-tw.php
index 540df6c2e3..d8a7404ccf 100644
--- a/module/program/lang/zh-tw.php
+++ b/module/program/lang/zh-tw.php
@@ -109,6 +109,24 @@ $lang->program->unitList['NZD'] = '新西蘭元';
$lang->program->unitList['THB'] = '泰國銖';
$lang->program->unitList['SGD'] = '新加坡元';
+$lang->program->currencySymbol['CNY'] = '¥';
+$lang->program->currencySymbol['USD'] = '$';
+$lang->program->currencySymbol['HKD'] = 'HK$';
+$lang->program->currencySymbol['NTD'] = 'NT$';
+$lang->program->currencySymbol['EUR'] = '€';
+$lang->program->currencySymbol['DEM'] = 'DEM';
+$lang->program->currencySymbol['CHF'] = '₣';
+$lang->program->currencySymbol['FRF'] = '₣';
+$lang->program->currencySymbol['GBP'] = '£';
+$lang->program->currencySymbol['NLG'] = 'ƒ';
+$lang->program->currencySymbol['CAD'] = '$';
+$lang->program->currencySymbol['RUR'] = '₽';
+$lang->program->currencySymbol['INR'] = '₹';
+$lang->program->currencySymbol['AUD'] = 'A$';
+$lang->program->currencySymbol['NZD'] = 'NZ$';
+$lang->program->currencySymbol['THB'] = '฿';
+$lang->program->currencySymbol['SGD'] = 'S$';
+
$lang->program->modelList['scrum'] = "Scrum";
$lang->program->modelList['waterfall'] = "瀑布";
diff --git a/module/program/model.php b/module/program/model.php
index 0ac14072ad..11c14b39c3 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -176,6 +176,7 @@ class programModel extends model
if(empty($program->end) and $this->post->delta == 999 and $parentProgram->end != '0000-00-00') dao::$errors['end'] = sprintf($this->lang->program->PGMEndGreaterParent, $parentProgram->end);
/* The budget of a child program cannot beyond the remaining budget of the parent program. */
+ $program->budgetUnit = $parentProgram->budgetUnit;
if(isset($program->budget) and $parentProgram->budget != 0)
{
$parentRemainBudget = $this->getParentRemainBudget($parentProgram);
@@ -290,6 +291,7 @@ class programModel extends model
}
/* The budget of a child program cannot beyond the remaining budget of the parent program. */
+ $program->budgetUnit = $parentProgram->budgetUnit;
if($program->budget != 0 and $parentProgram->budget != 0)
{
$parentRemainBudget = $this->getParentRemainBudget($parentProgram);
@@ -1387,6 +1389,7 @@ class programModel extends model
}
/* The budget of a child project cannot beyond the remaining budget of the parent program. */
+ $project->budgetUnit = $parentProgram->budgetUnit;
if(isset($project->budget) and $parentProgram->budget != 0)
{
$parentRemainBudget = $this->getParentRemainBudget($parentProgram);
@@ -1566,6 +1569,7 @@ class programModel extends model
}
/* The budget of a child project cannot beyond the remaining budget of the parent program. */
+ $project->budgetUnit = $parentProgram->budgetUnit;
if($project->budget != 0 and $parentProgram->budget != 0)
{
$parentRemainBudget = $this->getParentRemainBudget($parentProgram);
@@ -1699,7 +1703,7 @@ class programModel extends model
echo " " . zget($this->lang->program->statusList, $project->status) . "";
break;
case 'PRJBudget':
- echo $project->budget != 0 ? $project->budget . zget($this->lang->program->unitList, $project->budgetUnit) : $this->lang->program->future;
+ echo $project->budget != 0 ? zget($this->lang->program->currencySymbol, $project->budgetUnit) . number_format($project->budget, 2) : $this->lang->program->future;
break;
case 'teamCount':
echo $project->teamCount;
diff --git a/module/program/view/pgmbrowsebylist.html.php b/module/program/view/pgmbrowsebylist.html.php
index 3d2f98d1a6..6c2ef43dea 100644
--- a/module/program/view/pgmbrowsebylist.html.php
+++ b/module/program/view/pgmbrowsebylist.html.php
@@ -56,7 +56,7 @@
PM]) ? $PMList[$program->PM]->id : ''?>
PM)) echo html::a($this->createLink('user', 'profile', "userID=$userID", '', true), zget($users, $program->PM), '', "data-toggle='modal' data-type='iframe' data-width='600'");?>
|
- budget != 0 ? $program->budget . ' ' . zget($lang->program->unitList, $program->budgetUnit) : $lang->program->future;?> |
+ budget != 0 ? zget($lang->program->currencySymbol, $program->budgetUnit) . number_format($program->budget, 2) : $lang->program->future;?> |
project->statusList, $program->status, '');?> |
begin;?> |
end == LONG_TIME ? $lang->program->PRJLongTime : $program->end;?> |
diff --git a/module/program/view/pgmcreate.html.php b/module/program/view/pgmcreate.html.php
index f113fc616d..99f79d9c92 100644
--- a/module/program/view/pgmcreate.html.php
+++ b/module/program/view/pgmcreate.html.php
@@ -35,7 +35,7 @@
project->placeholder);?>
project->errorSameProducts);?>
program->PRJLongTime);?>
-program->unitList);?>
+program->currencySymbol);?>
program->PGMParentBudget);?>
program->future);?>
@@ -66,7 +66,7 @@
program->PGMBudget;?> |
|