CardTemplate

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;
@@ -60,6 +62,9 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
 	private UserFacade userfacade;
 
 	@EJB
+	private EventUserFacade eventUserFacade;
+
+	@EJB
 	private UserBeanLocal userbean;
 
 	// @Override
@@ -100,10 +105,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 +174,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;

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

@@ -6,6 +6,7 @@ import java.util.List;
 import javax.ejb.Local;
 
 import fi.insomnia.bortal.model.CardTemplate;
+import fi.insomnia.bortal.model.EventUser;
 import fi.insomnia.bortal.model.IUser;
 import fi.insomnia.bortal.model.PrintedCard;
 import fi.insomnia.bortal.model.User;
@@ -40,4 +41,6 @@ public interface CardTemplateBeanLocal extends EntityFinderBean<CardTemplate> {
 
 	List<CardTemplate> findAll();
 
+	PrintedCard checkPrintedCard(EventUser user);
+
 }