hups, samassa commitissa kanhta, paikkakoodia ja infoilua

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

@@ -20,6 +20,7 @@ import fi.codecrew.moya.enums.apps.MapPermission;
 import fi.codecrew.moya.enums.apps.PollPermission;
 import fi.codecrew.moya.enums.apps.ShopPermission;
 import fi.codecrew.moya.enums.apps.SpecialPermission;
+import fi.codecrew.moya.enums.apps.TerminalPermission;
 import fi.codecrew.moya.enums.apps.TournamentPermission;
 import fi.codecrew.moya.enums.apps.UserPermission;
 import fi.codecrew.moya.facade.MenuNavigationFacade;
@@ -196,7 +197,7 @@ public class MenuBean implements MenuBeanLocal {
 		adminShopProducts.addPage(menuitemfacade.findOrCreate("/product/list"), ShopPermission.LIST_ALL_PRODUCTS);
 		adminShopProducts.addPage(menuitemfacade.findOrCreate("/product/create"), ShopPermission.MANAGE_PRODUCTS);
 		adminShopProducts.addPage(menuitemfacade.findOrCreate("/product/edit"), ShopPermission.MANAGE_PRODUCTS).setVisible(false);
-		;
+		
 
 		MenuNavigation foodnavi = adminshop.addPage(null, null);
 		foodnavi.setKey("topnavi.foodwave");
@@ -257,12 +258,13 @@ public class MenuBean implements MenuBeanLocal {
 
 		adminevent.addPage(menuitemfacade.findOrCreate("/eventorg/editEvent"), EventPermission.MANAGE_PROPERTIES);
 		
-		navifacade.create(adminmenu);
 
-		//MenuNavigation shopmenu = new MenuNavigation(ev, "topnavi.shopnavi", menusort = +10);
-		// shopnavi.addPage(menuitemfacade.findOrCreate("/index3"),
-		// UserPermission.ANYUSER);
-		//	navifacade.create(shopmenu);
+		
+		
+
+	
+
+
 
 		MenuNavigation tournamentsadm = adminmenu.addPage(null, null);
 		tournamentsadm.setKey("tournaments.menutitle");
@@ -273,6 +275,32 @@ public class MenuBean implements MenuBeanLocal {
 		tournamentsadm.addPage(menuitemfacade.findOrCreate("/tournaments/admin/edit"), TournamentPermission.MANAGE_ALL).setVisible(false);
 		tournamentsadm.addPage(menuitemfacade.findOrCreate("/tournaments/admin/delete"), TournamentPermission.MANAGE_ALL).setVisible(false);
 		tournamentsadm.addPage(menuitemfacade.findOrCreate("/tournaments/admin/editrules"), TournamentPermission.MANAGE_ALL).setVisible(false);
+		
+		
+
+	
+		
+		
+		MenuNavigation infoviews = adminmenu.addPage(null, null);
+		infoviews.setKey("topnavi.infoviews");
+		infoviews.addPage(menuitemfacade.findOrCreate("/admin/adduser/index"), UserPermission.CREATE_NEW);
+		
+		MenuNavigation infonavi = infoviews.addPage(null, null);
+		infonavi.setKey("subnavi.info");
+		infonavi.addPage(menuitemfacade.findOrCreate("/info/index"), TerminalPermission.INFO);
+		infonavi.addPage(menuitemfacade.findOrCreate("/info/incoming"), TerminalPermission.INFO);
+
+
+		
+		navifacade.create(adminmenu);
+		
+		
+		
+		//MenuNavigation shopmenu = new MenuNavigation(ev, "topnavi.shopnavi", menusort = +10);
+		// shopnavi.addPage(menuitemfacade.findOrCreate("/index3"),
+		// UserPermission.ANYUSER);
+		//	navifacade.create(shopmenu);
+		
 		/*
 		 * MenuNavigation profileTopmenu = new MenuNavigation(ev,
 		 * "topnavi.profile", menusort = +10);

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

@@ -589,7 +589,7 @@ public class PlaceBean implements PlaceBeanLocal {
 			font.setSize(font2);
 
 			textLine = new TextLine(font);
-			textLine.setText(barcodeBean.getPlaceHexcode(place));
+			textLine.setText(barcodeBean.getPlaceTextCode(place));
 			textLine.setPosition(currentX, (pagey / 2) + font1);
 			textLine.setColor(new int[] { 0, 0, 0 });
 			textLine.drawOn(page);

code/MoyaBeansClient/ejbModule/fi/codecrew/moya/beans/BarcodeBeanLocal.java

@@ -18,8 +18,8 @@ public interface BarcodeBeanLocal {
 	
 	public InputStream getUserBarcode(EventUser user) throws IOException;
 	public InputStream getCardBarcode(PrintedCard printedCard) throws IOException;
-	public String getPlaceHexcode(Place place);
-	public Place getPlaceFromHexcode(String hexcode);
+	public String getPlaceTextCode(Place place);
+	public Place getPlaceFromTextCode(String hexcode);
 	public String checkVrAuthCode(String code);
 	
 	public Product getProduct(String barcode);

code/MoyaWeb/WebContent/admin/incoming/printCard.xhtml → code/MoyaWeb/WebContent/info/incoming.xhtml

@@ -12,7 +12,7 @@
 		</f:metadata>
 		<ui:define name="content">
 			<h:outputScript library="primefaces" name="jquery/jquery.js" target="head" />
-<h1>#{i18n['incomingflow.userdetails']} </h1>
+			<h1>#{i18n['incomingflow.userdetails']}</h1>
 			<h:panelGrid id="cropper" columns="3">
 				<h:panelGroup>
 					<user:edit id="usereditor" commitaction="#{incomingView.saveUser()}" commitvalue="#{i18n['user.save']}" camAlwaysOn="true" />
@@ -27,8 +27,9 @@
 					</h:form>
 				</h:panelGroup>
 				<h:panelGroup>
-					<h:form >
-						<p:graphicImage  url="/dydata/usercard/#{userView.user.user.id}.png" width="300" /><br />
+					<h:form>
+						<p:graphicImage url="/dydata/usercard/#{userView.user.user.id}.png" width="300" />
+						<br />
 						<h:commandButton action="#{incomingView.printCard}" value="#{i18n['print']}" /> (status: #{incomingView.printedStatus})
 					</h:form>
 				</h:panelGroup>

code/MoyaWeb/WebContent/admin/incoming/index.xhtml → code/MoyaWeb/WebContent/info/index.xhtml

@@ -9,6 +9,7 @@
 	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:infoview="http://java.sun.com/jsf/composite/cditools/infoview"
 	xmlns:tools="http://java.sun.com/jsf/composite/cditools">
 <h:body>
 	<ui:composition
@@ -22,6 +23,11 @@
 		<f:event type="preRenderView" listener="#{readerList.initReaderList}" />
 		
 		</f:metadata>
+		
+		
+		<ui:define name="headercontent">
+			<infoview:userselector />
+		</ui:define>
 		<ui:define name="content">
 		
 			<h:form>
@@ -37,6 +43,7 @@
 			
 		</ui:define>
 		
+
 	</ui:composition>
 </h:body>
 </html>
\ No newline at end of file

code/MoyaWeb/WebContent/resources/cditools/infoview/userselector.xhtml

+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:composite="http://java.sun.com/jsf/composite"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+	 xmlns:p="http://primefaces.org/ui"
+	 xmlns:reader="http://java.sun.com/jsf/composite/cditools/reader"
+	 >
+<composite:interface>
+	
+
+</composite:interface>
+
+<composite:implementation>
+	<reader:bacendReader />
+
+</composite:implementation>
+
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/resources/templates/blipview/css/style.css

@@ -283,8 +283,19 @@ label {
 	text-decoration: none;
 }
 
+#header_left {
+	float: left;
+	width: 400px;
+}
+#header_center {
+	float: left;
+	widows: 300px;
+}
+
 #header_right {
 	text-align: right;
+	float: right;
+	width: 400px;
 }
 
 
@@ -292,3 +303,9 @@ label {
 .success {
 	color: #006600;
 }
+
+
+	
+	
+	
+	
\ No newline at end of file

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

@@ -14,6 +14,7 @@
 		<link rel="icon" href="#{request.contextPath}/favicon.ico" type="image/x-icon" />
 		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/blipview/css/style.css" />
 		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/blipview/css/general.css" />
+		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/templates/custom_components.css" />
 		<ui:insert name="headerdata" />
 
 	</h:head>
@@ -37,8 +38,17 @@
 								</h1>
 							</ui:fragment>
 						</c:otherwise>
+						
 					</c:choose>
 				</h:link>
+				<div class="topmenu">
+					<h:form>
+						<p:menubar rendered="#{primeMenuView.hasSecondaryMenu}" model="#{primeMenuView.secondaryMenuModel}" />
+					</h:form>
+				</div>
+			</div>
+			<div id="header_center">
+				<ui:insert name="headercontent" />
 			</div>
 			<div id="header_right">
 				<img src="#{request.contextPath}/resources/templates/template1/img/moya_logo.png" />

code/MoyaWeb/src/fi/codecrew/moya/resources/i18n.properties

@@ -232,9 +232,14 @@ resetmailSent.body   = Email has been sent containing a link where you can chang
 resetmailSent.header = Email sent
 
 submenu.NotImplementedYet   = Not implemented
+submenu.admin.adduser       = K\u00E4ytt\u00E4j\u00E4nlis\u00E4ys
+submenu.admin.adduser.index = K\u00E4ytt\u00E4j\u00E4nlis\u00E4ys
 submenu.frontpage           = Frontpage
+submenu.info.incoming       = Incomingview
+submenu.info.index          = Infon\u00E4kym\u00E4
 
 subnavi.cards = \u0009\u0009
+subnavi.info  = Info
 
 topnavi.license   = Lisenssikoodit
 

code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties

@@ -909,6 +909,8 @@ sitepagelist.header = Site pages
 submenu.NotImplementedYet            = Not implemented
 submenu.actionlog.messagelist        = ActionLog
 submenu.actionlog.taskview           = View tasks
+submenu.admin.adduser                = Adduser
+submenu.admin.adduser.index          = Adduser
 submenu.admin.adduser.login          = Login
 submenu.admin.adduser.start          = Welcome
 submenu.admin.adduser.update         = Update profile picture
@@ -935,6 +937,8 @@ submenu.foodmanager.listFoodwaves    = List active foodwaves
 submenu.foodwave.list                = Foodwaves
 submenu.foodwave.listTemplates       = Food provides
 submenu.index                        = Frontpage
+submenu.info.incoming                = Sis\u00E4\u00E4ntulo
+submenu.info.index                   = Infoview
 submenu.license.manageCodes          = Manage codes
 submenu.license.viewCodes            = View codes
 submenu.map.create                   = Create map
@@ -993,6 +997,7 @@ submenu.voting.submitEntry           = Submit entry
 
 subnavi.billing  = Billing
 subnavi.cards    = Cards
+subnavi.info     = Info
 subnavi.products = Products
 subnavi.readers  = Readers
 subnavi.roles    = Roles
@@ -1025,6 +1030,7 @@ topnavi.event        = Event
 topnavi.foodwave     = Food
 topnavi.frontpage    = Front page
 topnavi.game         = Gamecodes
+topnavi.infoviews    = Infoviews
 topnavi.license      = Licensecodes
 topnavi.log          = Log
 topnavi.login        = Login

code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties

@@ -357,7 +357,7 @@ foodwavetemplate.actions            = Toimet
 foodwavetemplate.addproduct         = Lis\u00E4\u00E4
 foodwavetemplate.basicinfo          = Tilauspohja
 foodwavetemplate.createFoodwave     = Luo ruokatilaus
-foodwavetemplate.createwave         = Luo tilauspohja
+foodwavetemplate.createwave         = Luo tilaus
 foodwavetemplate.description        = Kuvaus
 foodwavetemplate.edit               = Muokkaa tilauspohjaa
 foodwavetemplate.editRow            = Muokkaa
@@ -891,6 +891,8 @@ sitepagelist.header = Sivuston sis\u00E4ll\u00F6t
 submenu.NotImplementedYet            = Toteuttamatta
 submenu.actionlog.messagelist        = ActionLog
 submenu.actionlog.taskview           = N\u00E4yt\u00E4 toiminnat
+submenu.admin.adduser                = K\u00E4ytt\u00E4j\u00E4nlis\u00E4ys
+submenu.admin.adduser.index          = K\u00E4ytt\u00E4j\u00E4nlis\u00E4ys
 submenu.admin.adduser.login          = Kirjaudu sis\u00E4\u00E4n
 submenu.admin.adduser.start          = Tervetuloa
 submenu.admin.adduser.update         = P\u00E4ivit\u00E4 profiilikuva
@@ -917,6 +919,8 @@ submenu.foodmanager.listFoodwaves    = Aktiiviset ruokatilaukset
 submenu.foodwave.list                = Ruokatilaukset
 submenu.frontpage                    = Etusivu
 submenu.index                        = Etusivu
+submenu.info.incoming                = Incomingview
+submenu.info.index                   = Infon\u00E4kym\u00E4
 submenu.license.manageCodes          = Hallinnoi lisenssej\u00E4
 submenu.license.viewCodes            = N\u00E4yt\u00E4 koodit
 submenu.map.create                   = Uusi kartta
@@ -978,6 +982,7 @@ submenu.voting.submitEntry           = L\u00E4het\u00E4 entry
 
 subnavi.billing  = Laskutus
 subnavi.cards    = Kortit
+subnavi.info     = Info
 subnavi.products = Tuotteet
 subnavi.readers  = Lukijat
 subnavi.roles    = Roolit
@@ -1010,6 +1015,7 @@ topnavi.event        = Tapahtuma
 topnavi.foodwave     = Ruokatilaus
 topnavi.frontpage    = Etusivu
 topnavi.game         = Pelikoodit
+topnavi.infoviews    = Infon\u00E4kym\u00E4t
 topnavi.license      = Lisenssikoodit
 topnavi.log          = Logi
 topnavi.login        = Kirjaudu sis\u00E4\u00E4n

code/MoyaWeb/src/fi/codecrew/moya/servlet/PlaceMap.java

@@ -273,7 +273,8 @@ public class PlaceMap extends HttpServlet {
 				logger.error("Cannot convert string {} to color.", p.getProduct().getColor());
 			}
 		} else {
-			logger.debug("Nothing special for this place. Color should be default.");
+// 			too much debugging -TKjne			
+//			logger.debug("Nothing special for this place. Color should be default.");
 
 		}
 

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

@@ -63,7 +63,8 @@ public class MenuView {
 	public List<PageContent> getPagecontent(String pagekey)
 	{
 		String key = new StringBuilder(layoutview.getPagepath()).append(":").append(pagekey).toString();
-		logger.debug("Getting pagecontent for key {}. Matches: {}", key, contents.containsKey(key));
+//		Removed by tkfftk, enought is enought
+//		logger.debug("Getting pagecontent for key {}. Matches: {}", key, contents.containsKey(key));
 
 		if (!contents.containsKey(key)) {
 			contents.put(key, pagebean.findContentsForUser(key, sessionstore.getLocale()));