Imixs/office-alexander-logistics
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

udpate

Browse source
This commit is contained in:
Ralph Soika 2020-11-26 16:44:15 +01:00
parent a36b89fe58
commit 7d489518c5
4 changed files with 2738 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/alexander/form_basic.xhtml
View file

@ -23,6 +23,18 @@
</f:subview>
<h:selectOneMenu required="true" value="#{workflowController.workitem.item['payment.type']}" >
<c:forEach items="#{sepaController.dbtrList}" var="dbtr">
<f:selectItem itemLabel="#{dbtr.item['name']}" itemValue="#{dbtr.item['name']}" />
</c:forEach>
<f:selectItem itemLabel="Bankeinzug / Kreditkarte" itemValue="direct_debit" />
</h:selectOneMenu>
<!-- sub forms (optional) -->
<c:forEach items="#{formController.formDefinition.sections}"
var="section">

2683
workflow/rechnungseingang-de-1.0.1-old.bpmn Normal file
View file

File diff suppressed because it is too large Load diff

42
workflow/rechnungseingang-de-1.0.1.bpmn
View file

@ -92,6 +92,7 @@
<bpmn2:flowNodeRef>IntermediateCatchEvent_12</bpmn2:flowNodeRef>
<bpmn2:flowNodeRef>Task_4</bpmn2:flowNodeRef>
<bpmn2:flowNodeRef>IntermediateCatchEvent_14</bpmn2:flowNodeRef>
<bpmn2:flowNodeRef>IntermediateCatchEvent_8</bpmn2:flowNodeRef>
</bpmn2:lane>
<bpmn2:lane id="Lane_6" name="Bereich Manager">
<bpmn2:flowNodeRef>IntermediateCatchEvent_9</bpmn2:flowNodeRef>
@ -632,7 +633,6 @@ result.isValid=true;
<item name="invoice.currency" type="selectOneMenu" required="true" options="EUR;USD" label="Währung:" />
<item name="cdtr.iban" type="text" label="IBAN:" />
<item name="cdtr.bic" type="text" label="BIC:" />
<item name="payment.type" type="selectOneMenu" required="true" options="SEPA|sepa_transfer;Bankeinzug / Kreditkarte|direct_debit" label="Zahlungsart:" />
</imixs-form-section>
@ -1310,7 +1310,7 @@ result.isValid=true;
</bpmn2:intermediateThrowEvent>
<bpmn2:sequenceFlow id="SequenceFlow_17" sourceRef="IntermediateCatchEvent_7" targetRef="IntermediateThrowEvent_4"/>
<bpmn2:sequenceFlow id="SequenceFlow_22" sourceRef="Task_3" targetRef="IntermediateCatchEvent_7"/>
<bpmn2:exclusiveGateway id="ExclusiveGateway_2" gatewayDirection="Diverging">
<bpmn2:exclusiveGateway id="ExclusiveGateway_2" gatewayDirection="Mixed">
<bpmn2:incoming>SequenceFlow_12</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_19</bpmn2:outgoing>
<bpmn2:outgoing>SequenceFlow_25</bpmn2:outgoing>
@ -1323,17 +1323,20 @@ result.isValid=true;
<imixs:item name="keypublicresult" type="xs:string">
<imixs:value><![CDATA[0]]></imixs:value>
</imixs:item>
<imixs:item name="rtfresultlog" type="CDATA">
<imixs:value><![CDATA[SEPA Export gestartet]]></imixs:value>
</imixs:item>
</bpmn2:extensionElements>
<bpmn2:incoming>SequenceFlow_19</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_23</bpmn2:outgoing>
<bpmn2:signalEventDefinition id="SignalEventDefinition_1"/>
</bpmn2:intermediateCatchEvent>
<bpmn2:sequenceFlow id="SequenceFlow_19" name="payment.type = sepa_transfer" sourceRef="ExclusiveGateway_2" targetRef="IntermediateCatchEvent_4">
<bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" id="FormalExpression_1">workitem['payment.type'] &amp;&amp; workitem['payment.type'][0]==&quot;sepa_transfer&quot;</bpmn2:conditionExpression>
<bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" id="FormalExpression_1">workitem['payment.type'] &amp;&amp; workitem['payment.type'][0]!=&quot;direct_debit&quot;</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:sequenceFlow id="SequenceFlow_23" sourceRef="IntermediateCatchEvent_4" targetRef="Task_6"/>
<bpmn2:sequenceFlow id="SequenceFlow_25" sourceRef="ExclusiveGateway_2" targetRef="Task_5">
<bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" id="FormalExpression_3">!workitem['payment.type'] || workitem['payment.type'][0]!=&quot;sepa_transfer&quot;</bpmn2:conditionExpression>
<bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" id="FormalExpression_3">!workitem['payment.type'] || workitem['payment.type'][0]==&quot;direct_debit&quot;</bpmn2:conditionExpression>
</bpmn2:sequenceFlow>
<bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_6" imixs:activityid="990" name="[OCR/ML Import]">
<bpmn2:extensionElements>
@ -1839,6 +1842,7 @@ result.isValid=true;
</bpmn2:extensionElements>
<bpmn2:documentation id="Documentation_7"><![CDATA[<textblock><itemvalue>$workflowgroup</itemvalue> - <itemvalue>$workflowstatus</itemvalue></textblock>]]></bpmn2:documentation>
<bpmn2:incoming>SequenceFlow_23</bpmn2:incoming>
<bpmn2:incoming>SequenceFlow_45</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>
</bpmn2:task>
<bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_14" imixs:activityid="300" name="[Close SEPA]">
@ -1941,6 +1945,7 @@ result.isValid=true;
<bpmn2:documentation id="Documentation_35"><![CDATA[<textblock><itemvalue>$workflowgroup</itemvalue> - <itemvalue>$workflowstatus</itemvalue></textblock>]]></bpmn2:documentation>
<bpmn2:incoming>SequenceFlow_42</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_43</bpmn2:outgoing>
<bpmn2:outgoing>SequenceFlow_27</bpmn2:outgoing>
</bpmn2:task>
<bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_18" imixs:activityid="20" name="Bezahlt">
<bpmn2:extensionElements>
@ -2015,6 +2020,17 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
</bpmn2:intermediateCatchEvent>
<bpmn2:sequenceFlow id="SequenceFlow_43" sourceRef="Task_7" targetRef="IntermediateCatchEvent_18"/>
<bpmn2:sequenceFlow id="SequenceFlow_44" sourceRef="IntermediateCatchEvent_18" targetRef="Task_5"/>
<bpmn2:intermediateCatchEvent id="IntermediateCatchEvent_8" imixs:activityid="50" name="SEPA Export wiederholen">
<bpmn2:extensionElements>
<imixs:item name="rtfresultlog" type="CDATA">
<imixs:value><![CDATA[SEPA Export wiederholt.]]></imixs:value>
</imixs:item>
</bpmn2:extensionElements>
<bpmn2:incoming>SequenceFlow_27</bpmn2:incoming>
<bpmn2:outgoing>SequenceFlow_45</bpmn2:outgoing>
</bpmn2:intermediateCatchEvent>
<bpmn2:sequenceFlow id="SequenceFlow_27" sourceRef="Task_7" targetRef="IntermediateCatchEvent_8"/>
<bpmn2:sequenceFlow id="SequenceFlow_45" sourceRef="IntermediateCatchEvent_8" targetRef="Task_6"/>
<bpmn2:association id="Association_2" sourceRef="DataObject_2" targetRef="Task_2"/>
<bpmn2:textAnnotation id="TextAnnotation_2">
<bpmn2:text>Wurde ein Prozess Manager festgelegt, erfolgt eine Genehmigung.</bpmn2:text>
@ -2352,6 +2368,12 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
<dc:Bounds height="14.0" width="41.0" x="2078.0" y="1187.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_IntermediateCatchEvent_14" bpmnElement="IntermediateCatchEvent_8">
<dc:Bounds height="36.0" width="36.0" x="1828.0" y="1073.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_55">
<dc:Bounds height="28.0" width="77.0" x="1808.0" y="1109.0"/>
</bpmndi:BPMNLabel>
</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"/>
<di:waypoint xsi:type="dc:Point" x="187.0" y="205.0"/>
@ -2675,6 +2697,18 @@ Betrag: <itemvalue>_amount</itemvalue> (Brutto € <itemvalue>_amount_brutto</it
<di:waypoint xsi:type="dc:Point" x="1728.0" y="1257.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_102"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_28" bpmnElement="SequenceFlow_27" sourceElement="BPMNShape_Task_7" targetElement="BPMNShape_IntermediateCatchEvent_14">
<di:waypoint xsi:type="dc:Point" x="1965.0" y="1144.0"/>
<di:waypoint xsi:type="dc:Point" x="1965.0" y="1091.0"/>
<di:waypoint xsi:type="dc:Point" x="1864.0" y="1091.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_56"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_46" bpmnElement="SequenceFlow_45" sourceElement="BPMNShape_IntermediateCatchEvent_14" targetElement="BPMNShape_Task_6">
<di:waypoint xsi:type="dc:Point" x="1828.0" y="1091.0"/>
<di:waypoint xsi:type="dc:Point" x="1728.0" y="1091.0"/>
<di:waypoint xsi:type="dc:Point" x="1728.0" y="1144.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_103"/>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
<bpmndi:BPMNLabelStyle id="BPMNLabelStyle_1">
<dc:Font name="arial" size="9.0"/>

8
workflow/sepa-export-3.0.1.bpmn
View file

@ -154,7 +154,7 @@ Please check the process:
<bpmn2:task id="Task_2" imixs:processid="1600" name="Abgeschlossen">
<bpmn2:extensionElements>
<imixs:item name="txtworkflowsummary" type="xs:string">
<imixs:value><![CDATA[SEPA-Lauf <itemvalue format="EEEE, d. MMMM yyyy" locale="de_DE">$created</itemvalue> (<itemvalue>dbtr.iban</itemvalue> / <itemvalue>dbtr.bic</itemvalue>)]]></imixs:value>
<imixs:value><![CDATA[SEPA-Lauf <itemvalue format="EEEE, d. MMMM yyyy" locale="de_DE">$created</itemvalue> (<itemvalue>payment.type</itemvalue>)]]></imixs:value>
</imixs:item>
<imixs:item name="keyupdateacl" type="xs:boolean">
<imixs:value>true</imixs:value>
@ -256,7 +256,7 @@ Please check the process:
<bpmn2:task id="Task_1" imixs:processid="1000" name="Erstellung">
<bpmn2:extensionElements>
<imixs:item name="txtworkflowsummary" type="xs:string">
<imixs:value><![CDATA[SEPA-Lauf <itemvalue format="EEEE, d. MMMM yyyy" locale="de_DE">$created</itemvalue> (<itemvalue>dbtr.iban</itemvalue> / <itemvalue>dbtr.bic</itemvalue>)]]></imixs:value>
<imixs:value><![CDATA[SEPA-Lauf <itemvalue format="EEEE, d. MMMM yyyy" locale="de_DE">$created</itemvalue> (<itemvalue>payment.type</itemvalue>)]]></imixs:value>
</imixs:item>
<imixs:item name="txteditorid" type="xs:string">
<imixs:value><![CDATA[form_panel#sepa_export]]></imixs:value>
@ -296,7 +296,7 @@ Please check the process:
<bpmn2:task id="Task_6" imixs:processid="1500" name="Fehler">
<bpmn2:extensionElements>
<imixs:item name="txtworkflowsummary" type="xs:string">
<imixs:value><![CDATA[SEPA-Lauf <itemvalue format="EEEE, d. MMMM yyyy" locale="de_DE">$created</itemvalue> (<itemvalue>dbtr.iban</itemvalue> / <itemvalue>dbtr.bic</itemvalue>)]]></imixs:value>
<imixs:value><![CDATA[SEPA-Lauf <itemvalue format="EEEE, d. MMMM yyyy" locale="de_DE">$created</itemvalue> (<itemvalue>payment.type</itemvalue>)]]></imixs:value>
</imixs:item>
<imixs:item name="keyupdateacl" type="xs:boolean">
<imixs:value>true</imixs:value>
@ -340,7 +340,7 @@ Please check the process:
<bpmn2:task id="Task_7" imixs:processid="1100" name="Zahlungslauf Offen">
<bpmn2:extensionElements>
<imixs:item name="txtworkflowsummary" type="xs:string">
<imixs:value><![CDATA[SEPA-Lauf <itemvalue format="EEEE, d. MMMM yyyy" locale="de_DE">$created</itemvalue> (<itemvalue>dbtr.iban</itemvalue> / <itemvalue>dbtr.bic</itemvalue>)]]></imixs:value>
<imixs:value><![CDATA[SEPA-Lauf <itemvalue format="EEEE, d. MMMM yyyy" locale="de_DE">$created</itemvalue> (<itemvalue>payment.type</itemvalue>)]]></imixs:value>
</imixs:item>
<imixs:item name="keyupdateacl" type="xs:boolean">
<imixs:value>true</imixs:value>