printing card on incoming/printCard -page, preparing is nice

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

@@ -13,56 +13,9 @@
 		</f:metadata>
 		<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/cdiview/user/UserView.java

@@ -178,11 +178,9 @@ public class UserView extends GenericCDIView {
 	}
 
 	public void prepareCardDownload() {
-
 		try {
-			mpr = cardPrintBean.getUserCardAsPrintablePdf(this.user.getId());
+			mpr = cardPrintBean.getUserCardAsPrintablePdf(getSelectedUser().getId());
 			ByteArrayInputStream pdfstream = new ByteArrayInputStream(mpr.getPdf());
-
 			setStreamedFile(new DefaultStreamedContent(pdfstream));
 		} catch (Exception e) {
 			FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(e.getMessage()));
@@ -211,13 +209,13 @@ public class UserView extends GenericCDIView {
 	}
 
 	public String sendImage() {
-		logger.debug("sending image");
+		
 		if (getImage() == null)
 		{
-			logger.debug("NO image to send!");
+		
 			super.addFaceMessage("user.imageUpload.imageNotFound");
 		} else {
-			logger.debug("uploading image");
+		
 			UserImage userimage = userbean.uploadImage(user, getImage().getContentType(), getImage().getContents(), getImage().getFileName(), "");
 			user = userbean.getEventUser(userimage.getUser());
 			super.addFaceMessage("user.imageUploaded");
@@ -231,7 +229,7 @@ public class UserView extends GenericCDIView {
 			super.beginConversation();
 		}
 	}
-
+	
 	public void initView() {
 
 		/*
@@ -424,6 +422,8 @@ public class UserView extends GenericCDIView {
 	}
 
 	public StreamedContent getStreamedFile() {
+		if(streamedFile == null)
+			logger.info("Tried to get empty streamed file");
 		return streamedFile;
 	}
 

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

@@ -48,7 +48,7 @@ public class IncomingView extends GenericCDIView {
 			}
 			
 			userview.setUser(user);
-			
+			userview.prepareCardDownload();
 			return "printCard";
 		}