Merge branch 'queuefixes' into 'master'

Queuefixes

asdf

See merge request !155

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

@@ -253,12 +253,7 @@ public class QueueBean implements QueueBeanLocal {
 	@Lock(LockType.READ)
 	@Override
 	public boolean isQueueEnabled() {
-		boolean ret = false;
-		LanEventProperty mapque = eventbean.getProperty(LanEventPropertyKey.MAP_QUEUE);
-		if (mapque != null)
-			ret = mapque.isBooleanValue();
-		return ret;
-
+		return eventbean.getPropertyBoolean(LanEventPropertyKey.MAP_QUEUE);
 	}
 
 	@Lock(LockType.READ)

code/moya-web/WebContent/neomap/view.xhtml

@@ -22,8 +22,7 @@
 					action="#{ajaxMapView.placeClicked()}" />
 			</h:form>
  -->
-			<p:dialog rendered="#{ajaxMapView.isMgmtPermission()}"
-				visible="#{!empty ajaxMapView.place}" id="fbdiag">
+			<p:dialog rendered="#{ajaxMapView.isMgmtPermission()}" visible="#{!empty ajaxMapView.place}" id="fbdiag">
 				Clicked place name : #{ajaxMapView.place.name};
 				<h:link rendered="#{!empty ajaxMapView.place}" outcome="/place/edit">
 					<f:param name="placeid" value="#{ajaxMapView.place.id}" />
@@ -44,20 +43,18 @@
 						action="#{ajaxMapView.buySelectedPlaces()}" ajax="false" />
 				</h:form>
 			</div>
-			<h:form>
-				<p:commandButton value="#{i18n['mapView.enterQueue']}"
-					action="#{ajaxMapView.enterQueue()}" ajax="false" />
-				<p:commandButton value="#{i18n['mapView.check']}"
-					action="#{ajaxMapView.checkReserving()}" />
-			</h:form>
-			queueEntry #{ajaxMapView.queueEntry} <br />
-QueuePosition: #{ajaxMapView.queuePosition} <br />
-Available places to select: #{ajaxMapView.placesLeftToSelect} <br />
-isReserving #{ajaxMapView.reserving}  <br />
+			<p:outputPanel rendered="#{ajaxMapView.queueEnabled}">
+				<h:form>
+					<p:commandButton value="#{i18n['mapView.enterQueue']}"  action="#{ajaxMapView.enterQueue()}" ajax="false" />
+					<p:commandButton value="#{i18n['mapView.check']}"  action="#{ajaxMapView.checkReserving()}" />
+				</h:form>
+				queueEntry #{ajaxMapView.queueEntry} <br />
+				QueuePosition: #{ajaxMapView.queuePosition} <br />
+				Available places to select: #{ajaxMapView.placesLeftToSelect} <br />
+				isReserving #{ajaxMapView.reserving}  <br />
+			</p:outputPanel>
 
-			<svg id="seatmap" style="margin: auto; border: 1px solid black;"
-				width="#{ajaxMapView.map.width}px"
-				height="#{ajaxMapView.map.height}px" />
+			<svg id="seatmap" style="margin: auto; border: 1px solid black;" width="#{ajaxMapView.map.width}px" height="#{ajaxMapView.map.height}px" />
 			<script type="text/javascript">
 				px = placemap({
 					element : document.getElementById("seatmap"),

code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties

@@ -456,3 +456,5 @@ etickets.placeinfo=Paikkatiedot
 etickets.eticketcode=Lippu
 etickets.placemap=Paikat kartalla
 placegroup.showEticket=N\u00E4yt\u00E4 lippu
+mapView.enterQueue=Liity jonoon
+mapView.check=P\u00E4ivit\u00E4 jonopaikka

code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_en.properties

@@ -1653,3 +1653,5 @@ etickets.placeinfo=Placeinfo
 etickets.eticketcode=Ticket
 etickets.placemap=Places on map
 placegroup.showEticket=Show eticket
+mapView.enterQueue=Enter queue
+mapView.check=Check own queuestatus

code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties

@@ -1634,3 +1634,5 @@ etickets.placeinfo=Paikkatiedot
 etickets.eticketcode=Lippu
 etickets.placemap=Paikat kartalla
 placegroup.showEticket=N\u00E4yt\u00E4 lippu
+mapView.enterQueue=Liity jonoon
+mapView.check=P\u00E4ivit\u00E4 jonopaikka