Commit 54d109ae by Tuomas Riihimäki

Add bill id to billist

1 parent b4ee141e
......@@ -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>
......
......@@ -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}" />
......
......@@ -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 ListDataModel<PlaceSlot> getPlaceslots()
{
return placeslotBean.getPlaceslots(user);
if (placeslots == null)
placeslots = new ListDataModel<>(placeslotBean.getPlaceslots(user));
return placeslots;
}
public boolean isCurrentReleaseAllowed() {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!