update modell icons, zahlungsavis neuer flow

office-alexander-logistics-app/src/main/java/com/alexanderlogistics/InvoicePlugin.java

@@ -24,6 +24,9 @@ import org.imixs.workflow.exceptions.QueryException;
  * Das Plugin prüft auch auf doppelte Rechnungsnummern. Dabei wird Systemweit
  * geprüft ob die Rechnungsnummer schon einmal vorkam. Falls ja, wird eine
  * Warnung ausgegeben. Der Benutzer kann diese dann skippen.
+ * <p>
+ * 2.2.22 - Das Plugin erzeugt auch das Feld _img welches die Images von
+ * Sofortüberweisung, Mahnung und Ablehnung anzeigt.
  * 
  * 
  * @author rsoika
@@ -56,6 +59,8 @@ public class InvoicePlugin extends AbstractPlugin {
     @Override
     public ItemCollection run(ItemCollection workitem, ItemCollection event) throws PluginException {
 
+        updateImg(workitem);
+        
         // skip if validaten tag is required=false
         ItemCollection evalItemCollection = this.getWorkflowService().evalWorkflowResult(event, "validation", workitem);
         if (evalItemCollection != null) {
@@ -169,10 +174,64 @@ public class InvoicePlugin extends AbstractPlugin {
             }
 
         }
+        
+     
+        
 
         return workitem;
     }
 
+    /**
+     * Hilfsroutine die das _img item aktualisiert.
+     */
+    private void updateImg(ItemCollection workitem) {
+        
+        // Update _img icon list
+        String img=workitem.getItemValueString("_img");
+        // 031=ablehnen
+        // 100=sofortüberweichung
+        // 074=mahnen
+            // sofortüberweisung
+            if (workitem.getEventID()==96 && !img.contains("100.png")) {
+                img=img+"<img title='Sofortüberweisung'  src=\"/layout/icons/icon100.png\">";
+            }
+            // mahnen
+            if (workitem.getEventID()==95 && !img.contains("103.png")) {
+                img=img+"<img title='Mahnen' src=\"/layout/icons/icon103.png\">";
+                
+            }
+            // ablehnen
+            if (workitem.getTaskID()==5100 && workitem.getEventID()==90 && !img.contains("028.png")) {
+                img=img+"<img  title='Abgelehnt'  src=\"/layout/icons/icon028.png\">";
+            }
+            if (workitem.getTaskID()==5200 && workitem.getEventID()==90 && !img.contains("028.png")) {
+                img=img+"<img  title='Abgelehnt'  src=\"/layout/icons/icon028.png\">";
+            }
+        workitem.setItemValue("_img", img);
+        
+        
+        
+        
+        
+        /*
+        for (String entry: eventLog) {
+            // sofortüberweisung
+            if (entry.contains(".96") && !img.contains("100.png")) {
+                img=img+"<img src=\"/layout/icons/icon100.png\">";
+            }
+            // mahnen
+            if (entry.contains(".95") && !img.contains("074.png")) {
+                img=img+"<img src=\"/layout/icons/icon074.png\">";
+            }
+            // ablehnen
+            if (entry.contains("5100.90") && !img.contains("031.png")) {
+                img=img+"<img src=\"/layout/icons/icon031.png\">";
+            }
+        }
+        workitem.setItemValue("_img", img);
+        */
+    }
+    
     /**
      * Diese Method prüft die Buchungsperiode auf Plausibilität
      * 
@@ -191,7 +250,7 @@ public class InvoicePlugin extends AbstractPlugin {
             int year = localDate.getYear();
             // build regex....
             String regex = "(" + year + "|" + (year + 1) + "|" + (year - 1) + ")(1[0-2]|0[1-9])";
-            
+
             if (!period.matches(regex)) {
                 // throw a plugin exception - because name is missing!
                 throw new PluginException(InvoicePlugin.class.getName(), ERROR_MISSING_DATA,

workflow/rechnungseingang-de-1.2.18.bpmn

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- origin at X=0.0 Y=0.0 -->
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:ext="http://org.eclipse.bpmn2/ext" xmlns:imixs="http://www.imixs.org/bpmn2" xmlns:xs="http://www.w3.org/2001/XMLSchema" id="Definitions_1" exporter="org.eclipse.bpmn2.modeler.core" exporterVersion="1.5.2.SNAPSHOT-v20200602-1600-B1" targetNamespace="http://www.imixs.org/bpmn2">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:ext="http://org.eclipse.bpmn2/ext" xmlns:imixs="http://www.imixs.org/bpmn2" xmlns:xs="http://www.w3.org/2001/XMLSchema" id="Definitions_1" exporter="org.eclipse.bpmn2.modeler.core" exporterVersion="1.5.3.Final-v20210519-2007-B1" targetNamespace="http://www.imixs.org/bpmn2">
   <bpmn2:extensionElements>
     <imixs:item name="txtworkflowmodelversion" type="xs:string">
       <imixs:value><![CDATA[rechnungseingang-de-1.2]]></imixs:value>
@@ -1079,7 +1079,7 @@ if (workitem['payment.type'][0]!="direct_debit"  && workitem['payment.type'][0]!
           <imixs:value><![CDATA[typcn-download|typcn-tick,imixs-success,icon-sub-ne]]></imixs:value>
         </imixs:item>
         <imixs:item name="txtworkflowsummary" type="xs:string">
-          <imixs:value><![CDATA[<itemvalue>numsequencenumber</itemvalue>: <itemvalue>cdtr.name</itemvalue> <itemvalue>invoice.number</itemvalue> (<itemvalue>invoice.currency</itemvalue> <itemvalue>invoice.total</itemvalue>) <itemvalue>space.name</itemvalue>]]></imixs:value>
+          <imixs:value><![CDATA[<itemvalue>_img</itemvalue><itemvalue>numsequencenumber</itemvalue>: <itemvalue>cdtr.name</itemvalue> <itemvalue>invoice.number</itemvalue> (<itemvalue>invoice.currency</itemvalue> <itemvalue>invoice.total</itemvalue>) <itemvalue>space.name</itemvalue>]]></imixs:value>
         </imixs:item>
         <imixs:item name="keyupdateacl" type="xs:boolean">
           <imixs:value>true</imixs:value>
@@ -1404,7 +1404,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com
           <imixs:value><![CDATA[typcn-download|typcn-info,imixs-info,icon-sub-ne]]></imixs:value>
         </imixs:item>
         <imixs:item name="txtworkflowsummary" type="xs:string">
-          <imixs:value><![CDATA[<itemvalue>numsequencenumber</itemvalue>: <itemvalue>cdtr.name</itemvalue> <itemvalue>invoice.number</itemvalue> (<itemvalue>invoice.currency</itemvalue> <itemvalue>invoice.total</itemvalue>) <itemvalue>space.name</itemvalue>]]></imixs:value>
+          <imixs:value><![CDATA[<itemvalue>_img</itemvalue><itemvalue>numsequencenumber</itemvalue>: <itemvalue>cdtr.name</itemvalue> <itemvalue>invoice.number</itemvalue> (<itemvalue>invoice.currency</itemvalue> <itemvalue>invoice.total</itemvalue>) <itemvalue>space.name</itemvalue>]]></imixs:value>
         </imixs:item>
         <imixs:item name="keyupdateacl" type="xs:boolean">
           <imixs:value>true</imixs:value>
@@ -1815,7 +1815,7 @@ result.isValid=true;
           <imixs:value><![CDATA[typcn-download|typcn-tick,imixs-success,icon-sub-ne]]></imixs:value>
         </imixs:item>
         <imixs:item name="txtworkflowsummary" type="xs:string">
-          <imixs:value><![CDATA[<itemvalue>numsequencenumber</itemvalue>: <itemvalue>cdtr.name</itemvalue> <itemvalue>invoice.number</itemvalue> (<itemvalue>invoice.currency</itemvalue> <itemvalue>invoice.total</itemvalue>) <itemvalue>space.name</itemvalue>]]></imixs:value>
+          <imixs:value><![CDATA[<itemvalue>_img</itemvalue><itemvalue>numsequencenumber</itemvalue>: <itemvalue>cdtr.name</itemvalue> <itemvalue>invoice.number</itemvalue> (<itemvalue>invoice.currency</itemvalue> <itemvalue>invoice.total</itemvalue>) <itemvalue>space.name</itemvalue>]]></imixs:value>
         </imixs:item>
         <imixs:item name="keyupdateacl" type="xs:boolean">
           <imixs:value>true</imixs:value>
@@ -1917,7 +1917,7 @@ result.isValid=true;
           <imixs:value><![CDATA[typcn-download|typcn-tick,imixs-success,icon-sub-ne]]></imixs:value>
         </imixs:item>
         <imixs:item name="txtworkflowsummary" type="xs:string">
-          <imixs:value><![CDATA[<itemvalue>numsequencenumber</itemvalue>: <itemvalue>cdtr.name</itemvalue> <itemvalue>invoice.number</itemvalue> (<itemvalue>invoice.currency</itemvalue> <itemvalue>invoice.total</itemvalue>) <itemvalue>space.name</itemvalue>]]></imixs:value>
+          <imixs:value><![CDATA[<itemvalue>_img</itemvalue><itemvalue>numsequencenumber</itemvalue>: <itemvalue>cdtr.name</itemvalue> <itemvalue>invoice.number</itemvalue> (<itemvalue>invoice.currency</itemvalue> <itemvalue>invoice.total</itemvalue>) <itemvalue>space.name</itemvalue>]]></imixs:value>
         </imixs:item>
         <imixs:item name="keyupdateacl" type="xs:boolean">
           <imixs:value>true</imixs:value>
@@ -3321,7 +3321,7 @@ Betrag: <itemvalue>invoice.total</itemvalue> <itemvalue>invoice.currency</itemva
           <imixs:value><![CDATA[typcn-download]]></imixs:value>
         </imixs:item>
         <imixs:item name="txtworkflowsummary" type="xs:string">
-          <imixs:value><![CDATA[<itemvalue>cdtr.name</itemvalue> <itemvalue>invoice.number</itemvalue> (<itemvalue>invoice.currency</itemvalue> <itemvalue>invoice.total</itemvalue>) <itemvalue>space.name</itemvalue>]]></imixs:value>
+          <imixs:value><![CDATA[<itemvalue>_img</itemvalue><itemvalue>cdtr.name</itemvalue> <itemvalue>invoice.number</itemvalue> (<itemvalue>invoice.currency</itemvalue> <itemvalue>invoice.total</itemvalue>) <itemvalue>space.name</itemvalue>]]></imixs:value>
         </imixs:item>
         <imixs:item name="keyupdateacl" type="xs:boolean">
           <imixs:value>true</imixs:value>
@@ -3593,7 +3593,7 @@ result.isValid=true;
           <imixs:value><![CDATA[typcn-download|typcn-tick,imixs-success,icon-sub-ne]]></imixs:value>
         </imixs:item>
         <imixs:item name="txtworkflowsummary" type="xs:string">
-          <imixs:value><![CDATA[<itemvalue>numsequencenumber</itemvalue>: <itemvalue>cdtr.name</itemvalue> <itemvalue>invoice.number</itemvalue> (<itemvalue>invoice.currency</itemvalue> <itemvalue>invoice.total</itemvalue>) <itemvalue>space.name</itemvalue>]]></imixs:value>
+          <imixs:value><![CDATA[<itemvalue>_img</itemvalue><itemvalue>numsequencenumber</itemvalue>: <itemvalue>cdtr.name</itemvalue> <itemvalue>invoice.number</itemvalue> (<itemvalue>invoice.currency</itemvalue> <itemvalue>invoice.total</itemvalue>) <itemvalue>space.name</itemvalue>]]></imixs:value>
         </imixs:item>
         <imixs:item name="keyupdateacl" type="xs:boolean">
           <imixs:value>true</imixs:value>
@@ -4175,7 +4175,7 @@ result.isValid=true;
         <imixs:item name="txtactivityresult" type="xs:string">
           <imixs:value><![CDATA[<item name="action">home</item>
 <validation name="required">false</validation>
-<item name="_img"><img src="/layout/icons/icon074.png"></item>]]></imixs:value>
+]]></imixs:value>
         </imixs:item>
         <imixs:item name="txtname" type="xs:string">
           <imixs:value><![CDATA[Anweisen]]></imixs:value>
@@ -4587,7 +4587,7 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
         <imixs:item name="txtactivityresult" type="xs:string">
           <imixs:value><![CDATA[<item name="action">home</item>
 <validation name="required">false</validation>
-<item name="_img"><img src="/layout/icons/icon074.png"></item>]]></imixs:value>
+]]></imixs:value>
         </imixs:item>
         <imixs:item name="txtname" type="xs:string">
           <imixs:value><![CDATA[Anweisen]]></imixs:value>
@@ -5424,7 +5424,7 @@ result.isValid=true;
         </imixs:item>
         <imixs:item name="txtactivityresult" type="xs:string">
           <imixs:value><![CDATA[<validation name="required">false</validation>
-<item name="_img"><img src="/layout/icons/icon009.png"></item>]]></imixs:value>
+]]></imixs:value>
         </imixs:item>
         <imixs:item name="txtname" type="xs:string">
           <imixs:value><![CDATA[Anweisen]]></imixs:value>
@@ -5503,7 +5503,7 @@ result.isValid=true;
         </imixs:item>
         <imixs:item name="txtactivityresult" type="xs:string">
           <imixs:value><![CDATA[<validation name="required">false</validation>
-<item name="_img"><img src="/layout/icons/icon009.png"></item>]]></imixs:value>
+]]></imixs:value>
         </imixs:item>
         <imixs:item name="txtname" type="xs:string">
           <imixs:value><![CDATA[Anweisen]]></imixs:value>
@@ -5625,6 +5625,9 @@ result.isValid=true;
         <imixs:item name="txtactivityresult" type="CDATA">
           <imixs:value><![CDATA[]]></imixs:value>
         </imixs:item>
+        <imixs:item name="rtfresultlog" type="CDATA">
+          <imixs:value><![CDATA[Zahlungsavis erstellt]]></imixs:value>
+        </imixs:item>
       </bpmn2:extensionElements>
       <bpmn2:outgoing>SequenceFlow_119</bpmn2:outgoing>
       <bpmn2:dataOutput id="DataOutput_2" name="Signal_1_Output"/>
@@ -6414,13 +6417,13 @@ Export erfolgt über eine asynchrone Verarbeitung im Modell 'cargosoft-export'</
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_IntermediateCatchEvent_62" bpmnElement="IntermediateCatchEvent_57">
         <dc:Bounds height="36.0" width="36.0" x="1729.0" y="1970.0"/>
-        <bpmndi:BPMNLabel id="BPMNLabel_256">
+        <bpmndi:BPMNLabel id="BPMNLabel_256" labelStyle="BPMNLabelStyle_1">
           <dc:Bounds height="14.0" width="73.0" x="1711.0" y="2006.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_ExclusiveGateway_4" bpmnElement="ExclusiveGateway_4" isMarkerVisible="true">
         <dc:Bounds height="50.0" width="50.0" x="545.0" y="1060.0"/>
-        <bpmndi:BPMNLabel id="BPMNLabel_258"/>
+        <bpmndi:BPMNLabel id="BPMNLabel_258" labelStyle="BPMNLabelStyle_1"/>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_0" sourceElement="BPMNShape_StartEvent_1" targetElement="BPMNShape_ExclusiveGateway_1">
         <di:waypoint xsi:type="dc:Point" x="155.0" y="205.0"/>