From ac2ffa1ca0ccb26a7d618f9d3652126767a326e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Wed, 2 Dec 2009 17:42:40 +0100 Subject: [PATCH] ItEr37S08CUCreacionUnidadesPlanificacionItEr36S11: Adding recommended allocation checkbox --- .../planner/allocation/ResourceAllocationController.java | 3 +++ navalplanner-webapp/src/main/webapp/planner/order.zul | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java index e6d1dab41..d5c29a126 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java @@ -55,6 +55,7 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.util.GenericForwardComposer; import org.zkoss.zul.Button; +import org.zkoss.zul.Checkbox; import org.zkoss.zul.Datebox; import org.zkoss.zul.Grid; import org.zkoss.zul.Intbox; @@ -107,6 +108,8 @@ public class ResourceAllocationController extends GenericForwardComposer { private Radiogroup calculationTypeSelector; + private Checkbox recommendedAllocationCheckbox; + private Datebox taskEndDate; private Button applyButton; diff --git a/navalplanner-webapp/src/main/webapp/planner/order.zul b/navalplanner-webapp/src/main/webapp/planner/order.zul index 6ba43677a..fdae8fb44 100644 --- a/navalplanner-webapp/src/main/webapp/planner/order.zul +++ b/navalplanner-webapp/src/main/webapp/planner/order.zul @@ -142,6 +142,12 @@ + + + + +