/user/list.jsf changed to cdi.

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

@@ -367,7 +367,12 @@ public class UserBean implements UserBeanLocal {
     }
 
     @Override
-    public List<User> getUsers(int page, int pagesize, String sort) {
-        return userFacade.findAll(page, pagesize, sort);
+    public List<User> getUsers(int page, int pagesize, String sort, String search) {
+        return userFacade.searchUser(page, pagesize, sort, search);
+    }
+
+    @Override
+    public long getUsersCount(String search) {
+        return userFacade.searchUserCount(search);
     }
 }

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

@@ -63,7 +63,7 @@ public abstract class GenericFacade<PK, T extends ModelInterface> {
     }
 
     public List<T> findAll(String sort) {
-        return findAll(0, 0, sort);
+        return search(0, 0, null, null, sort);
     }
 
     public List<T> findRange(int[] range) {
@@ -110,7 +110,9 @@ public abstract class GenericFacade<PK, T extends ModelInterface> {
 
         Root<T> root = cq.from(getEntityClass());
 
+        if (query != null && !query.isEmpty()) {
             addPredicates(cb, cq, root, query, fields);
+        }
 
         if (orderfield != null) {
             cq.orderBy(cb.asc(root.get(orderfield)));
@@ -131,8 +133,9 @@ public abstract class GenericFacade<PK, T extends ModelInterface> {
         CriteriaBuilder cb = getEm().getCriteriaBuilder();
         CriteriaQuery<Long> cq = cb.createQuery(Long.class);
         Root<T> root = cq.from(getEntityClass());
-
+        if (query != null && !query.isEmpty()) {
             addPredicates(cb, cq, root, query, fields);
+        }
 
         cq.select(getEm().getCriteriaBuilder().count(root));
         TypedQuery<Long> q = getEm().createQuery(cq);
@@ -149,24 +152,4 @@ public abstract class GenericFacade<PK, T extends ModelInterface> {
 
     }
 
-    public List<T> findAll(int page, int pagesize, String sort) {
-        CriteriaBuilder cb = getEm().getCriteriaBuilder();
-        CriteriaQuery<T> cq = cb.createQuery(getEntityClass());
-        Root<T> root = cq.from(getEntityClass());
-
-        if (sort != null) {
-            cq.orderBy(cb.asc(root.get(sort)));
-        }
-
-        cq.select(cq.from(getEntityClass()));
-        TypedQuery<T> q = getEm().createQuery(cq);
-
-        if (pagesize > 0) {
-            q.setFirstResult(page * pagesize);
-            q.setMaxResults(pagesize);
-        }
-
-        return q.getResultList();
-    }
-
 }

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

@@ -6,13 +6,11 @@ import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import fi.insomnia.bortal.model.LanEvent;
 import fi.insomnia.bortal.model.User;
 
 @Stateless
@@ -32,6 +30,7 @@ public class UserFacade extends GenericFacade<Integer, User> {
         super(User.class);
     }
 
+    @Override
     protected EntityManager getEm() {
         return em;
     }
@@ -49,7 +48,7 @@ public class UserFacade extends GenericFacade<Integer, User> {
         return getSingleNullableResult(q);
     }
 
-    private static final String[] NAMEFIELDS = { "nick", "login", "firstnames", "lastname" };
+    private static final String[] NAMEFIELDS = { "nick", "login", "firstnames", "lastname", "email" };
 
     public List<User> searchForName(String name) {
         return this.search(name, NAMEFIELDS, "login");
@@ -66,4 +65,24 @@ public class UserFacade extends GenericFacade<Integer, User> {
         user.setLogin(user.getLogin().toLowerCase().trim());
         return super.merge(user);
     }
+
+    public List<User> searchUser(int page, int pagesize, String sort, String search) {
+        String query = null;
+        if (sort == null || sort.isEmpty()) {
+            sort = "nick";
+        }
+        if (search != null) {
+            query = new StringBuilder('%').append(search).append('%').toString();
+        }
+        return this.search(page, pagesize, query, NAMEFIELDS, sort);
+    }
+
+    public long searchUserCount(String search) {
+        String query = null;
+        if (search != null) {
+            query = new StringBuilder('%').append(search).append('%').toString();
+        }
+        return this.searchCount(query, NAMEFIELDS);
+    }
+
 }

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

@@ -15,7 +15,7 @@ public interface UserBeanLocal {
 
     List<User> getUsers();
 
-    List<User> getUsers(int page, int pagesize, String sort);
+    List<User> getUsers(int page, int pagesize, String sort, String search);
 
     User getUser(String nick);
 
@@ -56,4 +56,6 @@ public interface UserBeanLocal {
 
     User findById(Integer integer);
 
+    long getUsersCount(String search);
+
 }

code/LanBortalWeb/WebContent/resources/tools/user/list.xhtml

@@ -3,14 +3,14 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:composite="http://java.sun.com/jsf/composite" xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:tools="http://java.sun.com/jsf/composite/tools">
+	xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:tools="http://java.sun.com/jsf/composite/tools"
+>
 <composite:interface>
 </composite:interface>
 
 <composite:implementation>
-	<tools:fatalPermission target="USER_MANAGEMENT" permission="READ" />
 	<h:form id="userlistform">
-		<h:dataTable border="1" id="user" value="#{userView.users}" var="user">
+		<h:dataTable border="1" id="user" value="#{userSearchView.users}" var="user">
 			<h:column>
 				<f:facet name="header">
 					<h:outputText value="Id" />
@@ -60,7 +60,8 @@
 					<h:outputText value="#{i18n['user.image']}" />
 				</f:facet>
 				<h:commandLink action="#{userView.showImage()}"
-					value="#{(empty user.currentImage)?i18n['user.noImage']:i18n['user.hasImage']}" />
+					value="#{(empty user.currentImage)?i18n['user.noImage']:i18n['user.hasImage']}"
+				/>
 			</h:column>
 			<h:column>
 				<h:commandButton action="#{userView.edit()}" value="#{i18n['user.edit']}" />

code/LanBortalWeb/WebContent/user/list.xhtml

 <!DOCTYPE html 
      PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:users="http://java.sun.com/jsf/composite/tools/user"
-	xmlns:f="http://java.sun.com/jsf/core">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:h="http://java.sun.com/jsf/html" xmlns:users="http://java.sun.com/jsf/composite/cditools/user"
+	xmlns:f="http://java.sun.com/jsf/core"
+>
 <h:body>
 	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
-		<ui:param name="thispage" value="page.user.create" />
+		<f:metadata>
+			<f:viewParam name="page" value="#{userSearchView.page}" />
+			<f:viewParam name="pagesize" value="#{userSearchView.pagesize}" />
+			<f:viewParam name="sort" value="#{userSearchView.sort}" />
+			<f:viewParam name="search" value="#{userSearchView.search}" />
 
-		<ui:define name="content">
-			<!-- <users:list /> -->
+			<f:event type="preRenderView" listener="#{userSearchView.initView}" />
+		</f:metadata>
 
+		<ui:param name="thispage" value="page.user.create" />
+		<ui:define name="content">
+			<h1>#{i18n['userlist.header']}</h1>
+			<h:form>
+				<h:inputText value="#{userSearchView.search}" />
+				<h:commandButton value="search" />
+			</h:form>
+			<users:list />
 		</ui:define>
 	</ui:composition>
 </h:body>

code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_en.properties

@@ -330,6 +330,8 @@ user.validate.notUniqueUsername=Username already exists. Please select another.
 user.wholeName=Name
 user.zipCode=Postal nr.
 userimage.webcam=Take picture with webcam
+
+userview.header=Users
 userview.loginstringFaulty=Username has to be atleast 2 characters long!
 userview.passwordTooShort=Password has to be atleast 5 characters long!
 userview.passwordsChanged=Password changed