From faf4c0df9793ac918cc39163d4c928d57859467a Mon Sep 17 00:00:00 2001 From: Aaron Louie Date: Wed, 15 Apr 2020 10:58:13 -0400 Subject: [PATCH 1/5] Updates BPMN and DMN files --- crc/static/bpmn/finance/finance.bpmn | 8 +- .../investigators_brochure.dmn | 2 +- .../ids_full_submission/ivrs_iwrs_ixrs.dmn | 2 +- .../irb_api_personnel/coordinator_status.dmn | 24 +++ .../department_chair_status.dmn | 24 +++ .../irb_api_personnel/irb_api_personnel.bpmn | 143 ++++++++++-------- .../primary_investigator_status.dmn | 32 ++++ .../top_level_workflow/data_security_plan.dmn | 6 +- .../top_level_workflow/enter_core_info.dmn | 2 +- .../sponsor_funding_source.dmn | 4 +- .../top_level_workflow.bpmn | 118 +++++++-------- example_data.py | 15 +- tests/test_files_api.py | 5 +- 13 files changed, 241 insertions(+), 144 deletions(-) create mode 100644 crc/static/bpmn/irb_api_personnel/coordinator_status.dmn create mode 100644 crc/static/bpmn/irb_api_personnel/department_chair_status.dmn create mode 100644 crc/static/bpmn/irb_api_personnel/primary_investigator_status.dmn diff --git a/crc/static/bpmn/finance/finance.bpmn b/crc/static/bpmn/finance/finance.bpmn index 51a513c1..e24fe802 100644 --- a/crc/static/bpmn/finance/finance.bpmn +++ b/crc/static/bpmn/finance/finance.bpmn @@ -14,13 +14,13 @@ - + - + @@ -54,7 +54,7 @@ - #### Process: + #### Process: The study team uploads the executed copy of the contract(s) after they receive it from the Office of Grants and Contracts, after the following process components are completed outside of the Clinical Research Connect: @@ -111,7 +111,7 @@ If you have any questions about the process, contact contract negotiator or Offi #### Non-Funded Executed Agreement -#### Process: +#### Process: OGC will upload the Non-Funded Executed Agreement after it has been negotiated by OSP contract negotiator. diff --git a/crc/static/bpmn/ids_full_submission/investigators_brochure.dmn b/crc/static/bpmn/ids_full_submission/investigators_brochure.dmn index 32b80410..c581f066 100644 --- a/crc/static/bpmn/ids_full_submission/investigators_brochure.dmn +++ b/crc/static/bpmn/ids_full_submission/investigators_brochure.dmn @@ -7,7 +7,7 @@ - Documents["DrugDevDoc_InvestBrochure"]["count"] + Documents.DrugDevDoc_InvestBrochure.count diff --git a/crc/static/bpmn/ids_full_submission/ivrs_iwrs_ixrs.dmn b/crc/static/bpmn/ids_full_submission/ivrs_iwrs_ixrs.dmn index 82daa151..39f0d20a 100644 --- a/crc/static/bpmn/ids_full_submission/ivrs_iwrs_ixrs.dmn +++ b/crc/static/bpmn/ids_full_submission/ivrs_iwrs_ixrs.dmn @@ -7,7 +7,7 @@ - Documents["DrugDevDoc_IVRSIWRSIXRSMan"]["count"] + Documents.DrugDevDoc_IVRSIWRSIXRSMan.count diff --git a/crc/static/bpmn/irb_api_personnel/coordinator_status.dmn b/crc/static/bpmn/irb_api_personnel/coordinator_status.dmn new file mode 100644 index 00000000..855bc719 --- /dev/null +++ b/crc/static/bpmn/irb_api_personnel/coordinator_status.dmn @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + "Placeholder" + + + + + diff --git a/crc/static/bpmn/irb_api_personnel/department_chair_status.dmn b/crc/static/bpmn/irb_api_personnel/department_chair_status.dmn new file mode 100644 index 00000000..7579049e --- /dev/null +++ b/crc/static/bpmn/irb_api_personnel/department_chair_status.dmn @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + "DC Placeholder" + + + + + diff --git a/crc/static/bpmn/irb_api_personnel/irb_api_personnel.bpmn b/crc/static/bpmn/irb_api_personnel/irb_api_personnel.bpmn index 6417ed2c..33aa0434 100644 --- a/crc/static/bpmn/irb_api_personnel/irb_api_personnel.bpmn +++ b/crc/static/bpmn/irb_api_personnel/irb_api_personnel.bpmn @@ -10,14 +10,7 @@ StudyInfo investigators - ### From Protocol Builder -{% for personnel in study.investigators|selectattr("INVESTIGATORTYPE", "equalto", "PI") %} - #### {{ personnel.INVESTIGATORTYPEFULL }} - {{ personnel.NETBADGEID }} -{% else %} - #### No Primary Investigator Entered in Protocol Builder -The PI is needed for many required steps. Please enter this information in Protocol Builder as soon as possible. -{% endfor %} + {{ElementDoc_PrimaryInvestigator}} @@ -44,7 +37,7 @@ The PI is needed for many required steps. Please enter this information in Prot - Flow_05aywbq + Flow_19i1d30 Flow_0g0o593 Flow_1nudg96 Flow_18ix81l @@ -58,13 +51,6 @@ The PI is needed for many required steps. Please enter this information in Prot - ### From Protocol Builder -{% for personnel in study.investigators|selectattr("INVESTIGATORTYPE", "equalto", "SC_I") %} - #### {{ personnel.INVESTIGATORTYPEFULL }} - {{ personnel.NETBADGEID }} -{% else %} - #### No Primary Coordinator Entered in Protocol Builder -{% endfor %} @@ -77,13 +63,6 @@ The PI is needed for many required steps. Please enter this information in Prot - ### From Protocol Builder -{% for personnel in study.investigators|selectattr("INVESTIGATORTYPE", "equalto", "DEPT_CH") %} - #### {{ personnel.INVESTIGATORTYPEFULL }} - {{ personnel.NETBADGEID }} -{% else %} - #### No Department Chair Entered in Protocol Builder -{% endfor %} @@ -94,74 +73,110 @@ The PI is needed for many required steps. Please enter this information in Prot Flow_0y1jvdw - + + + + Flow_05aywbq + Flow_12rh5aj + + + + Flow_12rh5aj + Flow_04nzqn8 + + + + Flow_04nzqn8 + Flow_19i1d30 + + + + + + + + + + + + + - - + + - - + + - - - + + + - - - + + + - - + + - - + + - - + + - - - + + + - - - + + + - + - - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/crc/static/bpmn/irb_api_personnel/primary_investigator_status.dmn b/crc/static/bpmn/irb_api_personnel/primary_investigator_status.dmn new file mode 100644 index 00000000..88baa49d --- /dev/null +++ b/crc/static/bpmn/irb_api_personnel/primary_investigator_status.dmn @@ -0,0 +1,32 @@ + + + + + + + + + + list contains( for i in [study.investigators[0].INVESTIGATORTYPE, study.investigators[1].INVESTIGATORTYPE, study.investigators[2].INVESTIGATORTYPE] return i, "PI") + + + + + + true + + + "Placeholder - True" + + + + + false + + + "Placeholder - False" + + + + + diff --git a/crc/static/bpmn/top_level_workflow/data_security_plan.dmn b/crc/static/bpmn/top_level_workflow/data_security_plan.dmn index d67da3b2..dd84045f 100644 --- a/crc/static/bpmn/top_level_workflow/data_security_plan.dmn +++ b/crc/static/bpmn/top_level_workflow/data_security_plan.dmn @@ -2,12 +2,12 @@ - + - + - Documents['Study_DataSecurityPlan']['required'] + Documents['UVACompl_PRCAppr']['required'] diff --git a/crc/static/bpmn/top_level_workflow/enter_core_info.dmn b/crc/static/bpmn/top_level_workflow/enter_core_info.dmn index d4345af3..7a204622 100644 --- a/crc/static/bpmn/top_level_workflow/enter_core_info.dmn +++ b/crc/static/bpmn/top_level_workflow/enter_core_info.dmn @@ -2,7 +2,7 @@ - + diff --git a/crc/static/bpmn/top_level_workflow/sponsor_funding_source.dmn b/crc/static/bpmn/top_level_workflow/sponsor_funding_source.dmn index e66274d3..2cf19dca 100644 --- a/crc/static/bpmn/top_level_workflow/sponsor_funding_source.dmn +++ b/crc/static/bpmn/top_level_workflow/sponsor_funding_source.dmn @@ -2,10 +2,10 @@