Skip to content

Antti Väyrynen / Moya

Go to a project
Commit dc4be23d by Juho Juopperi
Options

Revert "Show card filing info in incoming view" 

Sheisse. Ei sen tänne pitänyt pushata.
This reverts commit b54117be.
1 parent b54117be
Inline Side-by-side
Showing with 10 additions and 29 deletions
code/moya-web/WebContent/info/incoming.xhtml
...@@ -166,12 +166,8 @@ ...@@ -166,12 +166,8 @@
<p:graphicImage url="/dydata/usercard/#{userView.selectedUser.user.id}.png" width="300" /> <p:graphicImage url="/dydata/usercard/#{userView.selectedUser.user.id}.png" width="300" />
<br /> <br />
<h:commandButton action="#{incomingView.printCard}" value="#{i18n['print']}" /> <h:commandButton action="#{incomingView.printCard}" value="#{i18n['print']}" /> (status: <p:outputLabel value="#{incomingView.printedStatus}" />)
<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>
</p:fieldset> </p:fieldset>
......
code/moya-web/src/main/java/fi/codecrew/moya/resources/i18n.properties
...@@ -190,7 +190,6 @@ incomingView.cancel = Peruuta ...@@ -190,7 +190,6 @@ incomingView.cancel = Peruuta
incomingflow.alreadyShowingUser.message = Piipattu k\u00E4ytt\u00E4j\u00E4 on jo n\u00E4kyviss\u00E4 incomingflow.alreadyShowingUser.message = Piipattu k\u00E4ytt\u00E4j\u00E4 on jo n\u00E4kyviss\u00E4
incomingflow.alreadyShowingUser.title = Valmiiksi valittu incomingflow.alreadyShowingUser.title = Valmiiksi valittu
incomingflow.cardCodes = Kortin koodit incomingflow.cardCodes = Kortin koodit
incomingflow.cardfiling.label = Card filing:
incomingflow.codeattached.message = Piipattu koodi liitetty n\u00E4ytett\u00E4v\u00E4\u00E4n korttiin incomingflow.codeattached.message = Piipattu koodi liitetty n\u00E4ytett\u00E4v\u00E4\u00E4n korttiin
incomingflow.codeattached.title = Koodi liittetty incomingflow.codeattached.title = Koodi liittetty
incomingflow.giveplace = Merkitse annetuksi 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 ...@@ -513,7 +513,6 @@ incomingflow.alreadyShowingUser.message = We are already showing selected user
incomingflow.alreadyShowingUser.title = Already selected incomingflow.alreadyShowingUser.title = Already selected
incomingflow.barcode = Barcode incomingflow.barcode = Barcode
incomingflow.cardCodes = Barcodes in card incomingflow.cardCodes = Barcodes in card
incomingflow.cardfiling.label = Card filing:
incomingflow.changereader = Change Reader incomingflow.changereader = Change Reader
incomingflow.codeattached.message = Code attached to current user's card incomingflow.codeattached.message = Code attached to current user's card
incomingflow.codeattached.title = Code attached 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 ...@@ -521,7 +521,6 @@ incomingflow.alreadyShowingUser.message = Piipattu k\u00E4ytt\u00E4j\u00E4 on jo
incomingflow.alreadyShowingUser.title = Valmiiksi valittu incomingflow.alreadyShowingUser.title = Valmiiksi valittu
incomingflow.barcode = Viivakoodi incomingflow.barcode = Viivakoodi
incomingflow.cardCodes = Korttiin liitetyt koodit incomingflow.cardCodes = Korttiin liitetyt koodit
incomingflow.cardfiling.label = Kortin kansiointi:
incomingflow.changereader = Vaihda lukijaa incomingflow.changereader = Vaihda lukijaa
incomingflow.codeattached.message = Piipattu koodi liitetty aktiiviseen k\u00E4ytt\u00E4j\u00E4\u00E4n incomingflow.codeattached.message = Piipattu koodi liitetty aktiiviseen k\u00E4ytt\u00E4j\u00E4\u00E4n
incomingflow.codeattached.title = Koodi liitetty 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; ...@@ -27,7 +27,6 @@ import javax.faces.context.FacesContext;
import javax.faces.model.ListDataModel; import javax.faces.model.ListDataModel;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import javax.json.JsonObject;
import org.primefaces.event.SelectEvent; import org.primefaces.event.SelectEvent;
import org.slf4j.Logger; import org.slf4j.Logger;
...@@ -79,6 +78,7 @@ public class IncomingView extends GenericCDIView { ...@@ -79,6 +78,7 @@ public class IncomingView extends GenericCDIView {
@Inject @Inject
private FlowUserContainer flowUserContainer; private FlowUserContainer flowUserContainer;
@EJB @EJB
private BarcodeBeanLocal barcodeBean; private BarcodeBeanLocal barcodeBean;
...@@ -150,12 +150,13 @@ public class IncomingView extends GenericCDIView { ...@@ -150,12 +150,13 @@ public class IncomingView extends GenericCDIView {
if (!initialized) { if (!initialized) {
logger.debug("INITIALIZING!!!!"); logger.debug("INITIALIZING!!!!");
if (flowUserContainer.getUserId() != null && flowUserContainer.getUserId() > 0) { if(flowUserContainer.getUserId() != null && flowUserContainer.getUserId() > 0) {
userview.setUserid(flowUserContainer.getUserId()); userview.setUserid(flowUserContainer.getUserId());
} }
flowUserContainer.setUserId(null); flowUserContainer.setUserId(null);
// initializePoller(); // initializePoller();
initialized = true; initialized = true;
super.beginConversation(); super.beginConversation();
...@@ -214,6 +215,7 @@ public class IncomingView extends GenericCDIView { ...@@ -214,6 +215,7 @@ public class IncomingView extends GenericCDIView {
return; return;
} }
cardBean.giveCard(userview.getSelectedUser(), autoGivePlaces); cardBean.giveCard(userview.getSelectedUser(), autoGivePlaces);
userview.attachCodeToCard(eventToAttach); userview.attachCodeToCard(eventToAttach);
...@@ -227,6 +229,8 @@ public class IncomingView extends GenericCDIView { ...@@ -227,6 +229,8 @@ public class IncomingView extends GenericCDIView {
} }
public boolean isShowAttachDialog() { public boolean isShowAttachDialog() {
return showAttachDialog; return showAttachDialog;
} }
...@@ -266,23 +270,6 @@ public class IncomingView extends GenericCDIView { ...@@ -266,23 +270,6 @@ public class IncomingView extends GenericCDIView {
return ret; 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() { public String printCard() {
PrintedCard card = cardBean.checkPrintedCard(userview.getUser()); PrintedCard card = cardBean.checkPrintedCard(userview.getUser());
card.setCardState(CardState.VALIDATED); card.setCardState(CardState.VALIDATED);
...@@ -297,11 +284,12 @@ public class IncomingView extends GenericCDIView { ...@@ -297,11 +284,12 @@ public class IncomingView extends GenericCDIView {
public ListDataModel<CardCode> getCardCodes() { public ListDataModel<CardCode> getCardCodes() {
if (userview.getPrintedCard() == null) if(userview.getPrintedCard() == null)
return new ListDataModel<CardCode>(new ArrayList<CardCode>()); return new ListDataModel<CardCode>(new ArrayList<CardCode>());
cardCodes = new ListDataModel<CardCode>(userview.getPrintedCard().getCardCodes()); cardCodes = new ListDataModel<CardCode>(userview.getPrintedCard().getCardCodes());
return cardCodes; return cardCodes;
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!