Skip to content

Antti Väyrynen / Moya

Go to a project
Commit 83be3e3b by Tuukka Kivilahti
Options

sorting and stuff

1 parent 4877a108
Inline Side-by-side
Showing with 16 additions and 26 deletions
code/LanBortalWeb/WebContent/foodmanager/listOrders.xhtml
...@@ -13,11 +13,11 @@ ...@@ -13,11 +13,11 @@
</ui:define> </ui:define>
<ui:define name="content"> <ui:define name="content">
<h:form> <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"> <f:facet name="header">
<h:outputLabel value="#{i18n['foodWave.accountevents']}" /> <h:outputLabel value="#{i18n['foodWave.accountevents']}" />
</f:facet> </f:facet>
<p:column> <p:column sortBy="#{acc_line.eventTime.getTime()}">
<f:facet name="header"> <f:facet name="header">
<h:outputLabel value="#{i18n['acc_line.time']}" /> <h:outputLabel value="#{i18n['acc_line.time']}" />
</f:facet> </f:facet>
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" /> <f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
</h:outputText> </h:outputText>
</p:column> </p:column>
<p:column> <p:column sortBy="#{acc_line.quantity}">
<f:facet name="header"> <f:facet name="header">
<h:outputLabel value="#{i18n['acc_line.quantity']}" /> <h:outputLabel value="#{i18n['acc_line.quantity']}" />
</f:facet> </f:facet>
...@@ -33,13 +33,13 @@ ...@@ -33,13 +33,13 @@
<f:convertNumber minFractionDigits="2" maxFractionDigits="2" /> <f:convertNumber minFractionDigits="2" maxFractionDigits="2" />
</h:outputText> </h:outputText>
</p:column> </p:column>
<p:column> <p:column sortBy="#{acc_line.product.name}">
<f:facet name="header"> <f:facet name="header">
<h:outputLabel value="#{i18n['acc_line.product']}" /> <h:outputLabel value="#{i18n['acc_line.product']}" />
</f:facet> </f:facet>
<h:outputText value="#{acc_line.product.name}" /> <h:outputText value="#{acc_line.product.name}" />
</p:column> </p:column>
<p:column> <p:column sortBy="#{acc_line.user.wholeName}">
<f:facet name="header"> <f:facet name="header">
<h:outputLabel value="#{i18n['acc_line.eventuser']}" /> <h:outputLabel value="#{i18n['acc_line.eventuser']}" />
</f:facet> </f:facet>
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<f:param value="#{acc_line.user.id}" /> <f:param value="#{acc_line.user.id}" />
</h:link> </h:link>
</p:column> </p:column>
<p:column> <p:column sortBy="#{acc_line.user.nick}">
<f:facet name="header"> <f:facet name="header">
<h:outputLabel value="#{i18n['acc_line.nick']}" /> <h:outputLabel value="#{i18n['acc_line.nick']}" />
</f:facet> </f:facet>
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<f:param value="#{acc_line.user.id}" /> <f:param value="#{acc_line.user.id}" />
</h:link> </h:link>
</p:column> </p:column>
<p:column> <p:column sortBy="#{acc_line.eventDelivered}">
<f:facet name="header"> <f:facet name="header">
<h:outputLabel value="#{i18n['accountEvent.delivered']}" /> <h:outputLabel value="#{i18n['accountEvent.delivered']}" />
</f:facet> </f:facet>
...@@ -65,23 +65,15 @@ ...@@ -65,23 +65,15 @@
</p:dataTable> </p:dataTable>
</h:form> </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>
<br></br> <br></br>
<h:form> <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"> <f:facet name="header">
<h:outputLabel value="#{i18n['foodWave.billLines']}" /> <h:outputLabel value="#{i18n['foodWave.billLines']}" />
</f:facet> </f:facet>
<p:column> <p:column sortBy="#{bill_line.bill.sentDate.getTime()}">
<f:facet name="header"> <f:facet name="header">
<h:outputLabel value="#{i18n['billLine.time']}" /> <h:outputLabel value="#{i18n['billLine.time']}" />
</f:facet> </f:facet>
...@@ -89,7 +81,7 @@ ...@@ -89,7 +81,7 @@
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" /> <f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" />
</h:outputText> </h:outputText>
</p:column> </p:column>
<p:column> <p:column sortBy="#{bill_line.quantity}">
<f:facet name="header"> <f:facet name="header">
<h:outputLabel value="#{i18n['billLine.quantity']}" /> <h:outputLabel value="#{i18n['billLine.quantity']}" />
</f:facet> </f:facet>
...@@ -97,13 +89,13 @@ ...@@ -97,13 +89,13 @@
<f:convertNumber minFractionDigits="2" maxFractionDigits="2" /> <f:convertNumber minFractionDigits="2" maxFractionDigits="2" />
</h:outputText> </h:outputText>
</p:column> </p:column>
<p:column> <p:column sortBy="#{bill_line.name}">
<f:facet name="header"> <f:facet name="header">
<h:outputLabel value="#{i18n['billLine.product']}" /> <h:outputLabel value="#{i18n['billLine.product']}" />
</f:facet> </f:facet>
<h:outputText value="#{bill_line.name}" /> <h:outputText value="#{bill_line.name}" />
</p:column> </p:column>
<p:column> <p:column sortBy="#{bill_line.bill.user.wholeName}">
<f:facet name="header"> <f:facet name="header">
<h:outputLabel value="#{i18n['billLine.eventuser']}" /> <h:outputLabel value="#{i18n['billLine.eventuser']}" />
</f:facet> </f:facet>
...@@ -111,7 +103,7 @@ ...@@ -111,7 +103,7 @@
<f:param name="userid" value="#{bill_line.bill.user.id}" /> <f:param name="userid" value="#{bill_line.bill.user.id}" />
</h:link> </h:link>
</p:column> </p:column>
<p:column> <p:column sortBy="#{bill_line.bill.user.nick}">
<f:facet name="header"> <f:facet name="header">
<h:outputLabel value="#{i18n['billLine.nick']}" /> <h:outputLabel value="#{i18n['billLine.nick']}" />
</f:facet> </f:facet>
...@@ -119,7 +111,7 @@ ...@@ -119,7 +111,7 @@
<f:param name="userid" value="#{bill_line.bill.user.id}" /> <f:param name="userid" value="#{bill_line.bill.user.id}" />
</h:link> </h:link>
</p:column> </p:column>
<p:column> <p:column sortBy="#{bill_line.linePrice}">
<f:facet name="header"> <f:facet name="header">
<h:outputLabel value="#{i18n['billLine.price']}" /> <h:outputLabel value="#{i18n['billLine.price']}" />
</f:facet> </f:facet>
...@@ -128,7 +120,7 @@ ...@@ -128,7 +120,7 @@
</h:outputText> </h:outputText>
</p:column> </p:column>
<p:column> <p:column sortBy="#{bill_line.bill.totalPrice}">
<f:facet name="header"> <f:facet name="header">
<h:outputLabel value="#{i18n['bill.totalprice']}" /> <h:outputLabel value="#{i18n['bill.totalprice']}" />
</f:facet> </f:facet>
...@@ -148,6 +140,7 @@ ...@@ -148,6 +140,7 @@
</p:dataTable> </p:dataTable>
</h:form> </h:form>
<h2>#{i18n['foodwave.summaryView']}</h2> <h2>#{i18n['foodwave.summaryView']}</h2>
<div> <div>
<h:outputLabel value="#{i18n['foodwave.price']}: " /> <h:outputLabel value="#{i18n['foodwave.price']}: " />
...@@ -191,9 +184,6 @@ ...@@ -191,9 +184,6 @@
</p:dataTable> </p:dataTable>
<!-- <foodwave:summary foodwaveProductSummaries="#{foodWaveView.productSummaries}" foodwave="#{foodWaveView.selectedFoodWave}"/>
-->
</ui:define> </ui:define>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!