From 7d4eaebbdc10bb444fa61c857518077fd3a96b38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= <ltilve@igalia.com>
Date: Wed, 6 Feb 2013 09:57:09 +0100
Subject: [PATCH] Importing session filter parameters into WBS screen

FEA: ItEr77S15FilteringEnhancements
---
 .../orders/OrderElementTreeController.java    | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java
index 79c2829c5..1b4c0f296 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java
@@ -59,6 +59,7 @@ import org.zkoss.ganttz.IPredicate;
 import org.zkoss.ganttz.util.ComponentsFinder;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.Executions;
+import org.zkoss.zk.ui.Sessions;
 import org.zkoss.zk.ui.WrongValueException;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
@@ -274,9 +275,38 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
         operationsForOrderElement.tree(tree)
                 .orderTemplates(this.orderTemplates);
 
+        importOrderFiltersFromSession();
         disableCreateTemplateButtonIfNeeded(comp);
     }
 
+    private void importOrderFiltersFromSession() {
+        filterNameOrderElement.setValue((String) Sessions.getCurrent()
+                .getAttribute(
+                        orderModel.getOrder().getCode() + "-tasknameFilter"));
+        filterStartDateOrderElement.setValue((Date) Sessions.getCurrent()
+                .getAttribute(
+                        orderModel.getOrder().getCode() + "-startDateFilter"));
+        filterFinishDateOrderElement.setValue((Date) Sessions.getCurrent()
+                .getAttribute(
+                        orderModel.getOrder().getCode() + "-endDateFilter"));
+        if (Sessions.getCurrent().getAttribute(
+                orderModel.getOrder().getCode() + "-labelsandcriteriaFilter") != null) {
+            for (Object each : (List<Object>) Sessions.getCurrent()
+                    .getAttribute(
+                            orderModel.getOrder().getCode()
+                                    + "-labelsandcriteriaFilter")) {
+                bdFiltersOrderElement.addSelectedElement(each);
+            }
+        }
+        if (Sessions.getCurrent().getAttribute(
+                orderModel.getOrder().getCode() + "-inheritanceFilter") != null) {
+            labelsWithoutInheritance.setChecked((Boolean) Sessions.getCurrent()
+                    .getAttribute(
+                            orderModel.getOrder().getCode()
+                                    + "-inheritanceFilter"));
+        }
+    }
+
     private void disableCreateTemplateButtonIfNeeded(Component comp) {
         Button createTemplateButton = (Button) comp
                 .getFellowIfAny("createTemplateButton");