From 73a9d135a0f115f18bfdae0e28ab885c363daebf Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Thu, 1 Oct 2009 18:12:28 +0200
Subject: [PATCH]  ItEr26S13AltaEtiquetasTipoEtiqueta: Added assigned Labels to
 OrderElement controller

---
 ...ssignedLabelsToOrderElementController.java | 21 +++++++++++++++++++
 .../web/orders/OrderElementController.java    | 13 ++++++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java
new file mode 100644
index 000000000..a82c6b0c5
--- /dev/null
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java
@@ -0,0 +1,21 @@
+package org.navalplanner.web.orders;
+
+import org.zkoss.zk.ui.Component;
+import org.zkoss.zk.ui.util.GenericForwardComposer;
+
+/**
+ * Controller for showing OrderElement assigned labels
+ *
+ * @author Diego Pino García <dpino@igalia.com>
+ *
+ */
+public class AssignedLabelsToOrderElementController extends
+        GenericForwardComposer {
+
+    @Override
+    public void doAfterCompose(Component comp) throws Exception {
+        super.doAfterCompose(comp.getFellow("listOrderElementLabels"));
+        comp.setVariable("assignedLabelsController", this, true);
+    }
+
+}
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
index 24dcff662..a598af00a 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
@@ -20,6 +20,8 @@
 
 package org.navalplanner.web.orders;
 
+import static org.navalplanner.web.I18nHelper._;
+
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -58,8 +60,6 @@ import org.zkoss.zul.Vbox;
 import org.zkoss.zul.Window;
 import org.zkoss.zul.api.Listhead;
 
-import static org.navalplanner.web.I18nHelper._;
-
 /**
  * Controller for {@link OrderElement} view of {@link Order} entities <br />
  *
@@ -97,6 +97,8 @@ public class OrderElementController extends GenericForwardComposer {
 
     private ManageOrderElementAdvancesController manageOrderElementAdvancesController;
 
+    private AssignedLabelsToOrderElementController assignedLabelsController;
+
     public OrderElement getOrderElement() {
         if (model == null) {
             return OrderLine.create();
@@ -184,6 +186,7 @@ public class OrderElementController extends GenericForwardComposer {
         window = (Window) comp;
         setupAsignedHoursToOrderElementController(comp);
         setupManageOrderElementAdvancesController(comp);
+        setupAssignedLabelsToOrderElementController(comp);
     }
 
 
@@ -192,6 +195,12 @@ public class OrderElementController extends GenericForwardComposer {
         asignedHoursController.doAfterCompose(comp);
     }
 
+    private void setupAssignedLabelsToOrderElementController(Component comp)
+            throws Exception {
+        assignedLabelsController = new AssignedLabelsToOrderElementController();
+        assignedLabelsController.doAfterCompose(comp);
+    }
+
     private void setupManageOrderElementAdvancesController(Component comp)
             throws Exception {
         manageOrderElementAdvancesController = new ManageOrderElementAdvancesController();