reservedcount and sorting

code/LanBortalWeb/WebContent/resources/cditools/foodwave/list.xhtml

@@ -15,10 +15,10 @@
 	<!-- 	<h:outputScript target="head" library="script" name="shopscript.js" /> -->
 	<h:outputScript library="primefaces" name="jquery/jquery.js" />
 
-	<p:dataTable columnClasses="nowrap,numalign,numalign,nowrap,numalign" styleClass="bordertable" value="#{foodWaveView.foodWaves}" var="foodwave">
-		<p:column>
+	<p:dataTable columnClasses="nowrap,numalign,numalign,nowrap,numalign" styleClass="bordertable" value="#{foodWaveView.foodWaves}" var="foodwave" sortBy="#{foodwave.time.time}">
+		<p:column sortBy="#{i18n['foodWave.name']}">
 			<f:facet name="header">
-				<h:outputLabel id="name" value="${i18n['foodWave.name']}" />
+				<h:outputLabel id="name" value="#{i18n['foodWave.name']}" />
 			</f:facet>
 
 			<h:link outcome="#{cc.attrs.outcome}" value="#{foodwave.name}">
@@ -26,7 +26,7 @@
 				<f:param name="userid" value="#{userView.user.user.id}" />
  			</h:link>
 		</p:column>
-		<p:column>
+		<p:column sortBy="#{foodwave.template.name}">
 			<f:facet name="header">
 				<h:outputText value="Menu" />
 			</f:facet>
@@ -34,13 +34,22 @@
 				<f:param name="foodwaveid" value="#{foodwave.id}" />
 			</h:outputText>
 		</p:column>
-		<p:column>
+		<p:column sortBy="#{foodwave.template.description}">
 			<f:facet name="header">
 				<h:outputText value="${i18n['foodWave.description']}" />
 			</f:facet>
 			<h:outputText id="description" value="#{foodwave.template.description}" />
 		</p:column>
-		<p:column>
+		
+		<p:column sortBy="#{foodwave.reservedCount}">
+			<f:facet name="header">
+				<h:outputText value="${i18n['foodWave.totalReserved']}" />
+			</f:facet>
+			<h:outputText value="#{foodwave.reservedCount}" /> / <h:outputText value="#{foodwave.maximumFoods}" />
+			
+		</p:column>
+		
+		<p:column sortBy="#{foodwave.time.time}">
 			<f:facet name="header">
 				<h:outputText value="${i18n['foodWave.time']}" />
 			</f:facet>