Skip to content

Antti Väyrynen / Moya

Go to a project
Commit 9a83aed1 by Antti Tönkyrä
Options

Merge branch 'devel' of codecrew.fi:bortal into devel 

Conflicts:
	code/MoyaWeb/WebContent/useradmin/overview.xhtml
2 parents bf0a52bc 53737ab2
Inline Side-by-side
Showing with 134 additions and 118 deletions
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/MenuBean.java
...@@ -23,7 +23,6 @@ import fi.codecrew.moya.facade.MenuNavigationFacade; ...@@ -23,7 +23,6 @@ import fi.codecrew.moya.facade.MenuNavigationFacade;
import fi.codecrew.moya.facade.MenuitemFacade; import fi.codecrew.moya.facade.MenuitemFacade;
import fi.codecrew.moya.model.LanEvent; import fi.codecrew.moya.model.LanEvent;
import fi.codecrew.moya.model.MenuNavigation; import fi.codecrew.moya.model.MenuNavigation;
import fi.codecrew.moya.model.Menuitem;
/** /**
* Session Bean implementation class Menubean * Session Bean implementation class Menubean
...@@ -71,59 +70,68 @@ public class MenuBean implements MenuBeanLocal { ...@@ -71,59 +70,68 @@ public class MenuBean implements MenuBeanLocal {
int menusort = 100; int menusort = 100;
logger.info("Initializing new default menu"); logger.info("Initializing new default menu");
LanEvent ev = eventbean.getCurrentEvent(); LanEvent ev = eventbean.getCurrentEvent();
Menuitem idxpage = menuitemfacade.findOrCreate("/index");
MenuNavigation usermenu = new MenuNavigation(ev, "topnavi.usernavi", menusort = +10); MenuNavigation usermenu = new MenuNavigation(ev, "topnavi.usernavi", menusort = +10);
// usermenu.setItem(idxpage);
// usermenu.setPermission( UserPermission.ANYUSER); usermenu.addPage(menuitemfacade.findOrCreate("/index"), UserPermission.ANYUSER);
usermenu.addPage(idxpage, UserPermission.ANYUSER);
usermenu.addPage(menuitemfacade.findOrCreate("/permissionDenied"), null).setVisible(false); usermenu.addPage(menuitemfacade.findOrCreate("/permissionDenied"), null).setVisible(false);
usermenu.addPage(menuitemfacade.findOrCreate("/auth/login"), null).setVisible(false); usermenu.addPage(menuitemfacade.findOrCreate("/auth/login"), null).setVisible(false);
usermenu.addPage(menuitemfacade.findOrCreate("/auth/loginError"), null).setVisible(false); usermenu.addPage(menuitemfacade.findOrCreate("/auth/loginError"), null).setVisible(false);
usermenu.addPage(menuitemfacade.findOrCreate("/auth/logout"), null).setVisible(false); // usermenu.addPage(menuitemfacade.findOrCreate("/auth/logout"), null).setVisible(false); // disabled
usermenu.addPage(menuitemfacade.findOrCreate("/auth/logoutResponse"), null).setVisible(false); usermenu.addPage(menuitemfacade.findOrCreate("/auth/logoutResponse"), null).setVisible(false);
usermenu.addPage(menuitemfacade.findOrCreate("/auth/resetPassword"), null).setVisible(false); usermenu.addPage(menuitemfacade.findOrCreate("/auth/resetPassword"), null).setVisible(false);
usermenu.addPage(menuitemfacade.findOrCreate("/auth/resetmailSent"), null).setVisible(false); usermenu.addPage(menuitemfacade.findOrCreate("/auth/resetmailSent"), null).setVisible(false);
usermenu.addPage(menuitemfacade.findOrCreate("/auth/passwordChanged"), null).setVisible(false); usermenu.addPage(menuitemfacade.findOrCreate("/auth/passwordChanged"), null).setVisible(false);
usermenu.addPage(menuitemfacade.findOrCreate("/auth/notauthorized"), null).setVisible(false); usermenu.addPage(menuitemfacade.findOrCreate("/auth/notauthorized"), null).setVisible(false);
MenuNavigation userEvent = usermenu.addPage(null, null); MenuNavigation userEvent = usermenu.addPage(null, null);
userEvent.setKey("topnavi.userevent"); userEvent.setKey("topnavi.userevent");
userEvent.addPage(menuitemfacade.findOrCreate("/place/placemap"), MapPermission.VIEW);
userEvent.addPage(menuitemfacade.findOrCreate("/poll/index"), PollPermission.ANSWER); userEvent.addPage(menuitemfacade.findOrCreate("/poll/index"), PollPermission.ANSWER);
userEvent.addPage(menuitemfacade.findOrCreate("/feedback/index"), UserPermission.ANYUSER); userEvent.addPage(menuitemfacade.findOrCreate("/feedback/index"), UserPermission.ANYUSER);
userEvent.addPage(menuitemfacade.findOrCreate("/user/invite"), UserPermission.ANYUSER); userEvent.addPage(menuitemfacade.findOrCreate("/user/invite"), UserPermission.ANYUSER);
MenuNavigation userkauppa = usermenu.addPage(null, null); MenuNavigation userkauppa = usermenu.addPage(null, null);
userkauppa.setKey("topnavi.usershop"); userkauppa.setKey("topnavi.usershop");
userkauppa.addPage(menuitemfacade.findOrCreate("/shop/createBill"), BillPermission.CREATE_BILL); userkauppa.addPage(menuitemfacade.findOrCreate("/shop/createBill"), BillPermission.CREATE_BILL);
userkauppa.addPage(menuitemfacade.findOrCreate("/foodwave/list"), ShopPermission.SHOP_FOODWAVE); userkauppa.addPage(menuitemfacade.findOrCreate("/foodwave/list"), ShopPermission.SHOP_FOODWAVE);
userkauppa.addPage(menuitemfacade.findOrCreate("/bill/list"), BillPermission.VIEW_OWN); userkauppa.addPage(menuitemfacade.findOrCreate("/bill/list"), BillPermission.VIEW_OWN);
userkauppa.addPage(menuitemfacade.findOrCreate("/user/accountEvents"), UserPermission.VIEW_ACCOUNTEVENTS);
MenuNavigation userPlaces = usermenu.addPage(null, null);
userPlaces.setKey("topnavi.userplaces");
userPlaces.addPage(menuitemfacade.findOrCreate("/place/placemap"), MapPermission.VIEW);
userPlaces.addPage(menuitemfacade.findOrCreate("/place/myGroups"), MapPermission.VIEW);
MenuNavigation usercompetitions = usermenu.addPage(null, null); MenuNavigation usercompetitions = usermenu.addPage(null, null);
usercompetitions.setKey("topnavi.competitions"); usercompetitions.setKey("topnavi.competitions");
usercompetitions.addPage(menuitemfacade.findOrCreate("/voting/compolist"), CompoPermission.VIEW_COMPOS); usercompetitions.addPage(menuitemfacade.findOrCreate("/voting/compolist"), CompoPermission.VIEW_COMPOS);
usercompetitions.addPage(menuitemfacade.findOrCreate("/voting/myEntries"), CompoPermission.VIEW_COMPOS); usercompetitions.addPage(menuitemfacade.findOrCreate("/voting/myEntries"), CompoPermission.VIEW_COMPOS);
usercompetitions.addPage(menuitemfacade.findOrCreate("/voting/submitEntry"), null).setVisible(false); usercompetitions.addPage(menuitemfacade.findOrCreate("/voting/submitEntry"), CompoPermission.SUBMIT_ENTRY).setVisible(false);
usercompetitions.addPage(menuitemfacade.findOrCreate("/voting/details"), null).setVisible(false); usercompetitions.addPage(menuitemfacade.findOrCreate("/voting/details"), CompoPermission.VIEW_COMPOS).setVisible(false);
/* MenuNavigation createuser = usermenu.addPage(null, null); MenuNavigation userprofile = usermenu.addPage(null, null);
createuser.setKey("topnavi.createuser"); userprofile.setKey("topnavi.profile");
createuser.addPage(menuitemfacade.findOrCreate("/user/create"), UserPermission.CREATE_NEW); */
userprofile.addPage(menuitemfacade.findOrCreate("/user/edit"), UserPermission.MODIFY);
userprofile.addPage(menuitemfacade.findOrCreate("/auth/logout"), UserPermission.LOGOUT);
/*
* MenuNavigation createuser = usermenu.addPage(null, null);
* createuser.setKey("topnavi.createuser");
* createuser.addPage(menuitemfacade.findOrCreate("/user/create"),
* UserPermission.CREATE_NEW);
*/
navifacade.create(usermenu); navifacade.create(usermenu);
Menuitem adminlist = menuitemfacade.findOrCreate("/useradmin/list");
MenuNavigation adminmenu = new MenuNavigation(ev, "topnavi.adminnavi", menusort = +10); MenuNavigation adminmenu = new MenuNavigation(ev, "topnavi.adminnavi", menusort = +10);
// adminmenu.setItem(adminlist); //
// adminmenu.setPermission(UserPermission.VIEW_ALL);
//
MenuNavigation adminuser = adminmenu.addPage(null, null); MenuNavigation adminuser = adminmenu.addPage(null, null);
adminuser.setKey("topnavi.usermgmt"); adminuser.setKey("topnavi.usermgmt");
adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/create"), UserPermission.VIEW_ALL); adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/create"), UserPermission.VIEW_ALL);
adminuser.addPage(adminlist, UserPermission.VIEW_ALL); adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/list"), UserPermission.VIEW_ALL);
adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/edit"), UserPermission.VIEW_ALL).setVisible(false); adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/edit"), UserPermission.VIEW_ALL).setVisible(false);
adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/changePassword"), UserPermission.VIEW_ALL).setVisible(false); adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/changePassword"), UserPermission.VIEW_ALL).setVisible(false);
adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/accountEvents"), UserPermission.VIEW_ALL).setVisible(false); adminuser.addPage(menuitemfacade.findOrCreate("/useradmin/accountEvents"), UserPermission.VIEW_ALL).setVisible(false);
...@@ -408,8 +416,8 @@ public class MenuBean implements MenuBeanLocal { ...@@ -408,8 +416,8 @@ public class MenuBean implements MenuBeanLocal {
} }
@Override @Override
public MenuNavigation findNavigationId(Integer id) { public MenuNavigation findNavigationId(Integer id) {
return navifacade.find(id); return navifacade.find(id);
} }
} }
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/UserBean.java
...@@ -278,6 +278,7 @@ public class UserBean implements UserBeanLocal { ...@@ -278,6 +278,7 @@ public class UserBean implements UserBeanLocal {
user.setEvent(eventBean.getCurrentEvent()); user.setEvent(eventBean.getCurrentEvent());
// Tallennetaan olio kantaan... // Tallennetaan olio kantaan...
eventUserFacade.create(user); eventUserFacade.create(user);
em.flush(); em.flush();
} }
......
code/MoyaUtilities/src/fi/codecrew/moya/enums/CardState.java
...@@ -6,5 +6,9 @@ public enum CardState { ...@@ -6,5 +6,9 @@ public enum CardState {
VALIDATED, VALIDATED,
PENDING_PRINT, PENDING_PRINT,
PRINTING_IN_PROGRESS, PRINTING_IN_PROGRESS,
PRINTED PRINTED;
public String toStringLower() {
return this.toString().toLowerCase();
}
} }
code/MoyaWeb/WebContent/admin/adduser/login.xhtml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
xmlns:tools="http://java.sun.com/jsf/composite/cditools"> xmlns:tools="http://java.sun.com/jsf/composite/cditools">
<h:body> <h:body>
<ui:composition template="/layout/#{sessionHandler.adduserfullscreen}/template.xhtml"> <ui:composition template="/resources/templates/#{sessionHandler.adduserfullscreen}/template.xhtml">
<f:metadata> <f:metadata>
<f:event type="preRenderView" listener="#{authView.executeAdduserViewLogin}" /> <f:event type="preRenderView" listener="#{authView.executeAdduserViewLogin}" />
</f:metadata> </f:metadata>
......
code/MoyaWeb/WebContent/admin/adduser/newuser.xhtml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:tools="http://java.sun.com/jsf/composite/cditools"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:tools="http://java.sun.com/jsf/composite/cditools">
<h:body> <h:body>
<ui:composition template="/layout/#{sessionHandler.adduserfullscreen}/template.xhtml"> <ui:composition template="/resources/templates/#{sessionHandler.adduserfullscreen}/template.xhtml">
<f:metadata> <f:metadata>
<f:event type="preRenderView" listener="#{userView.initCreateView}" /> <f:event type="preRenderView" listener="#{userView.initCreateView}" />
</f:metadata> </f:metadata>
......
code/MoyaWeb/WebContent/admin/adduser/start.xhtml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui" xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop" xmlns:tools="http://java.sun.com/jsf/composite/cditools"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui" xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop" xmlns:tools="http://java.sun.com/jsf/composite/cditools">
<h:body> <h:body>
<ui:composition template="/layout/#{sessionHandler.adduserfullscreen}/template.xhtml"> <ui:composition template="/resources/templates/#{sessionHandler.adduserfullscreen}/template.xhtml">
<ui:define name="content"> <ui:define name="content">
<h:form> <h:form>
......
code/MoyaWeb/WebContent/admin/adduser/update.xhtml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui" xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop" xmlns:tools="http://java.sun.com/jsf/composite/cditools"> <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui" xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop" xmlns:tools="http://java.sun.com/jsf/composite/cditools">
<h:body> <h:body>
<ui:composition template="/layout/#{sessionHandler.adduserfullscreen}/template.xhtml"> <ui:composition template="/resources/templates/#{sessionHandler.adduserfullscreen}/template.xhtml">
<ui:param name="thispage" value="page.user.create" /> <ui:param name="thispage" value="page.user.create" />
<f:metadata> <f:metadata>
<f:viewParam name="userid" value="#{userView.userid}" /> <f:viewParam name="userid" value="#{userView.userid}" />
......
code/MoyaWeb/WebContent/admin/incoming/index.xhtml
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
xmlns:tools="http://java.sun.com/jsf/composite/cditools"> xmlns:tools="http://java.sun.com/jsf/composite/cditools">
<h:body> <h:body>
<ui:composition <ui:composition
template="/layout/#{sessionHandler.fullscreen}/template.xhtml"> template="/resources/templates/#{sessionHandler.fullscreen}/template.xhtml">
<f:metadata> <f:metadata>
<f:event type="preRenderView" listener="#{incomingView.initView}" /> <f:event type="preRenderView" listener="#{incomingView.initView}" />
......
code/MoyaWeb/WebContent/admin/incoming/printCard.xhtml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui" xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop" xmlns:reader="http://java.sun.com/jsf/composite/cditools/reader" <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui" xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop" xmlns:reader="http://java.sun.com/jsf/composite/cditools/reader"
xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:user="http://java.sun.com/jsf/composite/cditools/user"> xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:user="http://java.sun.com/jsf/composite/cditools/user">
<h:body> <h:body>
<ui:composition template="/layout/#{sessionHandler.fullscreen}/template.xhtml"> <ui:composition template="/resources/templates/#{sessionHandler.fullscreen}/template.xhtml">
<f:metadata> <f:metadata>
<f:viewParam name="userid" value="#{userView.userid}" /> <f:viewParam name="userid" value="#{userView.userid}" />
......
code/MoyaWeb/WebContent/admin/info/computerplaces.xhtml
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
> >
<h:body> <h:body>
<ui:composition <ui:composition
template="/layout/#{sessionHandler.fullscreen}/template.xhtml"> template="/resources/templates/#{sessionHandler.fullscreen}/template.xhtml">
<f:metadata> <f:metadata>
<f:viewParam name="userid" value="#{userView.userid}" /> <f:viewParam name="userid" value="#{userView.userid}" />
<f:event type="preRenderView" listener="#{userView.initView}" /> <f:event type="preRenderView" listener="#{userView.initView}" />
......
code/MoyaWeb/WebContent/admin/info/general.xhtml
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
xmlns:tools="http://java.sun.com/jsf/composite/cditools"> xmlns:tools="http://java.sun.com/jsf/composite/cditools">
<h:body> <h:body>
<ui:composition <ui:composition
template="/layout/#{sessionHandler.fullscreen}/template.xhtml"> template="/resources/templates/#{sessionHandler.fullscreen}/template.xhtml">
<f:metadata> <f:metadata>
<f:viewParam name="userid" value="#{userView.userid}" /> <f:viewParam name="userid" value="#{userView.userid}" />
<f:event type="preRenderView" listener="#{userView.initView}" /> <f:event type="preRenderView" listener="#{userView.initView}" />
......
code/MoyaWeb/WebContent/admin/info/index.xhtml
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
xmlns:tools="http://java.sun.com/jsf/composite/cditools"> xmlns:tools="http://java.sun.com/jsf/composite/cditools">
<h:body> <h:body>
<ui:composition <ui:composition
template="/layout/#{sessionHandler.fullscreen}/template.xhtml"> template="/resources/templates/#{sessionHandler.fullscreen}/template.xhtml">
<f:metadata> <f:metadata>
<f:event type="preRenderView" listener="#{infoView.initView}" /> <f:event type="preRenderView" listener="#{infoView.initView}" />
......
code/MoyaWeb/WebContent/admin/info/shop.xhtml
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop"> xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop">
<h:body> <h:body>
<ui:composition <ui:composition
template="/layout/#{sessionHandler.fullscreen}/template.xhtml"> template="/resources/templates/#{sessionHandler.fullscreen}/template.xhtml">
<f:metadata> <f:metadata>
<f:viewParam name="userid" value="#{userView.userid}" /> <f:viewParam name="userid" value="#{userView.userid}" />
<f:event type="preRenderView" listener="#{userView.initView}" /> <f:event type="preRenderView" listener="#{userView.initView}" />
......
code/MoyaWeb/WebContent/admin/port/index.xhtml
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
xmlns:tools="http://java.sun.com/jsf/composite/cditools"> xmlns:tools="http://java.sun.com/jsf/composite/cditools">
<h:body> <h:body>
<ui:composition <ui:composition
template="/layout/#{sessionHandler.fullscreen}/template.xhtml"> template="/resources/templates/#{sessionHandler.fullscreen}/template.xhtml">
<f:metadata> <f:metadata>
<f:event type="preRenderView" listener="#{barcodeView.initView}" /> <f:event type="preRenderView" listener="#{barcodeView.initView}" />
......
code/MoyaWeb/WebContent/error.xhtml
...@@ -22,7 +22,9 @@ ...@@ -22,7 +22,9 @@
<h1>LOL, ERROR!</h1> <h1>LOL, ERROR!</h1>
<br/> <br/>
</center> </center>
<h:outputText escape="false" value="#{errorPageView.stackTrace}" /> <pre>
<h:outputText escape="false" value="#{errorPageView.stackTrace}" />
</pre>
</ui:fragment> </ui:fragment>
</h:body> </h:body>
</html> </html>
\ No newline at end of file
code/MoyaWeb/WebContent/resources/templates/template1/template.xhtml
...@@ -100,10 +100,11 @@ ...@@ -100,10 +100,11 @@
<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 render="#{menuview.viewChangeTopmenu.size() gt 1}">
<p:selectOneMenu value="#{menuView.menuChange}"> <p:selectOneMenu value="#{menuView.menuChange}">
<p:ajax listener="#{menuView.menuChangeEvent}" /> <p:ajax listener="#{menuView.menuChangeEvent}" />
<f:selectItems var="menuitem" value="#{menuView.getMenu(0)}" 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>
</div> </div>
......
code/MoyaWeb/WebContent/useradmin/overview.xhtml
...@@ -9,25 +9,41 @@ ...@@ -9,25 +9,41 @@
</f:metadata> </f:metadata>
<ui:define name="content"> <ui:define name="content">
<p:dataTable value="#{userOverviewView.userOverviewItems}" var="cartItem"> <p:dialog id="rejectDialog" widgetVar="dialog">
<p:column> <p>Diibadaaba diibadaaba, daaba dii</p>
<ui:fragment rendered="#{!empty cartItem.eventUser.currentImage}">
<img style="width: 150px;" src="#{request.contextPath}/dydata/userimage/#{cartItem.eventUser.currentImage.id}.img" alt="image" /> <p:inputTextarea />
</ui:fragment> <br/>
<ui:fragment rendered="#{empty cartItem.eventUser.currentImage}"> <p:commandButton oncomplete="dialog.hide()" actionListener="todo" value="Apply"/>
<h:outputText value="#{i18n['overview.noimage']}" /> <p:commandButton onclick="dialog.hide()" type="button" value="Cancel"/>
</ui:fragment> </p:dialog>
</p:column>
<p:column> <h:form id="form">
<h2><h:outputText value="#{cartItem.eventUser.nick}" /></h2> <p:dataTable value="#{userOverviewView.userOverviewItems}" var="cartItem" binding="#{table}" id="cartOverviewTable">
<h:outputText value="#{cartItem.eventUser.firstnames} #{cartItem.eventUser.lastname}" /> <p:column style="#{cartItem.printedCard == null ? 'background:grey;' : ''}">
</p:column> <h:panelGroup layout="block" id="schneider" style="background: red;" styleClass="cardstatus-#{cartItem.printedCard == null ? 'nonprintable' : cartItem.printedCard.cardState.toStringLower()}">
<p:column> <ui:fragment rendered="#{!empty cartItem.eventUser.currentImage}">
<p:commandButton value="OK" /> <img style="width: 150px;" src="#{request.contextPath}/dydata/userimage/#{cartItem.eventUser.currentImage.id}.img" alt="image" />
<p:commandButton value="Notify" /> </ui:fragment>
<p:commandButton value="Reject" /> <ui:fragment rendered="#{empty cartItem.eventUser.currentImage}">
</p:column> <h:outputText value="#{i18n['overview.noimage']}" />
</p:dataTable> </ui:fragment>
</h:panelGroup>
</p:column>
<p:column style="#{cartItem.printedCard == null ? 'background:grey;' : ''}">
<h2><h:outputText value="#{cartItem.eventUser.nick}" /></h2>
<h:outputText value="#{cartItem.eventUser.firstnames} #{cartItem.eventUser.lastname}" />
<h:outputText value="zz #{cartItem.printedCard.template.name}" />
</p:column>
<p:column styleClass="cardstatus-#{cartItem.printedCard == null ? 'nonprintable' : cartItem.printedCard.cardState.toStringLower()}">
<p:commandButton value="OK #{table.rowIndex}" actionListener="#{cartItem.acceptCard}" ajax="true" update="schneider">
<!-- <f:ajax execute="uov-items" render="@all"></f:ajax> -->
</p:commandButton>
<p:commandButton id="Reject" value="Reject" onclick="dialog.show();" type="button" />
</p:column>
</p:dataTable>
</h:form>
</ui:define> </ui:define>
</ui:composition> </ui:composition>
</h:body> </h:body>
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties
...@@ -693,6 +693,7 @@ sitepage.save = Save ...@@ -693,6 +693,7 @@ sitepage.save = Save
sitepagelist.header = Site pages sitepagelist.header = Site pages
submenu.auth.login = Login submenu.auth.login = Login
submenu.auth.logout = Logout
submenu.auth.logoutResponse = Logout successfull submenu.auth.logoutResponse = Logout successfull
submenu.auth.sendResetMail = Password reset submenu.auth.sendResetMail = Password reset
submenu.bill.billSummary = Bill summary submenu.bill.billSummary = Bill summary
...@@ -743,6 +744,7 @@ submenu.useradmin.validateUser = Validate user ...@@ -743,6 +744,7 @@ submenu.useradmin.validateUser = Validate user
submenu.voting.compolist = Compos submenu.voting.compolist = Compos
submenu.voting.create = Create new compo submenu.voting.create = Create new compo
submenu.voting.myEntries = My entries submenu.voting.myEntries = My entries
submenu.voting.submitEntry = Submit entry
subnavi.billing = Billing subnavi.billing = Billing
subnavi.cards = Cards subnavi.cards = Cards
...@@ -762,8 +764,6 @@ svm.success.successMessage = Payment was successfull. You can now your credits i ...@@ -762,8 +764,6 @@ svm.success.successMessage = Payment was successfull. You can now your credits i
template.loggedInAs = Logged in as template.loggedInAs = Logged in as
topmenu.login = Login
topnavi.adminshop = Adminshop topnavi.adminshop = Adminshop
topnavi.billing = Billing topnavi.billing = Billing
topnavi.competitions = Competitions topnavi.competitions = Competitions
...@@ -774,15 +774,18 @@ topnavi.event = Event ...@@ -774,15 +774,18 @@ topnavi.event = Event
topnavi.foodwave = Food topnavi.foodwave = Food
topnavi.frontpage = Front page topnavi.frontpage = Front page
topnavi.log = Log topnavi.log = Log
topnavi.login = Login
topnavi.maps = Maps topnavi.maps = Maps
topnavi.placemap = Map topnavi.placemap = Map
topnavi.poll = Polls topnavi.poll = Polls
topnavi.products = Products topnavi.products = Products
topnavi.profile = Profile
topnavi.shop = Shop topnavi.shop = Shop
topnavi.user = My properties topnavi.user = My properties
topnavi.userevent = Event topnavi.userevent = Event
topnavi.userinit = User auth topnavi.userinit = User auth
topnavi.usermgmt = Users topnavi.usermgmt = Users
topnavi.userplaces = Computer Places
topnavi.usershop = Shop topnavi.usershop = Shop
user.accountBalance = Account balance user.accountBalance = Account balance
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties
...@@ -676,6 +676,7 @@ sitepage.save = Tallenna ...@@ -676,6 +676,7 @@ sitepage.save = Tallenna
sitepagelist.header = Sivuston sis\u00E4ll\u00F6t sitepagelist.header = Sivuston sis\u00E4ll\u00F6t
submenu.auth.login = Kirjaudu submenu.auth.login = Kirjaudu
submenu.auth.logout = Kirjaudu ulos
submenu.auth.logoutResponse = Uloskirjautuminen onnistui submenu.auth.logoutResponse = Uloskirjautuminen onnistui
submenu.auth.sendResetMail = Salasanan palautus submenu.auth.sendResetMail = Salasanan palautus
submenu.bill.billSummary = Laskujen yhteenveto submenu.bill.billSummary = Laskujen yhteenveto
...@@ -728,6 +729,7 @@ submenu.useradmin.validateUser = Validoi k\u00E4ytt\u00E4j\u00E4 ...@@ -728,6 +729,7 @@ submenu.useradmin.validateUser = Validoi k\u00E4ytt\u00E4j\u00E4
submenu.voting.compolist = Kilpailut submenu.voting.compolist = Kilpailut
submenu.voting.create = Uusi kilpailu submenu.voting.create = Uusi kilpailu
submenu.voting.myEntries = Omat entryt submenu.voting.myEntries = Omat entryt
submenu.voting.submitEntry = L\u00E4het\u00E4 entry
subnavi.billing = Laskutus subnavi.billing = Laskutus
subnavi.cards = Kortit subnavi.cards = Kortit
...@@ -747,8 +749,6 @@ svm.success.successMessage = Verkkomaksu onnistui. ...@@ -747,8 +749,6 @@ svm.success.successMessage = Verkkomaksu onnistui.
template.loggedInAs = Kirjautunut tunnuksella template.loggedInAs = Kirjautunut tunnuksella
topmenu.login = Kirjaudu sis\u00E4\u00E4n
topnavi.adminshop = Kauppa topnavi.adminshop = Kauppa
topnavi.billing = Laskutus topnavi.billing = Laskutus
topnavi.competitions = Kilpailut topnavi.competitions = Kilpailut
...@@ -759,15 +759,18 @@ topnavi.event = Tapahtuma ...@@ -759,15 +759,18 @@ topnavi.event = Tapahtuma
topnavi.foodwave = Ruokatilaus topnavi.foodwave = Ruokatilaus
topnavi.frontpage = Etusivu topnavi.frontpage = Etusivu
topnavi.log = Logi topnavi.log = Logi
topnavi.login = Kirjaudu sis\u00E4\u00E4n
topnavi.maps = Kartat topnavi.maps = Kartat
topnavi.placemap = Paikkakartta topnavi.placemap = Paikkakartta
topnavi.poll = Kyselyt topnavi.poll = Kyselyt
topnavi.products = Tuotteet topnavi.products = Tuotteet
topnavi.profile = Profiili
topnavi.shop = Kauppa topnavi.shop = Kauppa
topnavi.user = Omat tiedot topnavi.user = Omat tiedot
topnavi.userevent = Tapahtuma topnavi.userevent = Tapahtuma
topnavi.userinit = K\u00E4ytt\u00E4j\u00E4n tunnistus topnavi.userinit = K\u00E4ytt\u00E4j\u00E4n tunnistus
topnavi.usermgmt = K\u00E4ytt\u00E4j\u00E4t topnavi.usermgmt = K\u00E4ytt\u00E4j\u00E4t
topnavi.userplaces = Konepaikat
topnavi.usershop = Kauppa topnavi.usershop = Kauppa
user.accountBalance = Tilin saldo user.accountBalance = Tilin saldo
......
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/menu/JsfMenuitem.java
...@@ -8,6 +8,11 @@ public class JsfMenuitem { ...@@ -8,6 +8,11 @@ public class JsfMenuitem {
private final MenuNavigation navigation; private final MenuNavigation navigation;
private String outcome; private String outcome;
public JsfMenuitem(String key, String outcome) {
this.navigation = new MenuNavigation(null, key, null);
this.outcome = outcome;
}
public JsfMenuitem(MenuNavigation navi) { public JsfMenuitem(MenuNavigation navi) {
this.navigation = navi; this.navigation = navi;
if (navi.getSitepage() != null) { if (navi.getSitepage() != null) {
......
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/menu/MenuView.java
package fi.codecrew.moya.web.cdiview.menu; package fi.codecrew.moya.web.cdiview.menu;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedList; import java.util.LinkedList;
...@@ -9,8 +10,6 @@ import java.util.Map; ...@@ -9,8 +10,6 @@ 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.faces.event.ValueChangeListener;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
...@@ -19,8 +18,8 @@ import org.slf4j.LoggerFactory; ...@@ -19,8 +18,8 @@ import org.slf4j.LoggerFactory;
import fi.codecrew.moya.beans.MenuBeanLocal; import fi.codecrew.moya.beans.MenuBeanLocal;
import fi.codecrew.moya.beans.SitePageBeanLocal; import fi.codecrew.moya.beans.SitePageBeanLocal;
import fi.codecrew.moya.enums.apps.UserPermission;
import fi.codecrew.moya.model.MenuNavigation; import fi.codecrew.moya.model.MenuNavigation;
import fi.codecrew.moya.model.Menuitem;
import fi.codecrew.moya.model.PageContent; import fi.codecrew.moya.model.PageContent;
import fi.codecrew.moya.web.cdiview.GenericCDIView; import fi.codecrew.moya.web.cdiview.GenericCDIView;
import fi.codecrew.moya.web.helper.LayoutView; import fi.codecrew.moya.web.helper.LayoutView;
...@@ -85,6 +84,22 @@ public class MenuView extends GenericCDIView { ...@@ -85,6 +84,22 @@ public class MenuView extends GenericCDIView {
super.navihandler.forward(menuChange); super.navihandler.forward(menuChange);
} }
private List<JsfMenuitem> viewchangeTopmenu;
public List<JsfMenuitem> getViewChangeTopmenu()
{
if (viewchangeTopmenu == null) {
viewchangeTopmenu = new ArrayList<JsfMenuitem>();
viewchangeTopmenu.add(new JsfMenuitem("topmenu.user", "/index"));
if (super.hasPermission(UserPermission.VIEW_ALL)) {
viewchangeTopmenu.add(new JsfMenuitem("topmenu.helpdesk", "/admin/info/index"));
viewchangeTopmenu.add(new JsfMenuitem("topmenu.admin", "/useradmin/list"));
}
}
return viewchangeTopmenu;
}
public LinkedList<List<JsfMenuitem>> getMenus() public LinkedList<List<JsfMenuitem>> getMenus()
{ {
if (menus == null) if (menus == null)
......
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/menu/PrimeMenuView.java
...@@ -107,57 +107,7 @@ public class PrimeMenuView extends GenericCDIView { ...@@ -107,57 +107,7 @@ public class PrimeMenuView extends GenericCDIView {
} }
} }
} }
user = permbean.getCurrentUser();
if (permbean.isLoggedIn())
{
Submenu nameSub = new Submenu();
nameSub.setId("nameSubmenu");
nameSub.setStyle("float:right;");
nameSub.setLabel(I18n.get("user.profile"));
MenuItem myprop = new MenuItem();
myprop.setOutcome("/user/edit");
myprop.setValue(I18n.get("user.myProperties"));
nameSub.getChildren().add(myprop);
MenuItem myPlces = new MenuItem();
myPlces.setOutcome("/place/myGroups");
myPlces.setValue(I18n.get("user.myPlaces"));
nameSub.getChildren().add(myPlces);
nameSub.getChildren().add(new Separator());
if (permbean.hasPermission(UserPermission.VIEW_ALL)) {
MenuItem adminmenu = new MenuItem();
logger.info("Selected topmenu: {}", selectedTop.getKey());
if ("topnavi.usernavi".equals(selectedTop.getKey())) {
adminmenu.setOutcome("/useradmin/list");
adminmenu.setValue(I18n.get("menu.toAdmin"));
} else {
adminmenu.setOutcome("/index");
adminmenu.setValue(I18n.get("menu.toUser"));
}
nameSub.getChildren().add(adminmenu);
nameSub.getChildren().add(new Separator());
}
MenuItem logout = new MenuItem();
logout.setOutcome("/auth/logout");
logout.setValue(I18n.get("user.logout"));
nameSub.getChildren().add(logout);
menuModel.addSubmenu(nameSub);
} else {
MenuItem loginbtn = new MenuItem();
loginbtn.setId("loginMenuItem");
loginbtn.setStyleClass("nameMenuItem");
loginbtn.setOutcome("/auth/login");
loginbtn.setValue(I18n.get("topmenu.login"));
menuModel.addMenuItem(loginbtn);
}
} }
return menuModel; return menuModel;
......
code/MoyaWeb/src/fi/codecrew/moya/web/helpers/UserOverviewItem.java
package fi.codecrew.moya.web.helpers; package fi.codecrew.moya.web.helpers;
import javax.faces.event.ActionEvent;
import fi.codecrew.moya.enums.CardState;
import fi.codecrew.moya.model.EventUser; import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.PrintedCard; import fi.codecrew.moya.model.PrintedCard;
...@@ -12,6 +15,10 @@ public class UserOverviewItem { ...@@ -12,6 +15,10 @@ public class UserOverviewItem {
eventUser = eu; eventUser = eu;
printedCard = pc; printedCard = pc;
} }
public void acceptCard(ActionEvent ae) {
printedCard.setCardState(CardState.VALIDATED);
}
public EventUser getEventUser() { public EventUser getEventUser() {
return eventUser; return eventUser;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!