Merge branch 'master' into devel

Conflicts:
	code/MoyaWeb/src/fi/codecrew/moya/resources/i18n.properties

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/UserBean.java

@@ -28,6 +28,8 @@ import javax.persistence.PersistenceContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.sun.enterprise.security.webservices.GFServerPipeCreator;
+
 import fi.codecrew.moya.enums.apps.SpecialPermission;
 import fi.codecrew.moya.enums.apps.UserPermission;
 import fi.codecrew.moya.facade.ApprovalFacade;
@@ -585,6 +587,9 @@ public class UserBean implements UserBeanLocal {
 
 		return user;
 	}
+	
+	
+	
 
 	@Override
 	public SearchResult<User> getEventUsers(SearchQuery search) {
@@ -614,6 +619,20 @@ public class UserBean implements UserBeanLocal {
 
 			returnUsers = new SearchResult<EventUser>(newSearchList, (long) newSearchList.size());
 		}
+		
+		else if(searchQuery.isUsersWithUnusedCodes()){
+			List<EventUser> newSearchList = new ArrayList<EventUser>();
+			List<GroupMembership> groupMembers = new ArrayList<GroupMembership>();
+			groupMembers = gmfacade.findAllWithoutUser();
+			
+			for (GroupMembership member : groupMembers) {
+				PlaceGroup group = member.getPlaceGroup();
+				if(group != null && !newSearchList.contains(group.getCreator())) {
+					newSearchList.add(group.getCreator());
+				}
+			}
+			returnUsers = new SearchResult<EventUser>(newSearchList, (long)newSearchList.size());
+		}
 
 		return returnUsers;
 	}

code/MoyaBeans/ejbModule/fi/codecrew/moya/facade/GroupMembershipFacade.java

@@ -107,5 +107,18 @@ public class GroupMembershipFacade extends IntegerPkGenericFacade<GroupMembershi
 		// p.setParameter("user", user);
 		// return p.getResultList();
 	}
+	
+	public List<GroupMembership> findAllWithoutUser() {
+		CriteriaBuilder cb = getEm().getCriteriaBuilder();
+		CriteriaQuery<GroupMembership> cq = cb.createQuery(GroupMembership.class);
+		Root<GroupMembership> root = cq.from(GroupMembership.class);
+
+		Path<PlaceGroup> pg = root.get(GroupMembership_.placeGroup);
+
+		cq.where(cb.isNull(root.get(GroupMembership_.user)),
+				cb.equal(pg.get(PlaceGroup_.event), eventbean.getCurrentEvent())
+				);
+		return getEm().createQuery(cq).getResultList();
+	}
 
 }

code/MoyaBeansClient/ejbModule/fi/codecrew/moya/util/UserSearchQuery.java

@@ -16,6 +16,7 @@ public class UserSearchQuery extends SearchQuery {
 	private List<Role> filterRoles = new ArrayList<Role>();
 	private boolean onlyThisEvent = true;
 	private boolean placeAssoc = false;
+	private boolean usersWithUnusedCodes = false;
 	private DatabaseHasCompare requireImage = DatabaseHasCompare.NONE;
 
 	private BigDecimal accountSaldo;
@@ -34,6 +35,14 @@ public class UserSearchQuery extends SearchQuery {
 		this.onlyThisEvent = onlyThisEvent;
 	}
 
+	public boolean isUsersWithUnusedCodes() {
+		return usersWithUnusedCodes;
+	}
+	
+	public void setUsersWithUnusedCodes(boolean usersWithUnusedCodes) {
+		this.usersWithUnusedCodes = usersWithUnusedCodes;
+	}
+	
 	public List<Role> getFilterRoles() {
 		return filterRoles;
 	}

code/MoyaWeb/WebContent/useradmin/list.xhtml

@@ -42,6 +42,11 @@
 						<h:selectBooleanCheckbox id="onlythisevent" value="#{userSearchView.searchQuery.onlyThisEvent}" />
 						<h:outputLabel for="onlythisevent" value="#{i18n['userlist.onlythisevent']}" />
 						<br />
+						
+						<h:selectBooleanCheckbox id="userswithunusedcodes" value="#{userSearchView.searchQuery.usersWithUnusedCodes}" />
+						<h:outputLabel for="userswithunusedcodes" value="#{i18n['userlist.usersWithUnusedCodes']}" />
+						<br />
+						
 						<h:inputText value="#{userSearchView.search}" />
 						<h:commandButton value="#{i18n['userlist.search']}" action="#{userSearchView.newSearch()}" />
 					</h:panelGroup>

code/MoyaWeb/src/fi/codecrew/moya/resources/i18n.properties

@@ -169,7 +169,11 @@ subnavi.cards = \u0009\u0009
 
 topnavi.license = Lisenssikoodit
 
+<<<<<<< HEAD
 user.unauthenticated  = Kirjautumaton
+=======
+user.unauthenticated          = Kirjautumaton
+>>>>>>> master
 
 usercart.downloadCsv  = CSV
 usercart.showoverview = Vie tarkastusn\u00E4kym\u00E4\u00E4n

code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties

@@ -896,14 +896,15 @@ usercart.traverse         = Traverse
 
 userimage.webcam = Take picture with webcam
 
-userlist.header             = Users
-userlist.onlythisevent      = Limit to users of this event 
-userlist.placeassoc         = Assigned to place
-userlist.rolefilter         = Assigned roles
-userlist.saldofilter        = Saldo
-userlist.search             = Search
-userlist.searchcount        = Result count
-userlist.showAdvancedSearch = Advanced search
+userlist.header               = Users
+userlist.onlythisevent        = Limit to users of this event 
+userlist.placeassoc           = Assigned to place
+userlist.rolefilter           = Assigned roles
+userlist.saldofilter          = Saldo
+userlist.search               = Search
+userlist.searchcount          = Result count
+userlist.showAdvancedSearch   = Advanced search
+userlist.usersWithUnusedCodes = List this event's users with unused place codes
 
 usertitle.managingUser = Shop
 

code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties

@@ -879,14 +879,15 @@ usercart.traverse         = K\u00E4y l\u00E4pi
 
 userimage.webcam = Ota kuva webkameralla
 
-userlist.header             = Etsi k\u00E4ytt\u00E4ji\u00E4
-userlist.onlythisevent      = Vain t\u00E4m\u00E4n tapahtuman k\u00E4ytt\u00E4j\u00E4t
-userlist.placeassoc         = Liitetty paikkaan
-userlist.rolefilter         = Annetut roolit
-userlist.saldofilter        = Tilin saldo
-userlist.search             = Etsi
-userlist.searchcount        = Tuloksia
-userlist.showAdvancedSearch = Tarkennettu haku
+userlist.header               = Etsi k\u00E4ytt\u00E4ji\u00E4
+userlist.onlythisevent        = Vain t\u00E4m\u00E4n tapahtuman k\u00E4ytt\u00E4j\u00E4t
+userlist.placeassoc           = Liitetty paikkaan
+userlist.rolefilter           = Annetut roolit
+userlist.saldofilter          = Tilin saldo
+userlist.search               = Etsi
+userlist.searchcount          = Tuloksia
+userlist.showAdvancedSearch   = Tarkennettu haku
+userlist.usersWithUnusedCodes = Lista t\u00E4m\u00E4n tapahtuman k\u00E4ytt\u00E4jist\u00E4, joilla on k\u00E4ytt\u00E4m\u00E4tt\u00F6mi\u00E4 paikkakoodeja
 
 usertitle.managingUser = Kauppa