sorting and stuff

code/LanBortalWeb/WebContent/foodmanager/listOrders.xhtml

@@ -13,11 +13,11 @@
 		</ui:define>
 		<ui:define name="content">
 			<h:form>
-				<p:dataTable styleClass="bordertable" value="#{foodWaveView.accountEventLines}" var="acc_line">
+				<p:dataTable styleClass="bordertable" value="#{foodWaveView.accountEventLines}" var="acc_line" sortBy="#{acc_line.user.nick}">
 					<f:facet name="header">
 						<h:outputLabel value="#{i18n['foodWave.accountevents']}" />
 					</f:facet>
-					<p:column>
+					<p:column sortBy="#{acc_line.eventTime.getTime()}">
 						<f:facet name="header">
 							<h:outputLabel value="#{i18n['acc_line.time']}" />
 						</f:facet>
@@ -25,7 +25,7 @@
 							<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
 						</h:outputText>
 					</p:column>
-					<p:column>
+					<p:column sortBy="#{acc_line.quantity}">
 						<f:facet name="header">
 							<h:outputLabel value="#{i18n['acc_line.quantity']}" />
 						</f:facet>
@@ -33,13 +33,13 @@
 							<f:convertNumber minFractionDigits="2" maxFractionDigits="2" />
 						</h:outputText>
 					</p:column>
-					<p:column>
+					<p:column sortBy="#{acc_line.product.name}">
 						<f:facet name="header">
 							<h:outputLabel value="#{i18n['acc_line.product']}" />
 						</f:facet>
 						<h:outputText value="#{acc_line.product.name}" />
 					</p:column>
-					<p:column>
+					<p:column sortBy="#{acc_line.user.wholeName}">
 						<f:facet name="header">
 							<h:outputLabel value="#{i18n['acc_line.eventuser']}" />
 						</f:facet>
@@ -47,7 +47,7 @@
 							<f:param value="#{acc_line.user.id}" />
 						</h:link>
 					</p:column>
-					<p:column>
+					<p:column sortBy="#{acc_line.user.nick}">
 						<f:facet name="header">
 							<h:outputLabel value="#{i18n['acc_line.nick']}" />
 						</f:facet>
@@ -55,7 +55,7 @@
 							<f:param value="#{acc_line.user.id}" />
 						</h:link>
 					</p:column>
-					<p:column>
+					<p:column sortBy="#{acc_line.eventDelivered}">
 						<f:facet name="header">
 							<h:outputLabel value="#{i18n['accountEvent.delivered']}" />
 						</f:facet>
@@ -65,23 +65,15 @@
 				</p:dataTable>
 
 			</h:form>
-			<div>
-				<h:outputLabel value="#{i18n['foodwave.price']}" />
-				<h:outputText value="#{foodWaveView.foodWavePrice}" />
-			</div>
-			<div>
-				<h:outputLabel value="#{i18n['foodwave.buyInPrice']}" />
-				<h:outputText value="#{foodWaveView.buyInPrice}" />
-			</div>
 			<br></br>
 			<br></br>
 
 			<h:form>
-				<p:dataTable styleClass="bordertable" value="#{foodWaveView.billLines}" var="bill_line">
+				<p:dataTable styleClass="bordertable" value="#{foodWaveView.billLines}" var="bill_line" sortBy="#{bill_line.bill.user.nick}">
 					<f:facet name="header">
 						<h:outputLabel value="#{i18n['foodWave.billLines']}" />
 					</f:facet>
-					<p:column>
+					<p:column sortBy="#{bill_line.bill.sentDate.getTime()}">
 						<f:facet name="header">
 							<h:outputLabel value="#{i18n['billLine.time']}" />
 						</f:facet>
@@ -89,7 +81,7 @@
 							<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" />
 						</h:outputText>
 					</p:column>
-					<p:column>
+					<p:column sortBy="#{bill_line.quantity}">
 						<f:facet name="header">
 							<h:outputLabel value="#{i18n['billLine.quantity']}" />
 						</f:facet>
@@ -97,13 +89,13 @@
 							<f:convertNumber minFractionDigits="2" maxFractionDigits="2" />
 						</h:outputText>
 					</p:column>
-					<p:column>
+					<p:column sortBy="#{bill_line.name}">
 						<f:facet name="header">
 							<h:outputLabel value="#{i18n['billLine.product']}" />
 						</f:facet>
 						<h:outputText value="#{bill_line.name}" />
 					</p:column>
-					<p:column>
+					<p:column sortBy="#{bill_line.bill.user.wholeName}">
 						<f:facet name="header">
 							<h:outputLabel value="#{i18n['billLine.eventuser']}" />
 						</f:facet>
@@ -111,7 +103,7 @@
 							<f:param name="userid" value="#{bill_line.bill.user.id}" />
 						</h:link>
 					</p:column>
-					<p:column>
+					<p:column sortBy="#{bill_line.bill.user.nick}">
 						<f:facet name="header">
 							<h:outputLabel value="#{i18n['billLine.nick']}" />
 						</f:facet>
@@ -119,7 +111,7 @@
 							<f:param name="userid" value="#{bill_line.bill.user.id}" />
 						</h:link>
 					</p:column>
-					<p:column>
+					<p:column sortBy="#{bill_line.linePrice}">
 						<f:facet name="header">
 							<h:outputLabel value="#{i18n['billLine.price']}" />
 						</f:facet>
@@ -128,7 +120,7 @@
 						</h:outputText>
 					</p:column>
 
-					<p:column>
+					<p:column sortBy="#{bill_line.bill.totalPrice}">
 						<f:facet name="header">
 							<h:outputLabel value="#{i18n['bill.totalprice']}" />
 						</f:facet>
@@ -148,6 +140,7 @@
 				</p:dataTable>
 			</h:form>
 
+
 			<h2>#{i18n['foodwave.summaryView']}</h2>
 			<div>
 				<h:outputLabel value="#{i18n['foodwave.price']}: " />
@@ -191,9 +184,6 @@
 			</p:dataTable>
 
 
-
-			<!-- 		<foodwave:summary foodwaveProductSummaries="#{foodWaveView.productSummaries}" foodwave="#{foodWaveView.selectedFoodWave}"/>
-	-->
 		</ui:define>