diff --git a/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js b/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js index 13c8be6bf..2ac674d22 100644 --- a/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js +++ b/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js @@ -88,12 +88,12 @@ ViewDashboardPresenter.prototype.dashboardIndicatorsViewModel = function(data) { //rounding newObject.comparative = Math.round(newObject.comparative*100)/100; - newObject.comparative = ((newObject.comparative > 0)? "+": "") + newObject.comparative; + newObject.comparative = ((newObject.comparative > 0) ? "+": "") + newObject.comparative; newObject.percentComparative = (newObject.percentComparative != '--') ? '(' + newObject.percentComparative + '%)' : ""; - newObject.percentComparative = (newObject.comparative == 0) + newObject.percentComparative = (newObject.comparative == 0 && newObject.percentComparative != '') ? "(0%)" : newObject.percentComparative; diff --git a/workflow/engine/js/strategicDashboard/viewDashboardView.js b/workflow/engine/js/strategicDashboard/viewDashboardView.js index c5f03c931..6d2f112d3 100644 --- a/workflow/engine/js/strategicDashboard/viewDashboardView.js +++ b/workflow/engine/js/strategicDashboard/viewDashboardView.js @@ -535,7 +535,9 @@ var defaultEndDate = function () { var fillDashboardsList = function (presenterData) { if (presenterData == null || presenterData.length == 0) { - $('#dashboardsList').append(G_STRING['ID_NO_DATA_TO_DISPLAY']); + $('#dashboardMessage').text(G_STRING['ID_GRID_PAGE_NO_DASHBOARD_MESSAGE']); + $('#titleH4').text(G_STRING['ID_GRID_PAGE_NO_DASHBOARD_MESSAGE']); + $('#compareIndicators').hide(); } _.templateSettings.variable = "dashboard"; var template = _.template ($("script.dashboardButtonTemplate").html()) diff --git a/workflow/engine/templates/strategicDashboard/viewDashboard.html b/workflow/engine/templates/strategicDashboard/viewDashboard.html index 4460e1c8b..18925611e 100644 --- a/workflow/engine/templates/strategicDashboard/viewDashboard.html +++ b/workflow/engine/templates/strategicDashboard/viewDashboard.html @@ -358,7 +358,7 @@
{translate label="ID_DASH_CLICK_TO_VIEW"}
+{translate label="ID_DASH_CLICK_TO_VIEW"}