Menustuff

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

@@ -174,8 +174,8 @@ public class MenuBean implements MenuBeanLocal {
 
 		MenuNavigation adminShopProducts = adminshop.addPage(null, null);
 		adminShopProducts.setKey("subnavi.products");
-		adminShopProducts.addPage(menuitemfacade.findOrCreate("/product/create"), ShopPermission.MANAGE_PRODUCTS);
 		adminShopProducts.addPage(menuitemfacade.findOrCreate("/product/list"), ShopPermission.LIST_ALL_PRODUCTS);
+		adminShopProducts.addPage(menuitemfacade.findOrCreate("/product/create"), ShopPermission.MANAGE_PRODUCTS);
 
 		MenuNavigation foodnavi = adminshop.addPage(null, null);
 		foodnavi.setKey("topnavi.foodwave");
@@ -204,8 +204,8 @@ public class MenuBean implements MenuBeanLocal {
 
 		MenuNavigation mapnavi = adminPlaces.addPage(null, null);
 		mapnavi.setKey("topnavi.maps");
-		mapnavi.addPage(menuitemfacade.findOrCreate("/map/create"), MapPermission.MANAGE_MAPS);
 		mapnavi.addPage(menuitemfacade.findOrCreate("/map/list"), MapPermission.MANAGE_MAPS);
+		mapnavi.addPage(menuitemfacade.findOrCreate("/map/create"), MapPermission.MANAGE_MAPS);
 		mapnavi.addPage(menuitemfacade.findOrCreate("/map/edit"), null).setVisible(false);
 
 		// event

code/MoyaWeb/WebContent/resources/templates/template1/template.xhtml

@@ -72,7 +72,7 @@
 			<nav>
 				<div id="menu">
 					<p:panelMenu model="#{primeMenuView.menuModel}" />
-
+					<h:link style="font-size: 10px;" rendered="#{readerView.shopToOthers}" outcome="/shop/showReaderEvents" value="Readers"/>
 					<!--  <ui:fragment rendered="#{menuView.getMenu(2).size() > 1}">
 							<div id="right">
 								<ul>
@@ -93,22 +93,21 @@
 					</h:link>
 				</div>
 				<ui:insert name="title" />
-
-					<p:panelMenu model="#{primeMenuView.secondaryMenuModel}" />
-
-				<p:messages severity="info" />
-				<ui:insert name="edittab" />
-				<!-- <h:messages />  -->
-				<ui:repeat var="cont1" value="#{menuView.getPagecontent('top')}">
-					<h:outputText value="#{cont1.content}" escape="false" />
-				</ui:repeat>
-				<ui:insert name="content" />
-				<ui:repeat var="cont1" value="#{menuView.getPagecontent('bottom')}">
-					<h:outputText value="#{cont1.content}" escape="false" />
-				</ui:repeat>
-				<h:link rendered="#{layoutView.manageContent}" styleClass="editorlink" value="#{i18n['layout.editBottom']}" outcome="/pages/manage">
-					<f:param name="pagename" value="#{layoutView.pagepath}:bottom" />
-				</h:link>
+				<p:menubar rendered="#{primeMenuView.hasSecondaryMenu}" model="#{primeMenuView.secondaryMenuModel}" />
+
+					<p:messages severity="info" />
+					<ui:insert name="edittab" />
+					<!-- <h:messages />  -->
+					<ui:repeat var="cont1" value="#{menuView.getPagecontent('top')}">
+						<h:outputText value="#{cont1.content}" escape="false" />
+					</ui:repeat>
+					<ui:insert name="content" />
+					<ui:repeat var="cont1" value="#{menuView.getPagecontent('bottom')}">
+						<h:outputText value="#{cont1.content}" escape="false" />
+					</ui:repeat>
+					<h:link rendered="#{layoutView.manageContent}" styleClass="editorlink" value="#{i18n['layout.editBottom']}" outcome="/pages/manage">
+						<f:param name="pagename" value="#{layoutView.pagepath}:bottom" />
+					</h:link>
 			</section>
 
 			<aside class="flex1">
@@ -131,8 +130,8 @@
 						<div class="ui-widget-header">Select Mode</div>
 						<div class="ui-widget-content" style="text-align: center">
 							<h:form>
-								<p:selectOneMenu value="#{menuView.menuChange}">
-									<p:ajax listener="#{menuView.menuChangeEvent}" />
+								<p:selectOneMenu  value="#{menuView.menuChange}"  valueChangeListener="#{menuView.menuChangeEvent}" onchange="this.form.submit()">
+									 <!--  <p:ajax listener="#{menuView.menuChangeEvent}"  /> -->
 									<f:selectItems var="menuitem" value="#{menuView.viewChangeTopmenu}" itemLabel="#{i18n[menuitem.navigation.key]}" itemValue="#{menuitem.outcome}" />
 								</p:selectOneMenu>
 							</h:form>

code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/menu/MenuView.java

@@ -10,6 +10,7 @@ import java.util.Map;
 import javax.ejb.EJB;
 import javax.enterprise.context.RequestScoped;
 import javax.faces.context.FacesContext;
+import javax.faces.event.ValueChangeEvent;
 import javax.inject.Inject;
 import javax.inject.Named;
 
@@ -86,7 +87,9 @@ public class MenuView {
 
 	}
 
-	public void menuChangeEvent() {
+	public void menuChangeEvent(ValueChangeEvent e) {
+		//		logger.info("Executed menuchange-eventlistener for menuChange {} newval {}", menuChange, e.getNewValue());
+		menuChange = e.getNewValue().toString();
 		layoutview.setPageName(menuChange);
 		navihandler.forward(menuChange);
 		//		super.navihandler.forward(menuChange);

code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/menu/PrimeMenuView.java

@@ -69,7 +69,12 @@ public class PrimeMenuView extends GenericCDIView {
 	// return nameMenu;
 	// }
 
-	private DefaultMenuModel secondaryMenuModel;
+	public boolean isHasSecondaryMenu()
+	{
+		return getSecondaryMenuModel() != null;
+	}
+
+	private MenuModel secondaryMenuModel;
 
 	public MenuModel getSecondaryMenuModel()
 	{
@@ -151,27 +156,12 @@ public class PrimeMenuView extends GenericCDIView {
 						ret.addElement(subItem);
 
 						if (selectedSet.contains(child)) {
-							logger.info("Setting submenu model for {}", child.getKey());
-							secondaryMenuModel = new DefaultMenuModel();
-							DefaultMenuItem h1 = new DefaultMenuItem();
-							h1.setValue("Hurr1");
-							h1.setTitle("Title");
-							h1.setHref("http://www.iki.fi");
-							h1.setDisabled(false);
-							h1.setAjax(false);
-							//	h1.setOutcome("/useradmin/list");
-							secondaryMenuModel.getElements().add(h1);
-
-							DefaultMenuItem h2 = new DefaultMenuItem();
-							h2.setValue("Hurr2");
-							h2.setTitle("hu33");
-							h1.setAjax(false);
-							h2.setOutcome("/role/list");
-
-							secondaryMenuModel.getElements().add(h2);
-
-							for (DefaultMenuItem su : subm) {
-								//	secondaryMenuModel.addElement(su);
+
+							if (subm.size() > 1) {
+								secondaryMenuModel = new DefaultMenuModel();
+								for (DefaultMenuItem su : subm) {
+									secondaryMenuModel.addElement(su);
+								}
 							}
 						}
 					}

code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/reader/ReaderView.java

@@ -43,7 +43,7 @@ public class ReaderView extends GenericCDIView {
 	private String usersearch;
 	private String barcode;
 	private Reader reader;
-	
+
 	private boolean pollingMode = false;
 	private ReaderEvent lastReadEvent = null;
 
@@ -95,6 +95,11 @@ public class ReaderView extends GenericCDIView {
 		return userbean.findUsersRoles(user);
 	}
 
+	public boolean isShopToOthers()
+	{
+		return super.hasPermission(ShopPermission.SHOP_TO_OTHERS);
+	}
+
 	public void initCreateReader()
 	{
 		if (super.requirePermissions(ShopPermission.SHOP_TO_OTHERS) && reader == null)
@@ -275,20 +280,20 @@ public class ReaderView extends GenericCDIView {
 	}
 
 	public String getBarcode() {
-		
-		if(pollingMode) {
+
+		if (pollingMode) {
 			ReaderEvent event = readerbean.getLastReaderEvent(namecontainer.getReaderId());
-			if(!event.equals(lastReadEvent)) {
+			if (!event.equals(lastReadEvent)) {
 				return event.getValue();
 			}
 		}
-		
-		if(readerEventList != null && readerEventList.isRowAvailable()) {
-			if(readerEventList.getRowData().getReader().getType() == ReaderType.BARCODE) {
+
+		if (readerEventList != null && readerEventList.isRowAvailable()) {
+			if (readerEventList.getRowData().getReader().getType() == ReaderType.BARCODE) {
 				return readerEventList.getRowData().getValue();
 			}
 		}
-		
+
 		return barcode;
 	}
 
@@ -299,7 +304,7 @@ public class ReaderView extends GenericCDIView {
 	public ReaderEvent getReaderEvent() {
 		if (readerEventList == null)
 			return null;
-		
+
 		if (readerEventList.isRowAvailable()) {
 			return readerEventList.getRowData();
 		}
@@ -314,7 +319,6 @@ public class ReaderView extends GenericCDIView {
 	 */
 	public PrintedCard getPrintedCard() {
 
-		
 		PrintedCard card = barcodebean.getPrintedCard(getBarcode());
 
 		if (card == null && readerEventList != null && readerEventList.isRowAvailable()) {
@@ -323,48 +327,45 @@ public class ReaderView extends GenericCDIView {
 
 		return card;
 	}
-	
-	
+
 	public void initializeForPolling() {
 		// on polling mode, we do not use list, we use database and remember last readerEvent
 		this.pollingMode = true;
-		
+
 		this.barcode = null;
-		
+
 		lastReadEvent = readerbean.getLastReaderEvent(namecontainer.getReaderId());
 	}
-	
+
 	public void pollingBarcodeHandled() {
 		lastReadEvent = readerbean.getLastReaderEvent(namecontainer.getReaderId());
 	}
-	
-	
-	
+
 	public EventUser getUser() {
 		PrintedCard card = getPrintedCard();
-		
-		if(card != null) {
+
+		if (card != null) {
 			return card.getUser();
 		}
-		
+
 		return userbean.getUserByBarcode(getBarcode());
 	}
-	
+
 	public void clearBarcode() {
 		this.barcode = null;
 	}
-	
+
 	public String saveUser() {
 		userview.saveUser();
-		
+
 		return null;
 	}
 
 	public boolean isNewBarcodes() {
-		
-		if(!pollingMode)
+
+		if (!pollingMode)
 			return false;
-		
+
 		return (!readerbean.getLastReaderEvent(namecontainer.getReaderId()).equals(lastReadEvent));
 	}