Merge branch 'help' into 'master'

Queue fix 2, helpfix

See merge request !170

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

@@ -110,9 +110,6 @@ public class MenuBean implements MenuBeanLocal {
 		MenuNavigation usermenu = new MenuNavigation(ev, "topmenu.user", 5);
 
 		usermenu.addPage(menuitemfacade.findOrCreate("/frontpage"), UserPermission.ANYUSER);	
-		usermenu.addPage(menuitemfacade.findOrCreate("/help"), UserPermission.HELPPAGE);
-		
-		
 		usermenu.addPage(menuitemfacade.findOrCreate("/checkout/return"), null).setVisible(false);
 		usermenu.addPage(menuitemfacade.findOrCreate("/checkout/delayed"), null).setVisible(false);
 		usermenu.addPage(menuitemfacade.findOrCreate("/checkout/reject"), null).setVisible(false);
@@ -137,12 +134,15 @@ public class MenuBean implements MenuBeanLocal {
 		userEvent.addPage(menuitemfacade.findOrCreate("/user/invite"), UserPermission.INVITE_USERS);
 		userEvent.addPage(menuitemfacade.findOrCreate("/feedback/index"), UserPermission.VITUTTAAKO);
 		
+		MenuNavigation helpmenu = usermenu.addPage(null, null);
+		helpmenu.setKey("topnavi.help");
+		helpmenu.addPage(menuitemfacade.findOrCreate("/help"), UserPermission.HELPPAGE);
 		
 		MenuNavigation userkauppa = usermenu.addPage(null, null);
 		userkauppa.setKey("topnavi.usershop");
 		userkauppa.addPage(menuitemfacade.findOrCreate("/shop/createBill"), BillPermission.CREATE_BILL);
 		userkauppa.addPage(menuitemfacade.findOrCreate("/neomap/reserve"), MapPermission.BUY_PLACES);
-		userkauppa.addPage(menuitemfacade.findOrCreate("/neomap/notenoughslots"), UserPermission.ANYUSER);
+		userkauppa.addPage(menuitemfacade.findOrCreate("/neomap/notenoughslots"), UserPermission.ANYUSER).setVisible(false);;
 		userkauppa.addPage(menuitemfacade.findOrCreate("/foodwave/list"), ShopPermission.SHOP_FOODWAVE);
 		userkauppa.addPage(menuitemfacade.findOrCreate("/foodwave/listProducts"), ShopPermission.SHOP_FOODWAVE).setVisible(false);
 		userkauppa.addPage(menuitemfacade.findOrCreate("/foodwave/ThanksForOrderingFromCounter"), ShopPermission.SHOP_FOODWAVE).setVisible(false);

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

@@ -67,6 +67,7 @@ import fi.codecrew.moya.model.User;
 		UserPermission.S_READ_ORGROLES,
 		UserPermission.S_WRITE_ORGROLES,
 		UserPermission.S_VITUTTAAKO,
+		UserPermission.S_HELPPAGE,
 
 		MapPermission.S_VIEW,
 		MapPermission.S_MANAGE_MAPS,

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

@@ -149,14 +149,12 @@ public class QueueBean implements QueueBeanLocal {
 
 					ret = new MapReservationQueueEntry();
 					queEntries.put(user, ret);
-					if (reserving.size() < reservingSize) {
-						checkReservingEntry();
-						
-						logger.info("User {} not in queue and reserving smaller than size Entering directly: Success: {}", user);
-					} else {
 					boolean queStat = queue.offer(user);
 					logger.info("User {} not in queue, offer state {}", user, queStat);
-					}
+
+					// Check if the user can be put to reservation queue immediately
+					checkReservingEntry();
+
 				} else {
 					ret = queEntries.get(user);
 					logger.info("User {} already in queue. Not entering again {}", user, ret);

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

@@ -371,6 +371,7 @@ product.saved       = Product saved
 product.vat         = ALV-%
 
 productFlag.CREATE_NEW_PLACE_WHEN_BOUGHT = Luo uusi paikka ostettaessa
+productFlag.USERSHOP_AUTOPRODUCT         = Tuote lis\u00E4t\u00E4\u00E4n k\u00E4ytt\u00E4j\u00E4n tilaukseen
 
 productshop.minusOne = -1
 productshop.minusTen = -10
@@ -468,6 +469,3 @@ usercart.showoverview = Vie tarkastusn\u00E4kym\u00E4\u00E4n
 viewlectures.title = Kurssit ja luennot
 
 yes = Kyll\u00E4
-productFlag.USERSHOP_AUTOPRODUCT=Tuote lis\u00E4t\u00E4\u00E4n k\u00E4ytt\u00E4j\u00E4n tilaukseen
-acc_line.eventuser=
-mapView.productcount.productcount=

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

@@ -1018,6 +1018,7 @@ productFlag.HIDE_FROM_INFOSHOP           = Hide from info shop
 productFlag.PREPAID_CREDIT               = Prepaid credit
 productFlag.PREPAID_INSTANT_CREATE       = Prepaid instant create
 productFlag.RESERVE_PLACE_WHEN_BOUGHT    = Reserve place when bought
+productFlag.USERSHOP_AUTOPRODUCT         = Product will be added to user order
 productFlag.USER_SHOPPABLE               = User shoppable
 
 productLimit.description = Description
@@ -1235,6 +1236,7 @@ submenu.foodadmin.listTemplates = List foodwave templates
 submenu.foodmanager.listFoodwaves = List active foodwaves
 submenu.foodwave.list     = Foodwaves
 submenu.foodwave.listTemplates = Food provides
+submenu.help              = Ticket help
 submenu.index             = Frontpage
 submenu.info.foodwave.foodwaveshop = Foodshop
 submenu.info.incoming     = Incomingview
@@ -1345,6 +1347,7 @@ topnavi.event      = Event
 topnavi.foodwave   = Food
 topnavi.frontpage  = Front page
 topnavi.game       = Gamecodes
+topnavi.help       = Help
 topnavi.infoviews  = Infoviews
 topnavi.license    = Licensecodes
 topnavi.log        = Log
@@ -1674,4 +1677,3 @@ voting.create.voteEnd       = Voting close
 voting.create.voteStart     = Voting start
 
 yes = Yes
-productFlag.USERSHOP_AUTOPRODUCT=Product will be added to user order

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

@@ -1001,6 +1001,7 @@ productFlag.HIDE_FROM_INFOSHOP           = Piilota infon kaupasta
 productFlag.PREPAID_CREDIT               = Prepaid credit
 productFlag.PREPAID_INSTANT_CREATE       = Ostettaessa luotava tuote
 productFlag.RESERVE_PLACE_WHEN_BOUGHT    = Varaa paikka ostettaessa
+productFlag.USERSHOP_AUTOPRODUCT         = Tuote lis\u00E4t\u00E4\u00E4n k\u00E4ytt\u00E4j\u00E4n tilaukseen
 productFlag.USER_SHOPPABLE               = K\u00E4ytt\u00E4jien ostettavissa
 
 productLimit.description = Kuvaus
@@ -1215,6 +1216,7 @@ submenu.foodadmin.listTemplates = Muokkaa tilauspohjia
 submenu.foodmanager.listFoodwaves = Aktiiviset ruokatilaukset
 submenu.foodwave.list     = Ruokatilaukset
 submenu.frontpage         = Etusivu
+submenu.help              = Lippuopas
 submenu.index             = Etusivu
 submenu.info.foodwave.foodwaveshop = Ruokakauppa
 submenu.info.incoming     = Sis\u00E4\u00E4ntulo
@@ -1328,6 +1330,7 @@ topnavi.event      = Tapahtuma
 topnavi.foodwave   = Ruokatilaus
 topnavi.frontpage  = Etusivu
 topnavi.game       = Pelikoodit
+topnavi.help       = Ohjeet
 topnavi.infoviews  = Infon\u00E4kym\u00E4t
 topnavi.license    = Lisenssikoodit
 topnavi.log        = Logi
@@ -1656,4 +1659,3 @@ voting.create.voteEnd       = \u00C4\u00E4nestys kiinni
 voting.create.voteStart     = \u00C4\u00E4nestys auki
 
 yes = Kyll\u00E4
-productFlag.USERSHOP_AUTOPRODUCT=Tuote lis\u00E4t\u00E4\u00E4n k\u00E4ytt\u00E4j\u00E4n tilaukseen