diff --git a/app/apps/workflow/bpmn_files/default/summon/7.1.0/summon.bpmn b/app/apps/workflow/bpmn_files/default/summon/7.1.0/summon.bpmn index 39c8890ef..2c5dbfddc 100644 --- a/app/apps/workflow/bpmn_files/default/summon/7.1.0/summon.bpmn +++ b/app/apps/workflow/bpmn_files/default/summon/7.1.0/summon.bpmn @@ -6,48 +6,40 @@ - gateway_which_type_of_summon - task_create_summon - service_script_next_step_renounce_summon - service_script_next_step_decision_summon - service_script_next_step_summon - service_script_next_step_close_case_summon - task_monitoren_reactie_platform - Activity_1fpf4er gateway_do_we_renounce_or_decision gateway_has_point_of_view_received task_judge_point_of_view task_check_incoming_point_of_view gateway_has_permit_been_granted - task_monitor_permit_request_procedure - Activity_1gaa36w - Gateway_0zrx2ej gateway_has_permit_been_requested + task_monitor_permit_request_procedure + gateway_which_type_of_summon task_check_incoming_permit_application - task_rappelleren_informeren_collegas_beleid - gateway_reactie_platform - Gateway_14b0omd - service_script_next_step_visit + task_create_summon + gateway_afzien_concept_aanschrijvingen_na_check + service_script_next_step_renounce_summon + service_script_next_step_decision_summon + service_script_next_step_summon + service_script_next_step_close_case_summon service_script_next_step_closing_procedure - Event_12zzx0r - task_create_quick_decision task_afzien_concept_aanschrijving - Event_1514cbt - timer_monitoren_reactie_platform - gateway_afzien_concept_aanschrijvingen_na_check + service_script_next_step_visit + Event_12zzx0r gateway_afzien_concept_aanschrijvingen_opties - Event_1rmmm5s - service_status_summon + Activity_1gaa36w + Event_1514cbt + Gateway_0zrx2ej task_create_concept_summons + service_status_summon + Event_1rmmm5s + Gateway_0rrkf6q gateway_afzien_concept_aanschrijvingen - Gateway_053odu0 task_monitor_incoming_point_of_view - service_status_zienswijze task_monitor_incoming_permit_application + service_status_zienswijze service_script_set_status_vergunningscheck - service_script_next_step_unoccupied Event_1s4a0ru Event_1mo05mc @@ -55,142 +47,6 @@ task_check_summons - - Flow_1detbpm - Flow_0ca7pn4 - Flow_025eea2 - Flow_0jcg14m - Flow_1b4iipp - Flow_08sz0p5 - Flow_1ejttzw - Flow_1abp6nw - - - - - - - - - - - - - - - - - - Flow_0bf9aqr - Flow_1detbpm - - - - type_aanschrijving.value == "sluiting" - - - type_aanschrijving.value == "waarschuwingsbrief" - - - type_aanschrijving.value == "aanschrijvingen" - - - action_civilian_permit_requested.value == "no_action" - - - civilian_has_gotten_permit.value == "no_permit" - - - is_civilian_objection_received.value == "no_objection_not_received" - - - is_citizen_objection_valid.value == "no_citizen_objection_not_valid" - - - is_citizen_objection_valid.value == "yes_citizen_objection_valid" - - - - - - aanschrijving_valide.value == "nee" - - - afzien_concept_aanschrijving.value == "concept_aanschrijving" - - - afzien_concept_aanschrijving.value == "geen_overtreding" - - - afzien_concept_aanschrijving.value == "nieuw_huisbezoek" - - - type_aanschrijving.value == "legalisatie-brief" - - - - Flow_1kxv6a9 - Flow_09zglj3 - summon_next_step = {"value": "renounce"} - - - Flow_0o6dkue - Flow_15k43jt - Flow_1nk79jc - summon_next_step = {"value": "decision"} - - - Flow_12sivk9 - Flow_1usf3sm - Flow_07uhdij - Flow_18vst05 - Flow_1l3103l - summon_next_step = {"value": "summon"} - - - Flow_0sy2hc3 - Flow_025eea2 - Flow_1e0tx2f - Flow_0p1mnxg - Flow_0763lk9 - Flow_0hq2av6 - Flow_15oojg9 - summon_next_step = {"value": "close_case"} - - - - - - - - - type_aanschrijving.value == "verzoek_verwijdering_advertentie" - - - - - - - - - - - Flow_079uczj - Flow_02rp65e - Flow_0763lk9 - - - Flow_1o2ylbn - - parse_duration(monitoren_reactie_platform_duration) - - - - - Flow_08sz0p5 - Flow_079uczj - set_status("Verwijdering advertentie") - Flow_1bkt8kw Flow_1kxv6a9 @@ -235,39 +91,23 @@ Flow_1pop5qk Flow_0umy2og - - Flow_0ca7pn4 - Flow_1pop5qk - set_status("Zienswijze") - - - Flow_05c0mfz - - parse_duration(task_monitor_incoming_point_of_view_timer_duration) - - - - - - is_civilian_objection_received.value == "yes_objection_received" - - - - Flow_1f8btyg Flow_1usf3sm Flow_1izu6zi + + Flow_1c107fw + Flow_18si44b + Flow_12sivk9 + - + - - @@ -275,6 +115,13 @@ Flow_0oyiegq Flow_0m6yape + + Flow_1detbpm + Flow_0ca7pn4 + Flow_025eea2 + Flow_0jcg14m + Flow_1b4iipp + @@ -288,59 +135,6 @@ Flow_1kedpc9 Flow_0oyiegq - - - - - - - - - - Flow_1g3luuj - Flow_1f8btyg - - - Flow_1izu6zi - Flow_1igavhi - Flow_1e0tx2f - - - Flow_1g3luuj - - parse_duration(task_monitor_permit_request_procedure_timer_duration) - - - - Flow_1tvv61b - - parse_duration(task_monitor_incoming_permit_application_timer_duration) - - - - - civilian_has_gotten_permit.value == "yes_permit" - - - action_civilian_permit_requested.value == "yes_permit_requested" - - - action_civilian_permit_requested.value == True - - - - - - Flow_1b4iipp - Flow_1kedpc9 - set_status("Vergunningscheck") - - - Flow_1c107fw - Flow_18si44b - Flow_12sivk9 - - @@ -353,66 +147,84 @@ Flow_1tvv61b Flow_1c107fw - + - - - - + + + + + + + - Flow_1o2ylbn - Flow_0ymg74d + Flow_0bf9aqr + Flow_1detbpm - - Flow_0ymg74d - Flow_02rp65e - Flow_07uhdij - Flow_0p1mnxg + + Flow_0ij4o8b + Flow_0bf9aqr + Flow_189gckp - - - - summon_rappelleren_informeren_collegas_beleid.value == "opnieuw_monitoren" - - - summon_rappelleren_informeren_collegas_beleid.value == "opstellen_aanschrijving" - - - - - - - - type_aanschrijving.value == "leegstandsbrief" - - - Flow_1ejttzw - Flow_01fmf92 - summon_next_step = {"value": "unoccupied"} + + Flow_1kxv6a9 + Flow_09zglj3 + next_step = {"value": "renounce"} - - Flow_0m6yape - Flow_1igavhi - Flow_18vst05 - - - civilian_has_gotten_permit.value == 'yes_permit' - - - civilian_has_gotten_permit.value == 'no_permit' - - - Flow_0kqbmg9 - Flow_0fx0k7f - summon_next_step = {"value": "visit"} + + Flow_0o6dkue + Flow_15k43jt + Flow_1nk79jc + next_step = {"value": "decision"} + + + Flow_12sivk9 + Flow_1usf3sm + Flow_1l3103l + next_step = {"value": "summon"} + + + Flow_0sy2hc3 + Flow_025eea2 + Flow_1e0tx2f + Flow_15oojg9 + next_step = {"value": "close_case"} Flow_0jcg14m Flow_01jkj9f - summon_next_step = {"value": "closing_procedure"} + next_step = {"value": "closing_procedure"} + + + + + + + + + + + + Flow_1ohw0bb + Flow_189gckp + Flow_041q8eg + + + Flow_0ca7pn4 + Flow_1pop5qk + set_status("Zienswijze") + + + Flow_1b4iipp + Flow_1kedpc9 + set_status("Vergunningscheck") + + + Flow_0kqbmg9 + Flow_0fx0k7f + next_step = {"value": "visit"} Flow_01jkj9f @@ -421,58 +233,143 @@ Flow_1nk79jc Flow_09zglj3 Flow_0fx0k7f - Flow_01fmf92 - - type_aanschrijving.value == "besluit" + + Flow_041q8eg + Flow_1pt6l2m + Flow_0sy2hc3 + Flow_0kqbmg9 + + + + + + + + + + + Flow_1g3luuj + Flow_1f8btyg + + + Flow_1tvv61b + + parse_duration(task_monitor_incoming_permit_application_timer_duration) + + + + Flow_05c0mfz + + parse_duration(task_monitor_incoming_point_of_view_timer_duration) + + + + Flow_1g3luuj + + parse_duration(task_monitor_permit_request_procedure_timer_duration) + + + + + type_aanschrijving.value == "sluiting" + + + + type_aanschrijving.value == "waarschuwingsbrief" + + + type_aanschrijving.value == "aanschrijvingen" + + + + + action_civilian_permit_requested.value == "yes_permit_requested" + + + + action_civilian_permit_requested.value == True + + + action_civilian_permit_requested.value == "no_action" + + + + civilian_has_gotten_permit.value == "no_permit" + + + civilian_has_gotten_permit.value == True + + + + is_civilian_objection_received.value == "no_objection_not_received" + + + is_citizen_objection_valid.value == "no_citizen_objection_not_valid" + + + civilian_has_gotten_permit.value == "yes_permit" + + + + + + is_civilian_objection_received.value == "yes_objection_received" + + + + is_citizen_objection_valid.value == "yes_citizen_objection_valid" + + + + + + aanschrijving_valide.value == "nee" + + + type_concept_aanschrijving.value == "afzien_aanschrijving" + + + + afzien_concept_aanschrijving.value == "concept_aanschrijving" + + + afzien_concept_aanschrijving.value == "geen_overtreding" + + + + + + + + + afzien_concept_aanschrijving.value == "nieuw_huisbezoek" - - - - - - - - - Flow_1abp6nw - Flow_0hq2av6 - - - - - - - type_concept_aanschrijving.value == "afzien_aanschrijving" + + type_aanschrijving.value == "legalisatie-brief" - + + + + + Flow_0m6yape + Flow_1izu6zi + Flow_1e0tx2f + + - - - - + + + + - Flow_1ohw0bb - Flow_189gckp - Flow_041q8eg + Flow_1pt6l2m + Flow_011ntfk + Flow_0ot0wae - - - Flow_0ij4o8b - Flow_0bf9aqr - Flow_189gckp - - - Flow_041q8eg - Flow_1pt6l2m - Flow_0sy2hc3 - Flow_0kqbmg9 - - - Flow_1wlsww0 - @@ -483,27 +380,21 @@ Flow_1atmgnk set_status("Aanschrijving") - - - - - - - - - - - - - - - Flow_1pt6l2m - Flow_06uy6le - Flow_0ot0wae - + + Flow_1wlsww0 + + + + Flow_1atmgnk + Flow_011ntfk + Flow_0j0ohov + + + + direct_to_check_summons.value == "ja" + Flow_0ot0wae - Flow_1s64n5j Flow_02q9z4q Flow_1ohw0bb @@ -517,17 +408,9 @@ Flow_02q9z4q + Flow_0j0ohov Flow_0ij4o8b - - Flow_1atmgnk - Flow_06uy6le - Flow_1s64n5j - - - - type_concept_aanschrijving.value == "aanschrijvingen" - @@ -537,163 +420,133 @@ - + - - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - - - - + - + - - - - - - - - + + - - + + - - + + + + + - - + + - + - - + + + + + + + + - - + + - - + + - - + + - - + + - + - - + + - - - + + - - + + - - - - - + + + + + - + - - + + - - + + - + + + + + + + + + + - + - - - - - - - + - + - + - - - - - + + @@ -701,363 +554,273 @@ - - + + - + + + + + - + - + - + - + - - - - + + + - + - - - - - + + + + + + + + - + - - - - + + + - + - - - - + + + + - + - - - + + + - + - - - - - - - - - - - - - - + + + - - - + + + + + - + - - - - + + + + - + - - - + + + + + + + + - + - - - - + + + + - + - - - - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - + - - - - - - - - - - - + + + - - + + - - - - - - - - - - + + - + - - - - - - - - - - - + + + - - - + + + - + - - - - - - - + + + + - - - - - - - + + + - - - - - - + + + - - - + + + - + - - - + + + - + - - - - - - - - - - - - + + + - - - - + + + + - + - - - + + + - + - - - - + + + + - - - - - + + + + - - - - + + + + - - - - - - - + + + + - - - - - - + + + + + + + + - - - - + + + + - + - - - - + + + + - + - - - - - - - - - - - + + - - + + - - - - - - + + + + - - - - + + + - - - + + + - - - - + + + + - + diff --git a/app/apps/workflow/bpmn_files/default/unoccupied/7.1.0/unoccupied.bpmn b/app/apps/workflow/bpmn_files/default/unoccupied/7.1.0/unoccupied.bpmn index cdaaacdfd..71ba605e6 100644 --- a/app/apps/workflow/bpmn_files/default/unoccupied/7.1.0/unoccupied.bpmn +++ b/app/apps/workflow/bpmn_files/default/unoccupied/7.1.0/unoccupied.bpmn @@ -470,7 +470,7 @@ Flow_1fkzlv4 Flow_0ikowfz - type_concept_aanschrijving = {"value": "aanschrijvingen"} + direct_to_check_summons = {"value": "ja"} leegstand_resultaat_leegstandsbeschikking.value == "direct_naar_nakijken_besluit" diff --git a/app/config/settings.py b/app/config/settings.py index bc208b60f..00de5d2b9 100644 --- a/app/config/settings.py +++ b/app/config/settings.py @@ -1201,6 +1201,7 @@ "next_step": {"value": "summon"}, "type_concept_aanschrijving": {"value": "default"}, "aanschrijving_valide": {"value": "default"}, + "direct_to_check_summons": {"value": "No"}, }, "versions": { "0.1.0": {},