From 7902df76a985919f9f6984b672efe1fd08d2a740 Mon Sep 17 00:00:00 2001 From: Ralph Soika Date: Mon, 24 Apr 2023 15:49:58 +0200 Subject: [PATCH] Update Office Version - Stapelverarbeitung Update mit Filterfunktion --- office-alexander-logistics-app/pom.xml | 2 +- .../InvoiceDispatchController.java | 17 +- .../alexander/section_invoices_dispatch.xhtml | 90 +- pom.xml | 5 +- .../gutschriftabgleich-de-1.0.7.bpmn | 0 .../gutschriftabgleich-de-1.0.8.bpmn | 0 .../{ => deprecated}/mahnlauf-de-1.0.0.bpmn | 0 .../{ => deprecated}/mahnlauf-de-1.0.1.bpmn | 0 .../{ => deprecated}/mahnlauf-de-1.0.2.bpmn | 0 .../rechnungsausgang-de-1.0.0.bpmn | 0 .../rechnungsausgang-de-1.0.1.bpmn | 0 .../rechnungsausgang-de-1.0.1a.bpmn | 0 .../rechnungsausgang-de-1.0.2.bpmn | 0 .../rechnungseingang-de-1.2.30.bpmn | 0 .../rechnungseingang-de-1.2.31.bpmn | 0 ...chnungseingang-sachrechnung-de-1.0.17.bpmn | 0 ...chnungseingang-sachrechnung-de-1.0.18.bpmn | 0 .../{ => deprecated}/zahlungsavis-1.0.0.bpmn | 0 .../zahlungseingang-de-1.0.0.bpmn | 0 workflow/rechnungsausgang-de-1.0.4.bpmn | 3855 +++++++++++++++++ .../stapelverarbeitung-pruefung-de-1.0.2.bpmn | 412 ++ 21 files changed, 4346 insertions(+), 35 deletions(-) rename workflow/{ => deprecated}/gutschriftabgleich-de-1.0.7.bpmn (100%) rename workflow/{ => deprecated}/gutschriftabgleich-de-1.0.8.bpmn (100%) rename workflow/{ => deprecated}/mahnlauf-de-1.0.0.bpmn (100%) rename workflow/{ => deprecated}/mahnlauf-de-1.0.1.bpmn (100%) rename workflow/{ => deprecated}/mahnlauf-de-1.0.2.bpmn (100%) rename workflow/{ => deprecated}/rechnungsausgang-de-1.0.0.bpmn (100%) rename workflow/{ => deprecated}/rechnungsausgang-de-1.0.1.bpmn (100%) rename workflow/{ => deprecated}/rechnungsausgang-de-1.0.1a.bpmn (100%) rename workflow/{ => deprecated}/rechnungsausgang-de-1.0.2.bpmn (100%) rename workflow/{ => deprecated}/rechnungseingang-de-1.2.30.bpmn (100%) rename workflow/{ => deprecated}/rechnungseingang-de-1.2.31.bpmn (100%) rename workflow/{ => deprecated}/rechnungseingang-sachrechnung-de-1.0.17.bpmn (100%) rename workflow/{ => deprecated}/rechnungseingang-sachrechnung-de-1.0.18.bpmn (100%) rename workflow/{ => deprecated}/zahlungsavis-1.0.0.bpmn (100%) rename workflow/{ => deprecated}/zahlungseingang-de-1.0.0.bpmn (100%) create mode 100644 workflow/rechnungsausgang-de-1.0.4.bpmn create mode 100644 workflow/stapelverarbeitung-pruefung-de-1.0.2.bpmn 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']} - -
-
-
+
+ + + + + + + + + + + + + +
+ + +
+
+ + +