From 5c6f48d44c77b9ab85d96deea750e0f37983e713 Mon Sep 17 00:00:00 2001
From: Ralph Soika <ralph.soika@imixs.com>
Date: Thu, 19 Nov 2020 15:03:06 +0100
Subject: [PATCH] update

---
 Dockerfile                              |  2 +-
 README.md                               | 16 +++++++++
 docker-compose.yml                      |  2 +-
 office-alexander-logistics-app/pom.xml  | 46 +++++++++++++++++++++++++
 workflow/posteingang-de-1.0.0.bpmn      | 34 ------------------
 workflow/rechnungseingang-de-1.0.0.bpmn |  4 +++
 6 files changed, 68 insertions(+), 36 deletions(-)
 create mode 100644 README.md

diff --git a/Dockerfile b/Dockerfile
index 83946cb..e28c409 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM imixs/imixs-office-workflow:latest
+FROM imixs/imixs-office-workflow:4.4.0
 
 # Deploy artefact
 RUN rm -r /opt/jboss/wildfly/standalone/deployments/*
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..9691a02
--- /dev/null
+++ b/README.md
@@ -0,0 +1,16 @@
+# Office Alexander-Logistics
+
+	https://alexander-logistics.office-workflow.de
+	
+	https://archive.alexander-logistics.office-workflow.de
+	
+	
+## Build
+
+	$ mvn clean install -Pdocker
+	
+## Push to Ixchel Cloud
+
+	$ mvn clean install -Pkubernetes
+
+	
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 4e69c68..8a27f2a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -56,7 +56,7 @@ services:
     ports:
       - "9998:9998"  
 
-# Gotenberg Servcie (HTML2PDF converter)
+# Gotenberg Service (HTML2PDF converter)
   gotenberg: 
     image: thecodingmachine/gotenberg:6
     ports:
diff --git a/office-alexander-logistics-app/pom.xml b/office-alexander-logistics-app/pom.xml
index da13f76..fc8bbd7 100644
--- a/office-alexander-logistics-app/pom.xml
+++ b/office-alexander-logistics-app/pom.xml
@@ -118,6 +118,52 @@
 				</plugins>
 			</build>
 		</profile>
+		
+		<profile>
+			<id>kubernetes</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<version>1.8</version>
+						<executions>
+							<execution>
+								<phase>install</phase>
+								<configuration>
+									<target>
+										<exec executable="docker">
+											<arg value="build" />
+											<arg value="-t" />
+											<arg
+												value="imixs/${imixs-office.applicationname}:${project.version}" />
+											<arg value="../." />
+										</exec>
+										<exec executable="docker">
+											<arg value="tag" />
+											<arg
+												value="imixs/${imixs-office.applicationname}:${project.version}" />
+											<arg
+												value="${org.imixs.kubernetes.registry}/imixs/${imixs-office.applicationname}:${project.version}" />
+										</exec>
+										<exec executable="docker">
+											<arg value="push" />
+											<arg
+												value="${org.imixs.kubernetes.registry}/imixs/${imixs-office.applicationname}:${project.version}" />
+										</exec>
+									</target>
+								</configuration>
+								<goals>
+									<goal>run</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+
+				</plugins>
+			</build>
+		</profile>
+			
 	</profiles>
 	<build>
 		<plugins>
diff --git a/workflow/posteingang-de-1.0.0.bpmn b/workflow/posteingang-de-1.0.0.bpmn
index 86aa736..32f568b 100644
--- a/workflow/posteingang-de-1.0.0.bpmn
+++ b/workflow/posteingang-de-1.0.0.bpmn
@@ -93,7 +93,6 @@ Possible ImageTypes are:
         <bpmn2:flowNodeRef>StartEvent_1</bpmn2:flowNodeRef>
         <bpmn2:flowNodeRef>IntermediateCatchEvent_8</bpmn2:flowNodeRef>
         <bpmn2:flowNodeRef>EndEvent_1</bpmn2:flowNodeRef>
-        <bpmn2:flowNodeRef>IntermediateCatchEvent_1</bpmn2:flowNodeRef>
       </bpmn2:lane>
     </bpmn2:laneSet>
     <bpmn2:task id="Task_1" imixs:processid="100" name="Erfassung">
@@ -124,7 +123,6 @@ Possible ImageTypes are:
       </bpmn2:extensionElements>
       <bpmn2:documentation id="Documentation_3"><![CDATA[<textblock><itemvalue>$workflowgroup</itemvalue> - <itemvalue>$workflowstatus</itemvalue></textblock>]]></bpmn2:documentation>
       <bpmn2:incoming>SequenceFlow_13</bpmn2:incoming>
-      <bpmn2:incoming>SequenceFlow_26</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
     </bpmn2:task>
     <bpmn2:exclusiveGateway id="ExclusiveGateway_1" gatewayDirection="Diverging">
@@ -1127,26 +1125,6 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
     <bpmn2:sequenceFlow id="SequenceFlow_2" sourceRef="BoundaryEvent_1" targetRef="IntermediateCatchEvent_3"/>
     <bpmn2:sequenceFlow id="SequenceFlow_8" sourceRef="BoundaryEvent_2" targetRef="IntermediateCatchEvent_8"/>
     <bpmn2:sequenceFlow id="SequenceFlow_25" sourceRef="BoundaryEvent_3" targetRef="IntermediateCatchEvent_10"/>
-    <bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_1" imixs:activityid="50" name="XML Test">
-      <bpmn2:extensionElements>
-        <imixs:item name="txtactivityresult" type="CDATA">
-          <imixs:value><![CDATA[ <item name="PDFXMLExtractor">
-    <filename>*.xml</filename>
-    <report>myReport</report>
-</item>]]></imixs:value>
-        </imixs:item>
-      </bpmn2:extensionElements>
-      <bpmn2:outgoing>SequenceFlow_26</bpmn2:outgoing>
-      <bpmn2:dataOutput id="DataOutput_7" name="Signal_7_Output"/>
-      <bpmn2:dataOutputAssociation id="DataOutputAssociation_7">
-        <bpmn2:sourceRef>DataOutput_7</bpmn2:sourceRef>
-      </bpmn2:dataOutputAssociation>
-      <bpmn2:outputSet id="OutputSet_7" name="Output Set 7">
-        <bpmn2:dataOutputRefs>DataOutput_7</bpmn2:dataOutputRefs>
-      </bpmn2:outputSet>
-      <bpmn2:signalEventDefinition id="SignalEventDefinition_7" signalRef="Signal_3"/>
-    </bpmn2:intermediateCatchEvent>
-    <bpmn2:sequenceFlow id="SequenceFlow_26" sourceRef="IntermediateCatchEvent_1" targetRef="Task_1"/>
   </bpmn2:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1" name="Default Collaboration Diagram">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Collaboration_1">
@@ -1308,12 +1286,6 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
           <dc:Bounds height="315.0" width="529.0" x="446.0" y="600.0"/>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_IntermediateCatchEvent_1" bpmnElement="IntermediateCatchEvent_1">
-        <dc:Bounds height="36.0" width="36.0" x="242.0" y="182.0"/>
-        <bpmndi:BPMNLabel id="BPMNLabel_54">
-          <dc:Bounds height="14.0" width="50.0" x="235.0" y="218.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="BPMNShape_ExclusiveGateway_1" targetElement="BPMNShape_IntermediateCatchEvent_2">
         <di:waypoint xsi:type="dc:Point" x="426.0" y="296.0"/>
         <di:waypoint xsi:type="dc:Point" x="426.0" y="188.0"/>
@@ -1467,12 +1439,6 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
         <di:waypoint xsi:type="dc:Point" x="739.0" y="438.0"/>
         <bpmndi:BPMNLabel id="BPMNLabel_52"/>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_26" bpmnElement="SequenceFlow_26" sourceElement="BPMNShape_IntermediateCatchEvent_1" targetElement="BPMNShape_Task_1">
-        <di:waypoint xsi:type="dc:Point" x="278.0" y="200.0"/>
-        <di:waypoint xsi:type="dc:Point" x="296.0" y="200.0"/>
-        <di:waypoint xsi:type="dc:Point" x="296.0" y="296.0"/>
-        <bpmndi:BPMNLabel id="BPMNLabel_55"/>
-      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
     <bpmndi:BPMNLabelStyle id="BPMNLabelStyle_1">
       <dc:Font name="arial" size="9.0"/>
diff --git a/workflow/rechnungseingang-de-1.0.0.bpmn b/workflow/rechnungseingang-de-1.0.0.bpmn
index 4e0f178..226db00 100644
--- a/workflow/rechnungseingang-de-1.0.0.bpmn
+++ b/workflow/rechnungseingang-de-1.0.0.bpmn
@@ -596,6 +596,10 @@ result.isValid=true;
     <item name="cdtr.bic" type="text"  label="BIC:" />
   </imixs-form-section>
  
+  <imixs-form-section columns="1" label="Sonstige Daten">
+    <item name="invoice.currency" type="text"  label="Currency:" />
+    <item name="positionsnummer" type="text"  label="Positionsnummer:" />
+  </imixs-form-section>
 </imixs-form>]]></bpmn2:documentation>
       <bpmn2:dataState id="DataState_1"/>
     </bpmn2:dataObject>