Mergeee

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/CardTemplateBean.java

@@ -18,9 +18,11 @@ import org.slf4j.LoggerFactory;
 
 import fi.insomnia.bortal.enums.apps.UserPermission;
 import fi.insomnia.bortal.facade.CardTemplateFacade;
+import fi.insomnia.bortal.facade.EventUserFacade;
 import fi.insomnia.bortal.facade.PrintedCardFacade;
 import fi.insomnia.bortal.facade.UserFacade;
 import fi.insomnia.bortal.model.CardTemplate;
+import fi.insomnia.bortal.model.EventUser;
 import fi.insomnia.bortal.model.IUser;
 import fi.insomnia.bortal.model.LanEvent;
 import fi.insomnia.bortal.model.PrintedCard;
@@ -57,7 +59,7 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
 	private UtilBeanLocal mailbean;
 
 	@EJB
-	private UserFacade userfacade;
+	private EventUserFacade eventUserFacade;
 
 	@EJB
 	private UserBeanLocal userbean;
@@ -89,7 +91,7 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
 
 	@Override
 	public void checkAllUsersCardRights() {
-		for (User u : userbean.getUsers()) {
+		for (EventUser u : userbean.getUsers()) {
 			checkPrintedCard(u);
 		}
 	}
@@ -100,10 +102,10 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
 	 * @throws PermissionDeniedException
 	 */
 	@Override
-	public PrintedCard checkPrintedCard(User user) {
+	public PrintedCard checkPrintedCard(EventUser user) {
 		logger.info("Checking printed card");
 
-		user = userfacade.find(user.getId());
+		user = eventUserFacade.find(user.getId());
 
 		LanEvent currEvent = eventBean.getCurrentEvent();
 		List<PrintedCard> myCards = printedcardfacade.getCards(user);
@@ -169,7 +171,7 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
 	}
 
 	@RolesAllowed(UserPermission.S_WRITE_ROLES)
-	public CardTemplate getUsersCardtype(User user) {
+	public CardTemplate getUsersCardtype(EventUser user) {
 		List<Role> roles = userbean.findUsersRoles(user);
 
 		CardTemplate greatestTemplate = null;
@@ -185,7 +187,7 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
 	}
 
 	@Override
-	public PrintedCard setRfidUid(String tag, User user) {
+	public PrintedCard setRfidUid(String tag, EventUser user) {
 		PrintedCard ct = checkPrintedCard(user);
 		return setRfidUid(tag, ct);
 	}
@@ -215,7 +217,7 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
 	}
 
 	@Override
-	public List<PrintedCard> getCards(IUser user) {
+	public List<PrintedCard> getCards(EventUser user) {
 		return printedcardfacade.getCards(user);
 	}
 

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/CardTemplateBeanLocal.java

@@ -20,8 +20,6 @@ public interface CardTemplateBeanLocal extends EntityFinderBean<CardTemplate> {
 
 	CardTemplate find(Integer id);
 
-	PrintedCard checkPrintedCard(EventUser user);
-
 	void checkAllUsersCardRights();
 
 	PrintedCard setRfidUid(String tag, EventUser user);
@@ -34,10 +32,12 @@ public interface CardTemplateBeanLocal extends EntityFinderBean<CardTemplate> {
 
 	PrintedCard getCard(Integer idParam);
 
-	List<PrintedCard> getCards(IUser user);
+	List<PrintedCard> getCards(EventUser user);
 
 	CardTemplate saveImage(CardTemplate cardTemplate, byte[] bytes) throws IOException;
 
 	List<CardTemplate> findAll();
 
+	PrintedCard checkPrintedCard(EventUser user);
+
 }