From dde451e37fbe64fe25c7e2f0328552b7ed872e51 Mon Sep 17 00:00:00 2001 From: Dante Date: Fri, 29 May 2015 11:45:37 -0400 Subject: [PATCH] Revert "rounding two 2 decimals the indicator's old value" This reverts commit 67b4e31a3075cca526a063cfed85f70e5a00cabc. --- .../engine/js/strategicDashboard/viewDashboardPresenter.js | 5 +---- .../engine/templates/strategicDashboard/viewDashboard.html | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js b/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js index b7905e6ef..449a8ccd5 100644 --- a/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js +++ b/workflow/engine/js/strategicDashboard/viewDashboardPresenter.js @@ -70,6 +70,7 @@ ViewDashboardPresenter.prototype.dashboardIndicatorsViewModel = function(data) { "DAS_IND_PERCENT_VARIATION" : "percentComparative", "DAS_IND_DIRECTION" : "direction", "DAS_IND_VALUE" : "value", + "DAS_IND_OLD_VALUE" : "oldValue", "DAS_IND_X" : "x", "DAS_IND_Y" : "y", "DAS_IND_WIDTH" : "width", @@ -108,10 +109,6 @@ ViewDashboardPresenter.prototype.dashboardIndicatorsViewModel = function(data) { : newObject.percentComparative; newObject.value = that.roundedIndicatorValue(newObject.value); - - //we don't use the database values to avoid rounding differences - newObject.oldValue = newObject.value - newObject.comparative - newObject.favorite = 0; that.setStatusButtonWidthsAndDisplayValues(newObject); diff --git a/workflow/engine/templates/strategicDashboard/viewDashboard.html b/workflow/engine/templates/strategicDashboard/viewDashboard.html index 58b11bc69..39705503d 100644 --- a/workflow/engine/templates/strategicDashboard/viewDashboard.html +++ b/workflow/engine/templates/strategicDashboard/viewDashboard.html @@ -53,11 +53,10 @@
<%- indicator.value %>
-
<%- indicator.oldValue %>
- <%- indicator.oldValue %> <%- indicator.comparative %> <%- indicator.percentComparative %> + <%- indicator.comparative %> <%- indicator.percentComparative %>