From 74ef6e17a7d5793bba9b6cd4324f1f0d734e6a30 Mon Sep 17 00:00:00 2001 From: Ralph Soika Date: Thu, 23 Jan 2025 23:57:37 +0100 Subject: [PATCH] stapelverarbeitung --- .../InvoiceDispatchAdapter.java | 10 ++- .../resources/bundle/custom_de.properties | 3 +- .../resources/bundle/custom_en.properties | 2 + .../alexander/section_invoices_dispatch.xhtml | 63 ++++++++++--------- 4 files changed, 46 insertions(+), 32 deletions(-) diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoiceDispatchAdapter.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoiceDispatchAdapter.java index 0320ebd..f7216d2 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoiceDispatchAdapter.java +++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoiceDispatchAdapter.java @@ -74,8 +74,14 @@ public class InvoiceDispatchAdapter implements SignalAdapter { try { workflowService.processWorkItem(invoice, 20); } catch (AccessDeniedException | ProcessingErrorException | PluginException | ModelException e) { - throw new PluginException(InvoiceDispatchAdapter.class.getSimpleName(), "PROCESSING_ERROR", - "Failed to process invoice : " + invoice.getUniqueID()); + // Hier werfen wir keine Exception mehr sondern geben nur eine Warning auf der + // Console aus. + // Der User merkt also nicht wenn eine Rechnung nicht zugewiesen werden konnte + // throw new PluginException(InvoiceDispatchAdapter.class.getSimpleName(), + // "PROCESSING_ERROR", + // "Failed to process invoice : " + invoice.getUniqueID()); + + logger.info("Failed to process invoice : " + invoice.getUniqueID()); } } diff --git a/office-alexander-logistics-app/src/main/resources/bundle/custom_de.properties b/office-alexander-logistics-app/src/main/resources/bundle/custom_de.properties index c73637f..80a9d9f 100644 --- a/office-alexander-logistics-app/src/main/resources/bundle/custom_de.properties +++ b/office-alexander-logistics-app/src/main/resources/bundle/custom_de.properties @@ -56,7 +56,8 @@ oplist.invoices.description.open=Anzahl der Rechnungen die noch nicht fällig si oplist.invoices.description.due=Anzahl der fälligen Rechnungen oplist.invoices.description.dunning=Anzahl Rechnungen bereits gemahnt - +invoice.clickall=Alle Rechnungen markieren +invoice.unclickall=Auswahl zurücksetzen ERROR_CDTR_INVALID=Die Kreditorennummer ist nicht gültig ERROR_BOOKING_PERIOD=Eingabefehler - Bitte geben Sie eine gültige Buchungsperiode ein! Prüfen Sie auch die Spalte BP in der Positionstabelle. diff --git a/office-alexander-logistics-app/src/main/resources/bundle/custom_en.properties b/office-alexander-logistics-app/src/main/resources/bundle/custom_en.properties index 91267c8..9e5fea3 100644 --- a/office-alexander-logistics-app/src/main/resources/bundle/custom_en.properties +++ b/office-alexander-logistics-app/src/main/resources/bundle/custom_en.properties @@ -56,6 +56,8 @@ oplist.invoices.description.open=Number of invoices that are not yet due oplist.invoices.description.due=Number of invoices due oplist.invoices.description.dunning=Number of invoices already dunned +invoice.clickall=Select all invoices +invoice.unclickall=Reset ERROR_CDTR_INVALID=The creditor number is not valid ERROR_BOOKING_PERIOD=Input error - Please enter a valid booking period! Also check the BP column in the position table. 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 b306ca6..6e6d3d8 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 @@ -50,15 +50,13 @@ - -
- + + - @@ -84,37 +82,44 @@