diff --git a/category_number_one/workflow_one/sample.bpmn b/category_number_one/workflow_one/sample.bpmn index dba67481..2fb7792d 100644 --- a/category_number_one/workflow_one/sample.bpmn +++ b/category_number_one/workflow_one/sample.bpmn @@ -19,7 +19,7 @@ person = "Kevin" - + wonderful Flow_0htxke7 Flow_1hd6o66 diff --git a/sartography-admin/import-tickets/import-tickets.bpmn b/sartography-admin/import-tickets/import-tickets.bpmn index f6d644de..44ae5ce1 100644 --- a/sartography-admin/import-tickets/import-tickets.bpmn +++ b/sartography-admin/import-tickets/import-tickets.bpmn @@ -29,6 +29,7 @@ def main(): from spiffworkflow_backend.services.process_instance_service import ( ProcessInstanceService, ) + from spiffworkflow_backend.models.process_instance_report import ProcessInstanceReportModel process_model_identifier_ticket = "ticket" db.session.query(ProcessInstanceModel).filter( @@ -56,7 +57,7 @@ def main(): } columns_to_header_index_mappings = {} - user = UserModel.query.filter_by(username="test_user1").first() + user = UserModel.query.first() with open("tests/files/tickets.csv") as infile: reader = csv.reader(infile, delimiter=",") @@ -111,6 +112,9 @@ def main(): process_instance_data = processor.get_data() print(f"process_instance_data: {process_instance_data}") + ProcessInstanceReportModel.add_fixtures() + print("added report fixtures") + main() @@ -121,18 +125,6 @@ del main - - - - - - - - - - - - @@ -142,6 +134,18 @@ del main + + + + + + + + + + + + diff --git a/test/a22/A.2.2.bpmn b/test/a22/A.2.2.bpmn index e75d192c..6eb2b55e 100644 --- a/test/a22/A.2.2.bpmn +++ b/test/a22/A.2.2.bpmn @@ -4,13 +4,15 @@ Flow_02h0vpd - + Flow_0bs6slr Flow_1if1u6l Flow_0vztihb - + + some_var == "a" + Flow_0hwunwr @@ -21,10 +23,6 @@ - - Flow_02h0vpd - Flow_0bs6slr - Flow_1if1u6l Flow_0hwunwr @@ -33,9 +31,37 @@ Flow_0vztihb Flow_06dsshe + + Flow_02h0vpd + Flow_0bs6slr + some_var = "b" + + + + + + + + + + + + + + + + + + + + + + + + @@ -62,30 +88,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/a22/workflow.json b/test/a22/workflow.json index 75c1816f..7eb48285 100644 --- a/test/a22/workflow.json +++ b/test/a22/workflow.json @@ -1,12 +1,12 @@ { "description": "A.2.2", "display_name": "A.2.2 - Exclusive Gateway and Manual Task", - "primary_process_id": "", + "primary_process_id": "Process_bd2e724", "libraries": [], "id": "a22", "process_group_id": "test", "exception_notification_addresses": [], - "primary_file_name": "", + "primary_file_name": "A.2.2.bpmn", "fault_or_suspend_on_exception": "fault", "display_order": 6, "library": false, @@ -14,4 +14,4 @@ "standalone": false, "files": [], "is_review": false -} \ No newline at end of file +} diff --git a/test/a30/A.3.0.bpmn b/test/a30/A.3.0.bpmn new file mode 100644 index 00000000..90f9052c --- /dev/null +++ b/test/a30/A.3.0.bpmn @@ -0,0 +1,130 @@ + + + + + Flow_1epp17e + + + + Flow_1epp17e + Flow_0z8r33g + + + + Flow_0z8r33g + Flow_1we3ybd + + + Flow_0c5avic + + + + Flow_1ihui5u + + + + + + Flow_1we3ybd + Flow_0x6y0dy + + + + Flow_1ihui5u + Flow_0koj4al + + + Flow_0koj4al + + + + Flow_0x6y0dy + Flow_1m4vwod + + + + + Flow_0c5avic + Flow_1m4vwod + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/a30/workflow.json b/test/a30/workflow.json new file mode 100644 index 00000000..ee94ceae --- /dev/null +++ b/test/a30/workflow.json @@ -0,0 +1,17 @@ +{ + "primary_process_id": "Process_bd2e724", + "libraries": [], + "display_order": 27, + "standalone": false, + "is_master_spec": false, + "id": "a30", + "primary_file_name": "A.3.0.bpmn", + "process_group_id": "test", + "exception_notification_addresses": [], + "display_name": "A.3.0 - Boundary Intermediate Events", + "is_review": false, + "fault_or_suspend_on_exception": "fault", + "description": "A.3.0 - Boundary Intermediate Events", + "files": [], + "library": false +} \ No newline at end of file diff --git a/test/a40/A.4.0.bpmn b/test/a40/A.4.0.bpmn new file mode 100644 index 00000000..e75ff613 --- /dev/null +++ b/test/a40/A.4.0.bpmn @@ -0,0 +1,229 @@ + + + + + + + + + + + Flow_1ku7xfw + + + + Flow_1ku7xfw + Flow_1g2xyjh + + + + Flow_1g3myj1 + + + + Flow_1g2xyjh + Flow_1g3myj1 + + + + + + Event_0dt48rg + Activity_00q6l8z + + + Event_04kqhbj + Activity_1mhq0wl + Event_04ytu1c + Activity_0n8e1gw + Activity_1i94jhu + + + + Flow_04eswfr + Flow_075jaow + + Flow_1iwuni7 + + + + Flow_0c12fo4 + + + + Flow_1iwuni7 + Flow_0c12fo4 + + + + Flow_09eygja + + + Flow_09eygja + Flow_04eswfr + Flow_15rcr24 + + + Flow_15rcr24 + Flow_01lx82s + + Flow_1rpl3g6 + + + + Flow_0wbbw61 + + + + Flow_1rpl3g6 + Flow_0wbbw61 + + + + Flow_0cm55t3 + + + Flow_01lx82s + + + + + + + + + Flow_075jaow + Flow_0cm55t3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/a40/workflow.json b/test/a40/workflow.json new file mode 100644 index 00000000..acf02fe6 --- /dev/null +++ b/test/a40/workflow.json @@ -0,0 +1,17 @@ +{ + "primary_process_id": "Process_bd2e724", + "libraries": [], + "display_order": 28, + "standalone": false, + "is_master_spec": false, + "id": "a40", + "primary_file_name": "A.4.0.bpmn", + "process_group_id": "test", + "exception_notification_addresses": [], + "display_name": "A.4.0 - Pool, Lane and Expanded Sub Process", + "is_review": false, + "fault_or_suspend_on_exception": "fault", + "description": "A.4.0 - Pool, Lane and Expanded Sub Process", + "files": [], + "library": false +} \ No newline at end of file diff --git a/test/b10-all-elements/B.1.0.bpmn b/test/b10-all-elements/B.1.0.bpmn new file mode 100644 index 00000000..e0f5d67a --- /dev/null +++ b/test/b10-all-elements/B.1.0.bpmn @@ -0,0 +1,431 @@ + + + + + + + + + + + + + Flow_0fqhdmx + + + + Flow_1nawb96 + + + Flow_0fqhdmx + Flow_0ahhirr + + + Flow_0ahhirr + Flow_0imali3 + + + Flow_0imali3 + Flow_1nawb96 + + + + + + + + + + Event_03m2g74 + Gateway_1cm8qz6 + Gateway_14hv2p1 + Activity_0w5oh8n + Activity_1i8qhsk + Gateway_18whjw1 + Event_07x1aic + Activity_0l4s7de + + + Activity_020eatl + Gateway_1uq23c3 + Activity_1czn9ge + Gateway_10frsf9 + Event_0q3jrlh + Activity_1iv0b1z + Activity_1y8cgtt + + + + Flow_0jkiqv9 + + + + + Flow_0jkiqv9 + Flow_13a41n6 + Flow_1czuq5s + + + Flow_13a41n6 + Flow_1xwping + Flow_1uvmaw5 + + + + + + Flow_1xwping + Flow_1ttdmy4 + + + Flow_1uvmaw5 + Flow_1yey0f4 + + + + Flow_1czuq5s + Flow_16pwi0j + + + Flow_16pwi0j + Flow_0nbhils + Flow_0puu3d8 + + + + + Flow_1ttdmy4 + Flow_0gyjgp2 + + Flow_1acs2sc + + + Flow_1acs2sc + Flow_19af7ls + + + + Flow_19af7ls + + + + + Flow_0gyjgp2 + Flow_1yey0f4 + Flow_0q6r4bc + + + + + + Flow_0q6r4bc + + + + + + Flow_0nbhils + Flow_1k30d4h + + + Flow_0puu3d8 + Flow_0265ifh + + + DataObjectReference_0n50hok + Property_15r3opw + + + DataStoreReference_0dvftcm + Property_15r3opw + + + + + + + Flow_1k30d4h + Flow_1pzw0kr + + Flow_0bxszxa + + + Flow_0bxszxa + Flow_0o73t0l + + + + Flow_0o73t0l + + + + + Flow_1pzw0kr + Flow_0265ifh + Flow_1mw2lwn + + + + + Flow_1mw2lwn + + + + + Text Annotation + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/b10-all-elements/workflow.json b/test/b10-all-elements/workflow.json new file mode 100644 index 00000000..bbe86465 --- /dev/null +++ b/test/b10-all-elements/workflow.json @@ -0,0 +1,17 @@ +{ + "fault_or_suspend_on_exception": "fault", + "description": "B.1.0 - all elements", + "exception_notification_addresses": [], + "standalone": false, + "id": "b10-all-elements", + "is_master_spec": false, + "libraries": [], + "files": [], + "is_review": false, + "library": false, + "display_name": "B.1.0 - all elements", + "primary_process_id": "Process_bd2e724", + "process_group_id": "test", + "display_order": 29, + "primary_file_name": "B.1.0.bpmn" +} \ No newline at end of file diff --git a/test/b20/B.1.0.bpmn b/test/b20/B.1.0.bpmn new file mode 100644 index 00000000..921f5421 --- /dev/null +++ b/test/b20/B.1.0.bpmn @@ -0,0 +1,1344 @@ + + + + + + + + + + + + + Flow_0fqhdmx + + + + Flow_0fqhdmx + Flow_0ahhirr + + + Flow_0ahhirr + Flow_0imali3 + + + Flow_0imali3 + Flow_1nawb96 + + + DataObjectReference_01p09at + Property_1az9tdd + + + + Flow_1nawb96 + Flow_0pwa2vn + Flow_1u9jge5 + + + Flow_0pwa2vn + Flow_1t1o3dv + + + Flow_1t1o3dv + Flow_0f2e4qg + + + + Flow_0rev14e + Flow_0o3qc72 + + + Flow_0n8ldlb + Flow_1cqim40 + + + Flow_0n8s11b + Flow_15jtzv3 + + + Flow_1q86zpe + Flow_14q1xcr + + + Flow_14q1xcr + Flow_15jtzv3 + Flow_0o3qc72 + Flow_0lzfspz + + + Flow_0lzfspz + + + + Flow_1cqim40 + Flow_1dxhujd + + + + + + Flow_13a5jx0 + + + + Flow_1u9jge5 + Flow_09glfga + + + Flow_09glfga + Flow_0rev14e + + Flow_1wahzbp + + + + Flow_0t52yhx + + + + Flow_1wahzbp + Flow_0t52yhx + + + + + Flow_0f2e4qg + Flow_0n8s11b + + + + + + Flow_1dxhujd + Flow_13a5jx0 + + + Flow_1q86zpe + + + + + + Flow_0n8ldlb + + + + + + + + + + + + + + + + + + + + + + + + + + + Event_0esibh1 + Gateway_10frsf9 + Gateway_1vawa8u + Activity_1g1j26i + Activity_1czn9ge + Gateway_1uq23c3 + Activity_020eatl + Activity_15foq6r + Event_03b92qi + Activity_0tsy7re + Event_0q3jrlh + Activity_1r0w4w4 + Activity_1v9sp0w + Activity_0mzko6s + Event_13isahg + Event_18zyevn + Event_1peuzww + Event_0w0i16e + Activity_1y8cgtt + + + Event_03m2g74 + Activity_0l4s7de + Event_014vwmk + Event_1dzxljj + Gateway_0sdu1rm + Activity_1uh96tv + Activity_0rtkmlz + Event_11r8932 + Activity_023rj1r + Event_06a8xc6 + Activity_15j52lz + Gateway_10xarnq + Event_054ms9j + Activity_1g57ewx + Activity_0y8djtk + Event_1rdg7ej + Activity_04qr541 + Activity_1qdnk9f + Event_1shi7pe + Event_1ofekep + Activity_0l1kosw + Activity_0jylv57 + Activity_1yjo1q2 + Activity_0bepybl + Event_0expmf6 + Event_0hfv671 + Event_0bb4eo6 + Event_0nrfup5 + Event_0y7f6b9 + Event_0u3vn68 + Event_0qzv9fd + + + + + + + Flow_1dpjii5 + + + + + + + + + + + Flow_1w4hkes + Flow_17nx1hf + + Flow_1acs2sc + + + + Flow_1eg5i54 + + + + Flow_1acs2sc + Flow_1m6v7v1 + Flow_19af7ls + + + Flow_1m6v7v1 + + + + + Flow_19af7ls + Flow_1n0o123 + + + Flow_0g1ol6d + + + + + Flow_0g1ol6d + + + + + Flow_1n0o123 + Flow_1eg5i54 + + + + + Flow_1z0n4xe + Flow_1w4hkes + + + + Flow_1vul8i0 + Flow_1v6jwb7 + + + + Flow_0novbup + Flow_1z0n4xe + Flow_1vul8i0 + Flow_0hgysj9 + + + + Flow_1dpjii5 + Flow_0novbup + + + + Flow_17nx1hf + Flow_0o3w456 + + + Flow_1s7rby5 + + + + + + + Flow_1s7rby5 + + + + + Flow_0o3w456 + Flow_1vh7huk + + + + Flow_1vh7huk + + + + Flow_1v6jwb7 + Flow_0cxzs47 + + + Flow_0cxzs47 + Flow_0e842rp + Flow_1bjlqdu + + + + + Flow_0e842rp + Flow_07j47ll + + + + + Flow_07j47ll + Flow_0rffb0r + + + Flow_17xb8lm + + + + + + Flow_1bjlqdu + Flow_17xb8lm + Flow_0rsdd0x + + + + Flow_0rsdd0x + Flow_1fi3d5q + + + + + Flow_0rffb0r + Flow_0ul4sq3 + + + Flow_0pt453x + + + + + Flow_0pt453x + Flow_1jv26ec + + + + Flow_0ul4sq3 + Flow_1jv26ec + Flow_0vuqt3s + + + + Flow_0hgysj9 + Flow_1whiyr0 + + + + Flow_1whiyr0 + Flow_1lkf3nf + + + Flow_1cdp4kd + + + + + Flow_1lkf3nf + Flow_15xkei8 + + Flow_0hnyj8x + + + + Flow_16qfst0 + + + + Flow_0hnyj8x + Flow_16qfst0 + + + + Flow_0o2qgj7 + + + + Flow_003ag2m + + + + + + Flow_15xkei8 + Flow_1fi3d5q + Flow_0vuqt3s + + + + Flow_1id9sry + + + + + Flow_1id9sry + Flow_1ypo0z1 + + + + + Flow_0o2qgj7 + Flow_0rzskt6 + + + Flow_0rzskt6 + + + + + Flow_003ag2m + Flow_1ocjm4w + + + + + + Flow_14dkdn1 + + + Flow_1l7mo86 + Flow_14dkdn1 + + + Flow_1bbtjhz + Flow_0m23jez + + + + Flow_1l7mo86 + + + + + + + + Flow_0nbhils + Flow_1ulepl0 + Flow_1bbtjhz + + Flow_0bxszxa + + + Flow_125fb1o + Flow_0o73t0l + + + + Flow_08uscxe + + + + Flow_0bxszxa + Flow_125fb1o + + + + Flow_0o73t0l + Flow_08uscxe + Flow_1hh9ygu + + + + + Flow_1hh9ygu + + + + + Flow_1cdp4kd + Flow_01e06nh + + + + Flow_1ypo0z1 + Flow_1ocjm4w + Flow_0enjf53 + + + + Flow_0m23jez + Flow_0f9wa8t + Flow_0enjf53 + + + Flow_01e06nh + Flow_04nvmjv + Flow_1jfzoit + + + Flow_1jfzoit + Flow_0f9wa8t + + + + Flow_0typqre + Flow_04nvmjv + + + + Flow_0puu3d8 + Flow_0typqre + + + + Flow_16pwi0j + Flow_0nbhils + Flow_0puu3d8 + + + Flow_1pxbeos + Flow_16pwi0j + + + + Flow_1pxbeos + + + + + Flow_1ulepl0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/b20/workflow.json b/test/b20/workflow.json new file mode 100644 index 00000000..b106d9ee --- /dev/null +++ b/test/b20/workflow.json @@ -0,0 +1,17 @@ +{ + "fault_or_suspend_on_exception": "fault", + "description": "B.2.0 - the rest elements", + "exception_notification_addresses": [], + "standalone": false, + "id": "b20", + "is_master_spec": false, + "libraries": [], + "files": [], + "is_review": false, + "library": false, + "display_name": "B.2.0 - the rest elements", + "primary_process_id": "", + "process_group_id": "test", + "display_order": 30, + "primary_file_name": "" +} \ No newline at end of file diff --git a/test/process_group.json b/test/process_group.json index e9a1d70f..29c13abb 100644 --- a/test/process_group.json +++ b/test/process_group.json @@ -1,7 +1,7 @@ { - "process_models": [], - "display_name": "Testing OMG reference models", - "display_order": 0, "id": "test", - "admin": false + "display_name": "Testing", + "display_order": 0, + "admin": false, + "process_models": [] } \ No newline at end of file diff --git a/test/test2/t2.bpmn b/test/test2/t2.bpmn index ebacc7e7..229caff4 100644 --- a/test/test2/t2.bpmn +++ b/test/test2/t2.bpmn @@ -4,36 +4,36 @@ Flow_0cgghnv - + Flow_0qanvbo - - + + Flow_0cgghnv Flow_0qanvbo - - - - - - - - - + + + + + + + + +