Merge branch 'vectoinfo' of codecrew.fi:tkfftk/moya into vectoinfo

Conflicts:
	code/MoyaWeb/WebContent/info/incoming.xhtml
	code/MoyaWeb/WebContent/info/shop.xhtml
	code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/reader/ReaderView.java
	code/MoyaWeb/src/fi/codecrew/moya/web/flow/IncomingView.java
	code/MoyaWeb/src/fi/codecrew/moya/web/flow/InfoView.java
	code/MoyaWeb/src/fi/codecrew/moya/web/flow/flowShopView.java

code/MoyaWeb/WebContent/info/incoming.xhtml

@@ -11,6 +11,7 @@
 			<f:event type="preRenderView" listener="#{incomingView.initPrintCardView}" />
 		</f:metadata>
 		<ui:define name="content">
+
 <!-- 
 		<h1>#{i18n['incomingflow.search']}</h1>
 			<h:form>
@@ -29,6 +30,7 @@
 			</h:form>
 		
   yhtäsuurimerkit  -->
+
 			<reader:backendReader selectvalue="#{i18n['barcodeReader.readBarcode']}" selectaction="#{incomingView.polledRead}" />
 			<h:form>
 				<p:autoComplete id="acsb" value="#{infoView.multiSearchUser}" completeMethod="#{infoView.matchMulti}" converter="#{eventUserConverter}" var="usrx" itemLabel="#{usrx.shortUserDescriptor}" itemValue="#{usrx}">
@@ -36,7 +38,9 @@
 				</p:autoComplete>
 			</h:form>
 
+
 <!--  infoviilausta, kauppa infoon  -->
+
 			<h:outputScript library="primefaces" name="jquery/jquery.js" target="head" />
 			<h1>#{i18n['incomingflow.userdetails']}</h1>
 

code/MoyaWeb/WebContent/info/shop.xhtml

@@ -14,6 +14,7 @@
 			<f:event type="preRenderView" listener="#{flowShopView.initView}" />
 		</f:metadata>
 		<ui:define name="content">
+
 			<reader:backendReader selectvalue="#{i18n['barcodeReader.readBarcode']}" selectaction="#{flowShopView.polledRead}" />
 			<h:form>
 				<p:autoComplete id="acsb" value="#{infoView.multiSearchUser}" completeMethod="#{infoView.matchMulti}" converter="#{eventUserConverter}" var="usrx" itemLabel="#{usrx.shortUserDescriptor}" itemValue="#{usrx}">

code/MoyaWeb/src/fi/codecrew/moya/web/flow/IncomingView.java

@@ -149,7 +149,9 @@ public class IncomingView extends GenericCDIView {
 				logger.info("found user {}, redirecting", user.getNick());
 				userview.setUser(user);
 				// userview.prepareCardDownload();
-				// PURKKAAA, sori t��st��, koitan refaktoroida kauniiksi ku kerki��n -TKwtf
+
+				// PURKKAAA, sori tästä, koitan refaktoroida kauniiksi ku kerkiän -TKwtf
+
 				super.navihandler.redirectNavigation("incoming.jsf?userid=" + user.getUser().getId());
 			}