diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CompanyPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CompanyPlanningModel.java index 9dc3537e1..fcd965f3f 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CompanyPlanningModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/CompanyPlanningModel.java @@ -70,6 +70,8 @@ import org.zkoss.ganttz.timetracker.TimeTracker; import org.zkoss.ganttz.timetracker.zoom.IZoomLevelChangedListener; import org.zkoss.ganttz.timetracker.zoom.ZoomLevel; import org.zkoss.ganttz.util.Interval; +import org.zkoss.zk.ui.Executions; +import org.zkoss.zul.Div; /** * Model for company planning view. @@ -130,6 +132,8 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel { configuration.setAddingDependenciesEnabled(false); + configuration.setChartLegend(getChartLegend()); + planner.setConfiguration(configuration); setupChart(chartComponent, planner.getTimeTracker()); @@ -458,4 +462,13 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel { } } + private org.zkoss.zk.ui.Component getChartLegend() { + Div div = new Div(); + + Executions.createComponents("/planner/_legendCompanyPlanner.zul", div, + null); + + return div; + } + } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java index 983979f9a..b22d77765 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java @@ -74,6 +74,8 @@ import org.zkoss.ganttz.timetracker.TimeTracker; import org.zkoss.ganttz.timetracker.zoom.IZoomLevelChangedListener; import org.zkoss.ganttz.timetracker.zoom.ZoomLevel; import org.zkoss.ganttz.util.Interval; +import org.zkoss.zk.ui.Executions; +import org.zkoss.zul.Div; /** * @author Óscar González Fernández @@ -150,6 +152,8 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel { Timeplot chartComponent = new Timeplot(); configuration.setChartComponent(chartComponent); + configuration.setChartLegend(getChartLegend()); + planner.setConfiguration(configuration); setupChart(orderReloaded, chartComponent, planner.getTimeTracker()); @@ -617,4 +621,13 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel { } } + private org.zkoss.zk.ui.Component getChartLegend() { + Div div = new Div(); + + Executions.createComponents("/planner/_legendOrderPlanner.zul", div, + null); + + return div; + } + } diff --git a/navalplanner-webapp/src/main/webapp/planner/_legendCompanyPlanner.zul b/navalplanner-webapp/src/main/webapp/planner/_legendCompanyPlanner.zul new file mode 100644 index 000000000..3782553db --- /dev/null +++ b/navalplanner-webapp/src/main/webapp/planner/_legendCompanyPlanner.zul @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/navalplanner-webapp/src/main/webapp/planner/_legendOrderPlanner.zul b/navalplanner-webapp/src/main/webapp/planner/_legendOrderPlanner.zul new file mode 100644 index 000000000..c791b88e1 --- /dev/null +++ b/navalplanner-webapp/src/main/webapp/planner/_legendOrderPlanner.zul @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +