Skip to content

Antti Väyrynen / Moya

Go to a project
Commit ae395bec by Tuukka Kivilahti
Options

merge

2 parents 74a526ce 242887d6
Inline Side-by-side
Showing with 11 additions and 24 deletions
code/LanBortalWeb/WebContent/foodmanager/listFoodwaves.xhtml
<!DOCTYPE html <!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:foodwave="http://java.sun.com/jsf/composite/cditools/foodwave" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui">
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:foodwave="http://java.sun.com/jsf/composite/cditools/foodwave"
xmlns:users="http://java.sun.com/jsf/composite/cditools/user"
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:p="http://primefaces.org/ui">
<h:body> <h:body>
<ui:composition <ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
template="/layout/#{sessionHandler.layout}/template.xhtml">
<f:metadata> <f:metadata>
<f:event type="preRenderView" <f:event type="preRenderView" listener="#{foodWaveView.initFoodwaveManagerList}" />
listener="#{foodWaveView.initFoodwaveManagerList}" />
</f:metadata> </f:metadata>
<ui:define name="title"> <ui:define name="title">
...@@ -22,15 +13,15 @@ ...@@ -22,15 +13,15 @@
</ui:define> </ui:define>
<ui:define name="content"> <ui:define name="content">
<h:form> <h:form>
<p:dataTable styleClass="bordertable" value="#{foodWaveView.foodWaves}" sortBy="#{foodwave.time}" sortOrder="ascending" var="foodwave" editable="true"> <p:dataTable styleClass="bordertable" value="#{foodWaveView.foodWaves}" sortBy="#{foodwave.time}" sortOrder="ascending" var="foodwave" editable="true" rowStyleClass="#{foodWave.closed ? 'old' : null} >
<p:ajax event="rowEdit" listener="#{foodWaveView.onEditFoodWave}" /> <p:ajax event="rowEdit" listener="#{foodWaveView.onEditFoodWave}"/>
<p:column sortBy="#{foodwave.time}"> <p:column sortBy="#{foodwave.time}">
<f:facet name="header"> <f:facet name="header">
<h:outputText value="${i18n['foodWave.time']}" /> <h:outputText value="${i18n['foodWave.time']}" />
</f:facet> </f:facet>
<p:cellEditor> <p:cellEditor>
<f:facet name="output" > <f:facet name="output">
<h:outputText value="#{foodwave.time}"> <h:outputText value="#{foodwave.time}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" /> <f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
</h:outputText> </h:outputText>
...@@ -55,8 +46,7 @@ ...@@ -55,8 +46,7 @@
<h:outputText value="#{foodwave.name}" /> <h:outputText value="#{foodwave.name}" />
</f:facet> </f:facet>
<f:facet name="input"> <f:facet name="input">
<p:inputText value="#{foodwave.name}" style="width:100%" <p:inputText value="#{foodwave.name}" style="width:100%" required="true" requiredMessage="Name required" />
required="true" requiredMessage="Name required" />
</f:facet> </f:facet>
</p:cellEditor> </p:cellEditor>
</p:column> </p:column>
...@@ -64,31 +54,28 @@ ...@@ -64,31 +54,28 @@
<f:facet name="header"> <f:facet name="header">
<h:outputText value="${i18n['foodWave.paid']}" /> <h:outputText value="${i18n['foodWave.paid']}" />
</f:facet> </f:facet>
<h:outputText value="#{foodwave.orderedCount}" /> <h:outputText value="#{foodwave.accountEvents.size()}" />
</p:column> </p:column>
<p:column styleClass="text-center"> <p:column styleClass="text-center">
<f:facet name="header"> <f:facet name="header">
<h:outputText value="${i18n['foodWave.unconfirmedOrders']}" /> <h:outputText value="${i18n['foodWave.unconfirmedOrders']}" />
</f:facet> </f:facet>
<h:outputText value="#{foodwave.unpaidCount}" /> <h:outputText value="#{foodwave.unpaidBillLineCount}" />
</p:column> </p:column>
<p:column> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="${i18n['foodWave.totalReserved']}" /> <h:outputText value="${i18n['foodWave.totalReserved']}" />
</f:facet> </f:facet>
<h:outputText value="#{foodwave.reservedCount}" /> / <h:outputText <h:outputText value="#{foodwave.reservedCount}" /> / <h:outputText value="#{foodwave.maximumFoods}" />
value="#{foodwave.maximumFoods}" />
</p:column> </p:column>
<p:column> <p:column>
<h:link outcome="/foodmanager/listOrders" <h:link outcome="/foodmanager/listOrders" value="#{i18n['foodWave.show']}">
value="#{i18n['foodWave.show']}">
<f:param name="foodwaveid" value="#{foodwave.id}" /> <f:param name="foodwaveid" value="#{foodwave.id}" />
</h:link> </h:link>
</p:column> </p:column>
<p:column> <p:column>
<p:rowEditor /> <p:rowEditor />
</p:column> </p:column>
<!-- <!--
<p:column> <p:column>
<h:outputText value="#{foodwave.closed.toString()}" /> <h:outputText value="#{foodwave.closed.toString()}" />
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!