card template

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

@@ -59,9 +59,6 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
 	private UtilBeanLocal mailbean;
 	private UtilBeanLocal mailbean;
 
 
 	@EJB
 	@EJB
-	private UserFacade userfacade;
-
-	@EJB
 	private EventUserFacade eventUserFacade;
 	private EventUserFacade eventUserFacade;
 
 
 	@EJB
 	@EJB
@@ -94,7 +91,7 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
 
 
 	@Override
 	@Override
 	public void checkAllUsersCardRights() {
 	public void checkAllUsersCardRights() {
-		for (User u : userbean.getUsers()) {
+		for (EventUser u : userbean.getUsers()) {
 			checkPrintedCard(u);
 			checkPrintedCard(u);
 		}
 		}
 	}
 	}
@@ -190,7 +187,7 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
 	}
 	}
 
 
 	@Override
 	@Override
-	public PrintedCard setRfidUid(String tag, User user) {
+	public PrintedCard setRfidUid(String tag, EventUser user) {
 		PrintedCard ct = checkPrintedCard(user);
 		PrintedCard ct = checkPrintedCard(user);
 		return setRfidUid(tag, ct);
 		return setRfidUid(tag, ct);
 	}
 	}
@@ -220,7 +217,7 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
 	}
 	}
 
 
 	@Override
 	@Override
-	public List<PrintedCard> getCards(IUser user) {
+	public List<PrintedCard> getCards(EventUser user) {
 		return printedcardfacade.getCards(user);
 		return printedcardfacade.getCards(user);
 	}
 	}
 
 

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

@@ -21,11 +21,9 @@ public interface CardTemplateBeanLocal extends EntityFinderBean<CardTemplate> {
 
 
 	CardTemplate find(Integer id);
 	CardTemplate find(Integer id);
 
 
-	PrintedCard checkPrintedCard(User user);
-
 	void checkAllUsersCardRights();
 	void checkAllUsersCardRights();
 
 
-	PrintedCard setRfidUid(String tag, User user);
+	PrintedCard setRfidUid(String tag, EventUser user);
 
 
 	PrintedCard setRfidUid(String tag, PrintedCard card);
 	PrintedCard setRfidUid(String tag, PrintedCard card);
 
 
@@ -35,7 +33,7 @@ public interface CardTemplateBeanLocal extends EntityFinderBean<CardTemplate> {
 
 
 	PrintedCard getCard(Integer idParam);
 	PrintedCard getCard(Integer idParam);
 
 
-	List<PrintedCard> getCards(IUser user);
+	List<PrintedCard> getCards(EventUser user);
 
 
 	CardTemplate saveImage(CardTemplate cardTemplate, byte[] bytes) throws IOException;
 	CardTemplate saveImage(CardTemplate cardTemplate, byte[] bytes) throws IOException;