diff --git a/office-alexander-logistics-app/pom.xml b/office-alexander-logistics-app/pom.xml index a98128d..e1913bb 100644 --- a/office-alexander-logistics-app/pom.xml +++ b/office-alexander-logistics-app/pom.xml @@ -4,7 +4,7 @@ office-alexander-logistics com.alexander-logistics - 1.2.10 + 1.2.11 office-alexander-logistics-app war diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoiceDispatchController.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoiceDispatchController.java index 2b2ee24..c3c06f7 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoiceDispatchController.java +++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoiceDispatchController.java @@ -34,6 +34,16 @@ public class InvoiceDispatchController implements Serializable { protected LoginController loginController; private List invoices = null; + private String filter =null; + + + public String getFilter() { + return filter; + } + + public void setFilter(String filter) { + this.filter = filter; + } /** * This method searches the invoices. @@ -49,8 +59,13 @@ public class InvoiceDispatchController implements Serializable { String query = "(type:workitem) AND ($modelversion:rechnungseingang-de*) AND ($taskid:5100) AND ($owner:" + owner + ")"; + if (filter!=null && !filter.isEmpty()) { + query=query + " AND "+filter.toLowerCase() +"*"; + } + + logger.info("search: " + query); try { - invoices = documentService.findStubs(query, 30, 0, "$created", false); + invoices = documentService.findStubs(query, 2000, 0, "$created", false); logger.info("found " + invoices.size() + " invoices for StapelVerarbeitung in " + (System.currentTimeMillis()-l) + "ms"); } catch (QueryException e) { e.printStackTrace(); diff --git a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_invoices_dispatch.xhtml b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_invoices_dispatch.xhtml index 717a263..b306ca6 100644 --- a/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_invoices_dispatch.xhtml +++ b/office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/section_invoices_dispatch.xhtml @@ -8,49 +8,77 @@ + - - - - - - - Es liegen derzeit keine Rechnungen zur Prüfung für Sie vor. - - + - - - - - + + + + Suchbegriff: + + + + + + + + + - - + + + - + - - #{invoice.item['$workflowsummary']} - - - - + + + + + + + + - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + +
Es liegen derzeit keine Rechnungen zur Prüfung für Sie vor.
+ + + +