From f4d0485019d11addce8d953853d23f29e8dc064d Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Thu, 3 Mar 2022 12:09:09 +0100 Subject: [PATCH] # 129 Handler code renaming * renames handler code list * improves missing handler data rendering on detail view --- api/utils/serializer/v1/ecoaccount.py | 4 +- api/utils/serializer/v1/ema.py | 4 +- api/utils/serializer/v1/serializer.py | 4 +- .../management/commands/update_codelist.py | 4 +- codelist/settings.py | 2 +- compensation/forms/forms.py | 4 +- intervention/forms/forms.py | 4 +- intervention/models/responsibility.py | 9 +- konova/autocompletes.py | 4 +- konova/utils/message_templates.py | 2 + locale/de/LC_MESSAGES/django.mo | Bin 40671 -> 40705 bytes locale/de/LC_MESSAGES/django.po | 103 +++++++++--------- 12 files changed, 74 insertions(+), 70 deletions(-) diff --git a/api/utils/serializer/v1/ecoaccount.py b/api/utils/serializer/v1/ecoaccount.py index 241d362..7fe4373 100644 --- a/api/utils/serializer/v1/ecoaccount.py +++ b/api/utils/serializer/v1/ecoaccount.py @@ -9,7 +9,7 @@ from django.db import transaction from api.utils.serializer.v1.serializer import AbstractModelAPISerializerV1, AbstractCompensationAPISerializerV1Mixin, \ LegalAPISerializerV1Mixin, ResponsibilityAPISerializerV1Mixin, DeductableAPISerializerV1Mixin -from codelist.settings import CODELIST_CONSERVATION_OFFICE_ID, CODELIST_COMPENSATION_HANDLER_ID +from codelist.settings import CODELIST_CONSERVATION_OFFICE_ID, CODELIST_HANDLER_ID from compensation.models import EcoAccount from intervention.models import Legal, Responsibility, Handler from konova.models import Geometry @@ -66,7 +66,7 @@ class EcoAccountAPISerializerV1(AbstractModelAPISerializerV1, obj.responsible.conservation_file_number = responsibility_data["conservation_file_number"] obj.responsible.handler.type = self._konova_code_from_json( responsibility_data["handler"]["type"], - CODELIST_COMPENSATION_HANDLER_ID, + CODELIST_HANDLER_ID, ) obj.responsible.handler.detail = responsibility_data["handler"]["detail"] return obj diff --git a/api/utils/serializer/v1/ema.py b/api/utils/serializer/v1/ema.py index 548a7db..dfda724 100644 --- a/api/utils/serializer/v1/ema.py +++ b/api/utils/serializer/v1/ema.py @@ -9,7 +9,7 @@ from django.db import transaction from api.utils.serializer.v1.serializer import AbstractModelAPISerializerV1, AbstractCompensationAPISerializerV1Mixin, \ ResponsibilityAPISerializerV1Mixin -from codelist.settings import CODELIST_CONSERVATION_OFFICE_ID, CODELIST_COMPENSATION_HANDLER_ID +from codelist.settings import CODELIST_CONSERVATION_OFFICE_ID, CODELIST_HANDLER_ID from ema.models import Ema from intervention.models import Responsibility, Handler from konova.models import Geometry @@ -53,7 +53,7 @@ class EmaAPISerializerV1(AbstractModelAPISerializerV1, AbstractCompensationAPISe obj.responsible.conservation_file_number = responsibility_data["conservation_file_number"] obj.responsible.handler.type = self._konova_code_from_json( responsibility_data["handler"]["type"], - CODELIST_COMPENSATION_HANDLER_ID, + CODELIST_HANDLER_ID, ) obj.responsible.handler.detail = responsibility_data["handler"]["detail"] return obj diff --git a/api/utils/serializer/v1/serializer.py b/api/utils/serializer/v1/serializer.py index 924b6e3..23d1f69 100644 --- a/api/utils/serializer/v1/serializer.py +++ b/api/utils/serializer/v1/serializer.py @@ -15,7 +15,7 @@ from api.utils.serializer.serializer import AbstractModelAPISerializer from codelist.models import KonovaCode from codelist.settings import CODELIST_COMPENSATION_ACTION_ID, CODELIST_BIOTOPES_ID, CODELIST_PROCESS_TYPE_ID, \ CODELIST_LAW_ID, CODELIST_REGISTRATION_OFFICE_ID, CODELIST_CONSERVATION_OFFICE_ID, \ - CODELIST_COMPENSATION_ACTION_DETAIL_ID, CODELIST_BIOTOPES_EXTRA_CODES_ID, CODELIST_COMPENSATION_HANDLER_ID + CODELIST_COMPENSATION_ACTION_DETAIL_ID, CODELIST_BIOTOPES_EXTRA_CODES_ID, CODELIST_HANDLER_ID from compensation.models import CompensationAction, UnitChoices, CompensationState from intervention.models import Responsibility, Legal, Handler from konova.models import Deadline, DeadlineType @@ -223,7 +223,7 @@ class ResponsibilityAPISerializerV1Mixin: obj.responsible.conservation_file_number = responsibility_data["conservation_file_number"] obj.responsible.handler.type = self._konova_code_from_json( responsibility_data["handler"]["type"], - CODELIST_COMPENSATION_HANDLER_ID, + CODELIST_HANDLER_ID, ) obj.responsible.handler.detail = responsibility_data["handler"]["detail"] return obj diff --git a/codelist/management/commands/update_codelist.py b/codelist/management/commands/update_codelist.py index 85c9032..345b324 100644 --- a/codelist/management/commands/update_codelist.py +++ b/codelist/management/commands/update_codelist.py @@ -11,7 +11,7 @@ from xml.etree import ElementTree as etree from codelist.models import KonovaCode, KonovaCodeList from codelist.settings import CODELIST_INTERVENTION_HANDLER_ID, CODELIST_CONSERVATION_OFFICE_ID, \ - CODELIST_REGISTRATION_OFFICE_ID, CODELIST_BIOTOPES_ID, CODELIST_LAW_ID, CODELIST_COMPENSATION_HANDLER_ID, \ + CODELIST_REGISTRATION_OFFICE_ID, CODELIST_BIOTOPES_ID, CODELIST_LAW_ID, CODELIST_HANDLER_ID, \ CODELIST_COMPENSATION_ACTION_ID, CODELIST_COMPENSATION_ACTION_CLASS_ID, CODELIST_COMPENSATION_ADDITIONAL_TYPE_ID, \ CODELIST_BASE_URL, CODELIST_PROCESS_TYPE_ID, CODELIST_BIOTOPES_EXTRA_CODES_ID, \ CODELIST_COMPENSATION_ACTION_DETAIL_ID @@ -36,7 +36,7 @@ class Command(BaseKonovaCommand): CODELIST_BIOTOPES_ID, CODELIST_BIOTOPES_EXTRA_CODES_ID, CODELIST_LAW_ID, - CODELIST_COMPENSATION_HANDLER_ID, + CODELIST_HANDLER_ID, CODELIST_COMPENSATION_ACTION_ID, CODELIST_COMPENSATION_ACTION_CLASS_ID, CODELIST_COMPENSATION_ACTION_DETAIL_ID, diff --git a/codelist/settings.py b/codelist/settings.py index b4226b5..61652bd 100644 --- a/codelist/settings.py +++ b/codelist/settings.py @@ -19,7 +19,7 @@ CODELIST_BIOTOPES_EXTRA_CODES_ID = 975 # CLZusatzbezeichnung CODELIST_LAW_ID = 1048 # CLVerfahrensrecht CODELIST_PROCESS_TYPE_ID = 44382 # CLVerfahrenstyp -CODELIST_COMPENSATION_HANDLER_ID = 1052 # CLEingreifer +CODELIST_HANDLER_ID = 1052 # CLEingreifer CODELIST_COMPENSATION_ACTION_ID = 1026 # CLMassnahmedetail CODELIST_COMPENSATION_ACTION_DETAIL_ID = 1035 # CLZusatzmerkmal CODELIST_COMPENSATION_ACTION_CLASS_ID = 1034 # CLMassnahmeklasse diff --git a/compensation/forms/forms.py b/compensation/forms/forms.py index 768a6fe..4e9e329 100644 --- a/compensation/forms/forms.py +++ b/compensation/forms/forms.py @@ -13,7 +13,7 @@ from django.utils.translation import gettext_lazy as _ from django import forms from codelist.models import KonovaCode -from codelist.settings import CODELIST_CONSERVATION_OFFICE_ID, CODELIST_COMPENSATION_HANDLER_ID +from codelist.settings import CODELIST_CONSERVATION_OFFICE_ID, CODELIST_HANDLER_ID from compensation.models import Compensation, EcoAccount from intervention.inputs import GenerateInput from intervention.models import Intervention, Responsibility, Legal, Handler @@ -110,7 +110,7 @@ class CompensationResponsibleFormMixin(forms.Form): queryset=KonovaCode.objects.filter( is_archived=False, is_leaf=True, - code_lists__in=[CODELIST_COMPENSATION_HANDLER_ID], + code_lists__in=[CODELIST_HANDLER_ID], ), widget=autocomplete.ModelSelect2( url="codes-handler-autocomplete", diff --git a/intervention/forms/forms.py b/intervention/forms/forms.py index 1ed10e1..b83c4fb 100644 --- a/intervention/forms/forms.py +++ b/intervention/forms/forms.py @@ -16,7 +16,7 @@ from django.utils.translation import gettext_lazy as _ from codelist.models import KonovaCode from codelist.settings import CODELIST_PROCESS_TYPE_ID, CODELIST_LAW_ID, \ - CODELIST_REGISTRATION_OFFICE_ID, CODELIST_CONSERVATION_OFFICE_ID, CODELIST_COMPENSATION_HANDLER_ID + CODELIST_REGISTRATION_OFFICE_ID, CODELIST_CONSERVATION_OFFICE_ID, CODELIST_HANDLER_ID from intervention.inputs import GenerateInput from intervention.models import Intervention, Legal, Responsibility, Handler from konova.forms import BaseForm, SimpleGeomForm @@ -146,7 +146,7 @@ class NewInterventionForm(BaseForm): queryset=KonovaCode.objects.filter( is_archived=False, is_leaf=True, - code_lists__in=[CODELIST_COMPENSATION_HANDLER_ID], + code_lists__in=[CODELIST_HANDLER_ID], ), widget=autocomplete.ModelSelect2( url="codes-handler-autocomplete", diff --git a/intervention/models/responsibility.py b/intervention/models/responsibility.py index 6f34ba5..5d1c84a 100644 --- a/intervention/models/responsibility.py +++ b/intervention/models/responsibility.py @@ -10,8 +10,9 @@ from django.utils.translation import gettext_lazy as _ from codelist.models import KonovaCode from codelist.settings import CODELIST_CONSERVATION_OFFICE_ID, CODELIST_REGISTRATION_OFFICE_ID, \ - CODELIST_COMPENSATION_HANDLER_ID + CODELIST_HANDLER_ID from konova.models import UuidModel +from konova.utils.message_templates import UNKNOWN, NO_DETAILS class Handler(UuidModel): @@ -26,7 +27,7 @@ class Handler(UuidModel): null=True, blank=True, limit_choices_to={ - "code_lists__in": [CODELIST_COMPENSATION_HANDLER_ID], + "code_lists__in": [CODELIST_HANDLER_ID], "is_selectable": True, "is_archived": False, } @@ -38,8 +39,8 @@ class Handler(UuidModel): ) def __str__(self): - detail = self.detail or _("no further details") - _type = self.type.long_name if self.type is not None else None + detail = self.detail or NO_DETAILS + _type = self.type.long_name if self.type is not None else UNKNOWN return f'{_type}, {detail}' diff --git a/konova/autocompletes.py b/konova/autocompletes.py index 0b49851..9f60d54 100644 --- a/konova/autocompletes.py +++ b/konova/autocompletes.py @@ -17,7 +17,7 @@ from django.db.models import Q from codelist.models import KonovaCode from codelist.settings import CODELIST_COMPENSATION_ACTION_ID, CODELIST_BIOTOPES_ID, CODELIST_LAW_ID, \ CODELIST_REGISTRATION_OFFICE_ID, CODELIST_CONSERVATION_OFFICE_ID, CODELIST_PROCESS_TYPE_ID, \ - CODELIST_BIOTOPES_EXTRA_CODES_ID, CODELIST_COMPENSATION_ACTION_DETAIL_ID, CODELIST_COMPENSATION_HANDLER_ID + CODELIST_BIOTOPES_EXTRA_CODES_ID, CODELIST_COMPENSATION_ACTION_DETAIL_ID, CODELIST_HANDLER_ID from compensation.models import EcoAccount from intervention.models import Intervention @@ -367,7 +367,7 @@ class HandlerCodeAutocomplete(KonovaCodeAutocomplete): related_field_name = "long_name" def __init__(self, *args, **kwargs): - self.c = CODELIST_COMPENSATION_HANDLER_ID + self.c = CODELIST_HANDLER_ID super().__init__(*args, **kwargs) def get_result_label(self, result): diff --git a/konova/utils/message_templates.py b/konova/utils/message_templates.py index 6c0c614..64b7eab 100644 --- a/konova/utils/message_templates.py +++ b/konova/utils/message_templates.py @@ -7,6 +7,8 @@ Created on: 02.08.21 """ from django.utils.translation import gettext_lazy as _ +NO_DETAILS = _("no further details") +UNKNOWN = _("Unknown") UNGROUPED = _("Ungrouped") FORM_INVALID = _("There was an error on this form.") PARAMS_INVALID = _("Invalid parameters") diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index c032d7629dfbdce1ee10bfb6be2e607ea9be61a6..b3bf61fdcc2687d5b1e1f1ad8bc811c9ed514b44 100644 GIT binary patch delta 9418 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\n" "Language-Team: LANGUAGE \n" @@ -1159,7 +1159,7 @@ msgstr "Daten zu den verantwortlichen Stellen" msgid "Compensations - Overview" msgstr "Kompensationen - Übersicht" -#: compensation/views/compensation.py:151 konova/utils/message_templates.py:33 +#: compensation/views/compensation.py:151 konova/utils/message_templates.py:35 msgid "Compensation {} edited" msgstr "Kompensation {} bearbeitet" @@ -1446,10 +1446,6 @@ msgstr "" "Das Ökokonto {} hat für eine Abbuchung von {} m² nicht ausreichend " "Restfläche. Es stehen noch {} m² zur Verfügung." -#: intervention/models/responsibility.py:41 -msgid "no further details" -msgstr "keine weitere Angabe" - #: intervention/templates/intervention/detail/includes/compensations.html:14 msgid "Add new compensation" msgstr "Neue Kompensation hinzufügen" @@ -1843,22 +1839,31 @@ msgid "Request for new API token" msgstr "Anfrage für neuen API Token" #: konova/utils/message_templates.py:10 +msgid "no further details" +msgstr "keine weitere Angabe" + +#: konova/utils/message_templates.py:11 +#: venv/lib/python3.7/site-packages/django/forms/widgets.py:709 +msgid "Unknown" +msgstr "Unbekannt" + +#: konova/utils/message_templates.py:12 msgid "Ungrouped" msgstr "Ohne Zuordnung" -#: konova/utils/message_templates.py:11 +#: konova/utils/message_templates.py:13 msgid "There was an error on this form." msgstr "Es gab einen Fehler im Formular." -#: konova/utils/message_templates.py:12 +#: konova/utils/message_templates.py:14 msgid "Invalid parameters" msgstr "Parameter ungültig" -#: konova/utils/message_templates.py:13 +#: konova/utils/message_templates.py:15 msgid "There are errors in this intervention." msgstr "Es liegen Fehler in diesem Eingriff vor:" -#: konova/utils/message_templates.py:14 +#: konova/utils/message_templates.py:16 msgid "" "The identifier '{}' had to be changed to '{}' since another entry has been " "added in the meanwhile, which uses this identifier" @@ -1866,26 +1871,26 @@ msgstr "" "Die Kennung '{}' musste zu '{}' geändert werden, da ein anderer Eintrag in " "der Zwischenzeit angelegt wurde, welcher diese Kennung nun bereits verwendet" -#: konova/utils/message_templates.py:15 +#: konova/utils/message_templates.py:17 msgid "" "Only conservation or registration office users are allowed to remove entries." msgstr "" "Nur Mitarbeiter der Naturschutz- oder Zulassungsbehördengruppe dürfen " "Einträge entfernen" -#: konova/utils/message_templates.py:16 +#: konova/utils/message_templates.py:18 msgid "You need to be part of another user group." msgstr "Hierfür müssen Sie einer anderen Nutzergruppe angehören!" -#: konova/utils/message_templates.py:17 +#: konova/utils/message_templates.py:19 msgid "Status of Checked and Recorded reseted" msgstr "'Geprüft'/'Verzeichnet' wurde zurückgesetzt" -#: konova/utils/message_templates.py:20 +#: konova/utils/message_templates.py:22 msgid "This data is not shared with you" msgstr "Diese Daten sind für Sie nicht freigegeben" -#: konova/utils/message_templates.py:21 +#: konova/utils/message_templates.py:23 msgid "" "Remember: This data has not been shared with you, yet. This means you can " "only read but can not edit or perform any actions like running a check or " @@ -1895,15 +1900,15 @@ msgstr "" "bedeutet, dass Sie nur lesenden Zugriff hierauf haben und weder bearbeiten, " "noch Prüfungen durchführen oder verzeichnen können." -#: konova/utils/message_templates.py:24 +#: konova/utils/message_templates.py:26 msgid "Unsupported file type" msgstr "Dateiformat nicht unterstützt" -#: konova/utils/message_templates.py:25 +#: konova/utils/message_templates.py:27 msgid "File too large" msgstr "Datei zu groß" -#: konova/utils/message_templates.py:28 +#: konova/utils/message_templates.py:30 msgid "" "Action canceled. Eco account is recorded or deductions exist. Only " "conservation office member can perform this action." @@ -1911,119 +1916,119 @@ msgstr "" "Aktion abgebrochen. Ökokonto ist bereits verzeichnet oder Abbuchungen liegen " "vor. Nur Eintragungsstellennutzer können diese Aktion jetzt durchführen." -#: konova/utils/message_templates.py:31 +#: konova/utils/message_templates.py:33 msgid "Compensation {} added" msgstr "Kompensation {} hinzugefügt" -#: konova/utils/message_templates.py:32 +#: konova/utils/message_templates.py:34 msgid "Compensation {} removed" msgstr "Kompensation {} entfernt" -#: konova/utils/message_templates.py:34 +#: konova/utils/message_templates.py:36 msgid "Added compensation action" msgstr "Maßnahme hinzugefügt" -#: konova/utils/message_templates.py:35 +#: konova/utils/message_templates.py:37 msgid "Added compensation state" msgstr "Zustand hinzugefügt" -#: konova/utils/message_templates.py:38 +#: konova/utils/message_templates.py:40 msgid "State removed" msgstr "Zustand gelöscht" -#: konova/utils/message_templates.py:39 +#: konova/utils/message_templates.py:41 msgid "State edited" msgstr "Zustand bearbeitet" -#: konova/utils/message_templates.py:40 +#: konova/utils/message_templates.py:42 msgid "State added" msgstr "Zustand hinzugefügt" -#: konova/utils/message_templates.py:43 +#: konova/utils/message_templates.py:45 msgid "Action added" msgstr "Maßnahme hinzugefügt" -#: konova/utils/message_templates.py:44 +#: konova/utils/message_templates.py:46 msgid "Action edited" msgstr "Maßnahme bearbeitet" -#: konova/utils/message_templates.py:45 +#: konova/utils/message_templates.py:47 msgid "Action removed" msgstr "Maßnahme entfernt" -#: konova/utils/message_templates.py:48 +#: konova/utils/message_templates.py:50 msgid "Deduction added" msgstr "Abbuchung hinzugefügt" -#: konova/utils/message_templates.py:49 +#: konova/utils/message_templates.py:51 msgid "Deduction edited" msgstr "Abbuchung bearbeitet" -#: konova/utils/message_templates.py:50 +#: konova/utils/message_templates.py:52 msgid "Deduction removed" msgstr "Abbuchung entfernt" -#: konova/utils/message_templates.py:53 +#: konova/utils/message_templates.py:55 msgid "Deadline added" msgstr "Frist/Termin hinzugefügt" -#: konova/utils/message_templates.py:54 +#: konova/utils/message_templates.py:56 msgid "Deadline edited" msgstr "Frist/Termin bearbeitet" -#: konova/utils/message_templates.py:55 +#: konova/utils/message_templates.py:57 msgid "Deadline removed" msgstr "Frist/Termin gelöscht" -#: konova/utils/message_templates.py:58 +#: konova/utils/message_templates.py:60 msgid "Payment added" msgstr "Zahlung hinzugefügt" -#: konova/utils/message_templates.py:59 +#: konova/utils/message_templates.py:61 msgid "Payment edited" msgstr "Zahlung bearbeitet" -#: konova/utils/message_templates.py:60 +#: konova/utils/message_templates.py:62 msgid "Payment removed" msgstr "Zahlung gelöscht" -#: konova/utils/message_templates.py:63 +#: konova/utils/message_templates.py:65 msgid "Revocation added" msgstr "Widerspruch hinzugefügt" -#: konova/utils/message_templates.py:64 +#: konova/utils/message_templates.py:66 msgid "Revocation edited" msgstr "Widerspruch bearbeitet" -#: konova/utils/message_templates.py:65 +#: konova/utils/message_templates.py:67 msgid "Revocation removed" msgstr "Widerspruch entfernt" -#: konova/utils/message_templates.py:68 +#: konova/utils/message_templates.py:70 msgid "Document '{}' deleted" msgstr "Dokument '{}' gelöscht" -#: konova/utils/message_templates.py:69 +#: konova/utils/message_templates.py:71 msgid "Document added" msgstr "Dokument hinzugefügt" -#: konova/utils/message_templates.py:70 +#: konova/utils/message_templates.py:72 msgid "Document edited" msgstr "Dokument bearbeitet" -#: konova/utils/message_templates.py:73 +#: konova/utils/message_templates.py:75 msgid "Edited general data" msgstr "Allgemeine Daten bearbeitet" -#: konova/utils/message_templates.py:74 +#: konova/utils/message_templates.py:76 msgid "Added deadline" msgstr "Frist/Termin hinzugefügt" -#: konova/utils/message_templates.py:77 +#: konova/utils/message_templates.py:79 msgid "Geometry conflict detected with {}" msgstr "Geometriekonflikt mit folgenden Einträgen erkannt: {}" -#: konova/utils/message_templates.py:80 +#: konova/utils/message_templates.py:82 msgid "This intervention has {} revocations" msgstr "Dem Eingriff liegen {} Widersprüche vor" @@ -3599,10 +3604,6 @@ msgstr "" msgid "Change" msgstr "" -#: venv/lib/python3.7/site-packages/django/forms/widgets.py:709 -msgid "Unknown" -msgstr "" - #. Translators: Please do not add spaces around commas. #: venv/lib/python3.7/site-packages/django/template/defaultfilters.py:790 msgid "yes,no,maybe"