From 11ccddb52948b51a23f2d554e9aa370c69f9d5e9 Mon Sep 17 00:00:00 2001
From: Ralph Soika <ralph.soika@imixs.com>
Date: Wed, 27 Nov 2024 16:55:14 +0100
Subject: [PATCH] update

---
 .../OPListExportAdapter.java                  |  2 +-
 workflow/analyse-debitor-en-1.0.0.bpmn        | 39 +++++++-------
 workflow/analyse-opliste-de-1.0.3.bpmn        | 19 +++++--
 workflow/analyse-opliste-en-1.0.3.bpmn        | 52 +++++++++++--------
 4 files changed, 64 insertions(+), 48 deletions(-)

diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportAdapter.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportAdapter.java
index 57b4587..b83e986 100644
--- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportAdapter.java
+++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportAdapter.java
@@ -193,7 +193,7 @@ public class OPListExportAdapter extends POIFindReplaceAdapter {
         XSSFRow labelRow = sheet.getRow(9);
         for (String currency : currencyList) {
             cell = labelRow.getCell(col);
-            cell.setCellValue("Balance " + currency);
+            cell.setCellValue("" + currency);
             col++;
         }
     }
diff --git a/workflow/analyse-debitor-en-1.0.0.bpmn b/workflow/analyse-debitor-en-1.0.0.bpmn
index 258eec4..eac97a4 100644
--- a/workflow/analyse-debitor-en-1.0.0.bpmn
+++ b/workflow/analyse-debitor-en-1.0.0.bpmn
@@ -99,7 +99,7 @@ th {	font-weight: bold;}
     <bpmn2:task id="Task_2" imixs:processid="1900" name="Archived">
       <bpmn2:extensionElements>
         <imixs:item name="txtworkflowsummary" type="xs:string">
-          <imixs:value><![CDATA[<itemvalue>dbtr.name</itemvalue> - <itemvalue format="EEE. dd. MMM. yyyy">$lasteventdate</itemvalue>]]></imixs:value>
+          <imixs:value><![CDATA[SOA <itemvalue>dbtr.name</itemvalue> - <itemvalue format="EEE. dd. MMM. yyyy">$lasteventdate</itemvalue>]]></imixs:value>
         </imixs:item>
         <imixs:item name="keyupdateacl" type="xs:boolean">
           <imixs:value>true</imixs:value>
@@ -172,20 +172,20 @@ th {	font-weight: bold;}
     <bpmn2:dataObject id="DataObject_1" name="Form">
       <bpmn2:documentation id="Documentation_17"><![CDATA[<imixs-form>
   <imixs-form-section columns="2">
-    <item name="dbtr.number" type="custom" path="alexander/debitor_search" required="true"  label="Debitor:" />
+    <item name="dbtr.number" type="custom" path="alexander/debitor_search" required="true"  label="Debtor:" />
   </imixs-form-section>
 
   <imixs-form-section columns="4" label="Invoices">
-     <item name="analytic.invoices.count.all" type="custom" path="alexander/analyze_plain" label="Alle Rechnungen:" />
-     <item name="analytic.invoices.count.open" type="custom" path="alexander/analyze_plain" label="Offene Rechnungen:" />
-     <item name="analytic.invoices.count.due" type="custom" path="alexander/analyze_plain" label="Fällige Rechnungen:" />
-     <item name="analytic.invoices.count.dunning" type="custom" path="alexander/analyze_plain" label="Rechnungen in Mahnung:" />
+     <item name="analytic.invoices.count.all" type="custom" path="alexander/analyze_plain" label="All:" />
+     <item name="analytic.invoices.count.open" type="custom" path="alexander/analyze_plain" label="Unpaid:" />
+     <item name="analytic.invoices.count.due" type="custom" path="alexander/analyze_plain" label="Due:" />
+     <item name="analytic.invoices.count.dunning" type="custom" path="alexander/analyze_plain" label="Dunning:" />
      <item name="analytic.payment.avg.due" type="custom" path="alexander/analyze_plain" label="Average term of credit:" />
      <item name="analytic.payment.avg.days" type="custom" path="alexander/analyze_plain" label="Average payment duration:" />
  </imixs-form-section>
 
- <imixs-form-section columns="1" label="Trend Zahlungsmoral">
-   <item name="analytic.invoices.trend" type="custom" path="alexander/analyze_chart"  label="Zahlungen in den letzten 6 Monaten:" />
+ <imixs-form-section columns="1" label="Trend Payment ">
+   <item name="analytic.invoices.trend" type="custom" path="alexander/analyze_chart"  label="Payments in the last 6 months:" />
  </imixs-form-section>
  
 </imixs-form>]]></bpmn2:documentation>
@@ -310,7 +310,7 @@ th {	font-weight: bold;}
           <imixs:value><![CDATA[0]]></imixs:value>
         </imixs:item>
         <imixs:item name="rtfresultlog" type="xs:string">
-          <imixs:value><![CDATA[Analysedaten Debitor archiviert]]></imixs:value>
+          <imixs:value><![CDATA[Analysis data archived and Excel report generated]]></imixs:value>
         </imixs:item>
         <imixs:item name="keyupdateacl" type="xs:boolean">
           <imixs:value>false</imixs:value>
@@ -334,7 +334,7 @@ th {	font-weight: bold;}
 ]]></imixs:value>
         </imixs:item>
       </bpmn2:extensionElements>
-      <bpmn2:documentation id="documentation_pCTOtQ"><![CDATA[Excel Datei erzeugen]]></bpmn2:documentation>
+      <bpmn2:documentation id="documentation_pCTOtQ"><![CDATA[Create Excel File]]></bpmn2:documentation>
       <bpmn2:signalEventDefinition id="signalEventDefinition_007muw" signalRef="Signal_1"/>
       <bpmn2:outgoing>sequenceFlow_1K0l0g</bpmn2:outgoing>
       <bpmn2:incoming>sequenceFlow_LhcuMQ</bpmn2:incoming>
@@ -342,21 +342,20 @@ th {	font-weight: bold;}
     <bpmn2:dataObject id="dataObject_00mX6w" name="Form">
       <bpmn2:documentation id="documentation_lUG0qw"><![CDATA[<imixs-form>
   <imixs-form-section columns="2">
-    <item name="dbtr.name" type="text" label="Debitor:" />
+    <item name="dbtr.name" type="text" label="Debtor:" />
   </imixs-form-section>
   <imixs-form-section columns="4" label="Invoices">
-     <item name="analytic.invoices.count.all" type="custom" path="alexander/analyze_plain" label="Alle Rechnungen:" />
-     <item name="analytic.invoices.count.open" type="custom" path="alexander/analyze_plain" label="Offene Rechnungen:" />
-     <item name="analytic.invoices.count.due" type="custom" path="alexander/analyze_plain" label="Fällige Rechnungen:" />
-     <item name="analytic.invoices.count.dunning" type="custom" path="alexander/analyze_plain" label="Rechnungen in Mahnung:" />
+     <item name="analytic.invoices.count.all" type="custom" path="alexander/analyze_plain" label="All:" />
+     <item name="analytic.invoices.count.open" type="custom" path="alexander/analyze_plain" label="Unpaid:" />
+     <item name="analytic.invoices.count.due" type="custom" path="alexander/analyze_plain" label="Due:" />
+     <item name="analytic.invoices.count.dunning" type="custom" path="alexander/analyze_plain" label="Dunning:" />
      <item name="analytic.payment.avg.due" type="custom" path="alexander/analyze_plain" label="Average term of credit:" />
      <item name="analytic.payment.avg.days" type="custom" path="alexander/analyze_plain" label="Average payment duration:" />
-  </imixs-form-section>
-
- <imixs-form-section columns="1" label="Trend Zahlungsmoral">
-   <item name="analytic.invoices.trend" type="custom" path="alexander/analyze_chart"  label="Zahlungen in den letzten 6 Monaten:" />
  </imixs-form-section>
- 
+
+ <imixs-form-section columns="1" label="Trend Payment ">
+   <item name="analytic.invoices.trend" type="custom" path="alexander/analyze_chart"  label="Payments in the last 6 months:" />
+ </imixs-form-section>
  
 </imixs-form>]]></bpmn2:documentation>
       <bpmn2:dataState id="dataState_n87Eag"/>
diff --git a/workflow/analyse-opliste-de-1.0.3.bpmn b/workflow/analyse-opliste-de-1.0.3.bpmn
index 95926ec..d0a719e 100644
--- a/workflow/analyse-opliste-de-1.0.3.bpmn
+++ b/workflow/analyse-opliste-de-1.0.3.bpmn
@@ -331,7 +331,7 @@ Nach Prüfung schließen Sie bitte den Vorgang über die Schaltfläche "Erledigt
       <bpmn2:documentation id="Documentation_5"><![CDATA[<?xml version="1.0"?>
 <imixs-form>
   <imixs-form-section columns="2">
-	<item name="" type="custom" path="alexander/spaceref" label="Fachbereich:" required="true" />
+	<item name="" type="custom" path="alexander/spaceref" label="Fachbereich:" required="false" />
   </imixs-form-section>
 
   <imixs-form-section columns="4" label="Rechnungen">
@@ -383,10 +383,20 @@ Nach Prüfung schließen Sie bitte den Vorgang über die Schaltfläche "Erledigt
        <type>date</type>
  </poi-update>]]></imixs:value>
         </imixs:item>
+        <imixs:item name="txtbusinessrule" type="xs:string">
+          <imixs:value><![CDATA[var result={};
+var refField="space.ref"; 
+result.isValid=true;
+
+if (workitem.get(refField) == null || ''==workitem.get(refField)[0]) {
+   result.isValid=false;
+   result.errorMessage='Bitte wählen Sie einen Fachbereich aus.';
+}]]></imixs:value>
+        </imixs:item>
       </bpmn2:extensionElements>
       <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>
       <bpmn2:signalEventDefinition id="SignalEventDefinition_2" signalRef="Signal_1"/>
-      <bpmn2:documentation id="documentation_BPWZgA"/>
+      <bpmn2:documentation id="documentation_BPWZgA"><![CDATA[Erstellung einer OP Excel Liste für einen Fachbereich]]></bpmn2:documentation>
       <bpmn2:incoming>sequenceFlow_NSPD6g</bpmn2:incoming>
     </bpmn2:intermediateCatchEvent>
     <bpmn2:sequenceFlow id="SequenceFlow_6" sourceRef="IntermediateCatchEvent_4" targetRef="gateway_37SSsw">
@@ -428,8 +438,7 @@ Nach Prüfung schließen Sie bitte den Vorgang über die Schaltfläche "Erledigt
           <imixs:value><![CDATA[1]]></imixs:value>
         </imixs:item>
         <imixs:item name="txtactivityresult" type="xs:string">
-          <imixs:value><![CDATA[<item name="process">Mahnwesen</item>
-<opliste name="excel-export">
+          <imixs:value><![CDATA[<opliste name="excel-export">
   <textblock>OP-Liste KW Template</textblock>
   <template>op-liste_kw_template.xlsx</template>
   <target-name>op-liste_<itemvalue>space.name</itemvalue>_<itemvalue format="yyyy-MM-dd">$lasteventdate</itemvalue>.xlsx</target-name>
@@ -444,7 +453,7 @@ Nach Prüfung schließen Sie bitte den Vorgang über die Schaltfläche "Erledigt
         </imixs:item>
       </bpmn2:extensionElements>
       <bpmn2:signalEventDefinition id="signalEventDefinition_7PWLCA" signalRef="signal_2"/>
-      <bpmn2:documentation id="documentation_HEXfsw"/>
+      <bpmn2:documentation id="documentation_HEXfsw"><![CDATA[Erstellung einer OP Excel Liste mit allen offenen Außenständen nach Kalenderwoche]]></bpmn2:documentation>
       <bpmn2:incoming>sequenceFlow_McYLMw</bpmn2:incoming>
       <bpmn2:outgoing>sequenceFlow_L9cMeA</bpmn2:outgoing>
     </bpmn2:intermediateCatchEvent>
diff --git a/workflow/analyse-opliste-en-1.0.3.bpmn b/workflow/analyse-opliste-en-1.0.3.bpmn
index 37e1cb2..7d8d794 100644
--- a/workflow/analyse-opliste-en-1.0.3.bpmn
+++ b/workflow/analyse-opliste-en-1.0.3.bpmn
@@ -113,7 +113,7 @@ th {	font-weight: bold;}
     <bpmn2:task id="Task_1" imixs:processid="1000" name="Creation">
       <bpmn2:extensionElements>
         <imixs:item name="txtworkflowsummary" type="xs:string">
-          <imixs:value><![CDATA[<itemvalue>sequencenumber</itemvalue> <itemvalue>space.name</itemvalue> - <itemvalue format="dd.MM.yyyy">$lasteventdate</itemvalue>]]></imixs:value>
+          <imixs:value><![CDATA[<itemvalue>space.name</itemvalue> - <itemvalue format="dd.MM.yyyy">$lasteventdate</itemvalue>]]></imixs:value>
         </imixs:item>
         <imixs:item name="txteditorid" type="xs:string">
           <imixs:value><![CDATA[alexander/form_basic]]></imixs:value>
@@ -158,10 +158,10 @@ th {	font-weight: bold;}
   </imixs-form-section>
 
 <imixs-form-section columns="4" label="Invoices">
-     <item name="analytic.invoices.count.all" type="custom" path="alexander/analyze_plain" label="Alle Rechnungen:" />
-     <item name="analytic.invoices.count.open" type="custom" path="alexander/analyze_plain" label="Offene Rechnungen:" />
-     <item name="analytic.invoices.count.due" type="custom" path="alexander/analyze_plain" label="Fällige Rechnungen:" />
-     <item name="analytic.invoices.count.dunning" type="custom" path="alexander/analyze_plain" label="Rechnungen in Mahnung:" />
+     <item name="analytic.invoices.count.all" type="custom" path="alexander/analyze_plain" label="All:" />
+     <item name="analytic.invoices.count.open" type="custom" path="alexander/analyze_plain" label="Unpaid:" />
+     <item name="analytic.invoices.count.due" type="custom" path="alexander/analyze_plain" label="Due:" />
+     <item name="analytic.invoices.count.dunning" type="custom" path="alexander/analyze_plain" label="Dunning:" />
  </imixs-form-section>
 </imixs-form>]]></bpmn2:documentation>
       <bpmn2:dataState id="DataState_1"/>
@@ -239,7 +239,7 @@ Nach Prüfung schließen Sie bitte den Vorgang über die Schaltfläche "Erledigt
           <imixs:value><![CDATA[<opliste name="excel-export">
   <textblock>OP-Liste Template</textblock>
   <template>op-liste_template.xlsx</template>
-  <target-name>op-liste_<itemvalue>dbtr.number</itemvalue>_<itemvalue format="yyyy-MM-dd">$lasteventdate</itemvalue>.xlsx</target-name>
+  <target-name>outstanding_items_<itemvalue>space.name</itemvalue>_<itemvalue format="yyyy-MM-dd">$lasteventdate</itemvalue>.xlsx</target-name>
 </opliste>
 
 <poi-update name="findreplace">
@@ -271,7 +271,7 @@ Nach Prüfung schließen Sie bitte den Vorgang über die Schaltfläche "Erledigt
     <bpmn2:task id="Task_4" imixs:processid="1900" name="Archived">
       <bpmn2:extensionElements>
         <imixs:item name="txtworkflowsummary" type="xs:string">
-          <imixs:value><![CDATA[<itemvalue>sequencenumber</itemvalue> <itemvalue>space.name</itemvalue> - <itemvalue format="dd.MM.yyyy">$lasteventdate</itemvalue>]]></imixs:value>
+          <imixs:value><![CDATA[Outstanding Items <itemvalue>space.name</itemvalue> - <itemvalue format="dd.MM.yyyy">$lasteventdate</itemvalue>]]></imixs:value>
         </imixs:item>
         <imixs:item name="keyupdateacl" type="xs:boolean">
           <imixs:value>true</imixs:value>
@@ -331,20 +331,19 @@ Nach Prüfung schließen Sie bitte den Vorgang über die Schaltfläche "Erledigt
       <bpmn2:documentation id="Documentation_5"><![CDATA[<?xml version="1.0"?>
 <imixs-form>
   <imixs-form-section columns="2">
-	<item name="" type="custom" path="alexander/spaceref" label="Department:" required="true" />
+      <item name="" type="custom" path="alexander/spaceref" label="Department:" required="false" />
   </imixs-form-section>
 
   <imixs-form-section columns="4" label="Invoices">
-     <item name="analytic.invoices.count.all" type="custom" path="alexander/analyze_plain" label="Alle Rechnungen:" />
-     <item name="analytic.invoices.count.open" type="custom" path="alexander/analyze_plain" label="Offene Rechnungen:" />
-     <item name="analytic.invoices.count.due" type="custom" path="alexander/analyze_plain" label="Fällige Rechnungen:" />
-     <item name="analytic.invoices.count.dunning" type="custom" path="alexander/analyze_plain" label="Rechnungen in Mahnung:" />
+     <item name="analytic.invoices.count.all" type="custom" path="alexander/analyze_plain" label="All:" />
+     <item name="analytic.invoices.count.open" type="custom" path="alexander/analyze_plain" label="Unpaid:" />
+     <item name="analytic.invoices.count.due" type="custom" path="alexander/analyze_plain" label="Due:" />
+     <item name="analytic.invoices.count.dunning" type="custom" path="alexander/analyze_plain" label="Dunning:" />
  </imixs-form-section>
-
 </imixs-form>]]></bpmn2:documentation>
       <bpmn2:dataState id="DataState_2"/>
     </bpmn2:dataObject>
-    <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_4" imixs:activityid="20" name="Outstanding Payments List">
+    <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_4" imixs:activityid="20" name="Outstanding Items">
       <bpmn2:extensionElements>
         <imixs:item name="txtmailsubject" type="xs:string">
           <imixs:value/>
@@ -353,8 +352,8 @@ Nach Prüfung schließen Sie bitte den Vorgang über die Schaltfläche "Erledigt
         <imixs:item name="rtfmailbody" type="CDATA">
           <imixs:value/>
         </imixs:item>
-        <imixs:item name="rtfresultlog" type="CDATA">
-          <imixs:value><![CDATA[OP-Liste erstellt]]></imixs:value>
+        <imixs:item name="rtfresultlog" type="xs:string">
+          <imixs:value><![CDATA[Outstanding items exported.]]></imixs:value>
         </imixs:item>
         <imixs:item name="keypublicresult" type="xs:string">
           <imixs:value><![CDATA[1]]></imixs:value>
@@ -363,7 +362,7 @@ Nach Prüfung schließen Sie bitte den Vorgang über die Schaltfläche "Erledigt
           <imixs:value><![CDATA[<opliste name="excel-export">
   <textblock>OP-Liste Template</textblock>
   <template>op-liste_template.xlsx</template>
-  <target-name>op-liste_<itemvalue>dbtr.number</itemvalue>_<itemvalue format="yyyy-MM-dd">$lasteventdate</itemvalue>.xlsx</target-name>
+  <target-name>outstanding_items_<itemvalue>space.name</itemvalue>_<itemvalue format="yyyy-MM-dd">$lasteventdate</itemvalue>.xlsx</target-name>
 </opliste>
 
 <poi-update name="findreplace">
@@ -383,6 +382,16 @@ Nach Prüfung schließen Sie bitte den Vorgang über die Schaltfläche "Erledigt
        <type>date</type>
  </poi-update>]]></imixs:value>
         </imixs:item>
+        <imixs:item name="txtbusinessrule" type="xs:string">
+          <imixs:value><![CDATA[var result={};
+var refField="space.ref"; 
+result.isValid=true;
+
+if (workitem.get(refField) == null || ''==workitem.get(refField)[0]) {
+   result.isValid=false;
+   result.errorMessage='Please choose a department.';
+}]]></imixs:value>
+        </imixs:item>
       </bpmn2:extensionElements>
       <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>
       <bpmn2:signalEventDefinition id="SignalEventDefinition_2" signalRef="Signal_1"/>
@@ -412,7 +421,7 @@ Nach Prüfung schließen Sie bitte den Vorgang über die Schaltfläche "Erledigt
     <bpmn2:association id="Association_5" sourceRef="TextAnnotation_1" targetRef="IntermediateCatchEvent_1">
       <bpmn2:documentation id="documentation_QVzzbw"/>
     </bpmn2:association>
-    <bpmn2:intermediateCatchEvent id="event_rEFclQ" imixs:activityid="30" name="Outstanding Payments List by Week">
+    <bpmn2:intermediateCatchEvent id="event_rEFclQ" imixs:activityid="30" name="Outstanding Items by Week">
       <bpmn2:extensionElements>
         <imixs:item name="txtmailsubject" type="xs:string">
           <imixs:value/>
@@ -422,17 +431,16 @@ Nach Prüfung schließen Sie bitte den Vorgang über die Schaltfläche "Erledigt
           <imixs:value/>
         </imixs:item>
         <imixs:item name="rtfresultlog" type="xs:string">
-          <imixs:value><![CDATA[Liste Außenstände erstellt]]></imixs:value>
+          <imixs:value><![CDATA[Outstanding items exported.]]></imixs:value>
         </imixs:item>
         <imixs:item name="keypublicresult" type="xs:string">
           <imixs:value><![CDATA[1]]></imixs:value>
         </imixs:item>
         <imixs:item name="txtactivityresult" type="xs:string">
-          <imixs:value><![CDATA[<item name="process">Dunning</item>
-<opliste name="excel-export">
+          <imixs:value><![CDATA[<opliste name="excel-export">
   <textblock>OP-Liste KW Template</textblock>
   <template>op-liste_kw_template.xlsx</template>
-  <target-name>op-liste_<itemvalue>space.name</itemvalue>_<itemvalue format="yyyy-MM-dd">$lasteventdate</itemvalue>.xlsx</target-name>
+  <target-name>outstanding_items_by_week_<itemvalue format="yyyy-MM-dd">$lasteventdate</itemvalue>.xlsx</target-name>
 </opliste>
 <poi-update name="findreplace">
        <find>A8</find>