Add bill id to billist

code/moya-web/WebContent/place/adminGroups.xhtml

@@ -65,6 +65,7 @@
 			</h:form>
 			</h:form>
 
 
 			<h2>Place slots</h2>
 			<h2>Place slots</h2>
+			<h:form>
 			<p:dataTable var="slot" value="#{placeGroupView.placeslots}">
 			<p:dataTable var="slot" value="#{placeGroupView.placeslots}">
 				<p:column headerText="#{i18n['placeslot.id']}">
 				<p:column headerText="#{i18n['placeslot.id']}">
 					<h:outputText value="#{slot.id}" />
 					<h:outputText value="#{slot.id}" />
@@ -89,7 +90,7 @@
 					</h:link>
 					</h:link>
 				</p:column>
 				</p:column>
 			</p:dataTable>
 			</p:dataTable>
-
+	</h:form>
 
 
 
 
 
 

code/moya-web/WebContent/resources/cditools/bills/list.xhtml

@@ -58,6 +58,12 @@
 			</p:column>
 			</p:column>
 			<p:column>
 			<p:column>
 				<f:facet name="header">
 				<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']}" />
 					<h:outputText value="${i18n['bill.billNumber']}" />
 				</f:facet>
 				</f:facet>
 				<h:outputText value="#{bill.billNumber}" />
 				<h:outputText value="#{bill.billNumber}" />

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/map/PlacegroupView.java

@@ -78,6 +78,8 @@ public class PlacegroupView extends GenericCDIView {
 	private Map<Integer, String> inviteMails = new HashMap<>();
 	private Map<Integer, String> inviteMails = new HashMap<>();
 	@EJB
 	@EJB
 	private PlaceBeanLocal placeslotBean;
 	private PlaceBeanLocal placeslotBean;
+	
+	private ListDataModel<PlaceSlot> placeslots;
 
 
 	public String editGroup() {
 	public String editGroup() {
 		setGroup(placegroups.getRowData());
 		setGroup(placegroups.getRowData());
@@ -90,7 +92,6 @@ public class PlacegroupView extends GenericCDIView {
 		return eventBean.getPropertyBoolean(LanEventPropertyKey.USE_ETICKET);
 		return eventBean.getPropertyBoolean(LanEventPropertyKey.USE_ETICKET);
 	}
 	}
 
 
-
 	public boolean isPrintOnlyOwn() {
 	public boolean isPrintOnlyOwn() {
 		return eventBean.getPropertyBoolean(LanEventPropertyKey.PLACECODE_PRINT_ONLY_OWN);
 		return eventBean.getPropertyBoolean(LanEventPropertyKey.PLACECODE_PRINT_ONLY_OWN);
 	}
 	}
@@ -151,10 +152,11 @@ public class PlacegroupView extends GenericCDIView {
 		return false;
 		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() {
 	public boolean isCurrentReleaseAllowed() {