fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Money symbol not harcoded

Browse Source
This commit is contained in:
Dante
2015-04-28 11:23:11 -04:00
parent 4f06ad8611
commit 0eac01f44d
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
workflow/engine/js/strategicDashboard/viewDashboardPresenter.js
View File

@@ -165,7 +165,7 @@ ViewDashboardPresenter.prototype.peiViewModel = function(data) {
}; };
var newObject = that.helper.merge(originalObject, {}, map); var newObject = that.helper.merge(originalObject, {}, map);
graphData.push(newObject); graphData.push(newObject);
originalObject.inefficiencyCostToShow = "$ " + Math.round(originalObject.inefficiencyCost); originalObject.inefficiencyCostToShow = Math.round(originalObject.inefficiencyCost);
originalObject.efficiencyIndexToShow = Math.round(originalObject.efficiencyIndex * 100) / 100; originalObject.efficiencyIndexToShow = Math.round(originalObject.efficiencyIndex * 100) / 100;
originalObject.indicatorId = data.id; originalObject.indicatorId = data.id;
originalObject.json = JSON.stringify(originalObject); originalObject.json = JSON.stringify(originalObject);
@@ -177,8 +177,7 @@ ViewDashboardPresenter.prototype.peiViewModel = function(data) {
this.makeShortLabel(graphData, 10); this.makeShortLabel(graphData, 10);
retval.dataToDraw = this.adaptGraphData(graphData); retval.dataToDraw = this.adaptGraphData(graphData);
//TODO aumentar el símbolo de moneda $ retval.inefficiencyCostToShow = Math.round(retval.inefficiencyCost);
retval.inefficiencyCostToShow = "$ " +Math.round(retval.inefficiencyCost);
retval.efficiencyIndexToShow = Math.round(retval.efficiencyIndex * 100) / 100; retval.efficiencyIndexToShow = Math.round(retval.efficiencyIndex * 100) / 100;
return retval; return retval;
}; };
@@ -196,7 +195,7 @@ ViewDashboardPresenter.prototype.ueiViewModel = function(data) {
}; };
var newObject = that.helper.merge(originalObject, {}, map); var newObject = that.helper.merge(originalObject, {}, map);
graphData.push(newObject); graphData.push(newObject);
originalObject.inefficiencyCostToShow = "$ " + Math.round(originalObject.inefficiencyCost); originalObject.inefficiencyCostToShow = Math.round(originalObject.inefficiencyCost);
originalObject.efficiencyIndexToShow = Math.round(originalObject.efficiencyIndex * 100) / 100; originalObject.efficiencyIndexToShow = Math.round(originalObject.efficiencyIndex * 100) / 100;
originalObject.indicatorId = data.id; originalObject.indicatorId = data.id;
originalObject.json = JSON.stringify(originalObject); originalObject.json = JSON.stringify(originalObject);
@@ -207,8 +206,7 @@ ViewDashboardPresenter.prototype.ueiViewModel = function(data) {
this.makeShortLabel(graphData, 10); this.makeShortLabel(graphData, 10);
retval.dataToDraw = this.adaptGraphData(graphData); retval.dataToDraw = this.adaptGraphData(graphData);
//TODO aumentar el símbolo de moneda $ retval.inefficiencyCostToShow = Math.round(retval.inefficiencyCost);
retval.inefficiencyCostToShow = "$ " + Math.round(retval.inefficiencyCost);
retval.efficiencyIndexToShow = Math.round(retval.efficiencyIndex * 100) / 100; retval.efficiencyIndexToShow = Math.round(retval.efficiencyIndex * 100) / 100;
return retval; return retval;
}; };
@@ -223,10 +221,8 @@ ViewDashboardPresenter.prototype.statusViewModel = function(indicatorId, data) {
$.each(data.dataList, function(index, originalObject) { $.each(data.dataList, function(index, originalObject) {
originalObject.taskTitle = that.helper.labelIfEmpty(originalObject.taskTitle); originalObject.taskTitle = that.helper.labelIfEmpty(originalObject.taskTitle);
//TODO use more that 10 chars when the label and color problem in pie 2D is solved.
var title = originalObject.taskTitle.substring(0,10); var title = originalObject.taskTitle.substring(0,10);
//TODO Do not use the str. replace when color and lable in pie 2D is solved.
var newObject1 = { var newObject1 = {
datalabel : title, datalabel : title,
value : originalObject.percentageTotalOverdue value : originalObject.percentageTotalOverdue
@@ -258,7 +254,7 @@ ViewDashboardPresenter.prototype.statusViewModel = function(indicatorId, data) {
retval.graph1Data = this.orderGraphData(graph1Data, "down").splice(0,7) retval.graph1Data = this.orderGraphData(graph1Data, "down").splice(0,7)
retval.graph2Data = this.orderGraphData(graph2Data, "down").splice(0,7) retval.graph2Data = this.orderGraphData(graph2Data, "down").splice(0,7)
retval.graph3Data = this.orderGraphData(graph3Data, "down").splice(0,7) retval.graph3Data = this.orderGraphData(graph3Data, "down").splice(0,7)
//TODO correct 2D Pie so we don't depend on label name
$.each(retval.graph1Data, function(index, item) { item.datalabel = (index + 1) + "." + item.datalabel; }); $.each(retval.graph1Data, function(index, item) { item.datalabel = (index + 1) + "." + item.datalabel; });
$.each(retval.graph2Data, function(index, item) { item.datalabel = (index + 1) + "." + item.datalabel; }); $.each(retval.graph2Data, function(index, item) { item.datalabel = (index + 1) + "." + item.datalabel; });
$.each(retval.graph3Data, function(index, item) { item.datalabel = (index + 1) + "." + item.datalabel; }); $.each(retval.graph3Data, function(index, item) { item.datalabel = (index + 1) + "." + item.datalabel; });
@@ -329,7 +325,7 @@ ViewDashboardPresenter.prototype.returnIndicatorSecondLevelPei = function(modelD
"deviationTime" : "dispersion" "deviationTime" : "dispersion"
}; };
var newObject = that.helper.merge(originalObject, {}, map); var newObject = that.helper.merge(originalObject, {}, map);
originalObject.inefficiencyCostToShow = "$ " + Math.round(originalObject.inefficiencyCost); originalObject.inefficiencyCostToShow = Math.round(originalObject.inefficiencyCost);
originalObject.efficiencyIndexToShow = Math.round(originalObject.efficiencyIndex * 100) / 100; originalObject.efficiencyIndexToShow = Math.round(originalObject.efficiencyIndex * 100) / 100;
originalObject.deviationTimeToShow = Math.round(originalObject.deviationTime); originalObject.deviationTimeToShow = Math.round(originalObject.deviationTime);
originalObject.rankToShow = originalObject.rank + "/" + modelData.length; originalObject.rankToShow = originalObject.rank + "/" + modelData.length;
@@ -356,7 +352,7 @@ ViewDashboardPresenter.prototype.returnIndicatorSecondLevelUei = function(modelD
"deviationTime" : "dispersion" "deviationTime" : "dispersion"
}; };
var newObject = that.helper.merge(originalObject, {}, map); var newObject = that.helper.merge(originalObject, {}, map);
originalObject.inefficiencyCostToShow = "$ " +Math.round(originalObject.inefficiencyCost); originalObject.inefficiencyCostToShow = Math.round(originalObject.inefficiencyCost);
originalObject.efficiencyIndexToShow = Math.round(originalObject.efficiencyIndex * 100) / 100; originalObject.efficiencyIndexToShow = Math.round(originalObject.efficiencyIndex * 100) / 100;
originalObject.deviationTimeToShow = Math.round(originalObject.deviationTime); originalObject.deviationTimeToShow = Math.round(originalObject.deviationTime);
originalObject.rankToShow = originalObject.rank + "/" + modelData.length; originalObject.rankToShow = originalObject.rank + "/" + modelData.length;

9
workflow/engine/templates/strategicDashboard/viewDashboard.html
View File

@@ -29,6 +29,7 @@
var urlProxy = '{$urlProxy}'; var urlProxy = '{$urlProxy}';
var pageUserId = '{$usrId}'; var pageUserId = '{$usrId}';
var token = '{$credentials.access_token}'; var token = '{$credentials.access_token}';
var moneyUnit = '{$unitCost}';
var G_STRING = []; var G_STRING = [];
{foreach from=$translation key=index item=option} {foreach from=$translation key=index item=option}
G_STRING['{$index}'] = "{$option}"; G_STRING['{$index}'] = "{$option}";
@@ -163,7 +164,7 @@
<div class="small grey sind-index-selector ellipsis"></div> <div class="small grey sind-index-selector ellipsis"></div>
</div> </div>
<div class="col-xs-3 vcenter" style="margin-right:40px"> <div class="col-xs-3 vcenter" style="margin-right:40px">
<div class="red sind-cost-number-selector"><%- indicator.inefficiencyCostToShow %></div> <div class="red sind-cost-number-selector">{$unitCost} <%- indicator.inefficiencyCostToShow %></div>
<div class="small grey sind-cost-selector ellipsis"></div> <div class="small grey sind-cost-selector ellipsis"></div>
</div> </div>
<div class="col-xs-6" id="specialIndicatorGraph" style="width:540px;height:300px;"></div> <div class="col-xs-6" id="specialIndicatorGraph" style="width:540px;height:300px;"></div>
@@ -192,7 +193,7 @@
<div class="small grey detail-efficiency-selector ellipsis"></div> <div class="small grey detail-efficiency-selector ellipsis"></div>
</div> </div>
<div class="col-xs-3 text-center "> <div class="col-xs-3 text-center ">
<div class="red detail-cost-number-selector"><%- detailData.inefficiencyCostToShow %></div> <div class="red detail-cost-number-selector">{$unitCost}<%- detailData.inefficiencyCostToShow %></div>
<div class="small grey detail-cost-selector ellipsis"></div> <div class="small grey detail-cost-selector ellipsis"></div>
</div> </div>
<div class="col-xs-1 text-right arrow"><i class="fa fa-chevron-right fa-fw"></i></div> <div class="col-xs-1 text-right arrow"><i class="fa fa-chevron-right fa-fw"></i></div>
@@ -222,7 +223,7 @@
<div class="smallB grey detail-efficiency-selector ellipsis"></div> <div class="smallB grey detail-efficiency-selector ellipsis"></div>
</div> </div>
<div class="col-xs-6 "> <div class="col-xs-6 ">
<div class="small detail-cost-number-selector"><%- detailData.inefficiencyCostToShow%></div> <div class="small detail-cost-number-selector">{$unitCost}<%- detailData.inefficiencyCostToShow%></div>
<div class="smallB grey detail-cost-selector ellipsis"></div> <div class="smallB grey detail-cost-selector ellipsis"></div>
</div> </div>
</div> </div>
@@ -250,7 +251,7 @@
<div class="smallB grey detail-efficiency-selector ellipsis"></div> <div class="smallB grey detail-efficiency-selector ellipsis"></div>
</div> </div>
<div class="col-xs-6 "> <div class="col-xs-6 ">
<div class="small detail-cost-number-selector"><%- detailData.inefficiencyCostToShow%></div> <div class="small detail-cost-number-selector">{$unitCost}<%- detailData.inefficiencyCostToShow%></div>
<div class="smallB grey detail-cost-selector ellipsis"></div> <div class="smallB grey detail-cost-selector ellipsis"></div>
</div> </div>
</div> </div>