From 3b2c3c0627d1213adf5f82c4d8ef61a545f6bafc Mon Sep 17 00:00:00 2001 From: jasquat Date: Mon, 29 Aug 2022 11:51:54 -0400 Subject: [PATCH] updated models to use spiffworkflow:calledDecision w/ burnettk --- .../process_model_one.bpmn | 31 ++-- acceptance-tests-group-one/process_group.json | 92 +++++++++- .../message-receiver-two/workflow.json | 4 +- category_number_one/process_group.json | 163 +++++++++++++----- category_number_one/workflow_one/sample.bpmn | 4 +- 5 files changed, 234 insertions(+), 60 deletions(-) diff --git a/acceptance-tests-group-one/acceptance-tests-model-1/process_model_one.bpmn b/acceptance-tests-group-one/acceptance-tests-model-1/process_model_one.bpmn index df1bf26b..a29f8c7f 100644 --- a/acceptance-tests-group-one/acceptance-tests-model-1/process_model_one.bpmn +++ b/acceptance-tests-group-one/acceptance-tests-model-1/process_model_one.bpmn @@ -1,5 +1,5 @@ - + Flow_10jwwqy @@ -15,25 +15,16 @@ person = "Kevin" - + + + awesome_decision + Flow_0htxke7 Flow_1hd6o66 - - - - - - - - - - - - @@ -48,6 +39,18 @@ + + + + + + + + + + + + diff --git a/acceptance-tests-group-one/process_group.json b/acceptance-tests-group-one/process_group.json index bb61a2ea..8f627694 100644 --- a/acceptance-tests-group-one/process_group.json +++ b/acceptance-tests-group-one/process_group.json @@ -1,7 +1,93 @@ { - "id": "acceptance-tests-group-one", - "display_order": 2, + "process_models": [ + { + "exception_notification_addresses": [], + "is_master_spec": false, + "standalone": false, + "primary_process_id": "process_model_one", + "library": false, + "display_name": "Acceptance Tests Model 1", + "process_group_id": "acceptance-tests-group-one", + "primary_file_name": "process_model_one.bpmn", + "files": [], + "description": "Acceptance Tests Model 1", + "display_order": 0, + "fault_or_suspend_on_exception": "fault", + "is_review": false, + "libraries": [], + "id": "acceptance-tests-model-1" + }, + { + "exception_notification_addresses": [], + "is_master_spec": false, + "standalone": false, + "primary_process_id": "test_form", + "library": false, + "display_name": "Acceptance Tests Model 2", + "process_group_id": "acceptance-tests-group-one", + "primary_file_name": "test_form.bpmn", + "files": [], + "description": "Acceptance Tests Model 2", + "display_order": 0, + "fault_or_suspend_on_exception": "fault", + "is_review": false, + "libraries": [], + "id": "acceptance-tests-model-2" + }, + { + "exception_notification_addresses": [], + "is_master_spec": false, + "standalone": false, + "primary_process_id": "", + "library": false, + "display_name": "Acceptance Tests Model 3", + "process_group_id": "acceptance-tests-group-one", + "primary_file_name": "", + "files": [], + "description": "Acceptance Tests Model 3", + "display_order": 0, + "fault_or_suspend_on_exception": "fault", + "is_review": false, + "libraries": [], + "id": "acceptance-tests-model-3" + }, + { + "exception_notification_addresses": [], + "is_master_spec": false, + "standalone": false, + "primary_process_id": "", + "library": false, + "display_name": "Acceptance Tests Model 4", + "process_group_id": "acceptance-tests-group-one", + "primary_file_name": "", + "files": [], + "description": "Acceptance Tests Model 4", + "display_order": 0, + "fault_or_suspend_on_exception": "fault", + "is_review": false, + "libraries": [], + "id": "acceptance-tests-model-4" + }, + { + "exception_notification_addresses": [], + "is_master_spec": false, + "standalone": false, + "primary_process_id": "", + "library": false, + "display_name": "Acceptance Tests Model 5", + "process_group_id": "acceptance-tests-group-one", + "primary_file_name": "", + "files": [], + "description": "Acceptance Tests Model 5", + "display_order": 0, + "fault_or_suspend_on_exception": "fault", + "is_review": false, + "libraries": [], + "id": "acceptance-tests-model-5" + } + ], "display_name": "Acceptance Tests Group One", "admin": false, - "process_models": [] + "display_order": 0, + "id": "acceptance-tests-group-one" } \ No newline at end of file diff --git a/category_number_one/message-receiver-two/workflow.json b/category_number_one/message-receiver-two/workflow.json index ad2a51c3..545467b2 100644 --- a/category_number_one/message-receiver-two/workflow.json +++ b/category_number_one/message-receiver-two/workflow.json @@ -4,10 +4,10 @@ "primary_file_name": "message_receiver_two.bpmn", "exception_notification_addresses": [], "is_master_spec": false, - "description": "message_receivertwo", + "description": "message_receiver_two", "primary_process_id": "message_receiver_process", "is_review": false, - "process_group_id": "category_numbertwo", + "process_group_id": "category_number_one", "library": false, "display_name": "message_receivertwo", "standalone": false, diff --git a/category_number_one/process_group.json b/category_number_one/process_group.json index 9f8f20f4..32d0514f 100644 --- a/category_number_one/process_group.json +++ b/category_number_one/process_group.json @@ -1,59 +1,144 @@ { - "display_order": 0, - "display_name": "category_number_one", "process_models": [ { - "display_name": "Process Model With Form", - "display_order": 0, + "exception_notification_addresses": [], + "is_master_spec": false, + "standalone": false, + "primary_process_id": "message_receiver_process", + "library": false, + "display_name": "message_receiver_one", "process_group_id": "category_number_one", + "primary_file_name": "message_receiver_one.bpmn", + "files": [], + "description": "message_receiver_one", + "display_order": 6, + "fault_or_suspend_on_exception": "fault", + "is_review": false, + "libraries": [], + "id": "message-receiver-one" + }, + { + "exception_notification_addresses": [], + "is_master_spec": false, + "standalone": false, + "primary_process_id": "message_receiver_process", + "library": false, + "display_name": "message_receivertwo", + "process_group_id": "category_number_one", + "primary_file_name": "message_receiver_two.bpmn", + "files": [], + "description": "message_receiver_two", + "display_order": 6, + "fault_or_suspend_on_exception": "fault", + "is_review": false, + "libraries": [], + "id": "message-receiver-two" + }, + { + "exception_notification_addresses": [], + "is_master_spec": false, + "standalone": false, + "primary_process_id": "message_send_process", + "library": false, + "display_name": "message_send", + "process_group_id": "category_number_one", + "primary_file_name": "message_send.bpmn", + "files": [], + "description": "message_send", + "display_order": 3, + "fault_or_suspend_on_exception": "fault", + "is_review": false, + "libraries": [], + "id": "message-send" + }, + { + "exception_notification_addresses": [], + "is_master_spec": false, + "standalone": false, + "primary_process_id": "message_send_process", + "library": false, + "display_name": "message_sender", + "process_group_id": "category_number_one", + "primary_file_name": "message_sender.bpmn", + "files": [], + "description": "message_sender", + "display_order": 5, + "fault_or_suspend_on_exception": "fault", + "is_review": false, + "libraries": [], + "id": "message-sender" + }, + { + "exception_notification_addresses": [], + "is_master_spec": false, + "standalone": false, "primary_process_id": "test_form", - "libraries": [], - "is_master_spec": false, "library": false, - "standalone": false, - "is_review": false, - "files": [], - "id": "process-model-with-form", - "exception_notification_addresses": [], + "display_name": "Process Model With Form", + "process_group_id": "category_number_one", "primary_file_name": "test_form.bpmn", + "files": [], "description": "A Process Model with a form", - "fault_or_suspend_on_exception": "fault" - }, - { - "display_name": "Who is Wonderful Workflow", "display_order": 0, - "process_group_id": "category_number_one", - "primary_process_id": "sample", - "libraries": [], - "is_master_spec": false, - "library": false, - "standalone": false, + "fault_or_suspend_on_exception": "fault", "is_review": false, - "files": [], - "id": "workflow_one", - "exception_notification_addresses": [], - "primary_file_name": "sample.bpmn", - "description": "Workflow One, is a workflow.", - "fault_or_suspend_on_exception": "fault" + "libraries": [], + "id": "process-model-with-form" }, { - "display_name": "Process Model With Repeating Form", - "display_order": 2, - "process_group_id": "category_number_one", - "primary_process_id": "repeating_form", - "libraries": [], - "is_master_spec": false, - "library": false, - "standalone": false, - "is_review": false, - "files": [], - "id": "process-model-with-repeating-form", "exception_notification_addresses": [], + "is_master_spec": false, + "standalone": false, + "primary_process_id": "repeating_form", + "library": false, + "display_name": "Process Model With Repeating Form", + "process_group_id": "category_number_one", "primary_file_name": "assign_approvers.bpmn", + "files": [], "description": "Process Model With Repeating Form", - "fault_or_suspend_on_exception": "fault" + "display_order": 2, + "fault_or_suspend_on_exception": "fault", + "is_review": false, + "libraries": [], + "id": "process-model-with-repeating-form" + }, + { + "exception_notification_addresses": [], + "is_master_spec": false, + "standalone": false, + "primary_process_id": "Process_6be25102-637e-4c29-8ed5-8bc49a0cdf81", + "library": false, + "display_name": "test01", + "process_group_id": "category_number_one", + "primary_file_name": "raise-change-proposal-v3.bpmn", + "files": [], + "description": "test01", + "display_order": 3, + "fault_or_suspend_on_exception": "fault", + "is_review": true, + "libraries": [], + "id": "test01" + }, + { + "exception_notification_addresses": [], + "is_master_spec": false, + "standalone": false, + "primary_process_id": "sample", + "library": false, + "display_name": "Who is Wonderful Workflow", + "process_group_id": "category_number_one", + "primary_file_name": "sample.bpmn", + "files": [], + "description": "Workflow One, is a workflow.", + "display_order": 1, + "fault_or_suspend_on_exception": "fault", + "is_review": false, + "libraries": [], + "id": "workflow_one" } ], + "display_name": "category_number_one", "admin": false, + "display_order": 1, "id": "category_number_one" } \ No newline at end of file diff --git a/category_number_one/workflow_one/sample.bpmn b/category_number_one/workflow_one/sample.bpmn index d462a12c..dba67481 100644 --- a/category_number_one/workflow_one/sample.bpmn +++ b/category_number_one/workflow_one/sample.bpmn @@ -1,5 +1,5 @@ - + Flow_10jwwqy @@ -17,7 +17,7 @@ Mike = "Awesome" person = "Kevin" - +