From 72dabb9cc98d5d54129884c029f4b404ffc7892e Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smontes@wirelessgalicia.com>
Date: Tue, 20 Mar 2012 15:43:47 +0000
Subject: [PATCH] include a refresh button belonging to the list of customer
 and subcontractor communications, in order to update the selected filter.

---
 .../CustomerCommunicationCRUDController.java          | 10 ++++++++++
 .../SubcontractorCommunicationCRUDController.java     | 11 +++++++++++
 .../webapp/subcontract/customerCommunications.zul     |  2 ++
 .../subcontract/subcontractorCommunications.zul       |  2 ++
 4 files changed, 25 insertions(+)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerCommunicationCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerCommunicationCRUDController.java
index 8b466c183..b4d5db939 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerCommunicationCRUDController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerCommunicationCRUDController.java
@@ -98,7 +98,10 @@ public class CustomerCommunicationCRUDController extends GenericForwardComposer
 
     public void setCurrentFilterItem(FilterCommunicationEnum selected) {
         customerCommunicationModel.setCurrentFilter(selected);
+        refreshCustomerCommunicationsList();
+    }
 
+    private void refreshCustomerCommunicationsList(){
         // update the customer communication list
         listing.setModel(new SimpleListModel(getCustomerCommunications()));
         listing.invalidate();
@@ -198,4 +201,11 @@ public class CustomerCommunicationCRUDController extends GenericForwardComposer
         }
     }
 
+    /**
+     * Apply filter to customers communications
+     * @param event
+     */
+    public void onApplyFilter(Event event) {
+        refreshCustomerCommunicationsList();
+    }
 }
\ No newline at end of file
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorCommunicationCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorCommunicationCRUDController.java
index 505292553..6f00b5d10 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorCommunicationCRUDController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorCommunicationCRUDController.java
@@ -109,7 +109,10 @@ public class SubcontractorCommunicationCRUDController extends GenericForwardComp
 
     public void setCurrentFilterItem(FilterCommunicationEnum selected) {
         subcontractorCommunicationModel.setCurrentFilter(selected);
+        refreshSubcontractorCommunicationsList();
+    }
 
+    private void refreshSubcontractorCommunicationsList() {
         // update the subcontractor communication list
         listing.setModel(new SimpleListModel(getSubcontractorCommunications()));
         listing.invalidate();
@@ -233,4 +236,12 @@ public class SubcontractorCommunicationCRUDController extends GenericForwardComp
         }
     }
 
+    /**
+     * Apply filter to subcontractors communications
+     *
+     * @param event
+     */
+    public void onApplyFilter(Event event) {
+        refreshSubcontractorCommunicationsList();
+    }
 }
\ No newline at end of file
diff --git a/libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul b/libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul
index 5d0a6ac48..03b80ba04 100644
--- a/libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul
+++ b/libreplan-webapp/src/main/webapp/subcontract/customerCommunications.zul
@@ -39,6 +39,8 @@
             selectedItem="@{controller.currentFilterItem}"
             itemRenderer="org.libreplan.web.common.EnumsListitemRenderer">
         </listbox>
+        <button label="${i18n:_('Refresh')}" style="margin-top: -4px"
+                        onClick="controller.onApplyFilter(event)"/>
     </div>
 	<separator bar="false" spacing="20px" orient="horizontal"/>
     <grid id="listing"
diff --git a/libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul b/libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul
index 24f7d05db..0da5ac6f9 100644
--- a/libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul
+++ b/libreplan-webapp/src/main/webapp/subcontract/subcontractorCommunications.zul
@@ -39,6 +39,8 @@
             selectedItem="@{controller.currentFilterItem}"
             itemRenderer="org.libreplan.web.common.EnumsListitemRenderer">
         </listbox>
+        <button label="${i18n:_('Refresh')}" style="margin-top: -4px"
+                        onClick="controller.onApplyFilter(event)"/>
     </div>
 	<separator bar="false" spacing="20px" orient="horizontal"/>
 	 <grid id="listing"