From eca2f06b87ba24807624316291d474e12aec161c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= Date: Mon, 28 Mar 2011 20:59:52 +0200 Subject: [PATCH] [Bug #948] Improved graphs colour coherence Now always overload is represented with red scale based colours and load with green tones. In project view perspective the general load/overload is translucid just to give the additional information. FEA: ItEr73S04BugFixing --- .../web/planner/company/CompanyPlanningModel.java | 6 +++--- .../web/planner/order/OrderPlanningModel.java | 9 ++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java index 26c50dd4c..714a146f5 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java @@ -124,9 +124,9 @@ import org.zkoss.zul.Vbox; @Scope(BeanDefinition.SCOPE_SINGLETON) public abstract class CompanyPlanningModel implements ICompanyPlanningModel { - public static final String COLOR_ASSIGNED_LOAD_GLOBAL = "#98D471"; // green - public static final String COLOR_CAPABILITY_LINE = "#000000"; // black - public static final String COLOR_OVERLOAD_GLOBAL = "#FDBE13"; + public static final String COLOR_CAPABILITY_LINE = "#000000"; // Black + public static final String COLOR_ASSIGNED_LOAD_GLOBAL = "#98D471"; // Green + public static final String COLOR_OVERLOAD_GLOBAL = "#FF5A11"; // Red @Autowired private IOrderDAO orderDAO; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java index 0e96f5877..9a835a7cb 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java @@ -162,11 +162,10 @@ import org.zkoss.zul.Vbox; public abstract class OrderPlanningModel implements IOrderPlanningModel { public static final String COLOR_CAPABILITY_LINE = "#000000"; // Black - - public static final String COLOR_ASSIGNED_LOAD_GLOBAL = "#98D471"; // Green - public static final String COLOR_OVERLOAD_GLOBAL = "#FDBE13"; // Orange - - public static final String COLOR_ASSIGNED_LOAD_SPECIFIC = "#AA80d5"; // Violet + public static final String COLOR_ASSIGNED_LOAD_GLOBAL = "#E0F3D3"; // Soft + // green + public static final String COLOR_OVERLOAD_GLOBAL = "#FFD4C2"; // Soft red + public static final String COLOR_ASSIGNED_LOAD_SPECIFIC = "#98D471"; // Green public static final String COLOR_OVERLOAD_SPECIFIC = "#FF5A11"; // Red private static final Log LOG = LogFactory.getLog(OrderPlanningModel.class);