From ebd9e5807a98b0b0631c0d039984ba0008c56545 Mon Sep 17 00:00:00 2001
From: Jeremy Grelle <jgrelle@vmware.com>
Date: Fri, 23 May 2008 15:28:16 +0000
Subject: [PATCH] Adding sort functionality on the reviewHotels view to
 exercise SWF-692 and SWF-700

---
 .../webflow/samples/booking/JpaBookingService.java |  5 +++--
 .../webflow/samples/booking/SearchCriteria.java    | 11 +++++++++++
 .../src/main/webapp/WEB-INF/flows/main/main.xml    |  4 ++++
 .../webapp/WEB-INF/flows/main/reviewHotels.xhtml   | 14 ++++++++++++--
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java b/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java
index 13d7618d..52993c7a 100755
--- a/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java
+++ b/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java
@@ -43,8 +43,9 @@ public class JpaBookingService implements BookingService {
 	String pattern = getSearchPattern(criteria);
 	return em.createQuery(
 		"select h from Hotel h where lower(h.name) like " + pattern + " or lower(h.city) like " + pattern
-			+ " or lower(h.zip) like " + pattern + " or lower(h.address) like " + pattern).setMaxResults(
-		criteria.getPageSize()).setFirstResult(criteria.getPage() * criteria.getPageSize()).getResultList();
+			+ " or lower(h.zip) like " + pattern + " or lower(h.address) like " + pattern + " order by h."
+			+ criteria.getSortBy()).setMaxResults(criteria.getPageSize()).setFirstResult(
+		criteria.getPage() * criteria.getPageSize()).getResultList();
     }
 
     @Transactional(readOnly = true)
diff --git a/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/SearchCriteria.java b/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/SearchCriteria.java
index 0a1b92dc..109ded0d 100755
--- a/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/SearchCriteria.java
+++ b/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/SearchCriteria.java
@@ -24,6 +24,16 @@ public class SearchCriteria implements Serializable {
      */
     private int page;
 
+    private String sortBy = "name";
+
+    public String getSortBy() {
+	return sortBy;
+    }
+
+    public void setSortBy(String sortBy) {
+	this.sortBy = sortBy;
+    }
+
     public String getSearchString() {
 	return searchString;
     }
@@ -58,6 +68,7 @@ public class SearchCriteria implements Serializable {
 
     public void resetPage() {
 	page = 0;
+	sortBy = "name";
     }
 
     public String toString() {
diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/main.xml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/main.xml
index ce14cc19..1952d81b 100755
--- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/main.xml
+++ b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/main.xml
@@ -22,6 +22,10 @@
 		<on-render>
 			<evaluate expression="bookingService.findHotels(searchCriteria)" result="viewScope.hotels" result-type="dataModel" />
 		</on-render>
+        <transition on="sort">
+            <set name="searchCriteria.sortBy" value="requestParameters.sortBy"/>
+            <render fragments="hotels:searchResultsFragment" />
+        </transition>
 		<transition on="previous">
 			<evaluate expression="searchCriteria.previousPage()" />
 			<render fragments="hotels:searchResultsFragment" />
diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/reviewHotels.xhtml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/reviewHotels.xhtml
index c6544b73..bd10a19f 100644
--- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/reviewHotels.xhtml
+++ b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/reviewHotels.xhtml
@@ -19,7 +19,12 @@
 				<h:outputText id="noHotelsText" value="No Hotels Found" rendered="#{hotels.rowCount == 0}"/>
 				<h:dataTable id="hotels" styleClass="summary" value="#{hotels}" var="h" rendered="#{hotels.rowCount > 0}">
 					<h:column>
-						<f:facet name="header">Name</f:facet>
+						<f:facet name="header">
+							<!-- @TODO - Ajax won't work here until JSF RI fixes bug in UIData.invokeOnComponent - scheduled for 1.2_09 -->
+							<sf:commandLink id="sortByNameLink" ajaxEnabled="false" action="sort" value="Name">
+								<f:param name="sortBy" value="name" />
+							</sf:commandLink>
+						</f:facet>
 						#{h.name}
 					</h:column>
 					<h:column>
@@ -27,7 +32,12 @@
 						#{h.address}
 					</h:column>
 					<h:column>
-						<f:facet name="header">City, State</f:facet>
+						<f:facet name="header">
+							<!-- @TODO - Ajax won't work here until JSF RI fixes bug in UIData.invokeOnComponent - scheduled for 1.2_09 -->
+							<sf:commandLink id="sortByCity" ajaxEnabled="false" action="sort" value="City, State" >
+								<f:param name="sortBy" value="city" />
+							</sf:commandLink>
+						</f:facet>
 						#{h.city}, #{h.state}, #{h.country}
 					</h:column> 
 					<h:column>