From c3f82fbe24ac65cc9be89353c5ed2b740d3748d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Sun, 3 Jan 2010 17:18:37 +0100
Subject: [PATCH] ItEr41S20CUGravacionModelosUnidadesTraballoItEr40S25: Filter
 part is parametrized by the tree controller

---
 .../web/orders/OrderElementTreeController.java |  6 ++++++
 .../webapp/orders/_orderElementTreeFilter.zul  | 16 ++++++++++++++++
 .../orders/components/_orderElementTree.zul    | 18 +-----------------
 3 files changed, 23 insertions(+), 17 deletions(-)
 create mode 100644 navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java
index 198aee67c..c058ed4ce 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java
@@ -47,6 +47,7 @@ import org.navalplanner.web.common.Util.Setter;
 import org.navalplanner.web.common.components.bandboxsearch.BandboxSearch;
 import org.navalplanner.web.templates.IOrderTemplatesControllerEntryPoints;
 import org.zkoss.zk.ui.Component;
+import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.WrongValueException;
 import org.zkoss.zk.ui.event.DropEvent;
 import org.zkoss.zk.ui.event.Event;
@@ -68,6 +69,7 @@ import org.zkoss.zul.Treecell;
 import org.zkoss.zul.Treeitem;
 import org.zkoss.zul.TreeitemRenderer;
 import org.zkoss.zul.Treerow;
+import org.zkoss.zul.Vbox;
 
 /**
  * Controller for {@link OrderElement} tree view of {@link Order} entities <br />
@@ -76,6 +78,8 @@ import org.zkoss.zul.Treerow;
  */
 public class OrderElementTreeController extends GenericForwardComposer {
 
+    private Vbox filter;
+
     private IMessagesForUser messagesForUser;
 
     private Component messagesContainer;
@@ -293,6 +297,8 @@ public class OrderElementTreeController extends GenericForwardComposer {
     public void doAfterCompose(Component comp) throws Exception {
         super.doAfterCompose(comp);
         messagesForUser = new MessagesForUser(messagesContainer);
+        Executions.createComponents("/orders/_orderElementTreeFilter.zul",
+                filter, new HashMap<String, String>());
     }
 
     public class OrderElementTreeitemRenderer implements TreeitemRenderer,
diff --git a/navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul b/navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul
new file mode 100644
index 000000000..c49c75c29
--- /dev/null
+++ b/navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul
@@ -0,0 +1,16 @@
+<hbox>
+  <!-- Filter by label -->
+  <combobox id="cbFilterType" value="${i18n:_('Show all')}"
+        onChange="treeController.onShowAll(event)"
+        constraint="no empty:${i18n:_('cannot be null or empty')}"
+        readonly="true" >
+      <comboitem label="${i18n:_('Show all')}"
+            description="${i18n:_('Show all order elements')}" />
+      <comboitem label="${i18n:_('Filter by Label')}"
+            description="${i18n:_('Filter all order elements by label')}" />
+  </combobox>
+  <bandboxSearch id="bdFilter" finder="LabelBandboxFinder"
+        model="@{treeController.labels}"/>
+  <button label="${i18n:_('Filter')}" style="margin-top: -4px"
+        onClick="treeController.onApplyFilter(event)"/>
+</hbox>
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul b/navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul
index 2856a980b..0acbaa187 100644
--- a/navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul
@@ -37,23 +37,7 @@
                 onClick="treeController.removeOrderElement();" />
         </hbox>
     </vbox>
-    <vbox>
-        <hbox>
-          <!-- Filter by label -->
-          <combobox id="cbFilterType" value="${i18n:_('Show all')}"
-                onChange="treeController.onShowAll(event)"
-                constraint="no empty:${i18n:_('cannot be null or empty')}"
-                readonly="true" >
-              <comboitem label="${i18n:_('Show all')}"
-                    description="${i18n:_('Show all order elements')}" />
-              <comboitem label="${i18n:_('Filter by Label')}"
-                    description="${i18n:_('Filter all order elements by label')}" />
-          </combobox>
-          <bandboxSearch id="bdFilter" finder="LabelBandboxFinder"
-                model="@{treeController.labels}"/>
-          <button label="${i18n:_('Filter')}" style="margin-top: -4px"
-                onClick="treeController.onApplyFilter(event)"/>
-        </hbox>
+    <vbox id="filter">
     </vbox>
     <vbox>
         <tree id="tree" width="1050" multiple="true" droppable="true"