double print card fix

code/moya-beans/ejbModule/fi/codecrew/moya/beans/CardTemplateBean.java

@@ -358,15 +358,26 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
 
 
 	@Override
 	@Override
 	public PrintedCard setCardState(Integer cardId, CardState state) throws Exception {
 	public PrintedCard setCardState(Integer cardId, CardState state) throws Exception {
+
 		PrintedCard card = printedcardfacade.find(cardId);
 		PrintedCard card = printedcardfacade.find(cardId);
+
 		switch (state) {
 		switch (state) {
+			case VALIDATED:
+				Calendar mustBePrintedBefore = Calendar.getInstance();
+				mustBePrintedBefore.add(Calendar.MINUTE, -1);
+				if(card.getCardState().equals(CardState.PRINTED) && card.getPrintTime().before(mustBePrintedBefore)) {
+					String response = "Already printed in one minute.";
+					throw new Exception(response);
+				}
+				break;
 			case PRINTED:
 			case PRINTED:
 				card.setPrintCount(card.getPrintCount() + 1);
 				card.setPrintCount(card.getPrintCount() + 1);
 				card.setPrintTime(Calendar.getInstance());
 				card.setPrintTime(Calendar.getInstance());
 				break;
 				break;
 			case PRINTING_IN_PROGRESS:
 			case PRINTING_IN_PROGRESS:
 				if (card.getCardState().equals(CardState.PRINTING_IN_PROGRESS)
 				if (card.getCardState().equals(CardState.PRINTING_IN_PROGRESS)
-					|| card.getCardState().equals(CardState.PRINTED)) {
+						|| card.getCardState().equals(CardState.PRINTED)
+						|| card.getCardState().equals(CardState.DELIVERED)) {
 					String response = "Unable to change type to PRINTING_IN_PROGRESS value is already {}" + card.getCardState();
 					String response = "Unable to change type to PRINTING_IN_PROGRESS value is already {}" + card.getCardState();
 					logger.warn(response);
 					logger.warn(response);
 					throw new Exception(response);
 					throw new Exception(response);

code/moya-web/src/main/java/fi/codecrew/moya/handler/SessionStore.java

@@ -26,6 +26,8 @@ import javax.enterprise.context.SessionScoped;
 import javax.faces.context.FacesContext;
 import javax.faces.context.FacesContext;
 import javax.inject.Named;
 import javax.inject.Named;
 
 
+import fi.codecrew.moya.model.EventOrganiser;
+import fi.codecrew.moya.model.LanEvent;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 
 
@@ -53,7 +55,9 @@ public class SessionStore implements Serializable {
 		Locale ret = locale;
 		Locale ret = locale;
 		if (ret == null || ret.toString().equals(""))
 		if (ret == null || ret.toString().equals(""))
 		{
 		{
-			String retStr = eventbean.getCurrentEvent().getOrganiser().getBundleCountry();
+			LanEvent e = eventbean.getCurrentEvent();
+			EventOrganiser o = e.getOrganiser();
+			String retStr = o.getBundleCountry();
 
 
 			if (retStr != null && !retStr.isEmpty()) {
 			if (retStr != null && !retStr.isEmpty()) {
 				try {
 				try {