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

status percent corrections

Browse Source
This commit is contained in:
Dante
2015-04-29 11:27:36 -04:00
parent 773e9b5cbd
commit 9997c05d5e
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/js/strategicDashboard/viewDashboardModel.js
View File

@@ -1,8 +1,8 @@
var ViewDashboardModel = function (oauthToken, server, workspace) { var ViewDashboardModel = function (oauthToken, server, workspace) {
this.server = server; this.server = server;
this.workspace = workspace; this.workspace = workspace;
this.baseUrl = "/api/1.0/" + workspace + "/"; //this.baseUrl = "/api/1.0/" + workspace + "/";
//this.baseUrl = "http://127.0.0.1:8080/api/1.0/workflow/"; this.baseUrl = "http://127.0.0.1:8080/api/1.0/workflow/";
this.oauthToken = oauthToken; this.oauthToken = oauthToken;
this.helper = new ViewDashboardHelper(); this.helper = new ViewDashboardHelper();
this.cache = []; this.cache = [];

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

@@ -106,18 +106,21 @@ ViewDashboardPresenter.prototype.dashboardIndicatorsViewModel = function(data) {
//to be sure that percentages sum up to 100 (the rounding will lose decimals)% //to be sure that percentages sum up to 100 (the rounding will lose decimals)%
newObject.percentageOnTimeWidth = 100 - newObject.percentageOverdueWidth - newObject.percentageAtRiskWidth; newObject.percentageOnTimeWidth = 100 - newObject.percentageOverdueWidth - newObject.percentageAtRiskWidth;
newObject.percentageOverdueToShow = ((newObject.percentageOverdue == 0 ||newObject.percentageOverdue == null ) ? "" : newObject.percentageOverdueWidth + "%"); newObject.percentageOverdueToShow = ((newObject.percentageOverdue == 0 ||newObject.percentageOverdue == null )
newObject.percentageAtRiskToShow = ((newObject.percentageAtRisk == 0 || newObject.percentageAtRisk == null) ? "" : newObject.percentageAtRiskWidth + "%"); ? ""
: newObject.percentageOverdueWidth + "%");
newObject.percentageAtRiskToShow = ((newObject.percentageAtRisk == 0 || newObject.percentageAtRisk == null)
? ""
: newObject.percentageAtRiskWidth + "%");
newObject.percentageOnTimeToShow = ((newObject.percentageOnTime == 0 || newObject.percentageOnTime == 0) newObject.percentageOnTimeToShow = ((newObject.percentageOnTime == 0 || newObject.percentageOnTime == 0)
? G_STRING['ID_INBOX'] + ' ' + G_STRING['ID_EMPTY'] ? G_STRING['ID_INBOX'] + ' ' + G_STRING['ID_EMPTY']
: newObject.percentageOnTimeWidth + "%"); : newObject.percentageOnTimeWidth + "%");
newObject.overdueVisibility = (newObject.percentageOverdueWidth > 0) ? "visible" : "hidden";
newObject.atRiskVisibility = (newObject.percentageAtRiskWidth > 0) ? "visible" : "hidden";
newObject.onTimeVisibility = (newObject.percentageOnTimeWidth > 0) ? "visible" : "hidden";
newObject.overdueVisibility = (newObject.percentageOverdue > 0)? "visible" : "hidden";
newObject.atRiskVisibility = (newObject.percentageAtRisk > 0)? "visible" : "hidden";
newObject.onTimeVisibility = (newObject.percentageOnTime > 0)? "visible" : "hidden";
returnList.push(newObject); returnList.push(newObject);
i++; i++;
}); });