diff --git a/ganttzk-demo-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java b/ganttzk-demo-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java index af8893f65..b1c9fe362 100644 --- a/ganttzk-demo-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java +++ b/ganttzk-demo-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java @@ -35,7 +35,6 @@ import org.zkoss.ganttz.adapters.IStructureNavigator; import org.zkoss.ganttz.adapters.PlannerConfiguration; import org.zkoss.ganttz.data.DefaultFundamentalProperties; import org.zkoss.ganttz.data.DependencyType; -import org.zkoss.ganttz.data.GanttDiagramGraph; import org.zkoss.ganttz.data.ITaskFundamentalProperties; import org.zkoss.ganttz.extensions.ICommand; import org.zkoss.ganttz.extensions.ICommandOnTask; @@ -54,10 +53,6 @@ public class DataForPlanner { } - public GanttDiagramGraph getEmpty() { - return new GanttDiagramGraph(); - } - private PlannerConfiguration addCommands( PlannerConfiguration configuration) { configuration @@ -179,7 +174,8 @@ public class DataForPlanner { return false; } }; - return new PlannerConfiguration( + return mustStartNotTwoMonthsBeforeThan(now, + new PlannerConfiguration( new AutoAdapter() { @Override public List> getOutcomingDependencies( @@ -194,9 +190,17 @@ public class DataForPlanner { } return result; } - }, navigator, list); + }, navigator, list)); } + private PlannerConfiguration mustStartNotTwoMonthsBeforeThan( + Date date, + PlannerConfiguration plannerConfiguration) { + plannerConfiguration.setNotBeforeThan(twoMonthsBefore(date)); + return plannerConfiguration; + } + + private DefaultFundamentalProperties createTask(String name, Date now, Date end) { return new DefaultFundamentalProperties(name, end, end.getTime() @@ -209,6 +213,13 @@ public class DataForPlanner { twoMonthsLater(new Date()))); } + private Date twoMonthsBefore(Date date) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + calendar.add(Calendar.MONTH, -2); + return calendar.getTime(); + } + private static Date twoMonthsLater(Date now) { Calendar calendar = Calendar.getInstance(); calendar.setTime(now); 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 94c9071a7..461b04bb8 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 @@ -277,8 +277,11 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel { forceLoadOfDependenciesCollections(planningState.getInitial()); forceLoadOfWorkingHours(planningState.getInitial()); forceLoadOfLabels(planningState.getInitial()); - return new PlannerConfiguration(taskElementAdapter, + PlannerConfiguration result = new PlannerConfiguration( + taskElementAdapter, new TaskElementNavigator(), planningState.getInitial()); + result.setNotBeforeThan(orderReloaded.getInitDate()); + return result; } private void forceLoadOfWorkingHours(List initial) {