Skip to content

Antti Väyrynen / Moya

Go to a project
Commit c781ec17 by Tuukka Kivilahti
Options

Merge branch 'master' of codecrew.fi:bortal

2 parents dbf39565 f0c6dfe6
Inline Side-by-side
Showing with 154 additions and 47 deletions
code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWave.java
...@@ -216,6 +216,18 @@ public class FoodWave extends GenericEntity { ...@@ -216,6 +216,18 @@ public class FoodWave extends GenericEntity {
return ret; return ret;
} }
public boolean isDelivered() {
if (getAccountEvents() != null && getReservedCount() != 0) {
for(AccountEvent ae : getAccountEvents()) {
if (ae.isEventDelivered()) {
return true;
}
}
return false;
}
return true;
}
} }
......
code/LanBortalWeb/WebContent/foodmanager/listFoodwaves.xhtml
...@@ -13,11 +13,13 @@ ...@@ -13,11 +13,13 @@
</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="#{not foodwave.isOrderable() ? foodwave.isDelivered() ? 'hidden' : 'closed' : null}">
<!-- rowStyleClass="#{foodWave.closed ? 'old' : null} --> <!-- rowStyleClass="#{foodWave.closed ? 'old' : null} -->
<p:ajax event="rowEdit" listener="#{foodWaveView.onEditFoodWave}"/> <p:ajax event="rowEdit" listener="#{foodWaveView.onEditFoodWave}" />
<f:facet name="header">
<p:column sortBy="#{foodwave.time}"> <h:outputLabel value="#{i18n['foodWave.activeFoodWaves']}" />
</f:facet>
<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>
...@@ -31,53 +33,137 @@ ...@@ -31,53 +33,137 @@
<p:calendar id="startTime" value="#{foodwave.time}" pattern="#{sessionHandler.datetimeFormat}" /> <p:calendar id="startTime" value="#{foodwave.time}" pattern="#{sessionHandler.datetimeFormat}" />
</f:facet> </f:facet>
</p:cellEditor> </p:cellEditor>
</p:column> </p:column>
<p:column> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="${i18n['foodWave.template.name']}" /> <h:outputText value="${i18n['foodWave.template.name']}" />
</f:facet>
<h:outputText value="#{foodwave.template.name}" />
</p:column>
<p:column>
<f:facet name="header">
<h:outputLabel id="name" value="${i18n['foodWave.name']}" />
</f:facet>
<p:cellEditor>
<f:facet name="output">
<h:outputText value="#{foodwave.name}" />
</f:facet>
<f:facet name="input">
<p:inputText value="#{foodwave.name}" style="width:100%" required="true" requiredMessage="Name required" />
</f:facet> </f:facet>
<h:outputText value="#{foodwave.template.name}" /> </p:cellEditor>
</p:column> </p:column>
<p:column> <p:column styleClass="text-center">
<f:facet name="header"> <f:facet name="header">
<h:outputLabel id="name" value="${i18n['foodWave.name']}" /> <h:outputText value="${i18n['foodWave.paid']}" />
</f:facet>
<h:outputText value="#{foodwave.orderedCount}" />
</p:column>
<p:column styleClass="text-center">
<f:facet name="header">
<h:outputText value="${i18n['foodWave.unconfirmedOrders']}" />
</f:facet>
<h:outputText value="#{foodwave.unpaidCount}" />
</p:column>
<p:column>
<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>
<h:link outcome="/foodmanager/listOrders" value="#{i18n['foodWave.show']}">
<f:param name="foodwaveid" value="#{foodwave.id}" />
</h:link>
</p:column>
<p:column>
<p:rowEditor />
</p:column>
<!--
<p:column>
<h:outputText value="#{foodwave.closed.toString()}" />
<p:commandButton rendered="#{foodwave.closed}"
value="#{i18n['foodWave.openNow']}"
action="#{foodwave.toggleClosed}" />
<p:commandButton rendered="#{not foodwave.closed}"
value="#{i18n['foodWave.closeNow']}"
action="#{foodwave.toggleClosed}" />
</p:column> -->
</p:dataTable>
</h:form>
<br/>
<br/>
<h:form>
<p:dataTable styleClass="bordertable" value="#{foodWaveView.foodWaves}" sortBy="#{foodwave.time}" sortOrder="ascending" var="foodwave" editable="true" rowStyleClass="#{not foodwave.isDelivered() ? 'hidden' : 'closed'}">
<!-- rowStyleClass="#{foodWave.closed ? 'old' : null} -->
<p:ajax event="rowEdit" listener="#{foodWaveView.onEditFoodWave}" />
<f:facet name="header">
<h:outputLabel value="#{i18n['foodWave.deliveredFoodWaves']}" />
</f:facet>
<p:column sortBy="#{foodwave.time}">
<f:facet name="header">
<h:outputText value="${i18n['foodWave.time']}" />
</f:facet>
<p:cellEditor>
<f:facet name="output">
<h:outputText value="#{foodwave.time}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
</h:outputText>
</f:facet> </f:facet>
<p:cellEditor> <f:facet name="input">
<f:facet name="output"> <p:calendar id="startTime" value="#{foodwave.time}" pattern="#{sessionHandler.datetimeFormat}" />
<h:outputText value="#{foodwave.name}" />
</f:facet>
<f:facet name="input">
<p:inputText value="#{foodwave.name}" style="width:100%" required="true" requiredMessage="Name required" />
</f:facet>
</p:cellEditor>
</p:column>
<p:column styleClass="text-center">
<f:facet name="header">
<h:outputText value="${i18n['foodWave.paid']}" />
</f:facet> </f:facet>
<h:outputText value="#{foodwave.orderedCount}" /> </p:cellEditor>
</p:column> </p:column>
<p:column styleClass="text-center"> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="${i18n['foodWave.unconfirmedOrders']}" /> <h:outputText value="${i18n['foodWave.template.name']}" />
</f:facet>
<h:outputText value="#{foodwave.template.name}" />
</p:column>
<p:column>
<f:facet name="header">
<h:outputLabel id="name" value="${i18n['foodWave.name']}" />
</f:facet>
<p:cellEditor>
<f:facet name="output">
<h:outputText value="#{foodwave.name}" />
</f:facet> </f:facet>
<h:outputText value="#{foodwave.unpaidCount}" /> <f:facet name="input">
</p:column> <p:inputText value="#{foodwave.name}" style="width:100%" required="true" requiredMessage="Name required" />
<p:column>
<f:facet name="header">
<h:outputText value="${i18n['foodWave.totalReserved']}" />
</f:facet> </f:facet>
<h:outputText value="#{foodwave.reservedCount}" /> / <h:outputText value="#{foodwave.maximumFoods}" /> </p:cellEditor>
</p:column> </p:column>
<p:column> <p:column styleClass="text-center">
<h:link outcome="/foodmanager/listOrders" value="#{i18n['foodWave.show']}"> <f:facet name="header">
<f:param name="foodwaveid" value="#{foodwave.id}" /> <h:outputText value="${i18n['foodWave.paid']}" />
</h:link> </f:facet>
</p:column> <h:outputText value="#{foodwave.orderedCount}" />
<p:column> </p:column>
<p:rowEditor /> <p:column styleClass="text-center">
</p:column> <f:facet name="header">
<!-- <h:outputText value="${i18n['foodWave.unconfirmedOrders']}" />
</f:facet>
<h:outputText value="#{foodwave.unpaidCount}" />
</p:column>
<p:column>
<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>
<h:link outcome="/foodmanager/listOrders" value="#{i18n['foodWave.show']}">
<f:param name="foodwaveid" value="#{foodwave.id}" />
</h:link>
</p:column>
<p:column>
<p:rowEditor />
</p:column>
<!--
<p:column> <p:column>
<h:outputText value="#{foodwave.closed.toString()}" /> <h:outputText value="#{foodwave.closed.toString()}" />
<p:commandButton rendered="#{foodwave.closed}" <p:commandButton rendered="#{foodwave.closed}"
......
code/LanBortalWeb/WebContent/resources/style/insomnia2/css/general.css
...@@ -19,4 +19,12 @@ display: none; ...@@ -19,4 +19,12 @@ display: none;
.text-center { .text-center {
text-align: center; text-align: center;
}
.closed {
background-color: #eee;
}
.hidden {
display: none;
} }
\ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!