Skip to content

Codecrew / Moya

Go to a project
Commit dc64db73 by Tuomas Riihimäki
Options

Merge branch 'master' of codecrew.fi:bortal

2 parents 006077c2 648b33da
Inline Side-by-side
Showing with 9 additions and 9 deletions
code/LanBortalWeb/WebContent/foodmanager/listOrders.xhtml
...@@ -87,13 +87,13 @@ ...@@ -87,13 +87,13 @@
<h:outputLabel value="#{i18n['foodwave.orders']}" /> <h:outputLabel value="#{i18n['foodwave.orders']}" />
</h1> </h1>
<h:form> <h:form>
<p:dataTable styleClass="bordertable" value="#{foodWaveView.accountEventLines}" var="acc_lines"> <p:dataTable styleClass="bordertable" value="#{foodWaveView.accountEventLines}" var="acc_line">
<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>
<f:facet name="header"> <f:facet name="header">
<h:outputLabel value="${i18n['acc_lines.time']}" /> <h:outputLabel value="#{i18n['acc_lines.time']}" />
</f:facet> </f:facet>
<h:outputText value="#{acc_line.eventTime.getTime()}"> <h:outputText value="#{acc_line.eventTime.getTime()}">
<f:convertDateTime pattern="hh:mm d/M/yy" /> <f:convertDateTime pattern="hh:mm d/M/yy" />
...@@ -101,35 +101,35 @@ ...@@ -101,35 +101,35 @@
</p:column> </p:column>
<p:column> <p:column>
<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>
<h:outputText value="#{acc_line.quantity}" /> <h:outputText value="#{acc_line.quantity}" />
</p:column> </p:column>
<p:column> <p:column>
<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>
<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>
<h:link outcome="/useradmin/edit" value="#{acc_line.user.wholeName}"> <h:link outcome="/useradmin/edit" value="#{acc_line.user.wholeName}">
<f:param name="userid" value="#{acc_line.user.id}" /> <f:param value="#{acc_line.user.id}" />
</h:link> </h:link>
</p:column> </p:column>
<p:column> <p:column>
<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>
<h:link outcome="/useradmin/edit" value="#{acc_line.user.nick}"> <h:link outcome="/useradmin/edit" value="#{acc_line.user.nick}">
<f:param name="userid" value="#{acc_line.user.id}" /> <f:param value="#{acc_line.user.id}" />
</h:link> </h:link>
</p:column> </p:column>
<p:column> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputLabel value="${i18n['accountEvent.delivered']}" /> <h:outputLabel value="#{i18n['accountEvent.delivered']}" />
</f:facet> </f:facet>
<h:outputText rendered="#{acc_line.delivered}" value="#{i18n['accountEvent.delivered']}" /> <h:outputText rendered="#{acc_line.delivered}" value="#{i18n['accountEvent.delivered']}" />
<h:commandButton rendered="#{not acc_line.delivered}" value="#{i18n['accountEvent.deliver']}" action="#{foodWaveView.deliverAccountEvent}" /> <h:commandButton rendered="#{not acc_line.delivered}" value="#{i18n['accountEvent.deliver']}" action="#{foodWaveView.deliverAccountEvent}" />
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!