rikoin, jenkins test

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

@@ -27,36 +27,7 @@
 			<br />
 			<br />
 			<br />
 			<br />
 			
 			
-			<!--  reader eventtiles -->
-			
-			<h:form>
-		<p:poll interval="3" />
-		<ui:repeat value="#{readerView.readerEvents}" var="event" >
-			<h:link styleClass="userimagetile" outcome="/admin/incoming/printCard"
-				rendered="#{!empty event.printedCard.user}">
-
-				<div>
-					<img
-						src="#{request.contextPath}/dydata/userimage/#{event.printedCard.user.currentImage.id}.img" />
-					<br />
-					<h:outputText styleClass="usertilenick"
-						value="#{event.printedCard.user.nick}" />
-					<br />
-					<h:outputText value="#{event.printedCard.user.wholeName}" />
-					<br />
-
-					<ui:repeat
-						value="#{readerView.getUserRoles(event.printedCard.user)}"
-						var="role">
-						<h:outputText value="#{role.name}" />
-						<br />
-					</ui:repeat>
-
-				</div>
-				<f:param name="userid" value="#{event.printedCard.user.user.id}" />
-			</h:link>
-		</ui:repeat>
-	</h:form>
+				<reader:barcode_and_rfid selectvalue="#{i18n['barcodeReader.readBarcode']}" selectaction="#{incomingView.selectUser}" />
 			
 			
 			
 			
 			
 			
@@ -66,9 +37,7 @@
 		
 		
 			<reader:readerlisttiles />
 			<reader:readerlisttiles />
 			<br />
 			<br />
-				<h:form>
-				<reader:barcode selectvalue="#{i18n['barcodeReader.readBarcode']}" selectaction="#{incomingView.selectUser}" />
-			</h:form>
+				
 		</ui:define>
 		</ui:define>
 		
 		
 	</ui:composition>
 	</ui:composition>

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

@@ -13,6 +13,55 @@
 		</f:metadata>
 		</f:metadata>
 		<ui:define name="content">
 		<ui:define name="content">
 		
 		
+		
+			
+	
+				<h:outputScript library="primefaces" name="jquery/jquery.js" target="head" />
+	
+				<h:form enctype="multipart/form-data">
+					<p:fileUpload value="#{userView.image}" mode="simple" required="true" />
+					<h:commandButton action="#{userView.sendImage}" value="#{i18n['user.imagesubmit']}" />
+				</h:form>
+	
+				<h2>#{i18n['user.thisIsCurrentImage']}</h2>
+	
+				<h:outputText rendered="#{empty userView.user.currentImage}" value="#{i18n['user.noCurrentImage']}" />
+				<ui:fragment rendered="#{!empty userView.user.currentImage}">
+					<h:panelGrid columns="2">
+						<img width="300" src="#{request.contextPath}/dydata/userimage/#{userView.user.currentImage.id}.jpg" alt="image" />
+						<ui:fragment rendered="#{userView.canManage()}">
+							<h:form>
+								<p:imageCropper value="#{userView.croppedImage}" aspectRatio="0.7317073170731707" image="/dydata/userimage/#{userView.user.currentImage.id}.jpg" />
+								<h:commandButton action="#{userView.crop}" value="#{i18n['user.cropImage']}" />
+							</h:form>
+						</ui:fragment>
+	
+	
+					</h:panelGrid>
+					<ui:fragment rendered="#{userView.canManage()}">
+						<h2>Ylläpito</h2>
+						<h:form>
+							<user:previewAndPrintCard />
+							
+							<p:commandButton action="#{userView.acceptPrintedCard()}" value="accept printed card" />
+						</h:form>
+	
+	 
+						<h3>RFID</h3>
+						<reader:barcode_rfid selectvalue="#{i18n['readerevent.associateToUser']}" selectaction="#{userView.attachBarcodeToCard()}"/>
+	
+					</ui:fragment>
+	
+				</ui:fragment>
+	
+	
+	
+		OLD STUFF BELOW
+		
+		
+		
+			<h:outputScript library="primefaces" name="jquery/jquery.js" target="head" />
+		
 			<!--  user:edit commitaction="#{incomingView.saveUser()}" commitvalue="#{i18n['user.save']}" /-->
 			<!--  user:edit commitaction="#{incomingView.saveUser()}" commitvalue="#{i18n['user.save']}" /-->
 
 
 			<br />
 			<br />

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

@@ -29,7 +29,7 @@ public class InfoView extends GenericCDIView {
 		
 		
 		@Inject
 		@Inject
 		private ReaderView readerView;
 		private ReaderView readerView;
-		
+		s
 		public void initView() {
 		public void initView() {
 			super.beginConversation();
 			super.beginConversation();
 		}
 		}