From 5585d5b26e9ddf85f54270c2d24eeffc32b5cc94 Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smontes@wirelessgalicia.com>
Date: Tue, 19 Jul 2011 15:00:34 +0200
Subject: [PATCH] Change the format of the matching results of a search in the
 workers list and in the machine list.

FEA: ItEr75S09ImproveBandboxFinders
---
 .../finders/ResourcesMultipleFiltersFinder.java     | 13 ++++++-------
 .../finders/WorkerMultipleFiltersFinder.java        | 11 ++++++-----
 .../webapp/resources/search/_resourceFilter.zul     |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourcesMultipleFiltersFinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourcesMultipleFiltersFinder.java
index 4ca3e9401..24f398bad 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourcesMultipleFiltersFinder.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourcesMultipleFiltersFinder.java
@@ -152,18 +152,17 @@ public class ResourcesMultipleFiltersFinder extends MultipleFiltersFinder {
     }
 
     private void addCriterion(CriterionType type, Criterion criterion) {
-        String pattern = type.getName() + " :: " + criterion.getName();
-        getListMatching()
-                .add(
-                        new FilterPair(ResourceFilterEnum.Criterion, pattern,
-                criterion));
+        String pattern = criterion.getName() + " ( " + type.getName() + " ) ";
+        getListMatching().add(
+                new FilterPair(ResourceFilterEnum.Criterion, type.getResource()
+                        .toLowerCase(), pattern, criterion));
     }
 
     private void addCostCategory(CostCategory costCategory) {
         String pattern = costCategory.getName();
         getListMatching().add(
-                new FilterPair(ResourceFilterEnum.CostCategory,
-                pattern, costCategory));
+                new FilterPair(ResourceFilterEnum.CostCategory, pattern,
+                        costCategory));
     }
 
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/WorkerMultipleFiltersFinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/WorkerMultipleFiltersFinder.java
index 610445915..5941b6d39 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/WorkerMultipleFiltersFinder.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/WorkerMultipleFiltersFinder.java
@@ -37,7 +37,7 @@ public class WorkerMultipleFiltersFinder extends MultipleFiltersFinder {
     private IFilterEnum workerFilterEnum = new IFilterEnum() {
         @Override
         public String toString() {
-            return "worker";
+            return "Resource ( Worker )";
         }
     };
 
@@ -54,8 +54,9 @@ public class WorkerMultipleFiltersFinder extends MultipleFiltersFinder {
         Iterator<Worker> iteratorWorker = getListWorkers().iterator();
         while(iteratorWorker.hasNext() && getListMatching().size() < 10) {
             Worker worker = iteratorWorker.next();
-            getListMatching().add(new FilterPair(
-                    workerFilterEnum, worker.getShortDescription(), worker));
+            getListMatching().add(
+                    new FilterPair(workerFilterEnum, worker.getDescription(),
+                            worker));
         }
         addNoneFilter();
         return getListMatching();
@@ -78,8 +79,8 @@ public class WorkerMultipleFiltersFinder extends MultipleFiltersFinder {
     }
     private void searchInWorkers(String filter) {
         for (Worker worker : getListWorkers()) {
-            String name = StringUtils.deleteWhitespace(
-                    worker.getShortDescription().toLowerCase());
+            String name = StringUtils.deleteWhitespace(worker.getDescription()
+                    .toLowerCase());
             if(name.contains(filter)) {
                 getListMatching().add(new FilterPair(
                         workerFilterEnum, worker.getShortDescription(), worker));
diff --git a/navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul b/navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul
index 1236df0ca..f651d96fb 100644
--- a/navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/search/_resourceFilter.zul
@@ -24,7 +24,7 @@
     <!-- Multiple filter -->
     <label value="${i18n:_('Filter by')}"
         tooltiptext="${i18n:_('Select required criteria set and press filter button')}"/>
-    <bandboxMultipleSearch id="bdFilters" widthBandbox="285px" widthListbox="300px"
+    <bandboxMultipleSearch id="bdFilters" widthBandbox="285px" widthListbox="550px"
         finder="resourcesMultipleFiltersFinder"/>
 
     <!-- Personal details -->