From 07667fd294b212fb234ba356e7cc62d051e4742a Mon Sep 17 00:00:00 2001 From: Nacho Barrientos Date: Tue, 22 Nov 2011 18:01:02 +0100 Subject: [PATCH] Fix marginWithDeadline chart. * Add fixed bounds to range axis. * Set series color. * Adjust chart width. FEA: ItEr75S27PerProjectDashboard --- .../web/dashboard/DashboardController.java | 13 +++++++++++++ .../main/webapp/dashboard/_dashboardfororder.zul | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java b/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java index 5a274c5f5..39f79947d 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java @@ -23,6 +23,7 @@ import static org.libreplan.web.I18nHelper._; import java.awt.Color; import java.awt.Font; +import java.math.BigDecimal; import java.util.Iterator; import java.util.List; @@ -105,6 +106,18 @@ public class DashboardController extends GenericForwardComposer { private void generateTimeKPImarginWithDeadlineChart() { CategoryModel categoryModel; categoryModel = refreshTimeKPImarginWithDeadlineCategoryModel(); + timeKPImarginWithDeadlineChart.setAttribute("range-axis-lower-bound", + new Double(-3.0)); + timeKPImarginWithDeadlineChart.setAttribute("range-axis-upper-bound", + new Double(3.0)); + Color[] seriesColorMappings = new Color[1]; + if(dashboardModel.getMarginWithDeadLine().compareTo(BigDecimal.ZERO) >= 0) { + seriesColorMappings[0] = Color.GREEN; + } else { + seriesColorMappings[0] = Color.RED; + } + timeKPImarginWithDeadlineChart.setAttribute("series-color-mappings", + seriesColorMappings); timeKPImarginWithDeadlineChart.setModel(categoryModel); } diff --git a/libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul b/libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul index 5e31afb2d..fea3de327 100644 --- a/libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul +++ b/libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul @@ -55,7 +55,7 @@ paneColor="#FFFFFF" bgColor="#FFFFFF" showLegend="true" showTooltiptext="true" />