diff --git a/workflow/engine/js/strategicDashboard/viewDashboardModel.js b/workflow/engine/js/strategicDashboard/viewDashboardModel.js index 6a96e1c3f..56e3b3840 100644 --- a/workflow/engine/js/strategicDashboard/viewDashboardModel.js +++ b/workflow/engine/js/strategicDashboard/viewDashboardModel.js @@ -1,8 +1,8 @@ var ViewDashboardModel = function (oauthToken, server, workspace) { this.server = server; this.workspace = workspace; - this.baseUrl = "/api/1.0/" + workspace + "/"; - //this.baseUrl = "http://127.0.0.1:8080/api/1.0/workflow/"; + //this.baseUrl = "/api/1.0/" + workspace + "/"; + this.baseUrl = "http://127.0.0.1:8080/api/1.0/workflow/"; this.oauthToken = oauthToken; this.helper = new ViewDashboardHelper(); this.cache = []; diff --git a/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js b/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js index 4472f14d2..e1ed03b45 100644 --- a/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js +++ b/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js @@ -106,18 +106,21 @@ ViewDashboardPresenter.prototype.dashboardIndicatorsViewModel = function(data) { //to be sure that percentages sum up to 100 (the rounding will lose decimals)% newObject.percentageOnTimeWidth = 100 - newObject.percentageOverdueWidth - newObject.percentageAtRiskWidth; - newObject.percentageOverdueToShow = ((newObject.percentageOverdue == 0 ||newObject.percentageOverdue == null ) ? "" : newObject.percentageOverdueWidth + "%"); - newObject.percentageAtRiskToShow = ((newObject.percentageAtRisk == 0 || newObject.percentageAtRisk == null) ? "" : newObject.percentageAtRiskWidth + "%"); + newObject.percentageOverdueToShow = ((newObject.percentageOverdue == 0 ||newObject.percentageOverdue == null ) + ? "" + : newObject.percentageOverdueWidth + "%"); + + newObject.percentageAtRiskToShow = ((newObject.percentageAtRisk == 0 || newObject.percentageAtRisk == null) + ? "" + : newObject.percentageAtRiskWidth + "%"); + newObject.percentageOnTimeToShow = ((newObject.percentageOnTime == 0 || newObject.percentageOnTime == 0) ? G_STRING['ID_INBOX'] + ' ' + G_STRING['ID_EMPTY'] : newObject.percentageOnTimeWidth + "%"); - - - - newObject.overdueVisibility = (newObject.percentageOverdue > 0)? "visible" : "hidden"; - newObject.atRiskVisibility = (newObject.percentageAtRisk > 0)? "visible" : "hidden"; - newObject.onTimeVisibility = (newObject.percentageOnTime > 0)? "visible" : "hidden"; + newObject.overdueVisibility = (newObject.percentageOverdueWidth > 0) ? "visible" : "hidden"; + newObject.atRiskVisibility = (newObject.percentageAtRiskWidth > 0) ? "visible" : "hidden"; + newObject.onTimeVisibility = (newObject.percentageOnTimeWidth > 0) ? "visible" : "hidden"; returnList.push(newObject); i++; });