Skip to content

Max Mecklin / Moya

Go to a project
Commit 77f09a6a by Tuomas Riihimäki
Options

Menustuff

1 parent 6d438f93
Inline Side-by-side
Showing with 64 additions and 71 deletions
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/MenuBean.java
...@@ -174,8 +174,8 @@ public class MenuBean implements MenuBeanLocal { ...@@ -174,8 +174,8 @@ public class MenuBean implements MenuBeanLocal {
MenuNavigation adminShopProducts = adminshop.addPage(null, null); MenuNavigation adminShopProducts = adminshop.addPage(null, null);
adminShopProducts.setKey("subnavi.products"); 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/list"), ShopPermission.LIST_ALL_PRODUCTS);
adminShopProducts.addPage(menuitemfacade.findOrCreate("/product/create"), ShopPermission.MANAGE_PRODUCTS);
MenuNavigation foodnavi = adminshop.addPage(null, null); MenuNavigation foodnavi = adminshop.addPage(null, null);
foodnavi.setKey("topnavi.foodwave"); foodnavi.setKey("topnavi.foodwave");
...@@ -204,8 +204,8 @@ public class MenuBean implements MenuBeanLocal { ...@@ -204,8 +204,8 @@ public class MenuBean implements MenuBeanLocal {
MenuNavigation mapnavi = adminPlaces.addPage(null, null); MenuNavigation mapnavi = adminPlaces.addPage(null, null);
mapnavi.setKey("topnavi.maps"); 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/list"), MapPermission.MANAGE_MAPS);
mapnavi.addPage(menuitemfacade.findOrCreate("/map/create"), MapPermission.MANAGE_MAPS);
mapnavi.addPage(menuitemfacade.findOrCreate("/map/edit"), null).setVisible(false); mapnavi.addPage(menuitemfacade.findOrCreate("/map/edit"), null).setVisible(false);
// event // event
......
code/MoyaWeb/WebContent/resources/templates/template1/template.xhtml
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
<nav> <nav>
<div id="menu"> <div id="menu">
<p:panelMenu model="#{primeMenuView.menuModel}" /> <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}"> <!-- <ui:fragment rendered="#{menuView.getMenu(2).size() > 1}">
<div id="right"> <div id="right">
<ul> <ul>
...@@ -93,22 +93,21 @@ ...@@ -93,22 +93,21 @@
</h:link> </h:link>
</div> </div>
<ui:insert name="title" /> <ui:insert name="title" />
<p:menubar rendered="#{primeMenuView.hasSecondaryMenu}" model="#{primeMenuView.secondaryMenuModel}" />
<p:panelMenu model="#{primeMenuView.secondaryMenuModel}" />
<p:messages severity="info" />
<p:messages severity="info" /> <ui:insert name="edittab" />
<ui:insert name="edittab" /> <!-- <h:messages /> -->
<!-- <h:messages /> --> <ui:repeat var="cont1" value="#{menuView.getPagecontent('top')}">
<ui:repeat var="cont1" value="#{menuView.getPagecontent('top')}"> <h:outputText value="#{cont1.content}" escape="false" />
<h:outputText value="#{cont1.content}" escape="false" /> </ui:repeat>
</ui:repeat> <ui:insert name="content" />
<ui:insert name="content" /> <ui:repeat var="cont1" value="#{menuView.getPagecontent('bottom')}">
<ui:repeat var="cont1" value="#{menuView.getPagecontent('bottom')}"> <h:outputText value="#{cont1.content}" escape="false" />
<h:outputText value="#{cont1.content}" escape="false" /> </ui:repeat>
</ui:repeat> <h:link rendered="#{layoutView.manageContent}" styleClass="editorlink" value="#{i18n['layout.editBottom']}" outcome="/pages/manage">
<h:link rendered="#{layoutView.manageContent}" styleClass="editorlink" value="#{i18n['layout.editBottom']}" outcome="/pages/manage"> <f:param name="pagename" value="#{layoutView.pagepath}:bottom" />
<f:param name="pagename" value="#{layoutView.pagepath}:bottom" /> </h:link>
</h:link>
</section> </section>
<aside class="flex1"> <aside class="flex1">
...@@ -131,8 +130,8 @@ ...@@ -131,8 +130,8 @@
<div class="ui-widget-header">Select Mode</div> <div class="ui-widget-header">Select Mode</div>
<div class="ui-widget-content" style="text-align: center"> <div class="ui-widget-content" style="text-align: center">
<h:form> <h:form>
<p:selectOneMenu value="#{menuView.menuChange}"> <p:selectOneMenu value="#{menuView.menuChange}" valueChangeListener="#{menuView.menuChangeEvent}" onchange="this.form.submit()">
<p:ajax listener="#{menuView.menuChangeEvent}" /> <!-- <p:ajax listener="#{menuView.menuChangeEvent}" /> -->
<f:selectItems var="menuitem" value="#{menuView.viewChangeTopmenu}" itemLabel="#{i18n[menuitem.navigation.key]}" itemValue="#{menuitem.outcome}" /> <f:selectItems var="menuitem" value="#{menuView.viewChangeTopmenu}" itemLabel="#{i18n[menuitem.navigation.key]}" itemValue="#{menuitem.outcome}" />
</p:selectOneMenu> </p:selectOneMenu>
</h:form> </h:form>
......
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/menu/MenuView.java
...@@ -10,6 +10,7 @@ import java.util.Map; ...@@ -10,6 +10,7 @@ import java.util.Map;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
import javax.faces.context.FacesContext; import javax.faces.context.FacesContext;
import javax.faces.event.ValueChangeEvent;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
...@@ -86,7 +87,9 @@ public class MenuView { ...@@ -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); layoutview.setPageName(menuChange);
navihandler.forward(menuChange); navihandler.forward(menuChange);
// super.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 { ...@@ -69,7 +69,12 @@ public class PrimeMenuView extends GenericCDIView {
// return nameMenu; // return nameMenu;
// } // }
private DefaultMenuModel secondaryMenuModel; public boolean isHasSecondaryMenu()
{
return getSecondaryMenuModel() != null;
}
private MenuModel secondaryMenuModel;
public MenuModel getSecondaryMenuModel() public MenuModel getSecondaryMenuModel()
{ {
...@@ -151,27 +156,12 @@ public class PrimeMenuView extends GenericCDIView { ...@@ -151,27 +156,12 @@ public class PrimeMenuView extends GenericCDIView {
ret.addElement(subItem); ret.addElement(subItem);
if (selectedSet.contains(child)) { if (selectedSet.contains(child)) {
logger.info("Setting submenu model for {}", child.getKey());
secondaryMenuModel = new DefaultMenuModel(); if (subm.size() > 1) {
DefaultMenuItem h1 = new DefaultMenuItem(); secondaryMenuModel = new DefaultMenuModel();
h1.setValue("Hurr1"); for (DefaultMenuItem su : subm) {
h1.setTitle("Title"); secondaryMenuModel.addElement(su);
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);
} }
} }
} }
......
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/reader/ReaderView.java
...@@ -43,7 +43,7 @@ public class ReaderView extends GenericCDIView { ...@@ -43,7 +43,7 @@ public class ReaderView extends GenericCDIView {
private String usersearch; private String usersearch;
private String barcode; private String barcode;
private Reader reader; private Reader reader;
private boolean pollingMode = false; private boolean pollingMode = false;
private ReaderEvent lastReadEvent = null; private ReaderEvent lastReadEvent = null;
...@@ -95,6 +95,11 @@ public class ReaderView extends GenericCDIView { ...@@ -95,6 +95,11 @@ public class ReaderView extends GenericCDIView {
return userbean.findUsersRoles(user); return userbean.findUsersRoles(user);
} }
public boolean isShopToOthers()
{
return super.hasPermission(ShopPermission.SHOP_TO_OTHERS);
}
public void initCreateReader() public void initCreateReader()
{ {
if (super.requirePermissions(ShopPermission.SHOP_TO_OTHERS) && reader == null) if (super.requirePermissions(ShopPermission.SHOP_TO_OTHERS) && reader == null)
...@@ -275,20 +280,20 @@ public class ReaderView extends GenericCDIView { ...@@ -275,20 +280,20 @@ public class ReaderView extends GenericCDIView {
} }
public String getBarcode() { public String getBarcode() {
if(pollingMode) { if (pollingMode) {
ReaderEvent event = readerbean.getLastReaderEvent(namecontainer.getReaderId()); ReaderEvent event = readerbean.getLastReaderEvent(namecontainer.getReaderId());
if(!event.equals(lastReadEvent)) { if (!event.equals(lastReadEvent)) {
return event.getValue(); return event.getValue();
} }
} }
if(readerEventList != null && readerEventList.isRowAvailable()) { if (readerEventList != null && readerEventList.isRowAvailable()) {
if(readerEventList.getRowData().getReader().getType() == ReaderType.BARCODE) { if (readerEventList.getRowData().getReader().getType() == ReaderType.BARCODE) {
return readerEventList.getRowData().getValue(); return readerEventList.getRowData().getValue();
} }
} }
return barcode; return barcode;
} }
...@@ -299,7 +304,7 @@ public class ReaderView extends GenericCDIView { ...@@ -299,7 +304,7 @@ public class ReaderView extends GenericCDIView {
public ReaderEvent getReaderEvent() { public ReaderEvent getReaderEvent() {
if (readerEventList == null) if (readerEventList == null)
return null; return null;
if (readerEventList.isRowAvailable()) { if (readerEventList.isRowAvailable()) {
return readerEventList.getRowData(); return readerEventList.getRowData();
} }
...@@ -314,7 +319,6 @@ public class ReaderView extends GenericCDIView { ...@@ -314,7 +319,6 @@ public class ReaderView extends GenericCDIView {
*/ */
public PrintedCard getPrintedCard() { public PrintedCard getPrintedCard() {
PrintedCard card = barcodebean.getPrintedCard(getBarcode()); PrintedCard card = barcodebean.getPrintedCard(getBarcode());
if (card == null && readerEventList != null && readerEventList.isRowAvailable()) { if (card == null && readerEventList != null && readerEventList.isRowAvailable()) {
...@@ -323,48 +327,45 @@ public class ReaderView extends GenericCDIView { ...@@ -323,48 +327,45 @@ public class ReaderView extends GenericCDIView {
return card; return card;
} }
public void initializeForPolling() { public void initializeForPolling() {
// on polling mode, we do not use list, we use database and remember last readerEvent // on polling mode, we do not use list, we use database and remember last readerEvent
this.pollingMode = true; this.pollingMode = true;
this.barcode = null; this.barcode = null;
lastReadEvent = readerbean.getLastReaderEvent(namecontainer.getReaderId()); lastReadEvent = readerbean.getLastReaderEvent(namecontainer.getReaderId());
} }
public void pollingBarcodeHandled() { public void pollingBarcodeHandled() {
lastReadEvent = readerbean.getLastReaderEvent(namecontainer.getReaderId()); lastReadEvent = readerbean.getLastReaderEvent(namecontainer.getReaderId());
} }
public EventUser getUser() { public EventUser getUser() {
PrintedCard card = getPrintedCard(); PrintedCard card = getPrintedCard();
if(card != null) { if (card != null) {
return card.getUser(); return card.getUser();
} }
return userbean.getUserByBarcode(getBarcode()); return userbean.getUserByBarcode(getBarcode());
} }
public void clearBarcode() { public void clearBarcode() {
this.barcode = null; this.barcode = null;
} }
public String saveUser() { public String saveUser() {
userview.saveUser(); userview.saveUser();
return null; return null;
} }
public boolean isNewBarcodes() { public boolean isNewBarcodes() {
if(!pollingMode) if (!pollingMode)
return false; return false;
return (!readerbean.getLastReaderEvent(namecontainer.getReaderId()).equals(lastReadEvent)); return (!readerbean.getLastReaderEvent(namecontainer.getReaderId()).equals(lastReadEvent));
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!