Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Riina Antikainen
/
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 54d109ae
authored
Dec 16, 2014
by
Tuomas Riihimäki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add bill id to billist
1 parent
b4ee141e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
5 deletions
code/moya-web/WebContent/place/adminGroups.xhtml
code/moya-web/WebContent/resources/cditools/bills/list.xhtml
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/map/PlacegroupView.java
code/moya-web/WebContent/place/adminGroups.xhtml
View file @
54d109a
...
...
@@ -65,6 +65,7 @@
</h:form>
<h2>
Place slots
</h2>
<h:form>
<p:dataTable
var=
"slot"
value=
"#{placeGroupView.placeslots}"
>
<p:column
headerText=
"#{i18n['placeslot.id']}"
>
<h:outputText
value=
"#{slot.id}"
/>
...
...
@@ -89,7 +90,7 @@
</h:link>
</p:column>
</p:dataTable>
</h:form>
...
...
code/moya-web/WebContent/resources/cditools/bills/list.xhtml
View file @
54d109a
...
...
@@ -58,6 +58,12 @@
</p:column>
<p:column>
<f:facet
name=
"header"
>
<h:outputText
value=
"${i18n['bill.id']}"
/>
</f:facet>
<h:outputText
value=
"#{bill.id}"
/>
</p:column>
<p:column>
<f:facet
name=
"header"
>
<h:outputText
value=
"${i18n['bill.billNumber']}"
/>
</f:facet>
<h:outputText
value=
"#{bill.billNumber}"
/>
...
...
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/map/PlacegroupView.java
View file @
54d109a
...
...
@@ -78,6 +78,8 @@ public class PlacegroupView extends GenericCDIView {
private
Map
<
Integer
,
String
>
inviteMails
=
new
HashMap
<>();
@EJB
private
PlaceBeanLocal
placeslotBean
;
private
ListDataModel
<
PlaceSlot
>
placeslots
;
public
String
editGroup
()
{
setGroup
(
placegroups
.
getRowData
());
...
...
@@ -90,7 +92,6 @@ public class PlacegroupView extends GenericCDIView {
return
eventBean
.
getPropertyBoolean
(
LanEventPropertyKey
.
USE_ETICKET
);
}
public
boolean
isPrintOnlyOwn
()
{
return
eventBean
.
getPropertyBoolean
(
LanEventPropertyKey
.
PLACECODE_PRINT_ONLY_OWN
);
}
...
...
@@ -151,10 +152,11 @@ public class PlacegroupView extends GenericCDIView {
return
false
;
}
public
List
<
PlaceSlot
>
getPlaceslots
()
public
List
DataModel
<
PlaceSlot
>
getPlaceslots
()
{
return
placeslotBean
.
getPlaceslots
(
user
);
if
(
placeslots
==
null
)
placeslots
=
new
ListDataModel
<>(
placeslotBean
.
getPlaceslots
(
user
));
return
placeslots
;
}
public
boolean
isCurrentReleaseAllowed
()
{
...
...
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