From a49bdc8e3d0e9986242551648a39bf40c20a5a30 Mon Sep 17 00:00:00 2001
From: sartography-automated-committer
 <sartography-automated-committer@users.noreply.github.com>
Date: Mon, 9 Jan 2023 19:59:01 +0000
Subject: [PATCH] User: alex@sartography.com clicked save for
 manage-procurement/procurement/requisition-order-management/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn

---
 .../raise-new-demand-request-procurement.bpmn | 111 ++++++++++++++----
 1 file changed, 85 insertions(+), 26 deletions(-)

diff --git a/manage-procurement/procurement/requisition-order-management/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn b/manage-procurement/procurement/requisition-order-management/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn
index e648d1cc..5763b72d 100644
--- a/manage-procurement/procurement/requisition-order-management/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn
+++ b/manage-procurement/procurement/requisition-order-management/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn
@@ -69,13 +69,13 @@
         <bpmn:flowNodeRef>Gateway_0vdntex</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_0rhqmwe</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_1fsb3by</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Activity_05nr3wb</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Gateway_1je3z9i</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Activity_16i7dp7</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_1sbi4xu</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_1k3zz2f</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_0kh2b9q</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_0eu64qs</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Activity_05nr3wb</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Activity_16i7dp7</bpmn:flowNodeRef>
       </bpmn:lane>
       <bpmn:lane id="Lane_1tozxks" name="Budget Owner">
         <bpmn:flowNodeRef>Event_12tt6fj</bpmn:flowNodeRef>
@@ -519,14 +519,6 @@ review_outcome = None</spiffworkflow:postScript>
     <bpmn:endEvent id="Event_1fsb3by" name="The Request has been Approved">
       <bpmn:incoming>Flow_1naganq</bpmn:incoming>
     </bpmn:endEvent>
-    <bpmn:serviceTask id="Activity_05nr3wb" name="Approved - Send Waku message to CC">
-      <bpmn:documentation>Message - https://www.notion.so/Processes-WIP-bf288f19f8ff454699e2f1cc83ad7abe?p=9891dc90f4424a0ebd3407db1991c203&amp;pm=s</bpmn:documentation>
-      <bpmn:incoming>Flow_1jp7aqy</bpmn:incoming>
-      <bpmn:outgoing>Flow_1naganq</bpmn:outgoing>
-      <bpmn:dataOutputAssociation id="DataOutputAssociation_1u3484a">
-        <bpmn:targetRef>DataObjectReference_0njly5v</bpmn:targetRef>
-      </bpmn:dataOutputAssociation>
-    </bpmn:serviceTask>
     <bpmn:dataObjectReference id="DataObjectReference_0njly5v" name="Message Request Approved" dataObjectRef="message_Request_Approved" />
     <bpmn:dataObjectReference id="DataObjectReference_1ry26yk" name="Message Request Rejected" dataObjectRef="message_Request_Rejected" />
     <bpmn:intermediateThrowEvent id="Event_1eos1zo" name="PeopleOps review">
@@ -540,14 +532,6 @@ review_outcome = None</spiffworkflow:postScript>
       <bpmn:outgoing>Flow_01n63u0</bpmn:outgoing>
       <bpmn:outgoing>Flow_0a5yhak</bpmn:outgoing>
     </bpmn:exclusiveGateway>
-    <bpmn:serviceTask id="Activity_16i7dp7" name="Rejected - Send Waku message to CC">
-      <bpmn:documentation>Message - https://www.notion.so/Processes-WIP-bf288f19f8ff454699e2f1cc83ad7abe?p=9891dc90f4424a0ebd3407db1991c203&amp;pm=s</bpmn:documentation>
-      <bpmn:incoming>Flow_06c3yw6</bpmn:incoming>
-      <bpmn:outgoing>Flow_1v5wz1m</bpmn:outgoing>
-      <bpmn:dataOutputAssociation id="DataOutputAssociation_0f7i6in">
-        <bpmn:targetRef>DataObjectReference_1ry26yk</bpmn:targetRef>
-      </bpmn:dataOutputAssociation>
-    </bpmn:serviceTask>
     <bpmn:endEvent id="Event_1sbi4xu" name="The Request has been Rejected">
       <bpmn:incoming>Flow_1v5wz1m</bpmn:incoming>
     </bpmn:endEvent>
@@ -1521,6 +1505,51 @@ del(userTimeFormat)</spiffworkflow:postScript>
       <bpmn:sequenceFlow id="Flow_1a1po5b" sourceRef="Activity_0s4hexr" targetRef="Event_1oyvg0i" />
     </bpmn:subProcess>
     <bpmn:sequenceFlow id="Flow_0bkcbvp" sourceRef="Activity_0uhfy9l" targetRef="Gateway_05470yw" />
+    <bpmn:subProcess id="Activity_05nr3wb" name="Approved - Send Waku message to CC">
+      <bpmn:documentation>Message - https://www.notion.so/Processes-WIP-bf288f19f8ff454699e2f1cc83ad7abe?p=9891dc90f4424a0ebd3407db1991c203&amp;pm=s</bpmn:documentation>
+      <bpmn:incoming>Flow_1jp7aqy</bpmn:incoming>
+      <bpmn:outgoing>Flow_1naganq</bpmn:outgoing>
+      <bpmn:dataOutputAssociation id="DataOutputAssociation_1u3484a">
+        <bpmn:targetRef>DataObjectReference_0njly5v</bpmn:targetRef>
+      </bpmn:dataOutputAssociation>
+    </bpmn:subProcess>
+    <bpmn:subProcess id="Activity_16i7dp7" name="Rejected - Send Waku message to CC">
+      <bpmn:documentation>Message - https://www.notion.so/Processes-WIP-bf288f19f8ff454699e2f1cc83ad7abe?p=9891dc90f4424a0ebd3407db1991c203&amp;pm=s</bpmn:documentation>
+      <bpmn:incoming>Flow_06c3yw6</bpmn:incoming>
+      <bpmn:outgoing>Flow_1v5wz1m</bpmn:outgoing>
+      <bpmn:dataOutputAssociation id="DataOutputAssociation_0f7i6in">
+        <bpmn:targetRef>DataObjectReference_1ry26yk</bpmn:targetRef>
+      </bpmn:dataOutputAssociation>
+      <bpmn:startEvent id="Event_0daw0d1">
+        <bpmn:outgoing>Flow_0x1ua0q</bpmn:outgoing>
+      </bpmn:startEvent>
+      <bpmn:callActivity id="Activity_1i8fqe0" name="Call Get Waku Message Info" calledElement="Waku_Messages_Message-Raise_New_Demand_Request">
+        <bpmn:extensionElements>
+          <spiffworkflow:preScript>task_id = "waku_request_rejected"</spiffworkflow:preScript>
+        </bpmn:extensionElements>
+        <bpmn:incoming>Flow_0x1ua0q</bpmn:incoming>
+        <bpmn:outgoing>Flow_10y98rz</bpmn:outgoing>
+      </bpmn:callActivity>
+      <bpmn:serviceTask id="Activity_1io54rc" name="Send Waku Message">
+        <bpmn:extensionElements>
+          <spiffworkflow:serviceTaskOperator id="waku/SendMessage" resultVariable="message_Request_Rejected">
+            <spiffworkflow:parameters>
+              <spiffworkflow:parameter id="message" type="str" value="waku_message" />
+              <spiffworkflow:parameter id="message_type" type="str" value="&#34;wakuext_sendOneToOneMessage&#34;" />
+              <spiffworkflow:parameter id="recipient" type="str" value="current_user_extras[&#34;status_key&#34;]" />
+            </spiffworkflow:parameters>
+          </spiffworkflow:serviceTaskOperator>
+        </bpmn:extensionElements>
+        <bpmn:incoming>Flow_10y98rz</bpmn:incoming>
+        <bpmn:outgoing>Flow_1oql80v</bpmn:outgoing>
+      </bpmn:serviceTask>
+      <bpmn:endEvent id="Event_1qrzan1">
+        <bpmn:incoming>Flow_1oql80v</bpmn:incoming>
+      </bpmn:endEvent>
+      <bpmn:sequenceFlow id="Flow_0x1ua0q" sourceRef="Event_0daw0d1" targetRef="Activity_1i8fqe0" />
+      <bpmn:sequenceFlow id="Flow_10y98rz" sourceRef="Activity_1i8fqe0" targetRef="Activity_1io54rc" />
+      <bpmn:sequenceFlow id="Flow_1oql80v" sourceRef="Activity_1io54rc" targetRef="Event_1qrzan1" />
+    </bpmn:subProcess>
     <bpmn:textAnnotation id="TextAnnotation_0zy71k9">
       <bpmn:text>Orgdata from BBHR, Categories from a DB, Currencies from Xero</bpmn:text>
     </bpmn:textAnnotation>
@@ -1717,10 +1746,6 @@ del(userTimeFormat)</spiffworkflow:postScript>
           <dc:Bounds x="3008" y="1376" width="84" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0e58w5l_di" bpmnElement="Activity_05nr3wb">
-        <dc:Bounds x="3070" y="1470" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="DataObjectReference_0njly5v_di" bpmnElement="DataObjectReference_0njly5v">
         <dc:Bounds x="3212" y="1480" width="36" height="50" />
         <bpmndi:BPMNLabel>
@@ -1742,10 +1767,6 @@ del(userTimeFormat)</spiffworkflow:postScript>
       <bpmndi:BPMNShape id="Gateway_1je3z9i_di" bpmnElement="Gateway_1je3z9i" isMarkerVisible="true">
         <dc:Bounds x="3095" y="1675" width="50" height="50" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_0p4lb3w" bpmnElement="Activity_16i7dp7">
-        <dc:Bounds x="3280" y="1660" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_12h4exy_di" bpmnElement="Event_1sbi4xu">
         <dc:Bounds x="3472" y="1682" width="36" height="36" />
         <bpmndi:BPMNLabel>
@@ -2056,6 +2077,12 @@ del(userTimeFormat)</spiffworkflow:postScript>
         <dc:Bounds x="2150" y="910" width="70" height="30" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1jf6lp2_di" bpmnElement="Activity_05nr3wb">
+        <dc:Bounds x="3070" y="1470" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0m1doaa_di" bpmnElement="Activity_16i7dp7">
+        <dc:Bounds x="3280" y="1660" width="100" height="80" />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_095wlf3_di" bpmnElement="Event_06bnz9o">
         <dc:Bounds x="2021" y="1032" width="36" height="36" />
         <bpmndi:BPMNLabel>
@@ -3136,4 +3163,36 @@ del(userTimeFormat)</spiffworkflow:postScript>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_0euu743">
+    <bpmndi:BPMNPlane id="BPMNPlane_0fp7zsc" bpmnElement="Activity_05nr3wb" />
+  </bpmndi:BPMNDiagram>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_0hifmyb">
+    <bpmndi:BPMNPlane id="BPMNPlane_0c1dzdk" bpmnElement="Activity_16i7dp7">
+      <bpmndi:BPMNShape id="BPMNShape_19h2wl0" bpmnElement="Event_0daw0d1">
+        <dc:Bounds x="432" y="262" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_1k50mll" bpmnElement="Activity_1i8fqe0">
+        <dc:Bounds x="530" y="240" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_1rlg9yj" bpmnElement="Activity_1io54rc">
+        <dc:Bounds x="690" y="240" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_1roux27" bpmnElement="Event_1qrzan1">
+        <dc:Bounds x="852" y="262" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_0do0hbp" bpmnElement="Flow_0x1ua0q">
+        <di:waypoint x="468" y="280" />
+        <di:waypoint x="530" y="280" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_1jrug81" bpmnElement="Flow_10y98rz">
+        <di:waypoint x="630" y="280" />
+        <di:waypoint x="690" y="280" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_0ntahyb" bpmnElement="Flow_1oql80v">
+        <di:waypoint x="790" y="280" />
+        <di:waypoint x="852" y="280" />
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
 </bpmn:definitions>