From ba99079a859eb868b2a388582e82fe815d48fae1 Mon Sep 17 00:00:00 2001 From: Josef Rokos Date: Tue, 20 Jan 2015 10:31:30 +0100 Subject: [PATCH] =?UTF-8?q?V=20agend=C4=9B=20Fakturace=20bylo=20rozchozeno?= =?UTF-8?q?=20filtrov=C3=A1n=C3=AD=20podle=20=C5=BEadatele.=20Odkaz=20na?= =?UTF-8?q?=20n=C3=A1pov=C4=9Bdu=20v=20toolbaru.=20Zv=C3=BD=C5=A1en=20sess?= =?UTF-8?q?ion=20timeout=20na=20480=20minut.=20refs=20#182?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../isspst/filters/InvoicingFilter.java | 4 +++- .../isspst/ui/main/approved/ApprovedList.java | 2 +- .../ui/main/invoicing/InvoicingList.java | 8 +++++++ .../WEB-INF/locales/zk-label.properties | 3 +++ src/main/webapp/WEB-INF/web.xml | 4 ++++ src/main/webapp/app/mainMenu.zul | 3 +++ src/main/webapp/app/template.zhtml | 2 +- .../webapp/main/invoicing/invoicingGrid.zul | 21 +++++++++++++++++++ 8 files changed, 44 insertions(+), 3 deletions(-) diff --git a/src/main/java/info/bukova/isspst/filters/InvoicingFilter.java b/src/main/java/info/bukova/isspst/filters/InvoicingFilter.java index 166f44f5..8573b4a5 100644 --- a/src/main/java/info/bukova/isspst/filters/InvoicingFilter.java +++ b/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 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 diff --git a/src/main/java/info/bukova/isspst/ui/main/approved/ApprovedList.java b/src/main/java/info/bukova/isspst/ui/main/approved/ApprovedList.java index f708fab5..ecdfc471 100644 --- a/src/main/java/info/bukova/isspst/ui/main/approved/ApprovedList.java +++ b/src/main/java/info/bukova/isspst/ui/main/approved/ApprovedList.java @@ -85,7 +85,7 @@ public class ApprovedList extends ListViewModel public List getUsers() { - return this.userService.getAll(); + return this.userService.getUsersForCombo(); } @Command diff --git a/src/main/java/info/bukova/isspst/ui/main/invoicing/InvoicingList.java b/src/main/java/info/bukova/isspst/ui/main/invoicing/InvoicingList.java index 1c38b78a..2de94126 100644 --- a/src/main/java/info/bukova/isspst/ui/main/invoicing/InvoicingList.java +++ b/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 { 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 { return workgroupService.getWorkgroups(); } + public List getUsers() { + return userService.getUsersForCombo(); + } + } diff --git a/src/main/webapp/WEB-INF/locales/zk-label.properties b/src/main/webapp/WEB-INF/locales/zk-label.properties index f4ccef91..7fe9c936 100644 --- a/src/main/webapp/WEB-INF/locales/zk-label.properties +++ b/src/main/webapp/WEB-INF/locales/zk-label.properties @@ -358,3 +358,6 @@ WorkgroupFormCannotAddUser=Uživatele nelze přidat WorkgroupFormCannotAddWorkgroup=Komisi nelze přidat WorkgroupFormOrderLimit=Limit nákupů WorkgroupIsInWorkgroup=Komisi nelze smazat, protože je členem některého střediska + +GoogleDriveUrl=Odkaz na Google Drive +Help=Pomoc diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index da4c395b..442da6bb 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -187,6 +187,10 @@ /* + + 480 + + index.zul index.zhtml diff --git a/src/main/webapp/app/mainMenu.zul b/src/main/webapp/app/mainMenu.zul index 91bfcf0d..dc706c94 100644 --- a/src/main/webapp/app/mainMenu.zul +++ b/src/main/webapp/app/mainMenu.zul @@ -133,5 +133,8 @@ href="/j_spring_security_logout" /> + \ No newline at end of file diff --git a/src/main/webapp/app/template.zhtml b/src/main/webapp/app/template.zhtml index bca9beb4..2bdf230c 100644 --- a/src/main/webapp/app/template.zhtml +++ b/src/main/webapp/app/template.zhtml @@ -51,6 +51,6 @@
- + \ No newline at end of file diff --git a/src/main/webapp/main/invoicing/invoicingGrid.zul b/src/main/webapp/main/invoicing/invoicingGrid.zul index c2fdd775..53ae6fa6 100644 --- a/src/main/webapp/main/invoicing/invoicingGrid.zul +++ b/src/main/webapp/main/invoicing/invoicingGrid.zul @@ -123,6 +123,27 @@ + +
+
+ + + +
+
+ +
+
+