Printed card filtering and handling fixes.

 Set all but biggest  cards as disabled
 Get from filter only enabled cards.

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

@@ -122,16 +122,24 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
 		List<PrintedCard> myCards = printedcardfacade.getCards(user);
 
 		PrintedCard biggestCard = null;
-		PrintedCard smallestCard = null;
+		// PrintedCard smallestCard = null;
 		for (PrintedCard card : myCards) {
-			logger.info("Checking card {}", card);
+			// logger.info("Checking card {}", card);
 			if (card.getEnabled()) {
+
 				if (biggestCard == null || biggestCard.getTemplate().getPower() < card.getTemplate().getPower()) {
+					// The biggest card should be the only one enabled.
+					if (biggestCard != null) {
+						biggestCard.setEnabled(false);
+					}
 					biggestCard = card;
+					biggestCard.setEnabled(true);
 				}
-				if (smallestCard == null || smallestCard.getTemplate().getPower() > card.getTemplate().getPower()) {
-					smallestCard = card;
-				}
+				// if (smallestCard == null ||
+				// smallestCard.getTemplate().getPower() >
+				// card.getTemplate().getPower()) {
+				// smallestCard = card;
+				// }
 			}
 		}
 

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

@@ -13,7 +13,6 @@ 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;
@@ -37,7 +36,6 @@ public class PrintedCardFacade extends IntegerPkGenericFacade<PrintedCard> {
 	@EJB
 	private EventBeanLocal eventbean;
 
-
 	public PrintedCard findByCode(String code) {
 
 		CriteriaBuilder cb = getEm().getCriteriaBuilder();
@@ -48,8 +46,8 @@ public class PrintedCardFacade extends IntegerPkGenericFacade<PrintedCard> {
 				cb.equal(root.get(CardCode_.event), eventbean.getCurrentEvent()));
 
 		CardCode cardcode = getSingleNullableResult(getEm().createQuery(cq));
-		
-		return (cardcode == null)?null : cardcode.getPrintedCard();
+
+		return (cardcode == null) ? null : cardcode.getPrintedCard();
 	}
 
 	public List<PrintedCard> findAllEnabled(LanEvent currentEvent) {
@@ -71,19 +69,20 @@ public class PrintedCardFacade extends IntegerPkGenericFacade<PrintedCard> {
 		cq.where(cb.equal(root.get(PrintedCard_.user), user),
 				cb.equal(root.get(PrintedCard_.event), eventbean.getCurrentEvent()));
 
+		cq.orderBy(cb.asc(root.get(PrintedCard_.template).get(CardTemplate_.power)));
 		return getEm().createQuery(cq).getResultList();
 
 	}
 
 	public PrintedCard findLatestByCodeFromAny(String code) {
-		
+
 		CriteriaBuilder cb = getEm().getCriteriaBuilder();
 		CriteriaQuery<PrintedCard> cq = cb.createQuery(PrintedCard.class);
 		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);
@@ -96,7 +95,7 @@ public class PrintedCardFacade extends IntegerPkGenericFacade<PrintedCard> {
 		CriteriaBuilder cb = getEm().getCriteriaBuilder();
 		CriteriaQuery<PrintedCard> cq = cb.createQuery(PrintedCard.class);
 		Root<PrintedCard> root = cq.from(PrintedCard.class);
-		
+
 		List<Predicate> preds = new ArrayList<Predicate>();
 
 		preds.add(cb.equal(root.get(PrintedCard_.event), eventbean.getCurrentEvent()));
@@ -104,19 +103,19 @@ public class PrintedCardFacade extends IntegerPkGenericFacade<PrintedCard> {
 		if (state.length > 0) {
 			preds.add(root.get(PrintedCard_.cardState).in(Arrays.asList(state)));
 		}
-		
+
 		preds.add(cb.equal(root.get(PrintedCard_.enabled), true));
 
 		cq.where(preds.toArray(new Predicate[preds.size()]));
 		cq.orderBy(cb.asc(root.get(PrintedCard_.user)), cb.asc(root.get(PrintedCard_.template).get(CardTemplate_.power)));
 
 		List<PrintedCard> pcl = getEm().createQuery(cq).getResultList();
-		
+
 		HashMap<Integer, PrintedCard> pch = new HashMap<>();
-		for(PrintedCard pc : pcl) {
+		for (PrintedCard pc : pcl) {
 			pch.put(pc.getUser().getId(), pc);
 		}
-		
+
 		return new ArrayList<PrintedCard>(pch.values());
 
 	}

code/MoyaBeans/ejbModule/fi/codecrew/moya/facade/callbacks/EventUserCardStateFilter.java

@@ -38,11 +38,10 @@ public class EventUserCardStateFilter implements FacadeCallback<EventUser> {
 			logger.debug("Requiring states {}", states);
 
 			Path<Integer> rootId = root.get(EventUser_.id);
-
 			Subquery<Integer> subq = cq.subquery(Integer.class);
 			Root<PrintedCard> subroot = subq.from(PrintedCard.class);
 			subq.select(subroot.join(PrintedCard_.user).get(EventUser_.id));
-			subq.where(subroot.get(PrintedCard_.cardState).in(states));
+			subq.where(subroot.get(PrintedCard_.cardState).in(states), cb.isTrue(subroot.get(PrintedCard_.enabled)));
 			predicates.add(rootId.in(subq));
 
 		}