littlebit moar

code/MoyaBeans/ejbModule/fi/codecrew/moya/facade/PrintedCardFacade.java

@@ -3,7 +3,6 @@ package fi.codecrew.moya.facade;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 
 import javax.ejb.EJB;
@@ -14,9 +13,12 @@ import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
 
 import fi.codecrew.moya.beans.EventBeanLocal;
 import fi.codecrew.moya.enums.CardState;
+import fi.codecrew.moya.model.CardCode;
+import fi.codecrew.moya.model.CardCode_;
 import fi.codecrew.moya.model.CardTemplate_;
 import fi.codecrew.moya.model.EventUser;
 import fi.codecrew.moya.model.LanEvent;
@@ -35,31 +37,19 @@ public class PrintedCardFacade extends IntegerPkGenericFacade<PrintedCard> {
 	@EJB
 	private EventBeanLocal eventbean;
 
-	public PrintedCard findByRfid(String uid) {
 
-		CriteriaBuilder cb = getEm().getCriteriaBuilder();
-		CriteriaQuery<PrintedCard> cq = cb.createQuery(PrintedCard.class);
-		Root<PrintedCard> root = cq.from(PrintedCard.class);
-
-		cq.where(
-				cb.or(
-						cb.equal(root.get(PrintedCard_.barcode), uid),
-						cb.equal(root.get(PrintedCard_.rfidUid), uid)),
-				cb.equal(root.get(PrintedCard_.event), eventbean.getCurrentEvent()));
-
-		return getSingleNullableResult(getEm().createQuery(cq));
-	}
-
-	public PrintedCard findByBarcode(String barcode) {
+	public PrintedCard findByCode(String code) {
 
 		CriteriaBuilder cb = getEm().getCriteriaBuilder();
-		CriteriaQuery<PrintedCard> cq = cb.createQuery(PrintedCard.class);
-		Root<PrintedCard> root = cq.from(PrintedCard.class);
+		CriteriaQuery<CardCode> cq = cb.createQuery(CardCode.class);
+		Root<CardCode> root = cq.from(CardCode.class);
 
-		cq.where(cb.equal(root.get(PrintedCard_.barcode), barcode),
-				cb.equal(root.get(PrintedCard_.event), eventbean.getCurrentEvent()));
+		cq.where(cb.equal(root.get(CardCode_.code), code),
+				cb.equal(root.get(CardCode_.event), eventbean.getCurrentEvent()));
 
-		return getSingleNullableResult(getEm().createQuery(cq));
+		CardCode cardcode = getSingleNullableResult(getEm().createQuery(cq));
+		
+		return (cardcode == null)?null : cardcode.getPrintedCard();
 	}
 
 	public List<PrintedCard> findAllEnabled(LanEvent currentEvent) {
@@ -85,14 +75,16 @@ public class PrintedCardFacade extends IntegerPkGenericFacade<PrintedCard> {
 
 	}
 
-	public PrintedCard findLatestByRfidFromAny(String uid) {
-
+	public PrintedCard findLatestByCodeFromAny(String code) {
+		
 		CriteriaBuilder cb = getEm().getCriteriaBuilder();
 		CriteriaQuery<PrintedCard> cq = cb.createQuery(PrintedCard.class);
-		Root<PrintedCard> root = cq.from(PrintedCard.class);
-
-		cq.where(cb.equal(root.get(PrintedCard_.rfidUid), uid));
-		cq.orderBy(cb.desc(root.get(PrintedCard_.printTime)));
+		Root<CardCode> root = cq.from(CardCode.class);
+		cq.select(root.get(CardCode_.printedCard));
+		
+		cq.where(cb.equal(root.get(CardCode_.code), code));
+		
+		cq.orderBy(cb.desc(root.get(CardCode_.printedCard).get(PrintedCard_.printTime)));
 		TypedQuery<PrintedCard> q = getEm().createQuery(cq);
 		q.setMaxResults(1);
 

code/MoyaEar/.settings/org.eclipse.wst.common.component

@@ -62,7 +62,7 @@
         <dependent-module archiveName="jrobin-1.5.9.jar" deploy-path="/lib" handle="module:/classpath/var/M2_REPO/org/jrobin/jrobin/1.5.9/jrobin-1.5.9.jar">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="moya-mgmt-web-0.2.0.war" deploy-path="/" handle="module:/classpath/var/M2_REPO/fi/codecrew/moya/moya-mgmt-web/0.2.0/moya-mgmt-web-0.2.0.war">
+        <dependent-module archiveName="moya-mgmt-web-0.2.0.war" deploy-path="/" handle="module:/resource/MoyaEventMgmtWeb/MoyaEventMgmtWeb">
             <dependency-type>uses</dependency-type>
         </dependent-module>
         <dependent-module archiveName="commons-digester-2.1.jar" deploy-path="/lib" handle="module:/classpath/var/M2_REPO/commons-digester/commons-digester/2.1/commons-digester-2.1.jar">

code/MoyaTerminalWeb/src/fi/codecrew/moya/terminal/view/CashierView.java

@@ -10,7 +10,7 @@ public class CashierView extends AbstractView {
 	private static final long serialVersionUID = -4415449134790807417L;
 
 	public void initCreateView() {
-		if (super.requirePermissions(TerminalPermission.CASHIER)) {
+		if (super.requirePermissions(TerminalPermission.INFO)) {
 			super.beginConversation();
 		}
 	}

code/MoyaTerminalWeb/src/fi/codecrew/moya/terminal/view/CustomerView.java

@@ -10,7 +10,7 @@ public class CustomerView extends AbstractView {
 	private static final long serialVersionUID = -8746462342138568821L;
 
 	public void initCreateView() {
-		if (super.requirePermissions(TerminalPermission.CUSTOMER)) {
+		if (super.requirePermissions(TerminalPermission.USER)) {
 			super.beginConversation();
 		}
 	}

code/MoyaTerminalWeb/src/fi/codecrew/moya/terminal/view/RedirectView.java

@@ -18,10 +18,10 @@ public class RedirectView {
 	public void redirectByPermissions() throws Exception {
 		FacesContext fcont = FacesContext.getCurrentInstance();
 
-		if (permissionBean.hasPermission(TerminalPermission.CASHIER)) {
+		if (permissionBean.hasPermission(TerminalPermission.INFO)) {
 			fcont.getApplication().getNavigationHandler()
 					.handleNavigation(fcont, null, "/cashier");
-		} else if (permissionBean.hasPermission(TerminalPermission.CUSTOMER)) {
+		} else if (permissionBean.hasPermission(TerminalPermission.USER)) {
 			fcont.getApplication().getNavigationHandler()
 					.handleNavigation(fcont, null, "/customer");
 		} else {

code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/reader/ReaderView.java

@@ -39,9 +39,7 @@ public class ReaderView extends GenericCDIView {
 
 	private Integer eventid;
 
-	private String placecode;
-	private String usersearch;
-	private String barcode;
+	private String code;
 	private Reader reader;
 
 	private boolean pollingMode = false;
@@ -136,7 +134,7 @@ public class ReaderView extends GenericCDIView {
 
 		UserCardWrapper user = userlist.getRowData();
 		PrintedCard card = user.getPrintedCards().getRowData();
-		ReaderEvent re = readerbean.assocTagToCard(event.getValue(), event.getReader().getIdentification(), card);
+		ReaderEvent re = readerbean.assocTagToCard(event, card);
 		super.addFaceMessage("usercard.associated");
 		logger.info("re {}", re.getPrintedCard());
 		userview.setUser(re.getPrintedCard().getUser());

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

@@ -369,7 +369,7 @@ public class UserView extends GenericCDIView {
 			logger.debug("barcode {} to card {} ", readerView.getBarcode(), card.getUser().getNick());
 			cardBean.saveCard(card);
 		} else if (readerView.getReaderEvent() != null) {
-			readerbean.assocTagToCard(readerView.getReaderEvent().getValue(), readerView.getReaderEvent().getReader().getIdentification(), card);
+			readerbean.assocTagToCard(readerView.getReaderEvent() , card);
 		}
 
 		return null;