From 40a6c95407050392ef155b9a41ce86f08214db9e Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Mon, 5 Apr 2010 02:18:16 +0200
Subject: [PATCH]  ItEr52S13CUCreacionRecursosLimitantes: Added
 isLimitedResource filter for machines list

---
 .../machine/MachineCRUDController.java          | 17 +++++++++++++++--
 .../web/resources/search/ResourcePredicate.java | 12 +++---------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java
index 23d7291bd..f47216587 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java
@@ -99,6 +99,8 @@ public class MachineCRUDController extends GenericForwardComposer {
 
     private Datebox filterFinishDate;
 
+    private Combobox filterLimitedResource;
+
     private Textbox txtfilter;
 
     private BandboxMultipleSearch bdFilters;
@@ -141,6 +143,8 @@ public class MachineCRUDController extends GenericForwardComposer {
                 .getFellowIfAny("filterFinishDate");
         this.filterStartDate = (Datebox) listWindow
                 .getFellowIfAny("filterStartDate");
+        this.filterLimitedResource = (Combobox) listWindow
+                .getFellowIfAny("filterLimitedResource");
         this.bdFilters = (BandboxMultipleSearch) listWindow
                 .getFellowIfAny("bdFilters");
         this.txtfilter = (Textbox) listWindow.getFellowIfAny("txtfilter");
@@ -514,13 +518,18 @@ public class MachineCRUDController extends GenericForwardComposer {
                 .getValue());
         }
 
+        final Comboitem item = filterLimitedResource.getSelectedItem();
+        Boolean isLimitedResource = (item != null) ? LimitedResourceEnum
+                .valueOf((LimitedResourceEnum) item.getValue()) : null;
+
         if (listFilters.isEmpty()
                 && (personalFilter == null || personalFilter.isEmpty())
-                && startDate == null && finishDate == null) {
+                && startDate == null && finishDate == null
+                && isLimitedResource == null) {
             return null;
         }
         return new ResourcePredicate(listFilters, personalFilter, startDate,
-                finishDate);
+                finishDate, isLimitedResource);
     }
 
     private void filterByPredicate(ResourcePredicate predicate) {
@@ -541,6 +550,10 @@ public class MachineCRUDController extends GenericForwardComposer {
         listing.invalidate();
     }
 
+    public Set<LimitedResourceEnum> getLimitedResourceFilterOptionList() {
+        return LimitedResourceEnum.getLimitedResourceFilterOptionList();
+    }
+
     public Set<LimitedResourceEnum> getLimitedResourceOptionList() {
         return LimitedResourceEnum.getLimitedResourceOptionList();
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/ResourcePredicate.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/ResourcePredicate.java
index 7fad69821..bc65f13e6 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/ResourcePredicate.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/ResourcePredicate.java
@@ -58,19 +58,13 @@ public class ResourcePredicate implements IPredicate {
 
     public ResourcePredicate(List<FilterPair> filters, String personalFilters,
             LocalDate startDate,
-            LocalDate finishDate) {
+            LocalDate finishDate,
+            Boolean isLimitedResource) {
         this.filters = filters;
         this.startDate = startDate;
         this.finishDate = finishDate;
-        this.personalFilters = personalFilters.split(" ");
-    }
-
-    public ResourcePredicate(List<FilterPair> filters, String personalFilters,
-            LocalDate startDate,
-            LocalDate finishDate,
-            Boolean isLimitedResource) {
-        this(filters, personalFilters, startDate, finishDate);
         this.isLimitedResource = isLimitedResource;
+        this.personalFilters = personalFilters.split(" ");
     }
 
     @Override