Skip to content

Antti Väyrynen / Moya

Go to a project
Commit 1700c652 by Tuukka Kivilahti, TKffTK
Options

Merge branch 'master' of codecrew.fi:bortal

2 parents 147bac3e 698607d0
Inline Side-by-side
Showing with 158 additions and 129 deletions
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/BillBean.java
...@@ -219,7 +219,8 @@ public class BillBean implements BillBeanLocal { ...@@ -219,7 +219,8 @@ public class BillBean implements BillBeanLocal {
logger.info("Created creditentry. {}, userproducts {}", ac, user.getAccountEvents().size()); logger.info("Created creditentry. {}, userproducts {}", ac, user.getAccountEvents().size());
ac.setDelivered(when); // Used in foodwave. Should be null!
// ac.setDelivered(when);
ac.setEventTime(when); ac.setEventTime(when);
ac.setBill(bill); ac.setBill(bill);
ac.setSeller(permbean.getCurrentUser()); ac.setSeller(permbean.getCurrentUser());
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/MenuBean.java
...@@ -116,7 +116,11 @@ public class MenuBean implements MenuBeanLocal { ...@@ -116,7 +116,11 @@ public class MenuBean implements MenuBeanLocal {
MenuNavigation foodwaveTopmenu = usernavi.addPage(null, null); MenuNavigation foodwaveTopmenu = usernavi.addPage(null, null);
foodwaveTopmenu.setKey("topnavi.foodwave"); foodwaveTopmenu.setKey("topnavi.foodwave");
foodwaveTopmenu.addPage(menuitemfacade.findOrCreate("/foodwave/listTemplates"), ShopPermission.SHOP_FOODWAVE); foodwaveTopmenu.addPage(menuitemfacade.findOrCreate("/foodwave/list"), ShopPermission.SHOP_FOODWAVE);
// foodwaveTopmenu.addPage(menuitemfacade.findOrCreate("/foodwave/listTemplates"),
// ShopPermission.SHOP_FOODWAVE);
foodwaveTopmenu.addPage(menuitemfacade.findOrCreate("/foodwave/listProducts"), ShopPermission.SHOP_FOODWAVE).setVisible(false);
foodwaveTopmenu.addPage(menuitemfacade.findOrCreate("/foodwave/ThanksForOrderingFromCounter"), ShopPermission.SHOP_FOODWAVE).setVisible(false);
MenuNavigation pollTopmenu = usernavi.addPage(null, null); MenuNavigation pollTopmenu = usernavi.addPage(null, null);
pollTopmenu.setKey("topnavi.poll"); pollTopmenu.setKey("topnavi.poll");
...@@ -153,7 +157,8 @@ public class MenuBean implements MenuBeanLocal { ...@@ -153,7 +157,8 @@ public class MenuBean implements MenuBeanLocal {
adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/accountEvents"), UserPermission.VIEW_ALL).setVisible(false); adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/accountEvents"), UserPermission.VIEW_ALL).setVisible(false);
adminuser.addPage(menuitemfacade.findOrCreate("/place/adminGroups"), UserPermission.VIEW_ALL).setVisible(false); adminuser.addPage(menuitemfacade.findOrCreate("/place/adminGroups"), UserPermission.VIEW_ALL).setVisible(false);
adminuser.addPage(menuitemfacade.findOrCreate("/place/adminInsertToken"), UserPermission.VIEW_ALL).setVisible(false); adminuser.addPage(menuitemfacade.findOrCreate("/place/adminInsertToken"), UserPermission.VIEW_ALL).setVisible(false);
adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/sendPicture"), UserPermission.VIEW_ALL).setVisible(false); adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/foodwaveshop"), UserPermission.VIEW_ALL).setVisible(false);
adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/foodwaveProducts"), UserPermission.VIEW_ALL).setVisible(false);
adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/showTakePicture"), UserPermission.VIEW_ALL).setHeader("submenu.user.other"); adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/showTakePicture"), UserPermission.VIEW_ALL).setHeader("submenu.user.other");
// MenuNavigation initUser = adminnavi.addPage(null, null); // MenuNavigation initUser = adminnavi.addPage(null, null);
...@@ -195,6 +200,15 @@ public class MenuBean implements MenuBeanLocal { ...@@ -195,6 +200,15 @@ public class MenuBean implements MenuBeanLocal {
lognavi.addPage(menuitemfacade.findOrCreate("/actionlog/messagelist"), UserPermission.VIEW_ALL); lognavi.addPage(menuitemfacade.findOrCreate("/actionlog/messagelist"), UserPermission.VIEW_ALL);
lognavi.addPage(menuitemfacade.findOrCreate("/actionlog/taskview"), UserPermission.VIEW_ALL).setVisible(false); lognavi.addPage(menuitemfacade.findOrCreate("/actionlog/taskview"), UserPermission.VIEW_ALL).setVisible(false);
MenuNavigation foodnavi = adminnavi.addPage(null, null);
foodnavi.setKey("topnavi.foodwave");
foodnavi.addPage(menuitemfacade.findOrCreate("/foodadmin/listTemplates"), ShopPermission.MANAGE_FOODWAVES);
foodnavi.addPage(menuitemfacade.findOrCreate("/foodadmin/createTemplate"), ShopPermission.MANAGE_FOODWAVES);
foodnavi.addPage(menuitemfacade.findOrCreate("/foodadmin/editTemplate"), ShopPermission.MANAGE_FOODWAVES).setVisible(false);
foodnavi.addPage(menuitemfacade.findOrCreate("/foodmanager/listFoodwaves"), ShopPermission.MANAGE_FOODWAVES);
foodnavi.addPage(menuitemfacade.findOrCreate("/foodmanager/listOrders"), ShopPermission.MANAGE_FOODWAVES);
} }
@Override @Override
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/ProductPBean.java
...@@ -80,7 +80,7 @@ public class ProductPBean { ...@@ -80,7 +80,7 @@ public class ProductPBean {
AccountEvent ret = new AccountEvent(user, product, unitPrice, quantity, Calendar.getInstance()); AccountEvent ret = new AccountEvent(user, product, unitPrice, quantity, Calendar.getInstance());
ret.setDelivered(Calendar.getInstance()); // ret.setDelivered(Calendar.getInstance());
ret.setSeller(permbean.getCurrentUser()); ret.setSeller(permbean.getCurrentUser());
if (foodwave != null) { if (foodwave != null) {
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/MenuitemFacade.java
...@@ -22,6 +22,7 @@ public class MenuitemFacade extends IntegerPkGenericFacade<Menuitem> { ...@@ -22,6 +22,7 @@ public class MenuitemFacade extends IntegerPkGenericFacade<Menuitem> {
if (url == null || url.isEmpty()) { if (url == null || url.isEmpty()) {
return null; return null;
} }
CriteriaBuilder cb = getEm().getCriteriaBuilder(); CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<Menuitem> cq = cb.createQuery(Menuitem.class); CriteriaQuery<Menuitem> cq = cb.createQuery(Menuitem.class);
Root<Menuitem> root = cq.from(Menuitem.class); Root<Menuitem> root = cq.from(Menuitem.class);
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/AccountEvent.java
...@@ -230,7 +230,7 @@ public class AccountEvent extends GenericEntity { ...@@ -230,7 +230,7 @@ public class AccountEvent extends GenericEntity {
this.deliveredCount = deliveredCount; this.deliveredCount = deliveredCount;
} }
public boolean isDelivered() { public boolean isEventDelivered() {
return (delivered != null); return (delivered != null);
} }
......
code/LanBortalWeb/WebContent/foodmanager/listOrders.xhtml
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
<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.eventDelivered}" value="#{i18n['accountEvent.deliver']}" action="#{foodWaveView.deliverAccountEvent}" />
</p:column> </p:column>
</p:dataTable> </p:dataTable>
......
code/LanBortalWeb/WebContent/foodwave/list.xhtml
...@@ -22,49 +22,9 @@ ...@@ -22,49 +22,9 @@
<h1>#{i18n['user.foodwavelist.title']}</h1> <h1>#{i18n['user.foodwavelist.title']}</h1>
</ui:define> </ui:define>
<ui:define name="content"> <ui:define name="content">
<foodwave:list outcome="/foodwave/listProducts" />
<p:dataTable columnClasses="nowrap,numalign,numalign,nowrap,numalign"
styleClass="bordertable" value="#{foodWaveView.foodWaves}"
var="foodwave">
<p:column>
<f:facet name="header">
<h:outputLabel id="name" value="${i18n['foodWave.name']}" />
</f:facet>
<h:link outcome="/foodwave/listProducts" value="#{foodwave.name}">
<f:param name="foodwaveid" value="#{foodwave.id}" />
</h:link>
</p:column>
<p:column>
<f:facet name="header">
<h:outputText value="Menu" />
</f:facet>
<h:outputText
value="#{foodwave.template.name}">
<f:param name="foodwaveid" value="#{foodwave.id}" />
</h:outputText>
</p:column>
<p:column>
<f:facet name="header">
<h:outputText value="${i18n['foodWave.description']}" />
</f:facet>
<h:outputText id="description"
value="#{foodwave.template.description}" />
</p:column>
<p:column>
<f:facet name="header">
<h:outputText value="${i18n['foodWave.time']}" />
</f:facet>
<h:outputText
value="#{foodwave.time.time}">
<f:convertDateTime pattern="hh:mm d/M/yy" />
</h:outputText>
</p:column>
</p:dataTable>
</ui:define> </ui:define>
</ui:composition> </ui:composition>
</h:body> </h:body>
</html> </html>
\ No newline at end of file
code/LanBortalWeb/WebContent/foodwave/listProducts.xhtml
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
<ui:composition <ui:composition
template="/layout/#{sessionHandler.layout}/template.xhtml"> template="/layout/#{sessionHandler.layout}/template.xhtml">
<f:metadata> <f:metadata>
<f:viewParam name="userid" value="#{userView.userid}" />
<f:viewParam name="foodwaveid" value="#{foodWaveFoodView.foodwaveid}" /> <f:viewParam name="foodwaveid" value="#{foodWaveFoodView.foodwaveid}" />
<f:event type="preRenderView" listener="#{foodWaveFoodView.initFoodWaveFoods}" /> <f:event type="preRenderView" listener="#{foodWaveFoodView.initFoodWaveFoods}" />
</f:metadata> </f:metadata>
...@@ -24,8 +23,8 @@ ...@@ -24,8 +23,8 @@
<ui:define name="content"> <ui:define name="content">
<!-- products:shop commitaction="#{foodWaveFoodView.commitShoppingCart()}" items="#{foodWaveFoodView.shoppingcart}" commitValue="#{i18n['productshop.commit']}" /--> <!-- products:shop commitaction="#{foodWaveFoodView.commitShoppingCart()}" items="#{foodWaveFoodView.shoppingcart}" commitValue="#{i18n['productshop.commit']}" /-->
<foodwave:listFoods selectaction="#{foodWaveFoodView.commitShoppingCart()}" <foodwave:listFoods selectaction="#{foodWaveFoodView.buyFromCounter()}"
items="#{foodWaveFoodView.shoppingcart}" commitValue="#{i18n['productshop.commit']}"/> items="#{foodWaveFoodView.shoppingcart}" commitValue="foodshop.buyFromCounter"/>
</ui:define> </ui:define>
......
code/LanBortalWeb/WebContent/resources/cditools/account/list.xhtml
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['accountEvent.delivered']}" /> <h:outputText value="#{i18n['accountEvent.delivered']}" />
</f:facet> </f:facet>
<h:outputText value="#{ac.delivered.time}"> <h:outputText rendered="#{!empty ac.delivered}" value="#{ac.delivered.time}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" /> <f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
</h:outputText> </h:outputText>
</h:column> </h:column>
......
code/LanBortalWeb/WebContent/resources/cditools/foodwave/list.xhtml
<?xml version='1.0' encoding='UTF-8' ?> <?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:composite="http://java.sun.com/jsf/composite"
xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:tools="http://java.sun.com/jsf/composite/tools" xmlns:p="http://primefaces.org/ui">
xmlns:f="http://java.sun.com/jsf/core"
xmlns:composite="http://java.sun.com/jsf/composite"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:tools="http://java.sun.com/jsf/composite/tools">
<composite:interface> <composite:interface>
<composite:attribute name="items" required="true" /> <composite:attribute name="outcome" required="true" />
<!-- <composite:attribute name="selectValue" required="true" /> -->
<composite:attribute name="selectaction"
method-signature="java.lang.String action()" required="true" />
</composite:interface> </composite:interface>
<composite:implementation> <composite:implementation>
...@@ -22,41 +15,40 @@ ...@@ -22,41 +15,40 @@
<!-- <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">
<h:form> <p:column>
<h:dataTable columnClasses="nowrap,numalign,numalign,nowrap,numalign"
styleClass="bordertable" value="#{cc.attrs.items}" var="foodwave">
<h:column>
<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:commandLink action="#{cc.attrs.selectaction}" value="#{foodwave.name}" />
</h:column> <h:link outcome="#{cc.attrs.outcome}" value="#{foodwave.name}">
<h:column> <f:param name="foodwaveid" value="#{foodwave.id}" />
<f:param name="userid" value="#{userView.user.user.id}" />
</h:link>
</p:column>
<p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="${i18n['foodWave.template.name']}" /> <h:outputText value="Menu" />
</f:facet> </f:facet>
<h:commandLink action="#{cc.attrs.selectaction}" id="template_name" value="#{foodwave.template.name}" /> <h:outputText value="#{foodwave.template.name}">
</h:column> <f:param name="foodwaveid" value="#{foodwave.id}" />
<h:column> </h:outputText>
</p:column>
<p:column>
<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" <h:outputText id="description" value="#{foodwave.template.description}" />
value="#{foodwave.template.description}" /> </p:column>
</h:column> <p:column>
<h:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="${i18n['foodWave.time']}" /> <h:outputText value="${i18n['foodWave.time']}" />
</f:facet> </f:facet>
<h:commandLink action="#{cc.attrs.selectaction}" id="time" value="#{foodwave.time.time}" /> <h:outputText value="#{foodwave.time.time}">
</h:column> <f:convertDateTime pattern="hh:mm d/M/yy" />
</h:outputText>
<h:commandButton action="#{cc.attrs.selectaction}" </p:column>
id="selectbutton-botton" value="Valitte" /> </p:dataTable>
</h:dataTable>
</h:form>
</composite:implementation> </composite:implementation>
</html> </html>
......
code/LanBortalWeb/WebContent/resources/cditools/foodwave/listFoods.xhtml
...@@ -14,8 +14,7 @@ ...@@ -14,8 +14,7 @@
<composite:interface> <composite:interface>
<composite:attribute name="items" required="true" /> <composite:attribute name="items" required="true" />
<!-- <composite:attribute name="selectValue" required="true" /> --> <!-- <composite:attribute name="selectValue" required="true" /> -->
<composite:attribute name="selectaction" <composite:attribute name="selectaction" method-signature="java.lang.String action()" required="true" />
method-signature="java.lang.String action()" required="true" />
</composite:interface> </composite:interface>
<composite:implementation> <composite:implementation>
...@@ -86,7 +85,7 @@ ...@@ -86,7 +85,7 @@
</p:dataTable> </p:dataTable>
<h:commandButton action="#{foodWaveFoodView.buyFromCounter}" value="#{i18n['foodshop.buyFromCounter']}" > <h:commandButton action="#{cc.attrs.selectaction}" value="#{i18n[cc.attrs.commitValue]}" >
</h:commandButton> </h:commandButton>
......
code/LanBortalWeb/WebContent/resources/cditools/user/usertabs.xhtml
...@@ -42,7 +42,13 @@ ...@@ -42,7 +42,13 @@
<li class="picture"><h:link outcome="/useradmin/sendPicture" value="#{i18n['submenu.user.sendPicture']}"> <li class="picture"><h:link outcome="/useradmin/sendPicture" value="#{i18n['submenu.user.sendPicture']}">
<f:param name="userid" value="#{userView.user.user.id}" /> <f:param name="userid" value="#{userView.user.user.id}" />
</h:link></li> </h:link>
</li>
<li class="foodwave">
<h:link outcome="/useradmin/foodwaveshop" value="#{i18n['submenu.user.foodwave']}">
<f:param name="userid" value="#{userView.user.user.id}" />
</h:link>
</li>
</ul> </ul>
</div> </div>
......
code/LanBortalWeb/WebContent/resources/style/insomnia2/css/tabnav.css
...@@ -17,6 +17,7 @@ div#edit li.edit, ...@@ -17,6 +17,7 @@ div#edit li.edit,
div#chpass li.chpass, div#chpass li.chpass,
div#accountevents li.accountevents, div#accountevents li.accountevents,
div#groups li.groups, div#groups li.groups,
div#foodwave li.foodwave,
div#token li.token, div#token li.token,
div#picture li.picture div#picture li.picture
{ /* settings for selected tab */ { /* settings for selected tab */
...@@ -28,6 +29,7 @@ div#edit li.edit a, ...@@ -28,6 +29,7 @@ div#edit li.edit a,
div#chpass li.chpass a, div#chpass li.chpass a,
div#accountevents li.accountevents a, div#accountevents li.accountevents a,
div#groups li.groups a, div#groups li.groups a,
div#foodwave li.foodwave a,
div#token li.token a, div#token li.token a,
div#picture li.picture a{ /* settings for selected tab link */ div#picture li.picture a{ /* settings for selected tab link */
background-color: #FFF; /* set selected tab background color as desired */ background-color: #FFF; /* set selected tab background color as desired */
......
code/LanBortalWeb/WebContent/user/accountEvents.xhtml
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['accountEvent.delivered']}" /> <h:outputText value="#{i18n['accountEvent.delivered']}" />
</f:facet> </f:facet>
<h:outputText value="#{ac.delivered.time}"> <h:outputText rendered="#{!empty ac.delivered}" value="#{ac.delivered.time}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" /> <f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
</h:outputText> </h:outputText>
</h:column> </h:column>
......
code/LanBortalWeb/WebContent/useradmin/accountEvents.xhtml
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
<f:viewParam name="userid" value="#{userView.userid}" /> <f:viewParam name="userid" value="#{userView.userid}" />
<f:event type="preRenderView" listener="#{userView.initView}" /> <f:event type="preRenderView" listener="#{userView.initView}" />
</f:metadata> </f:metadata>
<ui:param name="thispage" value="page.account.list" />
<ui:define name="title"> <ui:define name="title">
<h1>#{i18n['user.accountevents']}</h1> <h1>#{i18n['user.accountevents']}</h1>
<users:usertabs tabId="accountevents" /> <users:usertabs tabId="accountevents" />
...@@ -62,7 +61,7 @@ ...@@ -62,7 +61,7 @@
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['accountEvent.delivered']}" /> <h:outputText value="#{i18n['accountEvent.delivered']}" />
</f:facet> </f:facet>
<h:outputText value="#{ac.delivered.time}"> <h:outputText rendered="#{!empty ac.delivered}" value="#{ac.delivered.time}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" /> <f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
</h:outputText> </h:outputText>
</h:column> </h:column>
......
code/LanBortalWeb/WebContent/useradmin/foodwaveProducts.xhtml 0 → 100644
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<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:products="http://java.sun.com/jsf/composite/cditools/products"
xmlns:users="http://java.sun.com/jsf/composite/cditools/user"
xmlns:c="http://java.sun.com/jsp/jstl/core">
<h:body>
<ui:composition
template="/layout/#{sessionHandler.layout}/template.xhtml">
<f:metadata>
<f:viewParam name="userid" value="#{userView.userid}" />
<f:viewParam name="foodwaveid" value="#{foodWaveFoodView.foodwaveid}" />
<f:event type="preRenderView" listener="#{userView.initView}" />
<f:event type="preRenderView" listener="#{foodWaveFoodView.initFoodWaveFoods}" />
</f:metadata>
<ui:define name="title">
<h1>#{i18n['user.foodwave.products.title']}</h1>
<users:usertabs tabId="foodwave" />
</ui:define>
<ui:define name="content">
<!-- products:shop commitaction="#{foodWaveFoodView.commitShoppingCart()}" items="#{foodWaveFoodView.shoppingcart}" commitValue="#{i18n['productshop.commit']}" /-->
<foodwave:listFoods selectaction="#{foodWaveFoodView.buyAndPay}"
items="#{foodWaveFoodView.shoppingcart}" commitValue="foodshop.buyAndPay"/>
</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/useradmin/foodwaveshop.xhtml 0 → 100644
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<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">
<h:body>
<ui:composition
template="/layout/#{sessionHandler.layout}/template.xhtml">
<f:metadata>
<f:viewParam name="userid" value="#{userView.userid}" />
<f:viewParam name="templateid" value="#{foodWaveView.templateId}" />
<f:event type="preRenderView" listener="#{userView.initView()}" />
<f:event type="preRenderView" listener="#{foodWaveView.initListFoodwaves}" />
</f:metadata>
<ui:define name="title">
<h1>#{i18n['user.foodwavelist.title']}</h1>
<users:usertabs tabId="foodwave" />
</ui:define>
<ui:define name="content">
<foodwave:list outcome="/useradmin/foodwaveProducts"/>
</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/useradmin/sendPicture.xhtml
...@@ -16,29 +16,12 @@ ...@@ -16,29 +16,12 @@
<h1>#{i18n['sendPicture.header']}</h1> <h1>#{i18n['sendPicture.header']}</h1>
<users:usertabs tabId="picture" /> <users:usertabs tabId="picture" />
</ui:define> </ui:define>
<ui:define name="headerdata">
<script type="text/javascript">
webcam.set_api_url('#{request.contextPath}/UploadServlet?type=userimage&amp;id=#{userView.selectedUser.id}');
webcam.set_hook('onComplete', 'my_completion_handler');
webcam.set_swf_url('#{request.contextPath}/resources/jpegcam/webcam.swf');
webcam.set_shutter_sound(true,'#{request.contextPath}/resources/jpegcam/shutter.mp3');
function my_completion_handler(msg) {
// alert("Completition handler executed" + msg);
window.location.href = "#{request.contextPath}/user/sendPicture.jsf?userid=#{userView.user.id}";
}
</script>
</ui:define>
<ui:define name="content"> <ui:define name="content">
<h:outputScript library="primefaces" name="jquery/jquery.js" target="head" /> <h:outputScript library="primefaces" name="jquery/jquery.js" target="head" />
<h:outputScript target="head" library="jpegcam" name="webcam.js" />
<button onclick="$('#webcamcontainer').prepend(webcam.get_html(320, 240));$('#webcamcontainer').show();$(this).hide();">#{i18n['userimage.webcam']}</button>
<div id="webcamcontainer" style="display: none;"></div>
<h:form enctype="multipart/form-data"> <h:form enctype="multipart/form-data">
<p:fileUpload value="#{userView.image}" mode="simple" required="true" /> <p:fileUpload value="#{userView.image}" mode="simple" required="true" />
......
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_en.properties
...@@ -607,6 +607,8 @@ submenu.auth.sendResetMail = Password reset ...@@ -607,6 +607,8 @@ submenu.auth.sendResetMail = Password reset
submenu.bill.billSummary = Bill summary submenu.bill.billSummary = Bill summary
submenu.bill.list = My bills submenu.bill.list = My bills
submenu.bill.listAll = All bills submenu.bill.listAll = All bills
submenu.foodwave.list = Open foodwaves
submenu.foodwave.listTemplates = Food provides
submenu.index = Frontpage submenu.index = Frontpage
submenu.map.create = Create map submenu.map.create = Create map
submenu.map.list = List maps submenu.map.list = List maps
...@@ -629,6 +631,7 @@ submenu.user.accountEvents = Account events ...@@ -629,6 +631,7 @@ submenu.user.accountEvents = Account events
submenu.user.changePassword = Change password submenu.user.changePassword = Change password
submenu.user.create = Create new user submenu.user.create = Create new user
submenu.user.edit = User information submenu.user.edit = User information
submenu.user.foodwave = Food
submenu.user.invite = Invite friends submenu.user.invite = Invite friends
submenu.user.manageuserlinks = Manage users submenu.user.manageuserlinks = Manage users
submenu.user.other = Other submenu.user.other = Other
......
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties
...@@ -587,6 +587,7 @@ submenu.auth.sendResetMail = Salasanan palautus ...@@ -587,6 +587,7 @@ submenu.auth.sendResetMail = Salasanan palautus
submenu.bill.billSummary = Laskujen yhteenveto submenu.bill.billSummary = Laskujen yhteenveto
submenu.bill.list = N\u00E4yt\u00E4 omat laskut submenu.bill.list = N\u00E4yt\u00E4 omat laskut
submenu.bill.listAll = Kaikki laskut submenu.bill.listAll = Kaikki laskut
submenu.foodwave.list = Avoimet tilaukset
submenu.index = Etusivu submenu.index = Etusivu
submenu.map.create = Uusi kartta submenu.map.create = Uusi kartta
submenu.map.list = N\u00E4yt\u00E4 kartat submenu.map.list = N\u00E4yt\u00E4 kartat
...@@ -610,6 +611,7 @@ submenu.user.changePassword = Vaihda salasana ...@@ -610,6 +611,7 @@ submenu.user.changePassword = Vaihda salasana
submenu.user.create = Luo k\u00E4ytt\u00E4j\u00E4 submenu.user.create = Luo k\u00E4ytt\u00E4j\u00E4
submenu.user.createCardTemplate = Luo korttiryhm\u00E4 submenu.user.createCardTemplate = Luo korttiryhm\u00E4
submenu.user.edit = K\u00E4ytt\u00E4j\u00E4n tiedot submenu.user.edit = K\u00E4ytt\u00E4j\u00E4n tiedot
submenu.user.foodwave = Ruoka
submenu.user.invite = Kutsu yst\u00E4vi\u00E4 submenu.user.invite = Kutsu yst\u00E4vi\u00E4
submenu.user.list = Kaikki k\u00E4ytt\u00E4j\u00E4t submenu.user.list = Kaikki k\u00E4ytt\u00E4j\u00E4t
submenu.user.listCardTemplates = Korttiryhm\u00E4t submenu.user.listCardTemplates = Korttiryhm\u00E4t
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/shop/FoodWaveFoodView.java
package fi.insomnia.bortal.web.cdiview.shop; package fi.insomnia.bortal.web.cdiview.shop;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Calendar;
import java.util.Iterator; import java.util.Iterator;
import javax.ejb.EJB; import javax.ejb.EJB;
...@@ -19,11 +20,10 @@ import fi.insomnia.bortal.beans.FoodWaveBeanLocal; ...@@ -19,11 +20,10 @@ import fi.insomnia.bortal.beans.FoodWaveBeanLocal;
import fi.insomnia.bortal.beans.ProductBeanLocal; import fi.insomnia.bortal.beans.ProductBeanLocal;
import fi.insomnia.bortal.enums.apps.ShopPermission; import fi.insomnia.bortal.enums.apps.ShopPermission;
import fi.insomnia.bortal.model.Bill; import fi.insomnia.bortal.model.Bill;
import fi.insomnia.bortal.model.EventUser;
import fi.insomnia.bortal.model.FoodWave; import fi.insomnia.bortal.model.FoodWave;
import fi.insomnia.bortal.model.Product; import fi.insomnia.bortal.model.Product;
import fi.insomnia.bortal.web.annotations.SelectedUser;
import fi.insomnia.bortal.web.cdiview.GenericCDIView; import fi.insomnia.bortal.web.cdiview.GenericCDIView;
import fi.insomnia.bortal.web.cdiview.user.UserView;
import fi.insomnia.bortal.web.helpers.ProductShopItem; import fi.insomnia.bortal.web.helpers.ProductShopItem;
@Named @Named
...@@ -53,8 +53,7 @@ public class FoodWaveFoodView extends GenericCDIView { ...@@ -53,8 +53,7 @@ public class FoodWaveFoodView extends GenericCDIView {
private transient ProductBeanLocal productBean; private transient ProductBeanLocal productBean;
@Inject @Inject
@SelectedUser private UserView userview;
private EventUser user;
@Inject @Inject
private BillEditView billEditView; private BillEditView billEditView;
...@@ -75,6 +74,7 @@ public class FoodWaveFoodView extends GenericCDIView { ...@@ -75,6 +74,7 @@ public class FoodWaveFoodView extends GenericCDIView {
this.beginConversation(); this.beginConversation();
} }
logger.info("injected user {}", userview.getUser());
} }
public ListDataModel<Product> getProducts() { public ListDataModel<Product> getProducts() {
...@@ -132,8 +132,8 @@ public class FoodWaveFoodView extends GenericCDIView { ...@@ -132,8 +132,8 @@ public class FoodWaveFoodView extends GenericCDIView {
* @return * @return
*/ */
public Bill createBillFromShoppingcart() { public Bill createBillFromShoppingcart() {
logger.warn("Committing shoppingcart for user {}, userid {}", userview.getSelectedUser().getWholeName());
Bill bill = new Bill(eventBean.getCurrentEvent(), user); Bill bill = new Bill(eventBean.getCurrentEvent(), userview.getSelectedUser());
bill.setOurReference(eventBean.getCurrentEvent().getName()); bill.setOurReference(eventBean.getCurrentEvent().getName());
for (ProductShopItem shopitem : shoppingcart) { for (ProductShopItem shopitem : shoppingcart) {
...@@ -146,6 +146,14 @@ public class FoodWaveFoodView extends GenericCDIView { ...@@ -146,6 +146,14 @@ public class FoodWaveFoodView extends GenericCDIView {
return bill; return bill;
} }
public String buyAndPay()
{
Bill b = createBillFromShoppingcart();
billBean.markPaid(b, Calendar.getInstance());
super.addFaceMessage("foodwave.markPaid");
return "/useradmin/edit";
}
public String buyFromCounter() { public String buyFromCounter() {
createBillFromShoppingcart(); createBillFromShoppingcart();
...@@ -164,14 +172,6 @@ public class FoodWaveFoodView extends GenericCDIView { ...@@ -164,14 +172,6 @@ public class FoodWaveFoodView extends GenericCDIView {
return null; return null;
} }
public void setUser(EventUser user) {
this.user = user;
}
public EventUser getUser() {
return user;
}
public void setShoppingcart(ListDataModel<ProductShopItem> shoppingcart) { public void setShoppingcart(ListDataModel<ProductShopItem> shoppingcart) {
this.shoppingcart = shoppingcart; this.shoppingcart = shoppingcart;
} }
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/user/UserView.java
package fi.insomnia.bortal.web.cdiview.user; package fi.insomnia.bortal.web.cdiview.user;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
...@@ -85,7 +84,6 @@ public class UserView extends GenericCDIView { ...@@ -85,7 +84,6 @@ public class UserView extends GenericCDIView {
@EJB @EJB
private transient CardPrintBeanLocal cardPrintBean; private transient CardPrintBeanLocal cardPrintBean;
private File file;
private StreamedContent streamedFile; private StreamedContent streamedFile;
private MassPrintResult mpr = null; private MassPrintResult mpr = null;
...@@ -162,7 +160,6 @@ public class UserView extends GenericCDIView { ...@@ -162,7 +160,6 @@ public class UserView extends GenericCDIView {
} }
public void prepareCardDownload() { public void prepareCardDownload() {
file = null;
try { try {
mpr = cardPrintBean.getUserCardAsPrintablePdf(this.user.getId()); mpr = cardPrintBean.getUserCardAsPrintablePdf(this.user.getId());
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!