Do definice pracovních skupin byl přidán vyhledávací edit. Doplněna

kontrola členství v komisích/střediscích. 
refs #123 
closes #119

src/main/java/info/bukova/isspst/services/workgroups/WorkgroupService.java

@@ -22,5 +22,6 @@ public interface WorkgroupService extends Service<Workgroup>  {
 	public List<Member> getMembers(Workgroup workgroup);
 	public void loadMembers(Workgroup workgroup);
 	public void loadParents(Member member);
+	public void loadParentsMembers(Workgroup workgroup);
 
 }

src/main/java/info/bukova/isspst/services/workgroups/WorkgroupServiceImpl.java

@@ -89,7 +89,7 @@ public class WorkgroupServiceImpl extends AbstractOwnedService<Workgroup> implem
 		}
 		
 		if (member.isPerson()) {
-			return true;
+			return checkParentsMembers(workgroup, (User)member);
 		}
 				
 		Workgroup toAdd = Workgroup.class.cast(member);
@@ -105,6 +105,23 @@ public class WorkgroupServiceImpl extends AbstractOwnedService<Workgroup> implem
 		return true;
 	}
 	
+	//check, jestli uzivatel pridavany do komise neni zaroven clenem strediska, jehoz je komise clenem
+	private boolean checkParentsMembers(Workgroup workgroup, User user) {
+		if (workgroup.isCentre()) {
+			return true;
+		}
+		
+		for (Workgroup wg : workgroup.getParents()) {
+			for (JobMapping jm : wg.getMembers()) {
+				if (jm.getMember().equals(user)) {
+					return false;
+				}
+			}
+		}
+		
+		return true;
+	}
+
 	@Override
 	@Transactional
 	public List<Workgroup> getUserCentres(User user) {
@@ -291,4 +308,14 @@ public class WorkgroupServiceImpl extends AbstractOwnedService<Workgroup> implem
 		}
 	}
 	
+	@Override
+	@Transactional
+	public void loadParentsMembers(Workgroup workgroup) {
+		loadParents(workgroup);
+		
+		for (Workgroup wg : workgroup.getParents()) {
+			loadMembers(wg);
+		}
+	}
+
 }

src/main/java/info/bukova/isspst/ui/workgroups/WorkgroupForm.java

@@ -1,6 +1,7 @@
 package info.bukova.isspst.ui.workgroups;
 
 import info.bukova.isspst.Constants;
+import info.bukova.isspst.StringUtils;
 import info.bukova.isspst.data.JobMapping;
 import info.bukova.isspst.data.Member;
 import info.bukova.isspst.data.Role;
@@ -8,6 +9,7 @@ import info.bukova.isspst.data.User;
 import info.bukova.isspst.data.Workgroup;
 import info.bukova.isspst.services.users.RoleService;
 import info.bukova.isspst.services.users.UserService;
+import info.bukova.isspst.services.workgroups.WorkgroupException;
 import info.bukova.isspst.services.workgroups.WorkgroupService;
 import info.bukova.isspst.ui.FormViewModel;
 
@@ -22,6 +24,10 @@ import org.zkoss.bind.annotation.NotifyChange;
 import org.zkoss.zk.ui.event.DropEvent;
 import org.zkoss.zk.ui.select.annotation.WireVariable;
 import org.zkoss.zul.Listitem;
+import org.zkoss.zul.Messagebox;
+
+import static ch.lambdaj.Lambda.*;
+import static org.hamcrest.Matchers.*;
 
 public class WorkgroupForm extends FormViewModel<Workgroup> {
 	
@@ -32,11 +38,14 @@ public class WorkgroupForm extends FormViewModel<Workgroup> {
 	@WireVariable
 	private WorkgroupService workgroupService;
 	private List<Member> users;
+	private String findUser;
+	private List<Member> selectedUsers;
 
 	@Init(superclass = true)
 	public void init() {
 		users = new ArrayList<Member>();
 		users.addAll(userService.getAll());
+		selectedUsers = new ArrayList<Member>();
 	}
 	
 	public List<Member> getUsers() {
@@ -147,13 +156,31 @@ public class WorkgroupForm extends FormViewModel<Workgroup> {
 		
 		if (!u.isPerson()) {
 			workgroupService.loadMembers((Workgroup) u);
+		} else if (!getDataBean().isCentre()) {
+			workgroupService.loadParentsMembers(getDataBean());
 		}
 		
-		workgroupService.addMember(getDataBean(), u, roleService.getRoleByAuthority(target));
+		try {
+			workgroupService.addMember(getDataBean(), u, roleService.getRoleByAuthority(target));
 			
-		if (!u.isPerson()) {
+			if (!u.isPerson()) {
-			users.remove(u);
+				users.remove(u);
+			}
+		} catch (WorkgroupException e) {
+			String message;
+			String title;
+			
+			if (!getDataBean().isCentre()) {
+				message = StringUtils.localize("WorkgroupFormUserIsCenterMember");
+				title = StringUtils.localize("WorkgroupFormCannotAddUser");
+			} else {
+				message = StringUtils.localize("WorkgroupFormMemberIsCenterMember");
+				title = StringUtils.localize("WorkgroupFormCannotAddWorkgroup");
+			}
+			
+			Messagebox.show(message, title, Messagebox.OK, Messagebox.ERROR);
 		}
+		
 	}
 	
 	private String getSource(DropEvent event) {
@@ -172,4 +199,35 @@ public class WorkgroupForm extends FormViewModel<Workgroup> {
 		return target;
 	}
 
+	public String getFindUser() {
+		return findUser;
+	}
+
+	public void setFindUser(String findUser) {
+		this.findUser = findUser;
+	}
+
+	public List<Member> getSelectedUsers() {
+		return selectedUsers;
+	}
+
+	public void setSelectedUsers(List<Member> selectedUser) {
+		this.selectedUsers = selectedUser;
+	}
+	
+	@Command
+	@NotifyChange("selectedUsers")
+	public void find() {
+		List<Member> found = filter(having(on(Member.class).getFullName(), startsWith(findUser)), users);
+		
+		if (!found.isEmpty()) {
+			if (selectedUsers == null) {
+				selectedUsers = new ArrayList<Member>();
+			} else {
+				selectedUsers.clear();
+				selectedUsers.add(found.get(0));
+			}
+		}
+	}
+	
 }

src/main/webapp/WEB-INF/locales/zk-label.properties

@@ -277,3 +277,7 @@ RemoveItem=Smazat
 
 Amount=Částka
 
+WorkgroupFormUserIsCenterMember=Uživatel je členem střediska, jehož je komise členem!
+WorkgroupFormMemberIsCenterMember=Některý ze členů přidávané komise je členem tohoto střediska!
+WorkgroupFormCannotAddUser=Uživatele nelze přidat
+WorkgroupFormCannotAddWorkgroup=Komisi nelze přidat

src/main/webapp/admin/workgroups/workgroupForm.zul

@@ -31,17 +31,19 @@
 			</grid>
 			<label value="Přetáhněte myší:"/>
 			<hlayout>
-				<listbox id="users" model="@bind(vm.users)" height="380px" width="300px" multiple="true"
+				<vbox>
-					droppable="true" onDrop="@command('addMember', event=event)">
+					<textbox value="@bind(vm.findUser)" onChange="@command('find')" instant="true" width="300px"/>	
-					<listhead>
+					<listbox id="users" model="@bind(vm.users)" height="380px" width="300px" multiple="true"
-						<listheader label="Uživatelé" sort="czech(fullName)"/>
+						droppable="true" onDrop="@command('addMember', event=event)" selectedItems="@bind(vm.selectedUsers)">
-					</listhead>
+						<listhead>
-					<template name="model">
+							<listheader label="Uživatelé" sort="czech(fullName)"/>
-						<listitem image="@load(each.person ? '/img/user-small.png' : '/img/commission-small.png')" label="@load(each.fullName)" draggable="user" droppable="user"
+						</listhead>
-						onDrop="@command('addMember', event=event)" attributes.item="@load(each)"/>
+						<template name="model">
-					</template>
+							<listitem image="@load(each.person ? '/img/user-small.png' : '/img/commission-small.png')" label="@load(each.fullName)" draggable="user" droppable="user"
-				</listbox>
+							onDrop="@command('addMember', event=event)" attributes.item="@load(each)"/>
-				
+						</template>
+					</listbox>
+				</vbox>
 				
 				<tabbox mold="accordion" width="300px">
 					<tabs children="@load(vm.workgroupRoles)">