Skip to content

Linnea Samila / Moya

Go to a project
Commit 38dcab89 by Tuomas Riihimäki
Options

Merge branch 'master' of codecrew.fi:bortal 

Conflicts:
	code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_en.properties
	code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties
2 parents abb72c29 6fc0abed
Expand all
Inline Side-by-side
Showing with 288 additions and 149 deletions
code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWave.java
...@@ -126,6 +126,14 @@ public class FoodWave extends GenericEntity { ...@@ -126,6 +126,14 @@ public class FoodWave extends GenericEntity {
} }
public boolean isFull() { public boolean isFull() {
if(getMaximumFoods() <= 0) {
return false;
}
if(getReservedCount() >= getMaximumFoods()) {
return true;
}
return false; return false;
} }
...@@ -174,6 +182,12 @@ public class FoodWave extends GenericEntity { ...@@ -174,6 +182,12 @@ public class FoodWave extends GenericEntity {
} }
public Integer getMaximumFoods() { public Integer getMaximumFoods() {
if(maximumFoods == null) {
return 0;
}
return maximumFoods; return maximumFoods;
} }
...@@ -216,6 +230,18 @@ public class FoodWave extends GenericEntity { ...@@ -216,6 +230,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,12 @@ ...@@ -13,11 +13,12 @@
</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} --> <p:ajax event="rowEdit" listener="#{foodWaveView.onEditFoodWave}" />
<p:ajax event="rowEdit" listener="#{foodWaveView.onEditFoodWave}"/> <f:facet name="header">
<h:outputLabel value="#{i18n['foodWave.activeFoodWaves']}" />
<p:column sortBy="#{foodwave.time}"> </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 +32,137 @@ ...@@ -31,53 +32,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/cditools/foodwave/list.xhtml
...@@ -15,18 +15,20 @@ ...@@ -15,18 +15,20 @@
<!-- <h:outputScript target="head" library="script" name="shopscript.js" /> --> <!-- <h:outputScript target="head" library="script" name="shopscript.js" /> -->
<h:outputScript library="primefaces" name="jquery/jquery.js" /> <h:outputScript library="primefaces" name="jquery/jquery.js" />
<p:dataTable columnClasses="nowrap,numalign,numalign,nowrap,numalign" styleClass="bordertable" value="#{foodWaveView.foodWaves}" var="foodwave"> <p:dataTable columnClasses="nowrap,numalign,numalign,nowrap,numalign" styleClass="bordertable" value="#{foodWaveView.foodWaves}" var="foodwave" sortBy="#{foodwave.time.time}" rowStyleClass="#{foodwave.isFull() ? 'closed' : null}">
<p:column> <p:column sortBy="#{i18n['foodWave.name']}">
<f:facet name="header"> <f:facet name="header">
<h:outputLabel id="name" value="${i18n['foodWave.name']}" /> <h:outputLabel id="name" value="#{i18n['foodWave.name']}" />
</f:facet> </f:facet>
<h:link outcome="#{cc.attrs.outcome}" value="#{foodwave.name}"> <h:link rendered="#{not foodwave.isFull()}" outcome="#{cc.attrs.outcome}" value="#{foodwave.name}">
<f:param name="foodwaveid" value="#{foodwave.id}" /> <f:param name="foodwaveid" value="#{foodwave.id}" />
<f:param name="userid" value="#{userView.user.user.id}" /> <f:param name="userid" value="#{userView.user.user.id}" />
</h:link> </h:link>
<h:outputText rendered="#{foodwave.isFull()}" value="#{foodwave.name}" />
</p:column> </p:column>
<p:column> <p:column sortBy="#{foodwave.template.name}">
<f:facet name="header"> <f:facet name="header">
<h:outputText value="Menu" /> <h:outputText value="Menu" />
</f:facet> </f:facet>
...@@ -34,13 +36,22 @@ ...@@ -34,13 +36,22 @@
<f:param name="foodwaveid" value="#{foodwave.id}" /> <f:param name="foodwaveid" value="#{foodwave.id}" />
</h:outputText> </h:outputText>
</p:column> </p:column>
<p:column> <p:column sortBy="#{foodwave.template.description}">
<f:facet name="header"> <f:facet name="header">
<h:outputText value="${i18n['foodWave.description']}" /> <h:outputText value="${i18n['foodWave.description']}" />
</f:facet> </f:facet>
<h:outputText id="description" value="#{foodwave.template.description}" /> <h:outputText id="description" value="#{foodwave.template.description}" />
</p:column> </p:column>
<p:column>
<p:column sortBy="#{foodwave.reservedCount}">
<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 sortBy="#{foodwave.time.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>
......
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
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_en.properties
...@@ -200,20 +200,22 @@ feedback.thanks = Thanks ...@@ -200,20 +200,22 @@ feedback.thanks = Thanks
food = Food food = Food
foodWave.accountevents = Accountevents foodWave.accountevents = Accountevents
foodWave.billLines = Pending Online Payments foodWave.activeFoodWaves = Active Foodwaves
foodWave.description = Description foodWave.billLines = Pending Online Payments
foodWave.list = Active Foodwaves foodWave.deliveredFoodWaves = Delivered Foodwaves
foodWave.name = Foodwave foodWave.description = Description
foodWave.orders = Amount of Orders foodWave.list = Active Foodwaves
foodWave.paid = Paid foodWave.name = Foodwave
foodWave.show = Show foodWave.orders = Amount of Orders
foodWave.template.name = Template foodWave.paid = Paid
foodWave.template.waves = Foodwaves foodWave.show = Show
foodWave.templatename = Choose Products foodWave.template.name = Template
foodWave.time = Time foodWave.template.waves = Foodwaves
foodWave.totalReserved = Total foodWave.templatename = Choose Products
foodWave.unconfirmedOrders = Unconfirmed foodWave.time = Time
foodWave.totalReserved = Total
foodWave.unconfirmedOrders = Unconfirmed
foodadmin.editTemplate = Edit foodadmin.editTemplate = Edit
......
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_en_ST.properties
#Generated by ResourceBundle Editor (http://eclipse-rbe.sourceforge.net) #Generated by ResourceBundle Editor (http://eclipse-rbe.sourceforge.net)
#Bill number #Bill number
# Validationmessages # Validationmessages
actionlog.create.header = Create new actionmessage actionlog.create.header = Create new actionmessage
actionlog.create.message = Message actionlog.create.message = Message
actionlog.create.role = Target role actionlog.create.role = Target role
actionlog.create.submitbutton = Send actionlog.create.submitbutton = Send
actionlog.create.taskradio = Task actionlog.create.taskradio = Task
actionlog.crew = Crew actionlog.crew = Crew
actionlog.message = Event actionlog.message = Event
actionlog.messagelist.description = You can follow and create new action messages in this view actionlog.messagelist.description = You can follow and create new action messages in this view
actionlog.messagelist.header = Messagelist actionlog.messagelist.header = Messagelist
actionlog.state = State actionlog.state = State
actionlog.task = Task actionlog.task = Task
actionlog.tasklist.header = Tasklist actionlog.tasklist.header = Tasklist
actionlog.time = Time actionlog.time = Time
actionlog.user = User actionlog.user = User
bill.billMarkedPaidMail.message = Your deposit number {0} has been marked as paid. bill.billMarkedPaidMail.message = Your deposit number {0} has been marked as paid.
bill.billMarkedPaidMail.subject = [Streamparty] Your credits have been updated bill.billMarkedPaidMail.subject = [Streamparty] Your credits have been updated
error.contact = If this happens again, contact Info with the following code: error.contact = If this happens again, contact Info with the following code:
error.error = You have encountered an error. error.error = You have encountered an error.
eventorg.create = Create eventorg.create = Create
eventorg.edit = Edit eventorg.edit = Edit
global.cancel = Cancel global.cancel = Cancel
global.copyright = Codecrew Ry global.copyright = Codecrew Ry
global.infomail = info@streamparty.org global.infomail = info@streamparty.org
global.notAuthorizedExecute = You are not authorized to execute that!! global.notAuthorizedExecute = You are not authorized to execute that!!
global.notauthorized = You don't have enough rights to enter this site. global.notauthorized = You don't have enough rights to enter this site.
global.save = Save global.save = Save
global.webpage = http://www.streamparty.org global.webpage = http://www.streamparty.org
httpsession.creationTime = Created httpsession.creationTime = Created
login.login = Login login.login = Login
login.logout = Logout login.logout = Logout
login.logoutmessage = You have logged out of the system login.logoutmessage = You have logged out of the system
login.password = Password login.password = Password
login.submit = Login login.submit = Login
login.username = Username login.username = Username
loginerror.header = Login failed loginerror.header = Login failed
loginerror.message = Username of password incorrect. loginerror.message = Username of password incorrect.
loginerror.resetpassword = Reset password loginerror.resetpassword = Reset password
passwordChanged.body = You can now login with the new password. passwordChanged.body = You can now login with the new password.
passwordChanged.header = Password changed successfully. passwordChanged.header = Password changed successfully.
passwordReset.errorChanging = Unexpected error whilst password reset. Contact your administrator. passwordReset.errorChanging = Unexpected error whilst password reset. Contact your administrator.
passwordReset.hashNotFound = Password change token has expired. Please send the query again. passwordReset.hashNotFound = Password change token has expired. Please send the query again.
permissiondenied.alreadyLoggedIn = You don't have enough rights permissiondenied.alreadyLoggedIn = You don't have enough rights
permissiondenied.header = Access denied permissiondenied.header = Access denied
permissiondenied.notLoggedIn = You don't have enough rights to enter this site. permissiondenied.notLoggedIn = You don't have enough rights to enter this site.
resetMail.body = You can change a forgotten password by inserting your username to the field below. A link where you can change the password will be sent to the email address associated to that. resetMail.body = You can change a forgotten password by inserting your username to the field below. A link where you can change the password will be sent to the email address associated to that.
resetMail.header = Reset lost password resetMail.header = Reset lost password
resetMail.send = Send email resetMail.send = Send email
resetMail.username = Username resetMail.username = Username
resetmailSent.body = Email has been sent containing a link where you can change the password. resetmailSent.body = Email has been sent containing a link where you can change the password.
resetmailSent.header = Email sent resetmailSent.header = Email sent
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties
...@@ -198,20 +198,22 @@ feedback.thanks = Kiiiiitooooos! :) ...@@ -198,20 +198,22 @@ feedback.thanks = Kiiiiitooooos! :)
food = Ruoka food = Ruoka
foodWave.accountevents = Maksetut tilaukset foodWave.accountevents = Maksetut tilaukset
foodWave.billLines = Maksamattomat Verkkomaksut foodWave.activeFoodWaves = Aktiiviset Ruokatilaukset
foodWave.description = Kuvaus foodWave.billLines = Maksamattomat Verkkomaksut
foodWave.list = Aktiviset ruokatilaukset foodWave.deliveredFoodWaves = Toimitetut Ruokatilaukset
foodWave.name = Ruokatilaus foodWave.description = Kuvaus
foodWave.orders = Tilausten M\u00E4\u00E4r\u00E4 foodWave.list = Ruokatilaukset
foodWave.paid = Maksettuja foodWave.name = Ruokatilaus
foodWave.show = N\u00E4yt\u00E4 foodWave.orders = Tilausten M\u00E4\u00E4r\u00E4
foodWave.template.name = Tilauspohja foodWave.paid = Maksettuja
foodWave.template.waves = Ruokatilaus foodWave.show = N\u00E4yt\u00E4
foodWave.templatename = Valitse tuotteet foodWave.template.name = Tilauspohja
foodWave.time = Aika foodWave.template.waves = Ruokatilaus
foodWave.totalReserved = Yhteens\u00E4 foodWave.templatename = Valitse tuotteet
foodWave.unconfirmedOrders = Vahvistamattomia foodWave.time = Aika
foodWave.totalReserved = Yhteens\u00E4
foodWave.unconfirmedOrders = Vahvistamattomia
foodadmin.editTemplate = Muokkaa foodadmin.editTemplate = Muokkaa
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/shop/FoodWaveFoodView.java
...@@ -141,8 +141,12 @@ public class FoodWaveFoodView extends GenericCDIView { ...@@ -141,8 +141,12 @@ public class FoodWaveFoodView extends GenericCDIView {
bill.addProduct(shopitem.getProduct(), shopitem.getCount(), getFoodWave()); bill.addProduct(shopitem.getProduct(), shopitem.getCount(), getFoodWave());
} }
} }
billBean.createBill(bill); billBean.createBill(bill);
// TODO: do this right way
eventBean.flushCache();
return bill; return bill;
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!