diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java index 8f4ebf40e..f41b164ca 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java @@ -11,6 +11,7 @@ import org.navalplanner.web.common.Level; import org.navalplanner.web.common.MessagesForUser; import org.navalplanner.web.common.OnlyOneVisible; import org.navalplanner.web.common.Util; +import org.navalplanner.web.planner.IOrderPlanningControllerEntryPoints; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.util.GenericForwardComposer; import org.zkoss.zul.api.Window; @@ -44,6 +45,8 @@ public class OrderCRUDController extends GenericForwardComposer { private boolean confirmingSchedule; + private IOrderPlanningControllerEntryPoints planningControllerEntryPoints; + public List getOrders() { return orderModel.getOrders(); } @@ -89,9 +92,7 @@ public class OrderCRUDController extends GenericForwardComposer { orderModel.prepareForSchedule(order); showScheduleConfirmingWindow(); } else { - messagesForUser - .showMessage(Level.INFO, - "xa se crearon as tarefas de planificacion asociadas o pedido"); + planningControllerEntryPoints.showSchedule(order); } } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IOrderPlanningControllerEntryPoints.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IOrderPlanningControllerEntryPoints.java new file mode 100644 index 000000000..c20ba48fc --- /dev/null +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IOrderPlanningControllerEntryPoints.java @@ -0,0 +1,15 @@ +package org.navalplanner.web.planner; + +import org.navalplanner.business.orders.entities.Order; +import org.navalplanner.web.common.entrypoints.EntryPoint; +import org.navalplanner.web.common.entrypoints.EntryPoints; + +/** + * @author Óscar González Fernández + */ +@EntryPoints(page = "/planner/order.zul", registerAs = "planningControllerEntryPoints") +public interface IOrderPlanningControllerEntryPoints { + + @EntryPoint("plan") + public void showSchedule(Order order); +} diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningController.java new file mode 100644 index 000000000..a4a996014 --- /dev/null +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningController.java @@ -0,0 +1,45 @@ +package org.navalplanner.web.planner; + +import org.navalplanner.business.orders.entities.Order; +import org.navalplanner.web.common.entrypoints.IURLHandlerRegistry; +import org.navalplanner.web.common.entrypoints.URLHandler; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.config.BeanDefinition; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Component; +import org.zkoss.ganttz.Planner; +import org.zkoss.ganttz.adapters.PlannerConfiguration; +import org.zkoss.ganttz.util.ITaskFundamentalProperties; + +/** + * @author Óscar González Fernández + */ +@Component +@Scope(BeanDefinition.SCOPE_PROTOTYPE) +public class OrderPlanningController implements + IOrderPlanningControllerEntryPoints { + + @Autowired + private IURLHandlerRegistry urlHandlerRegistry; + + private Planner planner; + + public OrderPlanningController() { + } + + @Override + public void showSchedule(Order order) { + PlannerConfiguration configuration = new DataForPlanner() + .getMediumLoad(); + // TODO just for trying passing medium load + planner.setConfiguration(configuration); + } + + public void registerPlanner(Planner planner) { + this.planner = planner; + final URLHandler handler = urlHandlerRegistry + .getRedirectorFor(IOrderPlanningControllerEntryPoints.class); + handler.registerListener(this, planner.getPage()); + } + +} diff --git a/navalplanner-webapp/src/main/webapp/planner/order.zul b/navalplanner-webapp/src/main/webapp/planner/order.zul new file mode 100644 index 000000000..4afc74bdc --- /dev/null +++ b/navalplanner-webapp/src/main/webapp/planner/order.zul @@ -0,0 +1,42 @@ + + + + + + + + + + +
+
+ + + + + + ${c:l('task.name')} + + + + ${c:l('task.start')} + + + + ${c:l('task.end')} + + + + ${c:l('task.notes')} + + + + +