V agendě Fakturace bylo rozchozeno filtrování podle žadatele.

Odkaz na nápovědu v toolbaru.
Zvýšen session timeout na 480 minut.
refs #182

src/main/java/info/bukova/isspst/filters/InvoicingFilter.java

@@ -4,6 +4,7 @@ import info.bukova.isspst.DateTimeUtils;
 import info.bukova.isspst.StringUtils;
 import info.bukova.isspst.data.Invoicing;
 import info.bukova.isspst.data.Requirement;
+import info.bukova.isspst.data.User;
 import info.bukova.isspst.data.Workgroup;
 
 import org.hamcrest.Description;
@@ -48,8 +49,9 @@ public class InvoicingFilter implements Filter<Invoicing>
 			boolean foundReqDate = DateTimeUtils.isEqualByDateForFilter(item.getRequirement().getReqDate(), condition.getRequirement().getReqDate());
 			boolean foundCenter = Workgroup.isEqualByWorkgroupForFilter(item.getRequirement().getCentre(), condition.getRequirement().getCentre());
 			boolean foundWorkgroup = Workgroup.isEqualByWorkgroupForFilter(item.getRequirement().getWorkgroup(), condition.getRequirement().getWorkgroup());
+			boolean foundUser = User.isEqualByUserForFilter(item.getRequirement().getOwnedBy(), condition.getRequirement().getOwnedBy());
 			boolean foundDescription = StringUtils.isEqualForFilter(item.getRequirement().getDescription(), condition.getRequirement().getDescription());
-			return (foundNumser && foundReqDate && foundCenter && foundDescription && foundWorkgroup);
+			return (foundNumser && foundReqDate && foundCenter && foundDescription && foundWorkgroup && foundUser);
 		}
 
 		@Factory

src/main/java/info/bukova/isspst/ui/main/approved/ApprovedList.java

@@ -85,7 +85,7 @@ public class ApprovedList extends ListViewModel<JoinedItem>
 
 	public List<User> getUsers()
 	{
-		return this.userService.getAll();
+		return this.userService.getUsersForCombo();
 	}
 
 	@Command

src/main/java/info/bukova/isspst/ui/main/invoicing/InvoicingList.java

@@ -3,9 +3,11 @@ package info.bukova.isspst.ui.main.invoicing;
 import java.util.List;
 
 import info.bukova.isspst.data.Invoicing;
+import info.bukova.isspst.data.User;
 import info.bukova.isspst.data.Workgroup;
 import info.bukova.isspst.filters.InvoicingFilter;
 import info.bukova.isspst.services.invoicing.InvoicingService;
+import info.bukova.isspst.services.users.UserService;
 import info.bukova.isspst.services.workgroups.WorkgroupService;
 import info.bukova.isspst.ui.ListViewModel;
 
@@ -18,6 +20,8 @@ public class InvoicingList extends ListViewModel<Invoicing> {
 	private InvoicingService invoicingService;
 	@WireVariable
 	private WorkgroupService workgroupService;
+	@WireVariable
+	private UserService userService;
 
 	@Init(superclass = true)
 	public void initInvoicing() {
@@ -45,4 +49,8 @@ public class InvoicingList extends ListViewModel<Invoicing> {
 		return workgroupService.getWorkgroups();
 	}
 	
+	public List<User> getUsers() {
+		return userService.getUsersForCombo();
+	}
+	
 }