Merge branch 'billist' into 'master'

Bill list fix

Fix users bill list

See merge request !180

code/moya-beans/ejbModule/fi/codecrew/moya/beans/QueueBean.java

@@ -53,7 +53,7 @@ public class QueueBean implements QueueBeanLocal {
 
 
 	private final Map<Integer, MapQueue> mapqueues;
 	private final Map<Integer, MapQueue> mapqueues;
 	private int defaultTimeoutMin = 10;
 	private int defaultTimeoutMin = 10;
-	private int minimumSlotsInQueue = 15;
+	private int minimumSlotsInQueue = 1;
 	private int reservingSize = 5;
 	private int reservingSize = 5;
 
 
 	private class MapQueue implements MapQueueI {
 	private class MapQueue implements MapQueueI {

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

@@ -40,7 +40,7 @@
 				<f:facet name="header">
 				<f:facet name="header">
 					<h:outputText value="#{i18n['bill.payer']}" />
 					<h:outputText value="#{i18n['bill.payer']}" />
 				</f:facet>
 				</f:facet>
-				<h:link rendered="#{billListView.canWriteBill}" outcome="/useradmin/edit" value="#{bill.user.user.login}">
+				<h:link rendered="#{billListView.canWriteBill}" outcome="/useradmin/edit" value="#{bill.user.user.login} #{bill.addr1}">
 					<f:param name="userid" value="#{bill.user.user.id}" />
 					<f:param name="userid" value="#{bill.user.user.id}" />
 				</h:link>
 				</h:link>
 				<h:outputText rendered="#{not billListView.canWriteBill}"
 				<h:outputText rendered="#{not billListView.canWriteBill}"
@@ -173,9 +173,6 @@
 		<ui:repeat var="ac" value="#{billListView.paytrailAuthcodes}">
 		<ui:repeat var="ac" value="#{billListView.paytrailAuthcodes}">
 			<h:outputText value="authcodes['#{ac.key}'] ='#{ac.value}';" />
 			<h:outputText value="authcodes['#{ac.key}'] ='#{ac.value}';" />
 		</ui:repeat>
 		</ui:repeat>
-		
-	alert("Parsed javascript");
-
 	</script>
 	</script>
 
 
 </composite:implementation>
 </composite:implementation>

code/moya-web/WebContent/user/accountEvents.xhtml

@@ -63,7 +63,7 @@
 				</p:column>
 				</p:column>
 				<p:columnGroup type="footer">
 				<p:columnGroup type="footer">
 					<p:row>
 					<p:row>
-						<p:column colspan="3" style="text-align: right;" footerText="#{i18n['user.accountBalance']}" />
+						<p:column colspan="5" style="text-align: right;" footerText="#{i18n['user.accountBalance']}" />
 						<p:column footerText="#{userView.user.accountBalance}" style="text-align: left;" />
 						<p:column footerText="#{userView.user.accountBalance}" style="text-align: left;" />
 					</p:row>
 					</p:row>
 				</p:columnGroup>
 				</p:columnGroup>

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/shop/BillListView.java

@@ -97,8 +97,13 @@ public class BillListView extends GenericCDIView {
 	}
 	}
 
 
 	public Object[] getPaytrailAuthcodes() {
 	public Object[] getPaytrailAuthcodes() {
-		Set<Entry<Integer, String>> ret = paytrailAuthcodes.entrySet();
-		return ret.toArray();
+		Object[] retarr = null;
+		if (paytrailAuthcodes != null)
+		{
+			Set<Entry<Integer, String>> ret = paytrailAuthcodes.entrySet();
+			retarr = ret.toArray();
+		}
+		return retarr;
 	}
 	}
 
 
 	public String getAuthcodeForBill(Integer id) {
 	public String getAuthcodeForBill(Integer id) {