Skip to content

Max Mecklin / Moya

Go to a project
Commit 1b858b07 by Riku Silvola
Options

Merge branch 'master' of codecrew.fi:bortal

2 parents 5188f5b1 1a9af8bc
Inline Side-by-side
Showing with 50 additions and 103 deletions
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/FoodWaveBean.java
...@@ -74,7 +74,7 @@ public class FoodWaveBean implements FoodWaveBeanLocal { ...@@ -74,7 +74,7 @@ public class FoodWaveBean implements FoodWaveBeanLocal {
@Override @Override
public FoodWaveTemplate saveTemplate(FoodWaveTemplate waveTemplate) { public FoodWaveTemplate saveTemplate(FoodWaveTemplate waveTemplate) {
throw new UnsupportedOperationException("would you mind to implement this method?"); return fwtFacade.merge(waveTemplate);
} }
...@@ -117,4 +117,14 @@ public class FoodWaveBean implements FoodWaveBeanLocal { ...@@ -117,4 +117,14 @@ public class FoodWaveBean implements FoodWaveBeanLocal {
return template; return template;
} }
@Override
public FoodWaveTemplate removeProductFromTemplate(Product product, FoodWaveTemplate template) {
template = fwtFacade.merge(template);
product = productfacade.merge(product);
template.getProducts().remove(product);
product.getFoodWaveTemplates().remove(template);
return template;
}
} }
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/ActionLogFacade.java
...@@ -29,8 +29,6 @@ public class ActionLogFacade extends IntegerPkGenericFacade<ActionLogMessage> { ...@@ -29,8 +29,6 @@ public class ActionLogFacade extends IntegerPkGenericFacade<ActionLogMessage> {
cq.orderBy(cb.desc(root.get("time"))); cq.orderBy(cb.desc(root.get("time")));
TypedQuery<ActionLogMessage> tq = getEm().createQuery(cq); TypedQuery<ActionLogMessage> tq = getEm().createQuery(cq);
tq.setMaxResults(10);
tq.setFirstResult(0);
return tq.getResultList(); return tq.getResultList();
} }
......
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/FoodWaveBeanLocal.java
...@@ -32,4 +32,6 @@ public interface FoodWaveBeanLocal { ...@@ -32,4 +32,6 @@ public interface FoodWaveBeanLocal {
public void createFoodWave(FoodWave fw); public void createFoodWave(FoodWave fw);
FoodWaveTemplate addProductToTemplate(FoodWaveTemplate template, Product currentProduct); FoodWaveTemplate addProductToTemplate(FoodWaveTemplate template, Product currentProduct);
FoodWaveTemplate removeProductFromTemplate(Product product, FoodWaveTemplate template);
} }
code/LanBortalWeb/WebContent/actionlog/messagelist.xhtml
...@@ -46,41 +46,41 @@ ...@@ -46,41 +46,41 @@
<div id="actionlog"> <div id="actionlog">
<h:form id="refresh"> <h:form id="refresh">
<p:poll interval="1" update="actionlogtable" /> <p:poll interval="1" update="actionlogtable" />
<h:dataTable styleClass="bordertable" rowClasses="roweven,rowodd" id="actionlogtable" value="#{actionLogMessageView.messages}" var="message"> <p:dataTable styleClass="bordertable" id="actionlogtable" value="#{actionLogMessageView.messages}" var="message" paginator="true" rows="10" paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}">
<h:column> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['actionlog.time']}" /> <h:outputText value="#{i18n['actionlog.time']}" />
</f:facet> </f:facet>
<h:outputText value="#{message.time}"> <h:outputText value="#{message.time}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" /> <f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
</h:outputText> </h:outputText>
</h:column> </p:column>
<h:column> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['actionlog.user']}" /> <h:outputText value="#{i18n['actionlog.user']}" />
</f:facet> </f:facet>
<h:outputText value="#{message.user.nick}" /> <h:outputText value="#{message.user.nick}" />
</h:column> </p:column>
<h:column> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['actionlog.crew']}" /> <h:outputText value="#{i18n['actionlog.crew']}" />
</f:facet> </f:facet>
<h:outputText value="#{message.crew.name}" /> <h:outputText value="#{message.crew.name}" />
</h:column> </p:column>
<h:column> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['actionlog.message']}" /> <h:outputText value="#{i18n['actionlog.message']}" />
</f:facet> </f:facet>
<h:outputText value="#{message.message}" /> <h:outputText value="#{message.message}" />
</h:column> </p:column>
<h:column> <p:column>
<h:link rendered="#{!empty message.state}" outcome="taskview"> <h:link rendered="#{!empty message.state}" outcome="taskview">
<f:param name="id" value="#{message.id}" /> <f:param name="id" value="#{message.id}" />
Näytä tehtävä Näytä tehtävä
</h:link> </h:link>
</h:column> </p:column>
</h:dataTable> </p:dataTable>
</h:form> </h:form>
</div> </div>
</ui:define> </ui:define>
......
code/LanBortalWeb/WebContent/actionlog/taskview.xhtml
...@@ -49,35 +49,35 @@ ...@@ -49,35 +49,35 @@
<div> <div>
<h:form> <h:form>
<p:poll interval="1" update="messageresponsetable" /> <p:poll interval="1" update="messageresponsetable" />
<h:dataTable id="messageresponsetable" value="#{taskModificationView.responses}" var="response"> <p:dataTable id="messageresponsetable" value="#{taskModificationView.responses}" var="response" paginator="true" rows="10" paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}">
<h:column> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="Aika" /> <h:outputText value="Aika" />
</f:facet> </f:facet>
<h:outputText value="#{response.time}"> <h:outputText value="#{response.time}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" /> <f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
</h:outputText> </h:outputText>
</h:column> </p:column>
<h:column> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="Submitter" /> <h:outputText value="Submitter" />
</f:facet> </f:facet>
<h:outputText value="#{response.user.nick}" /> <h:outputText value="#{response.user.nick}" />
</h:column> </p:column>
<h:column> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="Message" /> <h:outputText value="Message" />
</f:facet> </f:facet>
<h:outputText value="#{response.message}" /> <h:outputText value="#{response.message}" />
</h:column> </p:column>
<h:column> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="tilanvaihdos" /> <h:outputText value="tilanvaihdos" />
</f:facet> </f:facet>
<h:outputText value="#{i18n[response.stateChange.key]}" /> <h:outputText value="#{i18n[response.stateChange.key]}" />
</h:column> </p:column>
</h:dataTable> </p:dataTable>
</h:form> </h:form>
</div> </div>
......
code/LanBortalWeb/WebContent/foodadmin/createTemplate.xhtml
...@@ -38,84 +38,12 @@ ...@@ -38,84 +38,12 @@
requiredMessage="Description required" /> requiredMessage="Description required" />
<h:message for="description" /> <h:message for="description" />
</h:panelGrid> </h:panelGrid>
<!-- </p:tab>
<p:tab id="selectproducts"
title="#{i18n['foodwavetemplate.selectproducts']}"> -->
<h:messages />
<h:panelGrid columns="4">
<h:outputText value="#{i18n['foodwavetemplate.productname']}" />
<h:outputText
value="#{i18n['foodwavetemplate.productdescription']}" />
<h:outputText value="#{i18n['foodwavetemplate.price']}" />
<h:outputText value="&nbsp;" />
<h:inputText id="productname"
value="#{foodWaveView.currentProduct.name}" />
<h:inputText id="productdescription"
value="#{foodWaveView.currentProduct.description}" />
<h:inputText id="price"
value="#{foodWaveView.currentProduct.price}" />
<p:commandButton value="#{i18n['foodwavetemplate.addproduct']}"
actionListener="#{foodWaveView.addProductToTemplate}"
update="productTable" />
</h:panelGrid>
<p:dataTable name="productTable" id="productTable"
value="#{foodWaveView.template.products}" var="product"
editable="true">
<p:column headerText="#{i18n['foodwavetemplate.productname']}">
<p:cellEditor>
<f:facet name="output">
<h:outputText value="#{product.name}" />
</f:facet>
<f:facet name="input">
<p:inputText value="#{product.name}" style="width:100%"
required="true" requiredMessage="Name required" />
</f:facet>
</p:cellEditor>
</p:column>
<p:column
headerText="#{i18n['foodwavetemplate.productdescription']}">
<p:cellEditor>
<f:facet name="output">
<h:outputText value="#{product.description}" />
</f:facet>
<f:facet name="input">
<p:inputText value="#{product.description}" style="width:100%"
required="true" requiredMessage="Description required" />
</f:facet>
</p:cellEditor>
</p:column>
<p:column headerText="#{i18n['foodwavetemplate.price']}">
<p:cellEditor>
<f:facet name="output">
<h:outputText value="#{product.price}" />
</f:facet>
<f:facet name="input">
<p:inputText value="#{product.price}" style="width:100%"
required="true" requiredMessage="Price required" />
</f:facet>
</p:cellEditor>
</p:column>
<p:column headerText="#{i18n['foodwavetemplate.editRow']}"
style="width:20px">
<p:rowEditor />
</p:column>
<p:column headerText="#{i18n['foodwavetemplate.actions']}"
style="width:20px;">
<p:commandButton
value="#{i18n['foodwavetemplate.removeFromList']}"
action="#{foodWaveView.removeProductFromList(product)}"
update="productTable" />
</p:column>
</p:dataTable>
<h:commandButton action="#{foodWaveView.saveTemplate()}" <h:commandButton action="#{foodWaveView.saveTemplate()}"
value="#{i18n['foodwavetemplate.savetemplate']}"> value="#{i18n['foodwavetemplate.savetemplate']}">
<f:param value="#{foodWaveView.templateId}" name="id" /> <f:param value="#{foodWaveView.templateId}" name="id" />
</h:commandButton>> </h:commandButton>
<!-- </p:tab> --> <!-- </p:tab> -->
<!-- </p:wizard> --> <!-- </p:wizard> -->
......
code/LanBortalWeb/WebContent/foodadmin/editTemplate.xhtml
...@@ -49,7 +49,8 @@ ...@@ -49,7 +49,8 @@
<p:commandButton value="#{i18n['foodwavetemplate.addproduct']}" <p:commandButton value="#{i18n['foodwavetemplate.addproduct']}"
actionListener="#{foodWaveView.addProductToTemplate}" actionListener="#{foodWaveView.addProductToTemplate}"
update="productTable" /> update="productTable" />
<!-- <h:panelGrid columns="4">
<h:panelGrid columns="4">
<h:outputText value="#{i18n['foodwavetemplate.productname']}" /> <h:outputText value="#{i18n['foodwavetemplate.productname']}" />
<h:outputText <h:outputText
...@@ -68,11 +69,14 @@ ...@@ -68,11 +69,14 @@
actionListener="#{foodWaveView.addProductToTemplate}" actionListener="#{foodWaveView.addProductToTemplate}"
update="productTable" /> update="productTable" />
</h:panelGrid> </h:panelGrid>
-->
<p:dataTable name="productTable" id="productTable" <p:dataTable name="productTable" id="productTable"
value="#{foodWaveView.template.products}" var="product" value="#{foodWaveView.template.products}" var="product"
editable="true"> editable="true">
<p:ajax event="rowEdit" listener="#{foodWaveView.onEdit}" />
<p:column headerText="#{i18n['foodwavetemplate.productname']}"> <p:column headerText="#{i18n['foodwavetemplate.productname']}">
<p:cellEditor> <p:cellEditor>
<f:facet name="output"> <f:facet name="output">
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/shop/FoodWaveView.java
...@@ -56,6 +56,10 @@ public class FoodWaveView extends GenericCDIView { ...@@ -56,6 +56,10 @@ public class FoodWaveView extends GenericCDIView {
public List<Product> getProducts() { public List<Product> getProducts() {
return productbeanlocal.getProducts(); return productbeanlocal.getProducts();
} }
public void onEdit() {
this.foodWaveBean.saveTemplate(template);
}
public void initTemplateList() { public void initTemplateList() {
super.requirePermissions(ShopPermission.SHOP_FOODWAVE); super.requirePermissions(ShopPermission.SHOP_FOODWAVE);
...@@ -101,6 +105,8 @@ public class FoodWaveView extends GenericCDIView { ...@@ -101,6 +105,8 @@ public class FoodWaveView extends GenericCDIView {
{ {
template = foodWaveBean.findTemplate(templateId); template = foodWaveBean.findTemplate(templateId);
createNewProductSkeleton();
// prepare to make new foodwaves // prepare to make new foodwaves
selectedFoodWave = new FoodWave(); selectedFoodWave = new FoodWave();
selectedFoodWave.setTemplate(template); selectedFoodWave.setTemplate(template);
...@@ -203,8 +209,7 @@ public class FoodWaveView extends GenericCDIView { ...@@ -203,8 +209,7 @@ public class FoodWaveView extends GenericCDIView {
} }
public void removeProductFromList(Product product) { public void removeProductFromList(Product product) {
template = foodWaveBean.removeProductFromTemplate(product, template);
template.getProducts().remove(product);
} }
public Date getStartDate() { public Date getStartDate() {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!