From aefff75ed6d86fed691eff8144510032fe279644 Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 17:34:02 +0000 Subject: [PATCH 01/50] User: alex deleted process model file manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/submit-new-demand-request-procurement-schema.json --- ...new-demand-request-procurement-schema.json | 79 ------------------- 1 file changed, 79 deletions(-) delete mode 100644 manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/submit-new-demand-request-procurement-schema.json diff --git a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/submit-new-demand-request-procurement-schema.json b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/submit-new-demand-request-procurement-schema.json deleted file mode 100644 index 0227a931..00000000 --- a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/submit-new-demand-request-procurement-schema.json +++ /dev/null @@ -1,79 +0,0 @@ -{ - "title": "Submit New Demand Request-Procurement", - "description": "Submit a new demand request for the procurement of needed items. Does not include Travel or Compensation.", - "properties": { - "requestor": { - "type": "string", - "title": "Requestor" - }, - "project": { - "type": "string", - "title": "Project", - "enum": [ - "Project 1", - "Project 2", - "Project 3" - ] - }, - "category": { - "type": "string", - "title": "Category", - "enum": [ - " Software & Licences", - "Equipment", - "Consulting Fees", - "Other Fees" - ] - }, - "sub-category": { - "type": "string", - "title": "Sub-Category", - "enum": [ - "Licenses", - "Subscriptions", - "Bounties", - "Coworking" - ] - }, - "purpose": { - "type": "string", - "title": "Purpose" - }, - "criticality": { - "type": "string", - "title": " Criticality", - "enum": [ - "High", - "Medium", - "Low" - ] - }, - "vendor": { - "type": "string", - "title": "Vendor" - }, - "period": { - "type": "string", - "title": "Period" - }, - "payment-method": { - "type": "string", - "title": "Payment method", - "enum": [ - "Bank transfer", - "Debit Card", - "Crypto transfer" - ] - }, - "currency": { - "type": "string", - "title": "Currency", - "enum": [ - "USD", - "Euro", - "AUD" - ] - } - }, - "required": [] -} \ No newline at end of file From 3901168f9e25c4bcb9edd9fe31fe981e8f2d1c9c Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 17:34:10 +0000 Subject: [PATCH 02/50] User: alex deleted process model file manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/submit-new-demand-request-procurement-uischema.json --- ...ew-demand-request-procurement-uischema.json | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/submit-new-demand-request-procurement-uischema.json diff --git a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/submit-new-demand-request-procurement-uischema.json b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/submit-new-demand-request-procurement-uischema.json deleted file mode 100644 index 79c55578..00000000 --- a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/submit-new-demand-request-procurement-uischema.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "period": { - "ui:widget": "date", - "ui:placeholder": "Date when the goods/services should be delivered" - }, - "ui:order": [ - "requestor", - "project", - "category", - "sub-category", - "purpose", - "criticality", - "vendor", - "period", - "payment-method", - "currency" - ] -} \ No newline at end of file From fa93dd9552119f67657b05bef82e3e611a556e16 Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 17:34:35 +0000 Subject: [PATCH 03/50] User: alex clicked save for manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/submit-procurement-uischema.json --- .../submit-procurement-uischema.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/submit-procurement-uischema.json b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/submit-procurement-uischema.json index 4ef84426..79c55578 100644 --- a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/submit-procurement-uischema.json +++ b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/submit-procurement-uischema.json @@ -1,4 +1,8 @@ { + "period": { + "ui:widget": "date", + "ui:placeholder": "Date when the goods/services should be delivered" + }, "ui:order": [ "requestor", "project", From 4bd9ea6244e0fe1eac2f9fa1acad8d4781653bf7 Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 17:44:08 +0000 Subject: [PATCH 04/50] User: alex clicked save for manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/demand-request-items-schema.json --- .../demand-request-items-schema.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/demand-request-items-schema.json b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/demand-request-items-schema.json index 2d11ae76..edc02932 100644 --- a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/demand-request-items-schema.json +++ b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/demand-request-items-schema.json @@ -17,6 +17,11 @@ "curr": { "type": "string", "title": "Curr" + "enum": [ + "USD", + "Euro", + "AUD" + ] } }, "required": [] From 8f034f7a9277e5d4015ffc7c7700f27abf833ee2 Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 18:16:24 +0000 Subject: [PATCH 05/50] User: alex added process model file manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/supporting-info-and-files-schema.json --- .../supporting-info-and-files-schema.json | 15 +++++++++++++++ .../supporting-info-and-files-uischema.json | 6 ++++++ 2 files changed, 21 insertions(+) create mode 100644 manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/supporting-info-and-files-schema.json create mode 100644 manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/supporting-info-and-files-uischema.json diff --git a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/supporting-info-and-files-schema.json b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/supporting-info-and-files-schema.json new file mode 100644 index 00000000..72049fd4 --- /dev/null +++ b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/supporting-info-and-files-schema.json @@ -0,0 +1,15 @@ +{ + "title": "Supporting Info and Files", + "description": "Provide any supporting information or files for your request.", + "properties": { + "more-details": { + "type": "string", + "title": "More Details" + }, + "files": { + "type": "string", + "title": "files" + } + }, + "required": [] +} \ No newline at end of file diff --git a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/supporting-info-and-files-uischema.json b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/supporting-info-and-files-uischema.json new file mode 100644 index 00000000..02104d81 --- /dev/null +++ b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/supporting-info-and-files-uischema.json @@ -0,0 +1,6 @@ +{ + "ui:order": [ + "more-details", + "files" + ] +} \ No newline at end of file From 4b9c39d74b863f02ca569f059bc5f301f4802162 Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 18:17:01 +0000 Subject: [PATCH 06/50] User: alex clicked save for manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn --- .../raise-new-demand-request-procurement.bpmn | 1543 +++++++++-------- 1 file changed, 778 insertions(+), 765 deletions(-) diff --git a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn index 889f6c2d..dfa1ec32 100644 --- a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn +++ b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn @@ -106,6 +106,7 @@ Activity_18am0at Activity_000swbl Activity_18a4ocw + Activity_1itequ5 Gateway_078fn3y Event_0xklgk1 Activity_10nldyr @@ -116,7 +117,7 @@ Activity_108eq0l Submit_Validate_New_Demand_Request-Sub_Process Activity_1fz0bsz - Activity_1itequ5 + Activity_18x1o1c @@ -286,8 +287,19 @@ Flow_0ss3jdh + + + + + + + + + Flow_0ss3jdh + Flow_1ypq7k8 + - Flow_1ypq7k8 + Flow_0jhh37r Flow_0pp3u64 Flow_07gw03w @@ -794,40 +806,34 @@ Please ensure that you have enough budget for the demand, and if needed, submit Flow_12bnhp1 Flow_147yu0h - - Flow_0ja4xhr - - - - Flow_05fojyk - - - - Flow_08ncsz1 - - - - Flow_09rjnac - + + Flow_0m2l5ke + Flow_0cxeosr - - Flow_0m2l5ke - + + Flow_09rjnac + - - - - - - - - - Flow_0ss3jdh - Flow_1ypq7k8 + + Flow_08ncsz1 + + + + Flow_05fojyk + + + + Flow_0ja4xhr + + + + + Flow_1ypq7k8 + Flow_0jhh37r Orgdata from BBHR, Categories from a DB, Currencies from Xero @@ -857,34 +863,54 @@ Please ensure that you have enough budget for the demand, and if needed, submit - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + @@ -935,429 +961,6 @@ Please ensure that you have enough budget for the demand, and if needed, submit - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1365,60 +968,486 @@ Please ensure that you have enough budget for the demand, and if needed, submit - - - - - - - - - - - - - - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + @@ -1430,31 +1459,31 @@ Please ensure that you have enough budget for the demand, and if needed, submit - - + + - - + + - + - - - + + + - + - - + + - + @@ -1462,307 +1491,307 @@ Please ensure that you have enough budget for the demand, and if needed, submit - - + + - - + + - + - - + + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - + - - + + - + - - + + - + - - + + - - + + - + - - + + - + - - + + - - + + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - + - - + + - + - - + + - - + + - - - + + + - - + + - - + + - + - - + + - + - - + + - + - - - + + + - + - - - + + + - - - + + + - - - - - + + + + + - - + + - - - - - + + + + + - - + + - - - + + + - - + + - - + + - - + + - + - - - + + + - + - - + + - - + + - - + + @@ -1773,127 +1802,127 @@ Please ensure that you have enough budget for the demand, and if needed, submit - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - + - - + + - + - - + + - - + + - - + + - - + + - + - - + + - + - - - + + + - - + + - - + + - - - - - + + + + + - - + + - + @@ -1903,107 +1932,91 @@ Please ensure that you have enough budget for the demand, and if needed, submit - + - - - - - - - - - - - - - - - - - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + From ca56e6e9ffe09bd914caf056a5083774eacb3a98 Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 18:17:40 +0000 Subject: [PATCH 07/50] User: alex clicked save for manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn --- .../raise-new-demand-request-procurement.bpmn | 146 +++++++++--------- 1 file changed, 76 insertions(+), 70 deletions(-) diff --git a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn index dfa1ec32..793d73ff 100644 --- a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn +++ b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn @@ -832,6 +832,12 @@ Please ensure that you have enough budget for the demand, and if needed, submit + + + + + + Flow_1ypq7k8 Flow_0jhh37r @@ -893,26 +899,6 @@ Please ensure that you have enough budget for the demand, and if needed, submit - - - - - - - - - - - - - - - - - - - - @@ -964,10 +950,13 @@ Please ensure that you have enough budget for the demand, and if needed, submit - - + + + + + @@ -1387,55 +1376,34 @@ Please ensure that you have enough budget for the demand, and if needed, submit - - + + - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - + + + - - - - - + + + - - + + + + + + - + @@ -1444,10 +1412,28 @@ Please ensure that you have enough budget for the demand, and if needed, submit - - + + - + + + + + + + + + + + + + + + + + + + @@ -1934,13 +1920,33 @@ Please ensure that you have enough budget for the demand, and if needed, submit + + + + - - - + + + + + + + + + + + + + + + + + + + From 4437069ada7076a1715fadd8960de70f043f8b1e Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 18:19:35 +0000 Subject: [PATCH 08/50] User: alex clicked save for manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/supporting-info-and-files-uischema.json --- .../supporting-info-and-files-uischema.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/supporting-info-and-files-uischema.json b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/supporting-info-and-files-uischema.json index 02104d81..13b3a95e 100644 --- a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/supporting-info-and-files-uischema.json +++ b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/supporting-info-and-files-uischema.json @@ -1,4 +1,8 @@ { + "more-details": { + "ui:widget": "textarea", + "ui:help": "Enter additional details to support your demand request" + }, "ui:order": [ "more-details", "files" From 01dbae790d04a4060e3cf581b9e26cb559505050 Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 18:21:32 +0000 Subject: [PATCH 09/50] User: alex clicked save for manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/supporting-info-and-files-schema.json --- .../supporting-info-and-files-schema.json | 1 + 1 file changed, 1 insertion(+) diff --git a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/supporting-info-and-files-schema.json b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/supporting-info-and-files-schema.json index 72049fd4..e817a3f4 100644 --- a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/supporting-info-and-files-schema.json +++ b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/supporting-info-and-files-schema.json @@ -8,6 +8,7 @@ }, "files": { "type": "string", + "format": "data-url", "title": "files" } }, From 68b2d7bae3835e60a3422c97c3e6112af06fb458 Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 18:22:31 +0000 Subject: [PATCH 10/50] User: alex clicked save for manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/supporting-info-and-files-uischema.json --- .../supporting-info-and-files-uischema.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/supporting-info-and-files-uischema.json b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/supporting-info-and-files-uischema.json index 13b3a95e..127ac5b3 100644 --- a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/supporting-info-and-files-uischema.json +++ b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/supporting-info-and-files-uischema.json @@ -1,8 +1,8 @@ { - "more-details": { - "ui:widget": "textarea", - "ui:help": "Enter additional details to support your demand request" - }, + "more-details": { + "ui:widget": "textarea", + "ui:help": "Enter additional details to support your demand request" + }, "ui:order": [ "more-details", "files" From 314d1fb0860d0a32d6fae57a612a522b5332d29f Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 18:44:32 +0000 Subject: [PATCH 11/50] User: alex clicked save for manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/demand-request-items-schema.json --- .../demand-request-items-schema.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/demand-request-items-schema.json b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/demand-request-items-schema.json index edc02932..4278829d 100644 --- a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/demand-request-items-schema.json +++ b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/demand-request-items-schema.json @@ -16,7 +16,7 @@ }, "curr": { "type": "string", - "title": "Curr" + "title": "Curr", "enum": [ "USD", "Euro", From 446560817b6020ce36e8279893ffcc0d14856021 Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 19:15:53 +0000 Subject: [PATCH 12/50] User: alex added process model file manage-procurement/procurement/requisition-order-management/raise-new-demand-request/rndr-define_approval_strategy.bpmn --- .../rndr-define_approval_strategy.bpmn | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 manage-procurement/procurement/requisition-order-management/raise-new-demand-request/rndr-define_approval_strategy.bpmn diff --git a/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/rndr-define_approval_strategy.bpmn b/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/rndr-define_approval_strategy.bpmn new file mode 100644 index 00000000..cb1153ed --- /dev/null +++ b/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/rndr-define_approval_strategy.bpmn @@ -0,0 +1,69 @@ + + + + + Flow_0zfse3j + + + Flow_0zfse3j + Flow_093kc2f + + + Flow_1v3yxjj + + + + + Flow_093kc2f + Flow_1v3yxjj + + + + BBHR + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From f0e169df89ce713cccaeec1e04925904e375863a Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 19:17:42 +0000 Subject: [PATCH 13/50] User: alex clicked save for manage-procurement/procurement/requisition-order-management/raise-new-demand-request/rndr-define_approval_strategy.bpmn --- .../rndr-define_approval_strategy.bpmn | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/rndr-define_approval_strategy.bpmn b/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/rndr-define_approval_strategy.bpmn index cb1153ed..3bcb8a04 100644 --- a/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/rndr-define_approval_strategy.bpmn +++ b/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/rndr-define_approval_strategy.bpmn @@ -1,10 +1,18 @@ - + Flow_0zfse3j + + + + + + + + Flow_0zfse3j Flow_093kc2f From d7d9793c2db36440f5eb26b17e7fad573506cff7 Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 19:21:37 +0000 Subject: [PATCH 14/50] User: alex clicked save for manage-procurement/procurement/requisition-order-management/raise-new-demand-request/rndr-define_approval_strategy.bpmn --- .../rndr-define_approval_strategy.bpmn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/rndr-define_approval_strategy.bpmn b/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/rndr-define_approval_strategy.bpmn index 3bcb8a04..8223fbdc 100644 --- a/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/rndr-define_approval_strategy.bpmn +++ b/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/rndr-define_approval_strategy.bpmn @@ -8,8 +8,8 @@ - - + + From b8410e77f56a1e0e17beb061ce3eae5e0044a2f8 Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 19:25:34 +0000 Subject: [PATCH 15/50] User: alex added process model file manage-procurement/procurement/requisition-order-management/raise-new-demand-request/rndr-sme_list.dmn --- .../rndr-sme_list.dmn | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 manage-procurement/procurement/requisition-order-management/raise-new-demand-request/rndr-sme_list.dmn diff --git a/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/rndr-sme_list.dmn b/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/rndr-sme_list.dmn new file mode 100644 index 00000000..dffcbbd4 --- /dev/null +++ b/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/rndr-sme_list.dmn @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + From 96082d9d6b32c6764d0035a3b2e0d021ab80abfb Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 19:26:22 +0000 Subject: [PATCH 16/50] User: alex clicked save for manage-procurement/procurement/requisition-order-management/raise-new-demand-request/rndr-define_approval_strategy.bpmn --- .../rndr-define_approval_strategy.bpmn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/rndr-define_approval_strategy.bpmn b/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/rndr-define_approval_strategy.bpmn index 8223fbdc..d65b9f60 100644 --- a/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/rndr-define_approval_strategy.bpmn +++ b/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/rndr-define_approval_strategy.bpmn @@ -22,6 +22,9 @@ + + RNDR-SME_List + Flow_093kc2f Flow_1v3yxjj From f1d186c4743dc9a9778addc53860ebec90ba562a Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 19:28:58 +0000 Subject: [PATCH 17/50] User: alex clicked save for manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn --- .../raise-new-demand-request-procurement.bpmn | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn index 793d73ff..c509e0be 100644 --- a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn +++ b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn @@ -108,7 +108,6 @@ Activity_18a4ocw Activity_1itequ5 Gateway_078fn3y - Event_0xklgk1 Activity_10nldyr Gateway_1btvqy5 Event_15dhedu @@ -118,6 +117,7 @@ Submit_Validate_New_Demand_Request-Sub_Process Activity_1fz0bsz Activity_18x1o1c + Event_0xklgk1 @@ -187,7 +187,7 @@ - + @@ -271,7 +271,7 @@ Get Form Data Call Activity is used for getting required data for User Tasks. - + **Figma - New Demand request (Procurement) - SUBMIT**, https://www.figma.com/file/9NP2BUoLuwHUCGStvDMgOw/Form?node-id=0%3A1&t=BABeo58RkNviJr4N-0 @@ -408,9 +408,6 @@ Flow_0n4fh0y Flow_1spwsg1 - - Flow_001a5wn - @@ -430,7 +427,8 @@ Flow_0ledpg2 Flow_001a5wn - + + Flow_001a5wn Flow_0vw379z @@ -799,7 +797,6 @@ Please ensure that you have enough budget for the demand, and if needed, submit Milestone - Flow_1n2v5zg Flow_0h80bf3 @@ -841,6 +838,9 @@ Please ensure that you have enough budget for the demand, and if needed, submit Flow_1ypq7k8 Flow_0jhh37r + + Flow_1n2v5zg + Orgdata from BBHR, Categories from a DB, Currencies from Xero @@ -950,6 +950,9 @@ Please ensure that you have enough budget for the demand, and if needed, submit + + + @@ -963,9 +966,6 @@ Please ensure that you have enough budget for the demand, and if needed, submit - - - @@ -1507,7 +1507,7 @@ Please ensure that you have enough budget for the demand, and if needed, submit - + @@ -1904,8 +1904,8 @@ Please ensure that you have enough budget for the demand, and if needed, submit - - + + From 39df01d8586ad1f145b23d95aeba3e8a8c177063 Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 19:56:39 +0000 Subject: [PATCH 18/50] User: admin created process model misc/test/natalia-test --- misc/test/natalia-test/process_model.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 misc/test/natalia-test/process_model.json diff --git a/misc/test/natalia-test/process_model.json b/misc/test/natalia-test/process_model.json new file mode 100644 index 00000000..01436a5a --- /dev/null +++ b/misc/test/natalia-test/process_model.json @@ -0,0 +1,11 @@ +{ + "description": "", + "display_name": "Natalia Test", + "display_order": 0, + "exception_notification_addresses": [], + "fault_or_suspend_on_exception": "fault", + "files": [], + "metadata_extraction_paths": null, + "primary_file_name": null, + "primary_process_id": null +} \ No newline at end of file From c27278af02355bb9f73e8ac696d4bc5dd672b4d4 Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 20:06:55 +0000 Subject: [PATCH 19/50] User: admin created process model misc/test/natalia-test2 --- misc/test/natalia-test2/process_model.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 misc/test/natalia-test2/process_model.json diff --git a/misc/test/natalia-test2/process_model.json b/misc/test/natalia-test2/process_model.json new file mode 100644 index 00000000..14f6d39c --- /dev/null +++ b/misc/test/natalia-test2/process_model.json @@ -0,0 +1,11 @@ +{ + "description": "", + "display_name": "Natalia Test2", + "display_order": 0, + "exception_notification_addresses": [], + "fault_or_suspend_on_exception": "fault", + "files": [], + "metadata_extraction_paths": null, + "primary_file_name": null, + "primary_process_id": null +} \ No newline at end of file From 1d1b041e49d68a411b4ca6cadb2ecdd99b2e1c2b Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 20:08:13 +0000 Subject: [PATCH 20/50] User: alex created process model misc/start-process --- misc/start-process/process_model.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 misc/start-process/process_model.json diff --git a/misc/start-process/process_model.json b/misc/start-process/process_model.json new file mode 100644 index 00000000..a21d92c4 --- /dev/null +++ b/misc/start-process/process_model.json @@ -0,0 +1,11 @@ +{ + "description": "Gather common information at the start of process", + "display_name": "Start Process", + "display_order": 0, + "exception_notification_addresses": [], + "fault_or_suspend_on_exception": "fault", + "files": [], + "metadata_extraction_paths": null, + "primary_file_name": null, + "primary_process_id": null +} \ No newline at end of file From e4a97fb15ee98dcc9f847ef054d681ed1df6d853 Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 20:08:29 +0000 Subject: [PATCH 21/50] User: alex added process model file misc/start-process/start-process.bpmn --- misc/start-process/process_model.json | 4 +- misc/start-process/start-process.bpmn | 62 +++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 misc/start-process/start-process.bpmn diff --git a/misc/start-process/process_model.json b/misc/start-process/process_model.json index a21d92c4..21a50ebc 100644 --- a/misc/start-process/process_model.json +++ b/misc/start-process/process_model.json @@ -6,6 +6,6 @@ "fault_or_suspend_on_exception": "fault", "files": [], "metadata_extraction_paths": null, - "primary_file_name": null, - "primary_process_id": null + "primary_file_name": "start-process.bpmn", + "primary_process_id": "SR-Start_Process" } \ No newline at end of file diff --git a/misc/start-process/start-process.bpmn b/misc/start-process/start-process.bpmn new file mode 100644 index 00000000..f8543bd3 --- /dev/null +++ b/misc/start-process/start-process.bpmn @@ -0,0 +1,62 @@ + + + + + Flow_1u7dtsr + + + + Returns dictionary like: + "process_info": { + "process_instance_id": 96, + "process_model_identifier": "execute-procure-to-pay/cc-invoice-approval-process" + }, + Flow_1u7dtsr + Flow_1m5aamy + # Get Process Info +process_info = get_process_info() + +# Set User Instruction Text +which_user_task = "invoice-approval" + + + Flow_00fd8n9 + + + + + Flow_1m5aamy + Flow_00fd8n9 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From e74e77543d0ffe00bff9c50c84e89e0e8817ab40 Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 20:11:16 +0000 Subject: [PATCH 22/50] User: admin added process model file misc/test/natalia-test2/Testing.bpmn --- misc/test/natalia-test2/Testing.bpmn | 38 ++++++++++++++++++++++ misc/test/natalia-test2/process_model.json | 4 +-- 2 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 misc/test/natalia-test2/Testing.bpmn diff --git a/misc/test/natalia-test2/Testing.bpmn b/misc/test/natalia-test2/Testing.bpmn new file mode 100644 index 00000000..d58b1271 --- /dev/null +++ b/misc/test/natalia-test2/Testing.bpmn @@ -0,0 +1,38 @@ + + + + + Flow_0b8j3o9 + + + + Flow_06juksm + + + + Flow_0b8j3o9 + Flow_06juksm + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/misc/test/natalia-test2/process_model.json b/misc/test/natalia-test2/process_model.json index 14f6d39c..9341764f 100644 --- a/misc/test/natalia-test2/process_model.json +++ b/misc/test/natalia-test2/process_model.json @@ -6,6 +6,6 @@ "fault_or_suspend_on_exception": "fault", "files": [], "metadata_extraction_paths": null, - "primary_file_name": null, - "primary_process_id": null + "primary_file_name": "Testing.bpmn", + "primary_process_id": "Process_lay4fq7" } \ No newline at end of file From 0ff1fb41c43198d5f2cca50a29dd80a5cd0064fd Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 20:17:09 +0000 Subject: [PATCH 23/50] User: admin added process model file misc/test/natalia-test2/1.bpmn --- misc/test/natalia-test2/1.bpmn | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 misc/test/natalia-test2/1.bpmn diff --git a/misc/test/natalia-test2/1.bpmn b/misc/test/natalia-test2/1.bpmn new file mode 100644 index 00000000..cc4dcbd2 --- /dev/null +++ b/misc/test/natalia-test2/1.bpmn @@ -0,0 +1,13 @@ + + + + + + + + + + + + + From 5f2eddc62855b03d4bfce21da0fd8957104e445e Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 20:17:16 +0000 Subject: [PATCH 24/50] User: admin updated process model misc/test/natalia-test2 --- misc/test/natalia-test2/process_model.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/test/natalia-test2/process_model.json b/misc/test/natalia-test2/process_model.json index 9341764f..ce74a6d6 100644 --- a/misc/test/natalia-test2/process_model.json +++ b/misc/test/natalia-test2/process_model.json @@ -6,6 +6,6 @@ "fault_or_suspend_on_exception": "fault", "files": [], "metadata_extraction_paths": null, - "primary_file_name": "Testing.bpmn", + "primary_file_name": "1.bpmn", "primary_process_id": "Process_lay4fq7" } \ No newline at end of file From f77bdc67b24c6e0fae3b96d82180f6dd661e0472 Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 20:17:21 +0000 Subject: [PATCH 25/50] User: admin deleted process model file misc/test/natalia-test2/Testing.bpmn --- misc/test/natalia-test2/Testing.bpmn | 38 ---------------------------- 1 file changed, 38 deletions(-) delete mode 100644 misc/test/natalia-test2/Testing.bpmn diff --git a/misc/test/natalia-test2/Testing.bpmn b/misc/test/natalia-test2/Testing.bpmn deleted file mode 100644 index d58b1271..00000000 --- a/misc/test/natalia-test2/Testing.bpmn +++ /dev/null @@ -1,38 +0,0 @@ - - - - - Flow_0b8j3o9 - - - - Flow_06juksm - - - - Flow_0b8j3o9 - Flow_06juksm - - - - - - - - - - - - - - - - - - - - - - - - From 179039f2aa19711ae66f975ea5094e535f76dcb2 Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 20:18:15 +0000 Subject: [PATCH 26/50] User: alex clicked save for manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn --- .../raise-new-demand-request-procurement.bpmn | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn index c509e0be..48ac9063 100644 --- a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn +++ b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn @@ -118,6 +118,7 @@ Activity_1fz0bsz Activity_18x1o1c Event_0xklgk1 + Activity_0j02is0 @@ -126,8 +127,8 @@ Flow_0l3u381 - Flow_0mbb848 Flow_1a7xig3 + Flow_0d39lby Flow_1lfn8yz @@ -170,7 +171,7 @@ Flow_1c8vykc Flow_0xnbnkt - + @@ -841,6 +842,11 @@ Please ensure that you have enough budget for the demand, and if needed, submit Flow_1n2v5zg + + + Flow_0mbb848 + Flow_0d39lby + Orgdata from BBHR, Categories from a DB, Currencies from Xero @@ -950,8 +956,8 @@ Please ensure that you have enough budget for the demand, and if needed, submit - - + + @@ -1376,6 +1382,9 @@ Please ensure that you have enough budget for the demand, and if needed, submit + + + @@ -1438,7 +1447,7 @@ Please ensure that you have enough budget for the demand, and if needed, submit - + @@ -1948,6 +1957,10 @@ Please ensure that you have enough budget for the demand, and if needed, submit + + + + From da0209d527b0a761f075f3e50acab270b79ece40 Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 20:19:06 +0000 Subject: [PATCH 27/50] User: kb created process model site-administration/testing --- site-administration/testing/process_model.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 site-administration/testing/process_model.json diff --git a/site-administration/testing/process_model.json b/site-administration/testing/process_model.json new file mode 100644 index 00000000..5d39ffbf --- /dev/null +++ b/site-administration/testing/process_model.json @@ -0,0 +1,11 @@ +{ + "description": "", + "display_name": "testing", + "display_order": 0, + "exception_notification_addresses": [], + "fault_or_suspend_on_exception": "fault", + "files": [], + "metadata_extraction_paths": null, + "primary_file_name": null, + "primary_process_id": null +} \ No newline at end of file From 0bb8be20e8689ebdf392932f245fe3dee403305e Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 20:19:22 +0000 Subject: [PATCH 28/50] User: kb added process model file site-administration/testing/a.bpmn --- site-administration/testing/a.bpmn | 38 +++++++++++++++++++ .../testing/process_model.json | 4 +- 2 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 site-administration/testing/a.bpmn diff --git a/site-administration/testing/a.bpmn b/site-administration/testing/a.bpmn new file mode 100644 index 00000000..03253cf0 --- /dev/null +++ b/site-administration/testing/a.bpmn @@ -0,0 +1,38 @@ + + + + + Flow_1x2zlxe + + + Flow_1x2zlxe + Flow_0ww15ns + + + + Flow_0ww15ns + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/site-administration/testing/process_model.json b/site-administration/testing/process_model.json index 5d39ffbf..f54f91f1 100644 --- a/site-administration/testing/process_model.json +++ b/site-administration/testing/process_model.json @@ -6,6 +6,6 @@ "fault_or_suspend_on_exception": "fault", "files": [], "metadata_extraction_paths": null, - "primary_file_name": null, - "primary_process_id": null + "primary_file_name": "a.bpmn", + "primary_process_id": "Process_1g8zid0" } \ No newline at end of file From 03a72831887784752fa7cc3b52ece8ef1f298d18 Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 20:19:27 +0000 Subject: [PATCH 29/50] User: alex clicked save for manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn --- .../raise-new-demand-request-procurement.bpmn | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn index 48ac9063..b645a775 100644 --- a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn +++ b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn @@ -102,7 +102,6 @@ StartEvent_1 - Gateway_17sf14l Activity_18am0at Activity_000swbl Activity_18a4ocw @@ -119,18 +118,13 @@ Activity_18x1o1c Event_0xklgk1 Activity_0j02is0 + Gateway_17sf14l This is the documentation of the Start Event for this process model. Flow_0mbb848 - - Flow_0l3u381 - Flow_1a7xig3 - Flow_0d39lby - Flow_1lfn8yz - Data Object metadata - tbd @@ -847,6 +841,12 @@ Please ensure that you have enough budget for the demand, and if needed, submit Flow_0mbb848 Flow_0d39lby + + Flow_0l3u381 + Flow_1a7xig3 + Flow_0d39lby + Flow_1lfn8yz + Orgdata from BBHR, Categories from a DB, Currencies from Xero @@ -911,9 +911,6 @@ Please ensure that you have enough budget for the demand, and if needed, submit - - - @@ -957,7 +954,10 @@ Please ensure that you have enough budget for the demand, and if needed, submit - + + + + @@ -1447,10 +1447,10 @@ Please ensure that you have enough budget for the demand, and if needed, submit - + - + @@ -1475,8 +1475,8 @@ Please ensure that you have enough budget for the demand, and if needed, submit - - + + @@ -1918,8 +1918,8 @@ Please ensure that you have enough budget for the demand, and if needed, submit - - + + @@ -1933,6 +1933,10 @@ Please ensure that you have enough budget for the demand, and if needed, submit + + + + @@ -1957,10 +1961,6 @@ Please ensure that you have enough budget for the demand, and if needed, submit - - - - From 09f4c17656b7b9385047b4c161e7701f0c9cc45b Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 20:27:43 +0000 Subject: [PATCH 30/50] User: alex created process model misc/user-info --- misc/user-info/process_model.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 misc/user-info/process_model.json diff --git a/misc/user-info/process_model.json b/misc/user-info/process_model.json new file mode 100644 index 00000000..faacfe72 --- /dev/null +++ b/misc/user-info/process_model.json @@ -0,0 +1,11 @@ +{ + "description": "Assemble basic user information from Bamboo and if applicable, other sources", + "display_name": "User Info", + "display_order": 0, + "exception_notification_addresses": [], + "fault_or_suspend_on_exception": "fault", + "files": [], + "metadata_extraction_paths": null, + "primary_file_name": null, + "primary_process_id": null +} \ No newline at end of file From a88ab05a41365dde5e96df5883ada2b2f9c43152 Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 20:27:55 +0000 Subject: [PATCH 31/50] User: alex added process model file misc/user-info/user-info.bpmn --- misc/user-info/process_model.json | 4 +- misc/user-info/user-info.bpmn | 183 ++++++++++++++++++++++++++++++ 2 files changed, 185 insertions(+), 2 deletions(-) create mode 100644 misc/user-info/user-info.bpmn diff --git a/misc/user-info/process_model.json b/misc/user-info/process_model.json index faacfe72..1532430f 100644 --- a/misc/user-info/process_model.json +++ b/misc/user-info/process_model.json @@ -6,6 +6,6 @@ "fault_or_suspend_on_exception": "fault", "files": [], "metadata_extraction_paths": null, - "primary_file_name": null, - "primary_process_id": null + "primary_file_name": "user-info.bpmn", + "primary_process_id": "SR-User_Info" } \ No newline at end of file diff --git a/misc/user-info/user-info.bpmn b/misc/user-info/user-info.bpmn new file mode 100644 index 00000000..ec46e3a1 --- /dev/null +++ b/misc/user-info/user-info.bpmn @@ -0,0 +1,183 @@ + + + + + Flow_1q8xtg6 + + + + + user_info + + Flow_1q8xtg6 + Flow_08nmyrt + + + Flow_0pq61y0 + + + + Flow_08nmyrt + Flow_0i96b90 + Flow_0d47w7r + + + + + not(isCurrentUser) + + + Flow_0i96b90 + Flow_020y0gy + # Update Current User Extras +current_user_extras = {} +current_user_extras["bamboo_api_id"] = userBambooId +current_user_extras["full_name"] = userFullName +current_user_extras["first_name"] = userFirstName +current_user_extras["email"] = userEmail +current_user_extras["time_zone"] = userTimeZone +current_user_extras["date_format"] = userDateFormat +current_user_extras["time_format"] = userTimeFormat +current_user_extras["status_key"] = userStatusKey + +del(userFullName) +del (userFirstName) +del(userEmail) +del(userTimeZone) +del(userStatusKey) +del(userBambooId) +del(userDateFormat) +del(userTimeFormat) + + + + + + + + + + + Flow_020y0gy + Flow_009u4d4 + + + + Flow_0d47w7r + Flow_18ri6tq + Flow_1gd83n0 + + + + + Flow_009u4d4 + Flow_18ri6tq + # Add Bamboo Info to Extras +current_user_extras["bamboo_supervisor_api_id"] = resp_BambooUserInfo["supervisorEid"] +current_user_extras["bamboo_supervisor_email"] = userBambooId = resp_BambooUserInfo["supervisorEmail"] +current_user_extras["bamboo_supervisor_status_id"] = userBambooId = resp_BambooUserInfo["supervisorId"] + + + + + User_Info_Group-Finance + + Flow_1gd83n0 + Flow_1nghnfw + + + + + User_Info_Group-New_Talent + + Flow_1nghnfw + Flow_0pq61y0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 3896c47a351a7597a915e567a34efbeba96974eb Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 20:32:06 +0000 Subject: [PATCH 32/50] User: alex added process model file misc/user-info/user-info.dmn --- misc/test/natalia-test2/A.4.3.bpmn | 54 +++++ misc/user-info/user-info.dmn | 326 +++++++++++++++++++++++++++++ 2 files changed, 380 insertions(+) create mode 100644 misc/test/natalia-test2/A.4.3.bpmn create mode 100644 misc/user-info/user-info.dmn diff --git a/misc/test/natalia-test2/A.4.3.bpmn b/misc/test/natalia-test2/A.4.3.bpmn new file mode 100644 index 00000000..45bad590 --- /dev/null +++ b/misc/test/natalia-test2/A.4.3.bpmn @@ -0,0 +1,54 @@ + + + + + + + + + + Flow_07a55w5 + + + + Flow_07a55w5 + Flow_18acpea + + + Flow_18acpea + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/misc/user-info/user-info.dmn b/misc/user-info/user-info.dmn new file mode 100644 index 00000000..739037c8 --- /dev/null +++ b/misc/user-info/user-info.dmn @@ -0,0 +1,326 @@ + + + + + + + find_user + + + + + + + + + + + + Alex + + "alex" + + + 111 + + + "Alex Herron" + + + "Alex" + + + "alex@sartography.com" + + + "US/Eastern" + + + "MDY" + + + "24" + + + "0x04622cf750e9f79e60546258bebd4be274f75720b16862bb0c496aaeab746b6fbe897f956b2b08152bc3def5297bed95986a5211ae1a34491d35f51f69713cbf9d" + + + + Natalie + + "natalia" + + + 115 + + + "Natalia Forminykh" + + + "Natalia" + + + "natalie@sartography.com" + + + "US/Eastern" + + + "MDY" + + + "24" + + + "0x04cf9f835bfb5f5b94b4c6f36378fd14bde09960a4d021928981125d314fa423fa79cde37003b9c6135b52dc20734590dcac5a68b73af74d58060628b2c531faf1" + + + + zQ3shjbmAQ8QsCwBTPGumhzzBM1iKs29VuHojm2z4EF8yYGCZ + + "harmeet" + + + 109 + + + "Harmeet Singh" + + + "Harmeet" + + + "harmeet@status.im" + + + "Australia/Sydney" + + + "DMY" + + + "48" + + + "0x04622cf750e9f79e60546258bebd4be274f75720b16862bb0c496aaeab746b6fbe897f956b2b08152bc3def5297bed95986a5211ae1a34491d35f51f69713cbf9d" + + + + 0x04eac0dfbdb475e903e816f1ab9b193f0dd0c404226923c7035cee08f39d6730ffda5c4fc7c8f515a5e08ed9c31a88a1d1039defb72a3cbd2b93935f00f261b144 + + "manuchehr" + + + 110 + + + "Manuchehr Ebrahimi" + + + "Manuchehr" + + + "manuchehr@status.im" + + + "Europe/Stockholm" + + + "DMY" + + + "48" + + + "0x04622cf750e9f79e60546258bebd4be274f75720b16862bb0c496aaeab746b6fbe897f956b2b08152bc3def5297bed95986a5211ae1a34491d35f51f69713cbf9d" + + + + zQ3shwDqFxGXHvbCeQxTURrtSTCH4UtPHaEDu5LgNMpsjtqdF + + "sasha" + + + 112 + + + "Sasha Yarokhovich" + + + "Sasha" + + + "sasha@status.im" + + + "Asia/Dubai" + + + "DMY" + + + "48" + + + "zQ3shwDqFxGXHvbCeQxTURrtSTCH4UtPHaEDu5LgNMpsjtqdF" + + + + + "dan" + + + 109 + + + "Dan Funk" + + + "Dan" + + + "dan@sartography.com" + + + "US/Eastern" + + + "MDY" + + + "24" + + + "0x0446110e95957e47ae83eac486951502a1fc3f217477268dc1855bab58394cda27762d6e74df882c497c67e0ea8e65bf7f890443967815c6c988dde37762cd8a22" + + + + 0x048736f0d79be71d64b364d7172691a1053ef882017f02657bc2131c40a9e2e32cb87d35930a7410dada1818e2165f4bce671b805d08247de6333206dabab0aaee + + "core" + + + 113 + + + "Core Contributor" + + + "Core" + + + "core@status.im" + + + "Australia/Sydney" + + + "DMY" + + + "48" + + + "0x04622cf750e9f79e60546258bebd4be274f75720b16862bb0c496aaeab746b6fbe897f956b2b08152bc3def5297bed95986a5211ae1a34491d35f51f69713cbf9d" + + + + 0x04c3e87c880510000f3be0152905ab11c6e5c899fd580f4c76fc050a2d99cd2a9f034eafdde7385a31b2aee790bd67d7668dba17d6f282c8c5592488f4f4c4fe33 + + "fin" + + + 118 + + + "Finance Member" + + + "Finance" + + + "finance@status.im" + + + "Asia/Dubai" + + + "DMY" + + + "48" + + + "0x04622cf750e9f79e60546258bebd4be274f75720b16862bb0c496aaeab746b6fbe897f956b2b08152bc3def5297bed95986a5211ae1a34491d35f51f69713cbf9d" + + + + 0x04eac0dfbdb475e903e816f1ab9b193f0dd0c404226923c7035cee08f39d6730ffda5c4fc7c8f515a5e08ed9c31a88a1d1039defb72a3cbd2b93935f00f261b144 + + "lead" + + + 114 + + + "Project Lead" + + + "Lead" + + + "lead@status.im" + + + "Europe/Stockholm" + + + "DMY" + + + "48" + + + "0x04622cf750e9f79e60546258bebd4be274f75720b16862bb0c496aaeab746b6fbe897f956b2b08152bc3def5297bed95986a5211ae1a34491d35f51f69713cbf9d" + + + + Not Found + + + + + 109 + + + "not found" + + + "not found" + + + "not found" + + + "not found" + + + "not found" + + + "not found" + + + "not found" + + + + + + + + + + + + From c8f74fa58634b0f61b7517446502e28c5c7fbd86 Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 20:32:21 +0000 Subject: [PATCH 33/50] User: admin added process model file misc/test/natalia-test2/2.bpmn --- misc/test/natalia-test2/2.bpmn | 38 ++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 misc/test/natalia-test2/2.bpmn diff --git a/misc/test/natalia-test2/2.bpmn b/misc/test/natalia-test2/2.bpmn new file mode 100644 index 00000000..1dce4f82 --- /dev/null +++ b/misc/test/natalia-test2/2.bpmn @@ -0,0 +1,38 @@ + + + + + Flow_0sjdt4n + + + + Flow_02r6v10 + + + + Flow_0sjdt4n + Flow_02r6v10 + + + + + + + + + + + + + + + + + + + + + + + + From f16671b62e6aa24bc2abef9b3f7b075accec0503 Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 20:33:18 +0000 Subject: [PATCH 34/50] User: alex clicked save for misc/user-info/user-info.bpmn --- misc/user-info/user-info.bpmn | 42 +++++------------------------------ 1 file changed, 6 insertions(+), 36 deletions(-) diff --git a/misc/user-info/user-info.bpmn b/misc/user-info/user-info.bpmn index ec46e3a1..ce8a2873 100644 --- a/misc/user-info/user-info.bpmn +++ b/misc/user-info/user-info.bpmn @@ -7,13 +7,13 @@ - user_info + SR-User_Info Flow_1q8xtg6 Flow_08nmyrt - Flow_0pq61y0 + Flow_1gd83n0 @@ -67,7 +67,7 @@ del(userTimeFormat) Flow_18ri6tq Flow_1gd83n0 - + Flow_009u4d4 @@ -77,22 +77,6 @@ current_user_extras["bamboo_supervisor_api_id"] = resp_BambooUserInfo["superviso current_user_extras["bamboo_supervisor_email"] = userBambooId = resp_BambooUserInfo["supervisorEmail"] current_user_extras["bamboo_supervisor_status_id"] = userBambooId = resp_BambooUserInfo["supervisorId"] - - - - User_Info_Group-Finance - - Flow_1gd83n0 - Flow_1nghnfw - - - - - User_Info_Group-New_Talent - - Flow_1nghnfw - Flow_0pq61y0 - @@ -102,9 +86,6 @@ current_user_extras["bamboo_supervisor_status_id"] = userBambooId = resp_BambooU - - - @@ -124,11 +105,8 @@ current_user_extras["bamboo_supervisor_status_id"] = userBambooId = resp_BambooU - - - - - + + @@ -164,20 +142,12 @@ current_user_extras["bamboo_supervisor_status_id"] = userBambooId = resp_BambooU - + - - - - - - - - From 603a8eba0a18ac4d0dff9188f446ae789c6e65ba Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 20:34:44 +0000 Subject: [PATCH 35/50] User: admin added process model file misc/test/natalia-test2/2.bpmn --- misc/test/natalia-test2/2.bpmn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/test/natalia-test2/2.bpmn b/misc/test/natalia-test2/2.bpmn index 1dce4f82..b5687a9a 100644 --- a/misc/test/natalia-test2/2.bpmn +++ b/misc/test/natalia-test2/2.bpmn @@ -1,6 +1,6 @@ - + Flow_0sjdt4n From 5930a61d581da4bb2f6364599420956eed26390f Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 20:35:37 +0000 Subject: [PATCH 36/50] User: admin deleted process model file misc/test/natalia-test2/2.bpmn --- misc/test/natalia-test2/2.bpmn | 38 ---------------------------------- 1 file changed, 38 deletions(-) delete mode 100644 misc/test/natalia-test2/2.bpmn diff --git a/misc/test/natalia-test2/2.bpmn b/misc/test/natalia-test2/2.bpmn deleted file mode 100644 index b5687a9a..00000000 --- a/misc/test/natalia-test2/2.bpmn +++ /dev/null @@ -1,38 +0,0 @@ - - - - - Flow_0sjdt4n - - - - Flow_02r6v10 - - - - Flow_0sjdt4n - Flow_02r6v10 - - - - - - - - - - - - - - - - - - - - - - - - From f57fdd660911d1f97f4bfd9a265faf740d714ff5 Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 20:35:41 +0000 Subject: [PATCH 37/50] User: admin added process model file misc/test/natalia-test2/2.bpmn --- misc/test/natalia-test2/2.bpmn | 38 ++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 misc/test/natalia-test2/2.bpmn diff --git a/misc/test/natalia-test2/2.bpmn b/misc/test/natalia-test2/2.bpmn new file mode 100644 index 00000000..b5687a9a --- /dev/null +++ b/misc/test/natalia-test2/2.bpmn @@ -0,0 +1,38 @@ + + + + + Flow_0sjdt4n + + + + Flow_02r6v10 + + + + Flow_0sjdt4n + Flow_02r6v10 + + + + + + + + + + + + + + + + + + + + + + + + From 67359de911aed90ad35a3e98998781b65fd9a8e3 Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 20:53:36 +0000 Subject: [PATCH 38/50] User: alex clicked save for manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn --- .../raise-new-demand-request-procurement.bpmn | 83 ++++++++----------- 1 file changed, 34 insertions(+), 49 deletions(-) diff --git a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn index b645a775..ae4cffa1 100644 --- a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn +++ b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn @@ -110,15 +110,15 @@ Activity_10nldyr Gateway_1btvqy5 Event_15dhedu - Activity_0tt12kf Gateway_0tlgsqb - Activity_108eq0l Submit_Validate_New_Demand_Request-Sub_Process Activity_1fz0bsz Activity_18x1o1c - Event_0xklgk1 Activity_0j02is0 Gateway_17sf14l + Activity_108eq0l + Activity_0tt12kf + Event_0xklgk1 @@ -178,11 +178,9 @@ - - @@ -266,7 +264,6 @@ Get Form Data Call Activity is used for getting required data for User Tasks. - **Figma - New Demand request (Procurement) - SUBMIT**, https://www.figma.com/file/9NP2BUoLuwHUCGStvDMgOw/Form?node-id=0%3A1&t=BABeo58RkNviJr4N-0 @@ -420,25 +417,12 @@ Flow_0ledpg2 - Flow_001a5wn + Flow_1ca1pnj - - Flow_001a5wn - Flow_0vw379z - - Flow_0vw379z Flow_0ja4xhr Flow_1o4dqco - - To send message through Waku. Message - https://www.notion.so/Processes-WIP-bf288f19f8ff454699e2f1cc83ad7abe?p=9891dc90f4424a0ebd3407db1991c203&pm=s - Flow_1o4dqco - Flow_1n2v5zg - - DataObjectReference_1aq4lbg - - Message - https://www.notion.so/Processes-WIP-bf288f19f8ff454699e2f1cc83ad7abe?p=9891dc90f4424a0ebd3407db1991c203&pm=s Flow_147yu0h @@ -833,9 +817,6 @@ Please ensure that you have enough budget for the demand, and if needed, submit Flow_1ypq7k8 Flow_0jhh37r - - Flow_1n2v5zg - Flow_0mbb848 @@ -847,6 +828,18 @@ Please ensure that you have enough budget for the demand, and if needed, submit Flow_0d39lby Flow_1lfn8yz + + To send message through Waku. Message - https://www.notion.so/Processes-WIP-bf288f19f8ff454699e2f1cc83ad7abe?p=9891dc90f4424a0ebd3407db1991c203&pm=s + Flow_1o4dqco + + DataObjectReference_1aq4lbg + + + + + Flow_1ca1pnj + + Orgdata from BBHR, Categories from a DB, Currencies from Xero @@ -953,11 +946,16 @@ Please ensure that you have enough budget for the demand, and if needed, submit - - + + + - - + + + + + + @@ -987,17 +985,9 @@ Please ensure that you have enough budget for the demand, and if needed, submit - - - - - - - - @@ -1382,8 +1372,11 @@ Please ensure that you have enough budget for the demand, and if needed, submit - - + + + + + @@ -1496,10 +1489,6 @@ Please ensure that you have enough budget for the demand, and if needed, submit - - - - @@ -1514,10 +1503,6 @@ Please ensure that you have enough budget for the demand, and if needed, submit - - - - @@ -1912,10 +1897,6 @@ Please ensure that you have enough budget for the demand, and if needed, submit - - - - @@ -1961,6 +1942,10 @@ Please ensure that you have enough budget for the demand, and if needed, submit + + + + From 25736095f439fcdfd102d74ae58cade6cea2f6b4 Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 20:53:46 +0000 Subject: [PATCH 39/50] User: alex clicked save for manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn --- .../raise-new-demand-request-procurement.bpmn | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn index ae4cffa1..80fb67b5 100644 --- a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn +++ b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn @@ -99,6 +99,7 @@ Event_0daj31x Event_1si6b3g Event_06bnz9o + Activity_0tt12kf StartEvent_1 @@ -117,7 +118,6 @@ Activity_0j02is0 Gateway_17sf14l Activity_108eq0l - Activity_0tt12kf Event_0xklgk1 @@ -835,11 +835,11 @@ Please ensure that you have enough budget for the demand, and if needed, submit DataObjectReference_1aq4lbg - Flow_1ca1pnj + Orgdata from BBHR, Categories from a DB, Currencies from Xero @@ -950,13 +950,13 @@ Please ensure that you have enough budget for the demand, and if needed, submit - - - - + + + + From 38271351b3b7427d2be40b8f6d71af3bccefb18a Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 20:58:22 +0000 Subject: [PATCH 40/50] User: alex clicked save for misc/start-process/start-process.bpmn --- misc/start-process/start-process.bpmn | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/misc/start-process/start-process.bpmn b/misc/start-process/start-process.bpmn index f8543bd3..1b195b7c 100644 --- a/misc/start-process/start-process.bpmn +++ b/misc/start-process/start-process.bpmn @@ -1,5 +1,5 @@ - + Flow_1u7dtsr @@ -25,6 +25,9 @@ which_user_task = "invoice-approval" + + find_user = current_user["user_name"] + Flow_1m5aamy Flow_00fd8n9 From a933db1a30a7b9d1bb3a0c2dd13710b321e9018b Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 21:01:39 +0000 Subject: [PATCH 41/50] User: alex clicked save for manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn --- .../raise-new-demand-request-procurement.bpmn | 55 +++++++------------ 1 file changed, 21 insertions(+), 34 deletions(-) diff --git a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn index 80fb67b5..87df4ac6 100644 --- a/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn +++ b/manage-procurement/procurement/requisition-order-management/new-demand-requests/new-demand-request-procurement/raise-new-demand-request-procurement.bpmn @@ -115,7 +115,6 @@ Submit_Validate_New_Demand_Request-Sub_Process Activity_1fz0bsz Activity_18x1o1c - Activity_0j02is0 Gateway_17sf14l Activity_108eq0l Event_0xklgk1 @@ -165,7 +164,7 @@ Flow_1c8vykc Flow_0xnbnkt - + @@ -817,15 +816,10 @@ Please ensure that you have enough budget for the demand, and if needed, submit Flow_1ypq7k8 Flow_0jhh37r - - - Flow_0mbb848 - Flow_0d39lby - Flow_0l3u381 Flow_1a7xig3 - Flow_0d39lby + Flow_0mbb848 Flow_1lfn8yz @@ -946,17 +940,6 @@ Please ensure that you have enough budget for the demand, and if needed, submit - - - - - - - - - - - @@ -1372,12 +1355,20 @@ Please ensure that you have enough budget for the demand, and if needed, submit - - - + + + + + + + + + + + @@ -1440,7 +1431,7 @@ Please ensure that you have enough budget for the demand, and if needed, submit - + @@ -1914,9 +1905,9 @@ Please ensure that you have enough budget for the demand, and if needed, submit - - - + + + @@ -1942,18 +1933,10 @@ Please ensure that you have enough budget for the demand, and if needed, submit - - - - - - - - @@ -2022,6 +2005,10 @@ Please ensure that you have enough budget for the demand, and if needed, submit + + + + From 679483fe424bab7ad7a41e783d58c9b3afd5c05a Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 21:02:54 +0000 Subject: [PATCH 42/50] User: alex clicked save for manage-procurement/procurement/requisition-order-management/raise-new-demand-request/raise_new_demand_request-master.bpmn --- .../raise_new_demand_request-master.bpmn | 154 ++++++++++-------- 1 file changed, 83 insertions(+), 71 deletions(-) diff --git a/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/raise_new_demand_request-master.bpmn b/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/raise_new_demand_request-master.bpmn index ed61378f..89816be6 100644 --- a/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/raise_new_demand_request-master.bpmn +++ b/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/raise_new_demand_request-master.bpmn @@ -4,6 +4,25 @@ + + Flow_0z8y9x8 + + + + which_category == "procurement" + + + which_category == "travel" + + + which_category == "compensation" + + + + + + + Flow_0v2e2ml Flow_1mm6uz2 @@ -31,11 +50,8 @@ Flow_1cxxkmt Flow_0498fqn - - Flow_0z8y9x8 - - Flow_0z8y9x8 + Flow_090lxfa Flow_1k3j31g # When available, need to determine if current user is a project lead # Only projec leads have access to Compensation @@ -64,114 +80,110 @@ which_categories_list = [ Flow_1k3j31g Flow_0v2e2ml - - - which_category == "procurement" - - - which_category == "travel" - - - which_category == "compensation" - - - - - - - + + + Flow_0z8y9x8 + Flow_090lxfa + - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + - + - - - + + + - + - - - + + + - + - - - + + + - - + + - - - + + + - - + + + + + + From c739090aa4dd74ae8c090d49975128394f0c96d3 Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 21:03:36 +0000 Subject: [PATCH 43/50] User: alex clicked save for manage-procurement/procurement/requisition-order-management/raise-new-demand-request/raise_new_demand_request-master.bpmn --- .../raise_new_demand_request-master.bpmn | 80 +++++++++---------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/raise_new_demand_request-master.bpmn b/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/raise_new_demand_request-master.bpmn index 89816be6..c5398ec5 100644 --- a/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/raise_new_demand_request-master.bpmn +++ b/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/raise_new_demand_request-master.bpmn @@ -23,33 +23,21 @@ - - Flow_0v2e2ml - Flow_1mm6uz2 - Flow_0s5jvgp - Flow_08x110e - - - Flow_08x110e - Flow_1etakrx + + + Flow_0z8y9x8 + Flow_090lxfa - - Flow_1mm6uz2 - Flow_1n2v07t - - - Flow_0s5jvgp - Flow_1cxxkmt - - - Flow_0498fqn - - - Flow_1etakrx - Flow_1n2v07t - Flow_1cxxkmt - Flow_0498fqn - + + + + + + + + Flow_1k3j31g + Flow_0v2e2ml + Flow_090lxfa Flow_1k3j31g @@ -70,21 +58,33 @@ which_categories_list = [ } ] - - - - - - - - Flow_1k3j31g - Flow_0v2e2ml - - - - Flow_0z8y9x8 - Flow_090lxfa + + Flow_1etakrx + Flow_1n2v07t + Flow_1cxxkmt + Flow_0498fqn + + + Flow_0498fqn + + + Flow_0s5jvgp + Flow_1cxxkmt + + Flow_1mm6uz2 + Flow_1n2v07t + + + Flow_08x110e + Flow_1etakrx + + + Flow_0v2e2ml + Flow_1mm6uz2 + Flow_0s5jvgp + Flow_08x110e + From b25bc39c2c565b786ad4dd2267d891157a605ca7 Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 21:06:52 +0000 Subject: [PATCH 44/50] User: alex clicked save for manage-procurement/procurement/requisition-order-management/raise-new-demand-request/raise_new_demand_request-master.bpmn --- .../raise_new_demand_request-master.bpmn | 54 ++++++++++--------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/raise_new_demand_request-master.bpmn b/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/raise_new_demand_request-master.bpmn index c5398ec5..3f43dc6b 100644 --- a/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/raise_new_demand_request-master.bpmn +++ b/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/raise_new_demand_request-master.bpmn @@ -25,6 +25,10 @@ + + find_user = current_user["username"] +isCurrentUser = True + Flow_0z8y9x8 Flow_090lxfa @@ -95,40 +99,40 @@ which_categories_list = [ - - - - - + + - - + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - + + + + + From aac2486e6ac59eedb078976732451599413a1407 Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 21:07:49 +0000 Subject: [PATCH 45/50] User: alex clicked save for misc/start-process/start-process.bpmn --- misc/start-process/start-process.bpmn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/start-process/start-process.bpmn b/misc/start-process/start-process.bpmn index 1b195b7c..06397aae 100644 --- a/misc/start-process/start-process.bpmn +++ b/misc/start-process/start-process.bpmn @@ -26,7 +26,7 @@ which_user_task = "invoice-approval" - find_user = current_user["user_name"] + Flow_1m5aamy Flow_00fd8n9 From a757aaf863d995971229afb9c8e856e23945e220 Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 21:12:32 +0000 Subject: [PATCH 46/50] User: alex clicked save for misc/user-info/user-info.bpmn --- misc/user-info/user-info.bpmn | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/misc/user-info/user-info.bpmn b/misc/user-info/user-info.bpmn index ce8a2873..d101dd84 100644 --- a/misc/user-info/user-info.bpmn +++ b/misc/user-info/user-info.bpmn @@ -4,12 +4,12 @@ Flow_1q8xtg6 - + SR-User_Info - Flow_1q8xtg6 + Flow_05s4pvl Flow_08nmyrt @@ -77,15 +77,25 @@ current_user_extras["bamboo_supervisor_api_id"] = resp_BambooUserInfo["superviso current_user_extras["bamboo_supervisor_email"] = userBambooId = resp_BambooUserInfo["supervisorEmail"] current_user_extras["bamboo_supervisor_status_id"] = userBambooId = resp_BambooUserInfo["supervisorId"] + + + Flow_1q8xtg6 + Flow_05s4pvl + # If not previously set, set find_user to current_user +try: + find_user +except NameError: + find_user = current_user["username"] + - - - + + + @@ -105,12 +115,15 @@ current_user_extras["bamboo_supervisor_status_id"] = userBambooId = resp_BambooU - - + + + + + - - + + @@ -148,6 +161,10 @@ current_user_extras["bamboo_supervisor_status_id"] = userBambooId = resp_BambooU + + + + From 568e8c8ebda8c28c251c9ab31f166fee3092efdb Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 21:13:16 +0000 Subject: [PATCH 47/50] User: alex clicked save for manage-procurement/procurement/requisition-order-management/raise-new-demand-request/raise_new_demand_request-master.bpmn --- .../raise_new_demand_request-master.bpmn | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/raise_new_demand_request-master.bpmn b/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/raise_new_demand_request-master.bpmn index 3f43dc6b..d8539a26 100644 --- a/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/raise_new_demand_request-master.bpmn +++ b/manage-procurement/procurement/requisition-order-management/raise-new-demand-request/raise_new_demand_request-master.bpmn @@ -26,8 +26,7 @@ - find_user = current_user["username"] -isCurrentUser = True + Flow_0z8y9x8 Flow_090lxfa From 3f3348dd33766c2e9d95e2a71b8e2ea43714b160 Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 21:13:54 +0000 Subject: [PATCH 48/50] User: alex clicked save for misc/user-info/user-info.bpmn --- misc/user-info/user-info.bpmn | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/misc/user-info/user-info.bpmn b/misc/user-info/user-info.bpmn index d101dd84..b3a739f2 100644 --- a/misc/user-info/user-info.bpmn +++ b/misc/user-info/user-info.bpmn @@ -85,11 +85,15 @@ current_user_extras["bamboo_supervisor_status_id"] = userBambooId = resp_BambooU try: find_user except NameError: - find_user = current_user["username"] + find_user = current_user["username"] + isCurrentUser = True + + + @@ -115,9 +119,6 @@ except NameError: - - - From 0d3fecf445f87309c432dd6248bd5dd5b3146cad Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 21:15:47 +0000 Subject: [PATCH 49/50] User: alex clicked save for misc/start-process/start-process.bpmn --- misc/start-process/start-process.bpmn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/start-process/start-process.bpmn b/misc/start-process/start-process.bpmn index 06397aae..1f65436f 100644 --- a/misc/start-process/start-process.bpmn +++ b/misc/start-process/start-process.bpmn @@ -24,7 +24,7 @@ which_user_task = "invoice-approval" - + From b34fcee61a41bb8de7b23bdf6156b9606aca605a Mon Sep 17 00:00:00 2001 From: sartography-automated-committer Date: Thu, 22 Dec 2022 21:28:16 +0000 Subject: [PATCH 50/50] User: alex clicked save for misc/start-process/start-process.bpmn --- misc/start-process/start-process.bpmn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/start-process/start-process.bpmn b/misc/start-process/start-process.bpmn index 1f65436f..72e26b2b 100644 --- a/misc/start-process/start-process.bpmn +++ b/misc/start-process/start-process.bpmn @@ -24,7 +24,7 @@ which_user_task = "invoice-approval" - +