Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Max Mecklin
/
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 395704b7
authored
Oct 27, 2012
by
Riku Silvola
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
foodwavestuff
1 parent
7c6cc2c4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
5 deletions
code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWave.java
code/LanBortalWeb/WebContent/foodmanager/listFoodwaves.xhtml
code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWave.java
View file @
395704b
...
...
@@ -21,6 +21,8 @@ import javax.persistence.TemporalType;
import
org.eclipse.persistence.annotations.OptimisticLocking
;
import
org.eclipse.persistence.annotations.OptimisticLockingType
;
import
com.sun.istack.internal.logging.Logger
;
/**
*
*/
...
...
@@ -103,6 +105,10 @@ public class FoodWave extends GenericEntity {
public
void
setClosed
(
boolean
waveClosed
)
{
this
.
closed
=
waveClosed
;
}
public
void
toggleClosed
()
{
this
.
closed
=
!
isClosed
();
}
public
List
<
AccountEvent
>
getAccountEvents
()
{
return
accountEvents
;
...
...
code/LanBortalWeb/WebContent/foodmanager/listFoodwaves.xhtml
View file @
395704b
...
...
@@ -22,9 +22,8 @@
</ui:define>
<ui:define
name=
"content"
>
<p:dataTable
styleClass=
"bordertable"
value=
"#{foodWaveView.foodWaves}"
var=
"foodwave"
>
<p:dataTable
styleClass=
"bordertable"
value=
"#{foodWaveView.foodWaves}"
var=
"foodwave"
>
<p:column>
<f:facet
name=
"header"
>
<h:outputText
value=
"${i18n['foodWave.time']}"
/>
...
...
@@ -56,7 +55,7 @@
<f:facet
name=
"header"
>
<h:outputText
value=
"${i18n['foodWave.unconfirmedOrders']}"
/>
</f:facet>
<h:outputText
value=
"#{foodwave.
getUnpaidBillLineCount()
}"
/>
<h:outputText
value=
"#{foodwave.
unpaidBillLineCount
}"
/>
</p:column>
<p:column>
<f:facet
name=
"header"
>
...
...
@@ -70,7 +69,16 @@
value=
"#{i18n['foodWave.show']}"
>
<f:param
name=
"foodwaveid"
value=
"#{foodwave.id}"
/>
</h:link>
</p:column>
</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>
...
...
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