comment fixes and some more info to event admin

code/moya-beans/ejbModule/fi/codecrew/moya/beans/map/MapQueue.java

@@ -46,11 +46,7 @@ public class MapQueue implements MapQueueI {
 		}
 		}
 	}
 	}
 
 
-	void doHousekeeping() {
-		timeoutEntries();
-
-	}
-	private void timeoutEntries() {
+	public void timeoutEntries() {
 		logger.info("Timeouting entries");
 		logger.info("Timeouting entries");
 		// give 10 seconds mercy ( and give us some time to go through all entries)
 		// give 10 seconds mercy ( and give us some time to go through all entries)
 		Date now = new Date(System.currentTimeMillis() + 1000 * 15);
 		Date now = new Date(System.currentTimeMillis() + 1000 * 15);
@@ -101,8 +97,8 @@ public class MapQueue implements MapQueueI {
 			try {
 			try {
 				if (reserving.size() < getReservingSize() && !queue.isEmpty()) {
 				if (reserving.size() < getReservingSize() && !queue.isEmpty()) {
 
 
-					MapReservationQueueEntry queEntry = queue.get(0);
-					queue.remove(0);
+					MapReservationQueueEntry queEntry = queue.remove(0);
+
 					sortQueue();
 					sortQueue();
 
 
 					if (queEntry != null) {
 					if (queEntry != null) {

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

@@ -101,7 +101,7 @@ public class QueueBean implements QueueBeanLocal {
 		try {
 		try {
 			final long oldTime = nextReservingTimeoutCheck.get();
 			final long oldTime = nextReservingTimeoutCheck.get();
 			for (MapQueue m : mapqueues.values()) {
 			for (MapQueue m : mapqueues.values()) {
-				m.doHousekeeping();
+				m.timeoutEntries();
 			}
 			}
 
 
 			// DO housekeeping every 10 seconds.
 			// DO housekeeping every 10 seconds.

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

@@ -13,6 +13,15 @@
 
 
 		<ui:define name="content">
 		<ui:define name="content">
 			<h2>Queue properties</h2>
 			<h2>Queue properties</h2>
+			<ui:fragment rendered="#{ajaxMapView.queueEnabled}">
+				<h:outputText value="#{i18n['queuemgmt.queueEnabled']}"/>
+			</ui:fragment>
+
+
+			<ui:fragment rendered="#{not ajaxMapView.queueEnabled}">
+				<h:outputText value="#{i18n['queuemgmt.queueDisabled']}: "/>
+			</ui:fragment>
+			<br />
 			<h:form>
 			<h:form>
 				<p:panelGrid columns="3" id="queueGrid">
 				<p:panelGrid columns="3" id="queueGrid">
 					<p:outputLabel for="minslots" value="#{i18n['queuemgmt.minimumSlotsInQueue']}" />
 					<p:outputLabel for="minslots" value="#{i18n['queuemgmt.minimumSlotsInQueue']}" />

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

@@ -77,9 +77,11 @@
                         <p:commandButton  onclick="$(window).unbind('beforeunload');"  rendered="#{ajaxMapView.canUserBuy()}" value="#{i18n['mapView.buyPlaces']}" actionListener="#{ajaxMapView.buySelectedPlaces()}" />
                         <p:commandButton  onclick="$(window).unbind('beforeunload');"  rendered="#{ajaxMapView.canUserBuy()}" value="#{i18n['mapView.buyPlaces']}" actionListener="#{ajaxMapView.buySelectedPlaces()}" />
                     </h:form>
                     </h:form>
                 </div>
                 </div>
+                <ui:fragment rendered="#{ajaxMapView.queueEnabled}">
                     <h:outputText value="#{i18n['mapView.reserveTimeLeft']}: "/>
                     <h:outputText value="#{i18n['mapView.reserveTimeLeft']}: "/>
                     <span id="reserveTimeLeft"/><br/>
                     <span id="reserveTimeLeft"/><br/>
                 </ui:fragment>
                 </ui:fragment>
+            </ui:fragment>
 
 
 			<!-- Print queue status -->
 			<!-- Print queue status -->
             <ui:fragment rendered="#{ajaxMapView.queueEnabled and not ajaxMapView.reserving}">
             <ui:fragment rendered="#{ajaxMapView.queueEnabled and not ajaxMapView.reserving}">

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

@@ -1587,3 +1587,5 @@ queuemgmt.biggestFirst=Biggest group first
 queuemgmt.biggestIsFirst=Bigger group automaticly rises up in queue.
 queuemgmt.biggestIsFirst=Bigger group automaticly rises up in queue.
 reservequeue.reservingTimeIsUpAlert=Timeslot for your place reservation has timeouted. Pleace go back to queue to continue.
 reservequeue.reservingTimeIsUpAlert=Timeslot for your place reservation has timeouted. Pleace go back to queue to continue.
 mapView.reserveTimeLeft=Time to reserve places
 mapView.reserveTimeLeft=Time to reserve places
+queuemgmt.queueEnabled=Queue is ENABLED
+queuemgmt.queueDisabled=Queue is DISABLED (enable from Edit event -page)

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

@@ -1865,3 +1865,5 @@ queuemgmt.biggestFirst=Biggest group first
 queuemgmt.biggestIsFirst=Bigger group automaticly rises up in queue.
 queuemgmt.biggestIsFirst=Bigger group automaticly rises up in queue.
 reservequeue.reservingTimeIsUpAlert=Timeslot for your place reservation has timeouted. Pleace go back to queue to continue.
 reservequeue.reservingTimeIsUpAlert=Timeslot for your place reservation has timeouted. Pleace go back to queue to continue.
 mapView.reserveTimeLeft=Time to reserve places
 mapView.reserveTimeLeft=Time to reserve places
+queuemgmt.queueEnabled=Queue is ENABLED
+queuemgmt.queueDisabled=Queue is DISABLED (enable from Edit event -page)

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

@@ -1852,3 +1852,5 @@ queuemgmt.biggestFirst=Isoin ryhm\u00E4 ensin
 queuemgmt.biggestIsFirst=Isompi ryhm\u00E4 nousee automaattisesti jonossa edemm\u00E4ksi.
 queuemgmt.biggestIsFirst=Isompi ryhm\u00E4 nousee automaattisesti jonossa edemm\u00E4ksi.
 reservequeue.reservingTimeIsUpAlert=Sinulle varattu varausauka on kulunut loppuun! Palaa takaisin 'varaa paikkasi' -sivulle jatkaaksesi.
 reservequeue.reservingTimeIsUpAlert=Sinulle varattu varausauka on kulunut loppuun! Palaa takaisin 'varaa paikkasi' -sivulle jatkaaksesi.
 mapView.reserveTimeLeft=Aikaa varata paikkasi
 mapView.reserveTimeLeft=Aikaa varata paikkasi
+queuemgmt.queueEnabled=Varausjono ON k\u00E4yt\u00F6ss\u00E4
+queuemgmt.queueDisabled=K\u00E4ytt\u00E4j\u00E4jono EI OLE k\u00E4yt\u00F6ss\u00E4 (ota k\u00E4yttoon tapahtuman tiedot -sivulta)