From dde31cd2daefbc2c6c5c16b0a3e0aaca7dab6521 Mon Sep 17 00:00:00 2001 From: Farruco Sanjurjo Date: Mon, 10 Jan 2011 12:40:23 +0100 Subject: [PATCH] Changed the order Plotinfos are appended * If the want to maintaint this order: overloads on the back, maximum capacity on the middle and current load on the front; we have append Plotinfo objects on this new order to the Timeplot component. Otherwise the overload layer will hide everything as it was the last to be added. FEA: ItEr02S03MigracionZK5 --- .../web/planner/company/CompanyPlanningModel.java | 5 +++-- .../web/planner/order/OrderPlanningModel.java | 8 +++++--- .../web/resourceload/ResourceLoadController.java | 4 ++-- 3 files changed, 10 insertions(+), 7 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 93dc951e1..58b64f680 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 @@ -811,9 +811,10 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel { ValueGeometry valueGeometry = getValueGeometry(); TimeGeometry timeGeometry = getTimeGeometry(interval); - appendPlotinfo(chart, plotInfoLoad, valueGeometry, timeGeometry); - appendPlotinfo(chart, plotInfoMax, valueGeometry, timeGeometry); + appendPlotinfo(chart, plotInfoOverload, valueGeometry, timeGeometry); + appendPlotinfo(chart, plotInfoMax, valueGeometry, timeGeometry); + appendPlotinfo(chart, plotInfoLoad, valueGeometry, timeGeometry); chart.setWidth(size + "px"); chart.setHeight("150px"); 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 dc829d033..e94da457f 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 @@ -1210,13 +1210,15 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel { TimeGeometry timeGeometry = getTimeGeometry(interval); // Stacked area: load - otherLoad - max - overload - otherOverload - appendPlotinfo(chart, plotOrderLoad, valueGeometry, timeGeometry); - appendPlotinfo(chart, plotOtherLoad, valueGeometry, timeGeometry); - appendPlotinfo(chart, plotMaxCapacity, valueGeometry, timeGeometry); appendPlotinfo(chart, plotOrderOverload, valueGeometry, timeGeometry); appendPlotinfo(chart, plotOtherOverload, valueGeometry, timeGeometry); + appendPlotinfo(chart, plotMaxCapacity, valueGeometry, timeGeometry); + appendPlotinfo(chart, plotOrderLoad, valueGeometry, timeGeometry); + appendPlotinfo(chart, plotOtherLoad, valueGeometry, timeGeometry); + + chart.setWidth(size + "px"); chart.setHeight("150px"); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java index 0917f954b..3f4ac4aa1 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java @@ -625,9 +625,9 @@ public class ResourceLoadController implements Composer { ValueGeometry valueGeometry = getValueGeometry(); TimeGeometry timeGeometry = getTimeGeometry(interval); - appendPlotinfo(chart, plotInfoLoad, valueGeometry, timeGeometry); - appendPlotinfo(chart, plotInfoMax, valueGeometry, timeGeometry); appendPlotinfo(chart, plotInfoOverload, valueGeometry, timeGeometry); + appendPlotinfo(chart, plotInfoMax, valueGeometry, timeGeometry); + appendPlotinfo(chart, plotInfoLoad, valueGeometry, timeGeometry); chart.setWidth(size + "px"); chart.setHeight("150px");