PM-2573, and status width correction

workflow/engine/js/strategicDashboard/viewDashboardHelper.js

@@ -15,6 +15,16 @@ ViewDashboardHelper.prototype.stringIfNull = function (val){
 	return val;
 };
 
+ViewDashboardHelper.prototype.zeroIfNull = function (val) {
+	var retval = 0;
+	if(val === null || val === undefined || val === "") {
+		retval = 0;
+	} else {
+		retval = val;
+	}
+	return retval;
+};
+
 ViewDashboardHelper.prototype.labelIfEmpty = function (val){
 	if(val === null || val == undefined || val == ""){
 		val = "(No Name)";

workflow/engine/js/strategicDashboard/viewDashboardPresenter.js

@@ -101,23 +101,26 @@ ViewDashboardPresenter.prototype.dashboardIndicatorsViewModel = function(data) {
 
 		newObject.favorite = 0;
 
-		newObject.percentageOverdueWidth = Math.round(newObject.percentageOverdue);
+		/*newObject.percentageOverdueWidth = Math.round(newObject.percentageOverdue);
 		newObject.percentageAtRiskWidth = Math.round(newObject.percentageAtRisk);
 		//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.percentageOverdueToShow = ((newObject.percentageOverdue == null || newObject.percentageOverdue <= 20 ) 
 											? "" 
 											: newObject.percentageOverdueWidth + "%");
 
-		newObject.percentageAtRiskToShow = ((newObject.percentageAtRisk == 0 || newObject.percentageAtRisk == null) 
+		newObject.percentageAtRiskToShow = ((newObject.percentageAtRisk == null || newObject.percentageAtRisk == 0) 
 											? "" 
 											: newObject.percentageAtRiskWidth + "%");
 
-		newObject.percentageOnTimeToShow = ((newObject.percentageOnTime == 0 || newObject.percentageOnTime == 0) 
+		newObject.percentageOnTimeToShow = ((newObject.percentageOnTime == 0 
+											&& newObject.percentageAtRisk == 0
+											&& newObject.percentageOverdue == 0) 
 											? G_STRING['ID_INBOX']  + ' ' + G_STRING['ID_EMPTY'] 
 											: newObject.percentageOnTimeWidth + "%");
-
+		*/
+		that.setStatusButtonWidthsAndDisplayValues(newObject);
 		newObject.overdueVisibility = (newObject.percentageOverdueWidth > 0) ? "visible" : "hidden";
 		newObject.atRiskVisibility = (newObject.percentageAtRiskWidth > 0) ? "visible" : "hidden";
 		newObject.onTimeVisibility = (newObject.percentageOnTimeWidth > 0) ? "visible" : "hidden";
@@ -135,6 +138,77 @@ ViewDashboardPresenter.prototype.dashboardIndicatorsViewModel = function(data) {
 	return returnList;
 };
 
+
+ViewDashboardPresenter.prototype.setStatusButtonWidthsAndDisplayValues = function (data) {
+	var minPercent = 10;
+	var barsLessThanMin = [];
+	var barsNormal = [];
+
+	var classifyBar = function (bar) {
+		if (bar.valueRounded <= minPercent && bar.valueRounded > 0) {
+			barsLessThanMin.push (bar);
+		} else {
+			barsNormal.push (bar)	
+		}
+	}
+
+	var atRisk = {
+		type : "atRisk",
+		value : data.percentageAtRisk,
+		valueRounded : Math.round(data.percentageAtRisk)
+	};
+
+	var overdue = {
+		type : "overdue",
+		value : data.percentageOverdue,
+		valueRounded : Math.round(data.percentageOverdue)
+	};
+
+	var onTime = {
+		type : "onTime",
+		value : data.percentageOnTime,
+		valueRounded : Math.round(data.percentageOnTime)
+	};
+
+	atRisk.valueToShow = (this.helper.zeroIfNull(atRisk.valueRounded) == 0) 
+						? ""
+						: atRisk.valueRounded + "%";
+
+	overdue.valueToShow = (this.helper.zeroIfNull(overdue.valueRounded) == 0) 
+						? ""
+						: overdue.valueRounded + "%";
+
+	onTime.valueToShow = (this.helper.zeroIfNull(onTime.valueRounded) == 0) 
+						? G_STRING['ID_INBOX']  + ' ' + G_STRING['ID_EMPTY'] 
+						: onTime.valueRounded + "%";
+
+	classifyBar(atRisk);
+	classifyBar(overdue);
+	classifyBar(onTime);
+
+	var widthToDivide = 100 - barsLessThanMin.length * minPercent;
+	var normalsSum = 0;
+	$.each (barsNormal, function() {
+		normalsSum += this.valueRounded;
+	});
+
+	$.each(barsNormal, function(key, bar) {
+		bar.width = widthToDivide * bar.valueRounded / normalsSum;
+	});
+
+	$.each(barsLessThanMin, function(key, bar) {
+		bar.width = minPercent;
+	});
+
+	data.percentageOverdueWidth = overdue.width;
+	data.percentageOnTimeWidth = onTime.width;
+	data.percentageAtRiskWidth = atRisk.width;
+
+	data.percentageOverdueToShow = overdue.valueToShow;
+	data.percentageAtRiskToShow = atRisk.valueToShow;
+	data.percentageOnTimeToShow = onTime.valueToShow;
+}
+
 /*++++++++ FIRST LEVEL INDICATOR DATA +++++++++++++*/
 ViewDashboardPresenter.prototype.getIndicatorData = function (indicatorId, indicatorType, initDate, endDate) {
 	var that = this;

workflow/engine/js/strategicDashboard/viewDashboardView.js

@@ -195,6 +195,18 @@ WidgetBuilder.prototype.getIndicatorLoadedById = function (searchedIndicatorId)
 	return retval;
 }
 
+WidgetBuilder.prototype.getDashboardLoadedById = function (searchedDashboardId) {
+	var retval = null;
+	for (key in window.loadedDashboards) {
+		var dashboard = window.loadedDashboards[key];
+		if (dashboard.id == searchedDashboardId) {
+			retval = dashboard;		
+		}
+	}
+	if (retval == null) { throw new Error(searchedIndicatorId + " was not found in the loaded indicators.");}
+	return retval;
+}
+
 WidgetBuilder.prototype.buildGeneralIndicatorFirstView = function (indicatorData) {
 	_.templateSettings.variable = "indicator";
 	var template = _.template ($("script.generalIndicatorMainPanel").html());
@@ -223,6 +235,7 @@ model = new ViewDashboardModel(token, urlProxy, ws[3]);
 presenter = new ViewDashboardPresenter(model);
 
 window.loadedIndicators = []; //updated in das-title-selector.click->fillIndicatorWidgets, ready->fillIndicatorWidgets
+window.loadedDashboards = [];
 window.currentEntityData = null;
 window.currentIndicator = null;//updated in ind-button-selector.click ->loadIndicator, ready->loadIndicator
 window.currentDashboardId = null;
@@ -354,6 +367,7 @@ $(document).ready(function() {
 				.done(function(indicatorsVM) {
 					fillIndicatorWidgets(indicatorsVM);
 					loadIndicator(getFavoriteIndicator().id, defaultInitDate(), defaultEndDate());
+					setActiveDashboard();
 				});
 	});
 
@@ -431,6 +445,15 @@ var selectDefaultMonthAndYear = function () {
 	$('#year').val(compareYear);
 }
 
+var setActiveDashboard = function () {
+	var builder = new WidgetBuilder();
+	var dashboard = builder.getDashboardLoadedById(window.currentDashboardId);
+	if (dashboard == null) {
+		return;
+	}
+	$('#titleH4').text(dashboard.title);
+}
+
 var initialDraw = function () {
 	selectDefaultMonthAndYear();
 	presenter.getUserDashboards(pageUserId)
@@ -442,6 +465,7 @@ var initialDraw = function () {
 						.done(function(indicatorsVM) {
 							fillIndicatorWidgets(indicatorsVM);
 							loadIndicator(getFavoriteIndicator().id, defaultInitDate(), defaultEndDate());
+							setActiveDashboard();
 						});
 			});
 }
@@ -514,6 +538,7 @@ var fillDashboardsList = function (presenterData) {
 	}
 	_.templateSettings.variable = "dashboard";
 	var template = _.template ($("script.dashboardButtonTemplate").html())
+	window.loadedDashboards = presenterData;
 	for (key in presenterData) {
 		var dashboard = presenterData[key];
 		$('#dashboardsList').append(template(dashboard));