Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Antti Väyrynen
/
Moya
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 863ff474
authored
Oct 26, 2012
by
Tuomas Riihimäki
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of codecrew.fi:bortal
2 parents
2881c83a
a985f63e
Show whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
364 additions
and
43 deletions
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/FoodWaveBean.java
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/FoodWaveFacade.java
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/FoodWaveBeanLocal.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWave.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWaveTemplate.java
code/LanBortalWeb/WebContent/WEB-INF/web.xml
code/LanBortalWeb/WebContent/foodadmin/createTemplate.xhtml
code/LanBortalWeb/WebContent/foodadmin/editTemplate.xhtml
code/LanBortalWeb/WebContent/foodadmin/listTemplates.xhtml
code/LanBortalWeb/WebContent/foodmanager/listFoodwaves.xhtml
code/LanBortalWeb/WebContent/foodmanager/listOrders.xhtml
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n.properties
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_en.properties
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_en_ST.properties
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi_IN.properties
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/shop/FoodWaveView.java
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/FoodWaveBean.java
View file @
863ff47
...
...
@@ -76,4 +76,9 @@ public class FoodWaveBean implements FoodWaveBeanLocal {
return
fwtFacade
.
find
(
templateId
);
}
@Override
public
List
<
FoodWave
>
getEventFoodWaves
()
{
return
foodWaveFacade
.
getEventFoodWaves
();
}
}
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/FoodWaveFacade.java
View file @
863ff47
...
...
@@ -22,22 +22,26 @@ public class FoodWaveFacade extends IntegerPkGenericFacade<FoodWave> {
@EJB
EventBeanLocal
eventBean
;
public
FoodWaveFacade
()
{
super
(
FoodWave
.
class
);
}
public
List
<
FoodWave
>
getEventFoodWaves
()
{
CriteriaBuilder
cb
=
getEm
().
getCriteriaBuilder
();
CriteriaQuery
<
FoodWave
>
cq
=
cb
.
createQuery
(
FoodWave
.
class
);
Root
<
FoodWave
>
root
=
cq
.
from
(
FoodWave
.
class
);
cq
.
where
(
cb
.
equal
(
root
.
get
(
FoodWave_
.
template
).
get
(
FoodWaveTemplate_
.
event
),
eventBean
.
getCurrentEvent
()));
return
getEm
().
createQuery
(
cq
).
getResultList
();
}
public
List
<
FoodWave
>
getOpenFoodWaves
()
{
CriteriaBuilder
cb
=
getEm
().
getCriteriaBuilder
();
CriteriaQuery
<
FoodWave
>
cq
=
cb
.
createQuery
(
FoodWave
.
class
);
Root
<
FoodWave
>
root
=
cq
.
from
(
FoodWave
.
class
);
cq
.
where
(
cb
.
greaterThan
(
root
.
get
(
FoodWave_
.
time
),
Calendar
.
getInstance
()),
cb
.
isFalse
(
root
.
get
(
FoodWave_
.
closed
)),
cb
.
equal
(
root
.
get
(
FoodWave_
.
template
).
get
(
FoodWaveTemplate_
.
event
),
eventBean
.
getCurrentEvent
())
);
cq
.
where
(
cb
.
greaterThan
(
root
.
get
(
FoodWave_
.
time
),
Calendar
.
getInstance
()),
cb
.
isFalse
(
root
.
get
(
FoodWave_
.
closed
)),
cb
.
equal
(
root
.
get
(
FoodWave_
.
template
).
get
(
FoodWaveTemplate_
.
event
),
eventBean
.
getCurrentEvent
()));
return
getEm
().
createQuery
(
cq
).
getResultList
();
}
...
...
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/FoodWaveBeanLocal.java
View file @
863ff47
...
...
@@ -25,4 +25,6 @@ public interface FoodWaveBeanLocal {
public
FoodWave
findFoodwave
(
Integer
foodwaveId
);
public
FoodWave
merge
(
FoodWave
foodWave
);
public
List
<
FoodWave
>
getEventFoodWaves
();
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWave.java
View file @
863ff47
...
...
@@ -50,6 +50,9 @@ public class FoodWave extends GenericEntity {
@OneToMany
(
mappedBy
=
"foodWave"
)
private
List
<
AccountEvent
>
accountEvents
;
@OneToMany
(
mappedBy
=
"foodwave"
)
private
List
<
BillLine
>
billLines
;
@ManyToOne
@JoinColumn
(
name
=
"template_id"
,
referencedColumnName
=
"id"
,
nullable
=
false
)
private
FoodWaveTemplate
template
;
...
...
@@ -144,10 +147,30 @@ public class FoodWave extends GenericEntity {
return
true
;
}
public
List
<
BillLine
>
getBillLines
()
{
return
billLines
;
}
public
Integer
getMaximumFoods
()
{
return
maximumFoods
;
}
public
void
setBillLines
(
List
<
BillLine
>
billLines
)
{
this
.
billLines
=
billLines
;
}
public
int
getReservedCount
()
{
int
retval
=
0
;
if
(
getAccountEvents
()
!=
null
)
{
retval
+=
getAccountEvents
().
size
();
}
if
(
getBillLines
()
!=
null
)
{
retval
+=
getBillLines
().
size
();
}
return
retval
;
}
public
void
setMaximumFoods
(
Integer
maximumFoods
)
{
this
.
maximumFoods
=
maximumFoods
;
}
...
...
code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWaveTemplate.java
View file @
863ff47
...
...
@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model;
import
java.util.ArrayList
;
import
java.util.List
;
import
javax.persistence.CascadeType
;
import
javax.persistence.Column
;
import
javax.persistence.Entity
;
import
javax.persistence.JoinColumn
;
...
...
@@ -42,7 +43,7 @@ public class FoodWaveTemplate extends GenericEntity {
@Column
(
name
=
"template_description"
)
private
String
description
;
@ManyToMany
(
mappedBy
=
"foodWaveTemplates"
)
@ManyToMany
(
mappedBy
=
"foodWaveTemplates"
,
cascade
=
CascadeType
.
ALL
)
private
List
<
Product
>
products
;
@OneToMany
(
mappedBy
=
"template"
)
...
...
code/LanBortalWeb/WebContent/WEB-INF/web.xml
View file @
863ff47
...
...
@@ -9,8 +9,8 @@
</session-config>
<context-param>
<param-name>
javax.faces.PROJECT_STAGE
</param-name>
<
param-value>
Production
</param-value
>
<
!--<param-value>Development</param-value>--
>
<
!-- <param-value>Production</param-value> --
>
<
param-value>
Development
</param-value
>
</context-param>
<context-param>
...
...
code/LanBortalWeb/WebContent/foodadmin/createTemplate.xhtml
View file @
863ff47
<!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: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"
xmlns:p=
"http://primefaces.org/ui"
>
<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: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"
xmlns:p=
"http://primefaces.org/ui"
>
<h:body>
<ui:composition
template=
"/layout/#{sessionHandler.layout}/template.xhtml"
>
<ui:composition
template=
"/layout/#{sessionHandler.layout}/template.xhtml"
>
<f:metadata>
<f:event
type=
"preRenderView"
listener=
"#{foodWaveView.initCreateTemplate()}"
/>
<f:event
type=
"preRenderView"
listener=
"#{foodWaveView.initCreateTemplate()}"
/>
</f:metadata>
<ui:define
name=
"title"
>
...
...
@@ -18,43 +26,97 @@
<p:wizard>
<p:tab
id=
"basicinfo"
title=
"#{i18n['foodwavetemplate.basicinfo']}"
>
<h:panelGrid
columns=
"3"
>
<h:outputLabel
for=
"name"
value=
"#{i18n['foodwavetemplate.name']}"
/>
<h:inputText
id=
"name"
value=
"#{foodWaveView.template.name}"
/>
<h:outputLabel
for=
"name"
value=
"#{i18n['foodwavetemplate.name']}"
/>
<h:inputText
id=
"name"
value=
"#{foodWaveView.template.name}"
required=
"true"
requiredMessage=
"Name required"
/>
<h:message
for=
"name"
/>
<h:outputLabel
for=
"description"
value=
"#{i18n['foodwavetemplate.description']}"
/>
<h:inputText
id=
"description"
value=
"#{foodWaveView.template.description}"
/>
<h:outputLabel
for=
"description"
value=
"#{i18n['foodwavetemplate.description']}"
/>
<h:inputText
id=
"description"
value=
"#{foodWaveView.template.description}"
required=
"true"
requiredMessage=
"Description required"
/>
<h:message
for=
"description"
/>
</h:panelGrid>
</p:tab>
<p:tab
id=
"selectproducts"
title=
"#{i18n['foodwavetemplate.selectproducts']}"
>
<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.productdescription']}"
/>
<h:outputText
value=
"#{i18n['foodwavetemplate.price']}"
/>
<h:outputText
value=
" "
/>
<h:inputText
id=
"productname"
value=
"#{foodWaveView.currentProduct.name}"
/>
<h:inputText
id=
"productdescription"
value=
"#{foodWaveView.currentProduct.name}"
/>
<h:inputText
id=
"price"
value=
"#{foodWaveView.currentProduct.price}"
/>
<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"
/>
<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"
>
<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']}"
>
<h:outputText
value=
"#{product.name}"
/>
<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()}"
value=
"#{i18n['foodwavetemplate.savetemplate']}"
/>
</p:tab>
</p:wizard>
</h:form>
...
...
code/LanBortalWeb/WebContent/foodadmin/editTemplate.xhtml
View file @
863ff47
...
...
@@ -2,13 +2,12 @@
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: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"
>
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"
xmlns:p=
"http://primefaces.org/ui"
>
<h:body>
<ui:composition
template=
"/layout/#{sessionHandler.layout}/template.xhtml"
>
<f:metadata>
<f:event
type=
"preRenderView"
listener=
"#{foodWaveView.initEditTemplate()}"
/>
<f:viewParam
name=
"id"
value=
"#{userView.templateId}"
/>
<f:viewParam
name=
"id"
value=
"#{foodWaveView.templateId}"
/>
</f:metadata>
<ui:define
name=
"title"
>
...
...
@@ -17,18 +16,24 @@
<ui:define
name=
"content"
>
<h:form>
<p:panel
header=
"#{i18n['foodwavetemplate.edit']}"
>
<h:panelGrid
columns=
"3"
>
<h:outputLabel
for=
"name"
value=
"#{i18n['foodwavetemplate.name']}"
/>
<h:inputText
id=
"name"
value=
"#{foodWaveView.template.name}"
/>
<h:message
for=
"name"
/>
</h:panelGrid>
<div>
<h:inputTextarea
value=
"#{foodWaveView.template.description}"
/>
</div>
<h:commandButton
action=
"#{foodWaveView.saveTemplate()}"
value=
"#{i18n['foowavetemplate.save']}"
/>
<h:commandButton
action=
"#{foodWaveView.createFoodwave()}"
value=
"#{i18n['foodwavetemplate.createFoodwave']}"
/>
<h:outputLabel
for=
"desc"
value=
"#{i18n['foodwavetemplate.description']}"
/>
<h:inputText
id=
"desc"
value=
"#{foodWaveView.template.description}"
/>
<h:message
for=
"desc"
/>
<h:outputText
value=
" "
/>
<h:commandButton
action=
"#{foodWaveView.saveTemplate()}"
value=
"#{i18n['foodwavetemplate.save']}"
/>
</h:panelGrid>
</p:panel>
<p:panel
header=
"#{i18n['foodwavetemplate.createwave']}"
>
<p:calendar
value=
"#{foodWaveView.startDate}"
pattern=
"dd.MM.yyyy HH:mm"
/>
<h:commandButton
action=
"#{foodWaveView.createFoodwave()}"
value=
"#{i18n['foodwavetemplate.createFoodwave']}"
/>
</p:panel>
</h:form>
<ui:fragment>
...
...
code/LanBortalWeb/WebContent/foodadmin/listTemplates.xhtml
View file @
863ff47
...
...
@@ -16,16 +16,16 @@
<ui:define
name=
"content"
>
<h:dataTable
var=
"
templ
"
value=
"#{foodWaveView.templates}"
>
<h:dataTable
var=
"
foodwaveTemplate
"
value=
"#{foodWaveView.templates}"
>
<h:column>
<f:facet
name=
"header"
>
<h:outputText
value=
"#{i18n['foodwaveTemplate.name']}"
/>
</f:facet>
<h:outputText
value=
"#{
templ
.name}"
/>
<h:outputText
value=
"#{
foodwaveTemplate
.name}"
/>
</h:column>
<h:column>
<h:link
outcome=
"/foodadmin/editTemplate"
>
<f:param
value=
"#{
templ.id}"
/>
<h:link
value=
"LOL"
outcome=
"/foodadmin/editTemplate"
>
<f:param
value=
"#{
foodwaveTemplate.id}"
name=
"id"
/>
</h:link>
</h:column>
</h:dataTable>
...
...
code/LanBortalWeb/WebContent/foodmanager/listFoodwaves.xhtml
0 → 100644
View file @
863ff47
<!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"
>
<h:body>
<ui:composition
template=
"/layout/#{sessionHandler.layout}/template.xhtml"
>
<f:metadata>
<f:event
type=
"preRenderView"
listener=
"#{foodWaveView.initFoodwaveManagerList}"
/>
</f:metadata>
<ui:define
name=
"title"
>
<h1>
fixme
</h1>
</ui:define>
<ui:define
name=
"content"
>
<h:dataTable
columnClasses=
"nowrap,numalign,numalign,nowrap,numalign"
styleClass=
"bordertable"
value=
"#{foodWaveView.foodWaves}"
var=
"foodwave"
>
<h:column
>
<f:facet
name=
"header"
>
<h:outputLabel
id=
"name"
value=
"${i18n['foodWave.name']}"
/>
</f:facet>
<h:link
outcome=
"/foodmanager/listOrders"
value=
"#{foodwave.name}"
>
<f:param
name=
"foodwaveid"
value=
"#{foodwave.id}"
/>
</h:link>
</h:column>
<h:column>
<f:facet
name=
"header"
>
<h:outputText
value=
"${i18n['foodWave.template.name']}"
/>
</f:facet>
<h:link
outcome=
"/foodmanager/listOrders"
value=
"#{foodwave.template.name}"
>
<f:param
name=
"foodwaveid"
value=
"#{foodwave.id}"
/>
</h:link>
</h:column>
<h:column>
<f:facet
name=
"header"
>
<h:outputText
value=
"${i18n['foodWave.orders']}"
/>
</f:facet>
<h:link
outcome=
"/foodmanager/listOrders"
value=
"#{foodwave.accountEvents.size()}"
>
<f:param
name=
"foodwaveid"
value=
"#{foodwave.id}"
/>
</h:link>
</h:column>
<h:column>
<f:facet
name=
"header"
>
<h:outputText
value=
"${i18n['foodWave.unconfirmedOrders']}"
/>
</f:facet>
<h:link
outcome=
"/foodmanager/listOrders"
value=
"#{foodwave.billLines.size()}"
>
<f:param
name=
"foodwaveid"
value=
"#{foodwave.id}"
/>
</h:link>
</h:column>
<h:column>
<f:facet
name=
"header"
>
<h:outputText
value=
"${i18n['foodWave.totalReserved']}"
/>
</f:facet>
<h:link
outcome=
"/foodmanager/listOrders"
value=
"#{foodwave.reservedCount}"
>
<f:param
name=
"foodwaveid"
value=
"#{foodwave.id}"
/>
</h:link>
</h:column>
<h:column>
<f:facet
name=
"header"
>
<h:outputText
value=
"${i18n['foodWave.time']}"
/>
</f:facet>
<h:link
outcome=
"/foodmanager/listOrders"
value=
"#{foodwave.time.time}"
>
<f:param
name=
"foodwaveid"
value=
"#{foodwave.id}"
/>
</h:link>
</h:column>
</h:dataTable>
</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/WebContent/foodmanager/listOrders.xhtml
0 → 100644
View file @
863ff47
<!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"
>
<h:body>
<ui:composition
template=
"/layout/#{sessionHandler.layout}/template.xhtml"
>
<f:metadata>
<f:event
type=
"preRenderView"
listener=
"#{foodWaveView.initFoodwaveBillLineList}"
/>
<f:event
type=
"preRenderView"
listener=
"#{foodWaveView.initFoodwaveAccountEventList}"
/>
</f:metadata>
<ui:define
name=
"title"
>
<h1>
fixme
</h1>
</ui:define>
<ui:define
name=
"content"
>
<h1><h:outputLabel
id=
"name"
value=
"${i18n['foodWave.billLines']}"
/></h1>
<h:dataTable
columnClasses=
"nowrap,numalign,numalign,nowrap,numalign"
styleClass=
"bordertable"
value=
"#{foodWaveView.billLines}"
var=
"billLine"
>
<h:column
>
<f:facet
name=
"header"
>
<h:outputLabel
id=
"name"
value=
"${i18n['billLine.name']}"
/>
</f:facet>
<h:link
outcome=
"/foodmanager/listOrders"
value=
"#{billLine.name}"
>
<f:param
name=
"foodwaveid"
value=
"#{foodwave.id}"
/>
</h:link>
</h:column>
<h:column>
<f:facet
name=
"header"
>
<h:outputText
value=
"${i18n['billLine.quantiny']}"
/>
</f:facet>
<h:link
outcome=
"/foodmanager/listOrders"
value=
"#{foodwave.template.name}"
>
<f:param
name=
"foodwaveid"
value=
"#{billLine.quantiny}"
/>
</h:link>
</h:column>
<h:column>
<f:facet
name=
"header"
>
<h:outputText
value=
"${i18n['billLine.unitprice']}"
/>
</f:facet>
<h:link
outcome=
"/foodmanager/listOrders"
value=
"#{billLine.unitprice}"
>
<f:param
name=
"foodwaveid"
value=
"#{foodwave.id}"
/>
</h:link>
</h:column>
<h:column>
<f:facet
name=
"header"
>
<h:outputText
value=
"${i18n['foodWave.unconfirmedOrders']}"
/>
</f:facet>
<h:link
outcome=
"/foodmanager/listOrders"
value=
"#{foodwave.billLines.size()}"
>
<f:param
name=
"foodwaveid"
value=
"#{foodwave.id}"
/>
</h:link>
</h:column>
<h:column>
<f:facet
name=
"header"
>
<h:outputText
value=
"${i18n['foodWave.totalReserved']}"
/>
</f:facet>
<h:link
outcome=
"/foodmanager/listOrders"
value=
"#{foodwave.reservedCount}"
>
<f:param
name=
"foodwaveid"
value=
"#{foodwave.id}"
/>
</h:link>
</h:column>
<h:column>
<f:facet
name=
"header"
>
<h:outputText
value=
"${i18n['foodWave.time']}"
/>
</f:facet>
<h:link
outcome=
"/foodmanager/listOrders"
value=
"#{foodwave.time.time}"
>
<f:param
name=
"foodwaveid"
value=
"#{foodwave.id}"
/>
</h:link>
</h:column>
</h:dataTable>
</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n.properties
View file @
863ff47
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_en.properties
View file @
863ff47
...
...
@@ -190,6 +190,28 @@ foodWave.time = Time
foodshop.buyFromCounter
=
Pay at info
foodshop.buyFromInternet
=
Pay at Internet
foodwave.template.basicinfo
=
Template Information
foodwave.template.edit.title
=
Foodwave Template Editor
foodwave.template.list.title
=
Foodwave Templates
foodwave.template.selectproducts
=
Products
foodwaveTemplate.name
=
Name
foodwavetemplate.actions
=
Actions
foodwavetemplate.addproduct
=
Add
foodwavetemplate.basicinfo
=
Template
foodwavetemplate.createFoodwave
=
Create Foodwave
foodwavetemplate.description
=
Description
foodwavetemplate.editRow
=
Edit
foodwavetemplate.name
=
Name
foodwavetemplate.price
=
Price
foodwavetemplate.productdescription
=
Description
foodwavetemplate.productname
=
Name
foodwavetemplate.removeFromList
=
Remove
foodwavetemplate.save
=
Ok
foodwavetemplate.savetemplate
=
Submit
foodwavetemplate.selectproducts
=
Products
game.gamepoints
=
Game points
gamepoints
=
Gamepoints
...
...
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_en_ST.properties
View file @
863ff47
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties
View file @
863ff47
...
...
@@ -188,6 +188,28 @@ foodWave.time = Aika
foodshop.buyFromCounter
=
Maksa infossa
foodshop.buyFromInternet
=
Maksa Internetiss
\u
00E4
foodwave.template.basicinfo
=
Template Infot
foodwave.template.edit.title
=
Foodwave Template Editori
foodwave.template.list.title
=
Ruokatilaus Templatet
foodwave.template.selectproducts
=
Tuotteet
foodwaveTemplate.name
=
Nimi
foodwavetemplate.actions
=
Toimet
foodwavetemplate.addproduct
=
Lis
\u
00E4
\u
00E4
foodwavetemplate.basicinfo
=
Templeitti
foodwavetemplate.createFoodwave
=
Luo ruokatilaus
foodwavetemplate.description
=
Kuvaus
foodwavetemplate.editRow
=
Muokkaa
foodwavetemplate.name
=
Nimi
foodwavetemplate.price
=
Hinta
foodwavetemplate.productdescription
=
Kuvaus
foodwavetemplate.productname
=
Nimi
\r\n
foodwavetemplate.removeFromList = Poista
foodwavetemplate.save
=
Ok
foodwavetemplate.savetemplate
=
Tallenna
foodwavetemplate.selectproducts
=
Tuotteet
game.gamepoints
=
Insomnia Game pisteet:
gamepoints
=
Pelipisteit
\u
00E4
...
...
code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi_IN.properties
View file @
863ff47
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/shop/FoodWaveView.java
View file @
863ff47
package
fi
.
insomnia
.
bortal
.
web
.
cdiview
.
shop
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.TreeSet
;
import
java.util.Vector
;
...
...
@@ -40,13 +41,14 @@ public class FoodWaveView extends GenericCDIView {
private
FoodWave
selectedFoodWave
=
null
;
private
Date
startDate
;
private
Product
currentProduct
;
public
void
initTemplateList
()
{
if
(
super
.
requirePermissions
(
ShopPermission
.
LIST_USERPRODUCTS
))
{
setTemplates
(
new
ListDataModel
<
FoodWaveTemplate
>(
foodWaveBean
.
getTemplates
()));
setTemplates
(
new
ListDataModel
<
FoodWaveTemplate
>(
foodWaveBean
.
getTemplates
()));
super
.
beginConversation
();
}
...
...
@@ -82,6 +84,7 @@ public class FoodWaveView extends GenericCDIView {
currentProduct
=
new
Product
();
currentProduct
.
setProductFlags
(
ts
);
currentProduct
.
setEvent
(
eventbean
.
getCurrentEvent
());
}
public
void
addProductToTemplate
()
{
...
...
@@ -98,8 +101,11 @@ public class FoodWaveView extends GenericCDIView {
}
public
void
initUserFoodWaveList
()
{
this
.
foodWaves
=
new
ListDataModel
<
FoodWave
>(
foodWaveBean
.
getOpenFoodWaves
());
this
.
foodWaves
=
new
ListDataModel
<
FoodWave
>(
foodWaveBean
.
getOpenFoodWaves
());
}
public
void
initFoodwaveManagerList
()
{
this
.
foodWaves
=
new
ListDataModel
<
FoodWave
>(
foodWaveBean
.
getEventFoodWaves
());
}
public
String
editTemplate
()
{
...
...
@@ -176,4 +182,16 @@ public class FoodWaveView extends GenericCDIView {
this
.
templateId
=
templateId
;
}
public
void
removeProductFromList
(
Product
product
)
{
template
.
getProducts
().
remove
(
product
);
}
public
Date
getStartDate
()
{
return
startDate
;
}
public
void
setStartDate
(
Date
startDate
)
{
this
.
startDate
=
startDate
;
}
}
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment