Revert "Show card filing info in incoming view"

Sheisse. Ei sen tänne pitänyt pushata.
This reverts commit b54117be.

code/moya-web/WebContent/info/incoming.xhtml

@@ -166,12 +166,8 @@
 
 							<p:graphicImage url="/dydata/usercard/#{userView.selectedUser.user.id}.png" width="300" />
 							<br />
-							<h:commandButton action="#{incomingView.printCard}" value="#{i18n['print']}" />
-							<b>
-								(status: <p:outputLabel value="#{incomingView.printedStatus}" />)
-								<p:outputLabel value="#{i18n['incomingflow.cardfiling.label']}" rendered="#{!empty incomingView.cardFiling}" />
-								<p:outputLabel value="#{incomingView.cardFiling}" rendered="#{!empty incomingView.cardFiling}" />
-							</b>
+							<h:commandButton action="#{incomingView.printCard}" value="#{i18n['print']}" /> (status: <p:outputLabel value="#{incomingView.printedStatus}" />)
+								
 
 							
 						</p:fieldset>

code/moya-web/src/main/java/fi/codecrew/moya/resources/i18n.properties

@@ -190,7 +190,6 @@ incomingView.cancel = Peruuta
 incomingflow.alreadyShowingUser.message = Piipattu k\u00E4ytt\u00E4j\u00E4 on jo n\u00E4kyviss\u00E4
 incomingflow.alreadyShowingUser.title   = Valmiiksi valittu
 incomingflow.cardCodes                  = Kortin koodit
-incomingflow.cardfiling.label           = Card filing:
 incomingflow.codeattached.message       = Piipattu koodi liitetty n\u00E4ytett\u00E4v\u00E4\u00E4n korttiin
 incomingflow.codeattached.title         = Koodi liittetty
 incomingflow.giveplace                  = Merkitse annetuksi

code/moya-web/src/main/java/fi/codecrew/moya/resources/i18n_en.properties

@@ -513,7 +513,6 @@ incomingflow.alreadyShowingUser.message = We are already showing selected user
 incomingflow.alreadyShowingUser.title   = Already selected
 incomingflow.barcode                    = Barcode
 incomingflow.cardCodes                  = Barcodes in card
-incomingflow.cardfiling.label           = Card filing:
 incomingflow.changereader               = Change Reader
 incomingflow.codeattached.message       = Code attached to current user's card
 incomingflow.codeattached.title         = Code attached

code/moya-web/src/main/java/fi/codecrew/moya/resources/i18n_fi.properties

@@ -521,7 +521,6 @@ incomingflow.alreadyShowingUser.message = Piipattu k\u00E4ytt\u00E4j\u00E4 on jo
 incomingflow.alreadyShowingUser.title   = Valmiiksi valittu
 incomingflow.barcode                    = Viivakoodi
 incomingflow.cardCodes                  = Korttiin liitetyt koodit
-incomingflow.cardfiling.label           = Kortin kansiointi:
 incomingflow.changereader               = Vaihda lukijaa
 incomingflow.codeattached.message       = Piipattu koodi liitetty aktiiviseen k\u00E4ytt\u00E4j\u00E4\u00E4n
 incomingflow.codeattached.title         = Koodi liitetty

code/moya-web/src/main/java/fi/codecrew/moya/web/flow/IncomingView.java

@@ -27,7 +27,6 @@ import javax.faces.context.FacesContext;
 import javax.faces.model.ListDataModel;
 import javax.inject.Inject;
 import javax.inject.Named;
-import javax.json.JsonObject;
 
 import org.primefaces.event.SelectEvent;
 import org.slf4j.Logger;
@@ -75,9 +74,10 @@ public class IncomingView extends GenericCDIView {
 
 	@Inject
 	private ReaderNameContainer namecontainer;
-
+	
 	@Inject
 	private FlowUserContainer flowUserContainer;
+	
 
 	@EJB
 	private BarcodeBeanLocal barcodeBean;
@@ -149,13 +149,14 @@ public class IncomingView extends GenericCDIView {
 
 		if (!initialized) {
 			logger.debug("INITIALIZING!!!!");
-
-			if (flowUserContainer.getUserId() != null && flowUserContainer.getUserId() > 0) {
+			
+			if(flowUserContainer.getUserId() != null && flowUserContainer.getUserId() > 0) {
 				userview.setUserid(flowUserContainer.getUserId());
 			}
-
+			
 			flowUserContainer.setUserId(null);
-
+			
+			
 			// initializePoller();
 			initialized = true;
 			super.beginConversation();
@@ -214,6 +215,7 @@ public class IncomingView extends GenericCDIView {
 			return;
 		}
 
+		
 		cardBean.giveCard(userview.getSelectedUser(), autoGivePlaces);
 
 		userview.attachCodeToCard(eventToAttach);
@@ -224,9 +226,11 @@ public class IncomingView extends GenericCDIView {
 		userview.setPrintedCard(null); // refresh card
 
 		FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(I18n.get("incomingflow.codeattached.title"), I18n.get("incomingflow.codeattached.message")));
-
+		
 	}
+	
 
+	
 	public boolean isShowAttachDialog() {
 		return showAttachDialog;
 	}
@@ -266,23 +270,6 @@ public class IncomingView extends GenericCDIView {
 		return ret;
 	}
 
-	/**
-	 * Try to get card filing info from the metadata. Empty string if not found.
-	 * 
-	 * @return Card filing info String or empty string.
-	 */
-	public String getCardFiling() {
-		try {
-			PrintedCard card = cardBean.checkPrintedCard(userview.getSelectedUser());
-			JsonObject cardMeta = card.getMeta();
-			JsonObject cardFilingObject = cardMeta.getJsonObject("card-filing");
-			return cardFilingObject.getString("cardplace");
-		} catch (Exception e) {
-			logger.warn("Could not get card filing info", e);
-		}
-		return "";
-	}
-
 	public String printCard() {
 		PrintedCard card = cardBean.checkPrintedCard(userview.getUser());
 		card.setCardState(CardState.VALIDATED);
@@ -296,11 +283,12 @@ public class IncomingView extends GenericCDIView {
 	}
 
 	public ListDataModel<CardCode> getCardCodes() {
-
-		if (userview.getPrintedCard() == null)
+		
+		if(userview.getPrintedCard() == null)
 			return new ListDataModel<CardCode>(new ArrayList<CardCode>());
-
+			
 		cardCodes = new ListDataModel<CardCode>(userview.getPrintedCard().getCardCodes());
+		
 
 		return cardCodes;
 	}
@@ -309,7 +297,7 @@ public class IncomingView extends GenericCDIView {
 		if (cardCodes != null && cardCodes.isRowAvailable()) {
 			CardCode code = cardCodes.getRowData();
 			cardTemplateBean.removeCardCode(code);
-
+			
 			// flush that fucker
 			userview.setPrintedCard(null);
 		}
@@ -332,5 +320,5 @@ public class IncomingView extends GenericCDIView {
 		}
 		return null;
 	}
-
+	
 }