Merge branch 'master' into devel

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/BarcodeBean.java

@@ -189,6 +189,16 @@ public class BarcodeBean implements BarcodeBeanLocal {
 			return null;
 			return null;
 		
 		
 		
 		
+		// trim zeros off from barcode
+		String stripped = barcode;
+		while(stripped.length() > 0 && stripped.charAt(0) == '0') {
+			stripped = stripped.substring(1);
+		}
+		
+		if(stripped.length() > 0)
+			barcode = stripped;
+
+
 		try {
 		try {
 			// it's our special front barcode
 			// it's our special front barcode
 			if (barcode.startsWith(EVENTUSER_PREFIX)) {
 			if (barcode.startsWith(EVENTUSER_PREFIX)) {

code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/user/UserView.java

@@ -340,7 +340,7 @@ public class UserView extends GenericCDIView {
 
 
 		if (readerView.getBarcode() != null && !readerView.getBarcode().isEmpty()) {
 		if (readerView.getBarcode() != null && !readerView.getBarcode().isEmpty()) {
 			card.setBarcode(readerView.getBarcode());
 			card.setBarcode(readerView.getBarcode());
-			card.setCardState(CardState.VALIDATED);
+			card.setCardState(CardState.PRINTED);
 
 
 			logger.debug("barcode {} to card {} ", readerView.getBarcode(), card.getUser().getNick());
 			logger.debug("barcode {} to card {} ", readerView.getBarcode(), card.getUser().getNick());
 			cardBean.saveCard(card);
 			cardBean.saveCard(card);