Merge branch 'eventuser' of dev.insomnia.fi:/data/bortal into eventuser

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

@@ -91,7 +91,7 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
 
 
 	@Override
 	@Override
 	public void checkAllUsersCardRights() {
 	public void checkAllUsersCardRights() {
-		for (EventUser u : userbean.getUsers()) {
+		for (EventUser u : eventUserFacade.findAll()) {
 			checkPrintedCard(u);
 			checkPrintedCard(u);
 		}
 		}
 	}
 	}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/EventUserFacade.java

 package fi.insomnia.bortal.facade;
 package fi.insomnia.bortal.facade;
 
 
+import java.util.List;
+
 import javax.ejb.EJB;
 import javax.ejb.EJB;
 import javax.ejb.LocalBean;
 import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
 import javax.ejb.Stateless;
@@ -52,4 +54,13 @@ public class EventUserFacade extends IntegerPkGenericFacade<EventUser> {
 
 
 	}
 	}
 
 
+	public List<EventUser> findAll() {
+		CriteriaBuilder cb = getEm().getCriteriaBuilder();
+		CriteriaQuery<EventUser> cq = cb.createQuery(EventUser.class);
+		Root<EventUser> root = cq.from(EventUser.class);
+		cq.where(cb.equal(root.get(EventUser_.event),
+				eventBean.getCurrentEvent()));
+		return getEm().createQuery(cq).getResultList();
+	}
+
 }
 }

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/map/PlaceView.java

@@ -52,7 +52,7 @@ public class PlaceView extends GenericCDIView {
 	private EventMap currentMap;
 	private EventMap currentMap;
 
 
 	private String searchuser;
 	private String searchuser;
-	private transient ListDataModel<User> userlist;
+	private transient ListDataModel<EventUser> userlist;
 	@EJB
 	@EJB
 	private AccountEventBeanLocal acbean;
 	private AccountEventBeanLocal acbean;
 
 
@@ -152,7 +152,7 @@ public class PlaceView extends GenericCDIView {
 
 
 	public String searchUser() {
 	public String searchUser() {
 		super.beginConversation();
 		super.beginConversation();
-		userlist = new ListDataModel<User>(userbean.getUsers(0, 0, null, searchuser).getResults());
+		userlist = new ListDataModel<EventUser>(userbean.getUsers(0, 0, null, searchuser).getResults());
 		return null;
 		return null;
 	}
 	}
 
 
@@ -190,11 +190,11 @@ public class PlaceView extends GenericCDIView {
 		return searchuser;
 		return searchuser;
 	}
 	}
 
 
-	public void setUserlist(ListDataModel<User> userlist) {
+	public void setUserlist(ListDataModel<EventUser> userlist) {
 		this.userlist = userlist;
 		this.userlist = userlist;
 	}
 	}
 
 
-	public ListDataModel<User> getUserlist() {
+	public ListDataModel<EventUser> getUserlist() {
 		return userlist;
 		return userlist;
 	}
 	}