RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed the order Plotinfos are appended

Browse source 
* 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
This commit is contained in:
Farruco Sanjurjo 2011-01-10 12:40:23 +01:00
parent 1f071acb82
commit dde31cd2da
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
View file

@ -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");

8
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
View file

@ -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");

4
navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java
View file

@ -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");