From 1aff93e81b34043fdece43403b3d432c3d0b4c2b Mon Sep 17 00:00:00 2001 From: ramonavic Date: Tue, 28 Jan 2025 09:59:45 +0100 Subject: [PATCH] prepend signalering to omschrijving --- .../sigmax/stuf_protocol/outgoing/creeerZaak_Lk01.py | 4 ++-- .../stuf_protocol/outgoing/test_creeerZaak_Lk01.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/signals/apps/sigmax/stuf_protocol/outgoing/creeerZaak_Lk01.py b/app/signals/apps/sigmax/stuf_protocol/outgoing/creeerZaak_Lk01.py index 09f721255..53306c3bb 100644 --- a/app/signals/apps/sigmax/stuf_protocol/outgoing/creeerZaak_Lk01.py +++ b/app/signals/apps/sigmax/stuf_protocol/outgoing/creeerZaak_Lk01.py @@ -78,12 +78,12 @@ def _generate_omschrijving(signal, seq_no): area = _determine_area_for_omschrijving(signal, buurt, stadsdeel_code_sigmax) - return '{} SIA-{}.{}{}{} {}{}'.format( + return '{}{} SIA-{}.{}{} {}{}'.format( + f"{extra_description} " if extra_description else '', category, signal.id, seq_no, f" {urgent}" if urgent else '', - f" {extra_description}" if extra_description else '', signal.location.short_address_text, f" {area}" if area else '' ) diff --git a/app/signals/apps/sigmax/tests/stuf_protocol/outgoing/test_creeerZaak_Lk01.py b/app/signals/apps/sigmax/tests/stuf_protocol/outgoing/test_creeerZaak_Lk01.py index 5e1fc4cf5..339c2eb91 100644 --- a/app/signals/apps/sigmax/tests/stuf_protocol/outgoing/test_creeerZaak_Lk01.py +++ b/app/signals/apps/sigmax/tests/stuf_protocol/outgoing/test_creeerZaak_Lk01.py @@ -303,7 +303,7 @@ def test_generate_omschrijving_with_extra_description(self) -> None: signal.source = source.name signal.save() - correct = '{} SIA-{}.01 Signalering {} {}'.format( + correct = 'Signalering {} SIA-{}.01 {} {}'.format( signal.category_assignment.category.name, signal.pk, signal.location.short_address_text, @@ -327,7 +327,7 @@ def test_generate_omschrijving_with_area_name_and_buurt_and_extra_description(se signal.location.buurt_code = buurt.vollcode signal.location.save() - correct = '{} SIA-{}.01 Signalering {} {}'.format( + correct = 'Signalering {} SIA-{}.01 {} {}'.format( signal.category_assignment.category.name, signal.pk, signal.location.short_address_text, @@ -351,7 +351,7 @@ def test_generate_omschrijving_with_urgent_area_name_and_buurt_and_extra_descrip signal.location.buurt_code = buurt.vollcode signal.location.save() - correct = '{} SIA-{}.01 URGENT Signalering {} {}'.format( + correct = 'Signalering {} SIA-{}.01 URGENT {} {}'.format( signal.category_assignment.category.name, signal.pk, signal.location.short_address_text, @@ -371,7 +371,7 @@ def test_generate_omschrijving_with_urgent_and_extra_description(self) -> None: signal.source = source.name signal.save() - correct = '{} SIA-{}.01 URGENT Signalering {} {}'.format( + correct = 'Signalering {} SIA-{}.01 URGENT {} {}'.format( signal.category_assignment.category.name, signal.pk, signal.location.short_address_text, @@ -391,7 +391,7 @@ def test_generate_omschrijving_with_urgent_and_extra_description_and_area_name(s signal.source = source.name signal.save() - correct = '{} SIA-{}.01 URGENT Signalering {} {}'.format( + correct = 'Signalering {} SIA-{}.01 URGENT {} {}'.format( signal.category_assignment.category.name, signal.pk, signal.location.short_address_text,