From 4138481a1b2276696b378a4af424e20c4baf7f62 Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Wed, 10 Aug 2022 08:03:18 +0200 Subject: [PATCH] New Notification * adds new notification setting to user settings form * adds translations * adds initial creating of ENUM on setup command --- konova/management/commands/setup_data.py | 3 +- locale/de/LC_MESSAGES/django.mo | Bin 44074 -> 44182 bytes locale/de/LC_MESSAGES/django.po | 82 ++++++++++++----------- user/enums.py | 3 +- user/forms.py | 2 +- 5 files changed, 49 insertions(+), 41 deletions(-) diff --git a/konova/management/commands/setup_data.py b/konova/management/commands/setup_data.py index 4a5683c..078b547 100644 --- a/konova/management/commands/setup_data.py +++ b/konova/management/commands/setup_data.py @@ -28,4 +28,5 @@ USER_NOTIFICATIONS_NAMES = { "NOTIFY_ON_SHARED_DATA_RECORDED": _("On shared data recorded"), "NOTIFY_ON_SHARED_DATA_DELETED": _("On shared data deleted"), "NOTIFY_ON_SHARED_DATA_CHECKED": _("On shared data checked"), -} \ No newline at end of file + "NOTIFY_ON_DEDUCTION_CHANGES": _("On deduction changes"), +} diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index 5b2d55a9dbb4a98c46dd7d7eb3f0612c61cd9508..d1cbdfba463cad7b0e3308a74702bbfb3158c120 100644 GIT binary patch delta 11374 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 diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 1da188a..893d438 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -26,7 +26,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-08-08 14:39+0200\n" +"POT-Creation-Date: 2022-08-10 08:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -55,7 +55,7 @@ msgstr "Einträge erstellt bis..." #: analysis/forms.py:49 compensation/forms/forms.py:77 #: compensation/templates/compensation/detail/eco_account/view.html:59 #: compensation/templates/compensation/report/eco_account/report.html:16 -#: compensation/utils/quality.py:113 ema/templates/ema/detail/view.html:49 +#: compensation/utils/quality.py:111 ema/templates/ema/detail/view.html:49 #: ema/templates/ema/report/report.html:16 ema/utils/quality.py:26 #: intervention/forms/forms.py:102 #: intervention/templates/intervention/detail/view.html:56 @@ -297,8 +297,8 @@ msgstr "Gesetz" #: analysis/templates/analysis/reports/includes/old_data/amount.html:17 #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:33 -#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:28 -#: ema/templates/ema/detail/includes/deadlines.html:28 +#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:33 +#: ema/templates/ema/detail/includes/deadlines.html:33 msgid "Type" msgstr "Typ" @@ -378,10 +378,10 @@ msgstr "Kompensation XY; Flur ABC" #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:39 #: compensation/templates/compensation/detail/compensation/includes/documents.html:34 #: compensation/templates/compensation/detail/eco_account/includes/actions.html:34 -#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:34 +#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:39 #: compensation/templates/compensation/detail/eco_account/includes/documents.html:34 #: ema/templates/ema/detail/includes/actions.html:34 -#: ema/templates/ema/detail/includes/deadlines.html:34 +#: ema/templates/ema/detail/includes/deadlines.html:39 #: ema/templates/ema/detail/includes/documents.html:34 #: intervention/forms/forms.py:198 intervention/forms/modalForms.py:175 #: intervention/templates/intervention/detail/includes/documents.html:34 @@ -399,7 +399,7 @@ msgstr "Zusätzlicher Kommentar" #: compensation/forms/forms.py:93 #: compensation/templates/compensation/detail/eco_account/view.html:63 #: compensation/templates/compensation/report/eco_account/report.html:20 -#: compensation/utils/quality.py:115 ema/templates/ema/detail/view.html:53 +#: compensation/utils/quality.py:113 ema/templates/ema/detail/view.html:53 #: ema/templates/ema/report/report.html:20 ema/utils/quality.py:28 #: intervention/forms/forms.py:130 #: intervention/templates/intervention/detail/view.html:60 @@ -485,7 +485,7 @@ msgstr "Neue Kompensation" msgid "Edit compensation" msgstr "Bearbeite Kompensation" -#: compensation/forms/forms.py:356 compensation/utils/quality.py:97 +#: compensation/forms/forms.py:356 compensation/utils/quality.py:95 msgid "Available Surface" msgstr "Verfügbare Fläche" @@ -495,7 +495,7 @@ msgstr "Die für Abbuchungen zur Verfügung stehende Menge" #: compensation/forms/forms.py:368 #: compensation/templates/compensation/detail/eco_account/view.html:67 -#: compensation/utils/quality.py:85 +#: compensation/utils/quality.py:83 msgid "Agreement date" msgstr "Vereinbarungsdatum" @@ -598,8 +598,8 @@ msgstr "Fristart wählen" #: compensation/forms/modalForms.py:345 #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:36 -#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:31 -#: ema/templates/ema/detail/includes/deadlines.html:31 +#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:36 +#: ema/templates/ema/detail/includes/deadlines.html:36 #: intervention/forms/modalForms.py:149 msgid "Date" msgstr "Datum" @@ -618,8 +618,8 @@ msgstr "Geben Sie die Daten der neuen Frist ein" #: compensation/forms/modalForms.py:389 #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:64 -#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:57 -#: ema/templates/ema/detail/includes/deadlines.html:57 +#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:62 +#: ema/templates/ema/detail/includes/deadlines.html:62 msgid "Edit deadline" msgstr "Frist/Termin bearbeiten" @@ -803,13 +803,13 @@ msgstr "Menge" #: compensation/templates/compensation/detail/compensation/includes/states-after.html:41 #: compensation/templates/compensation/detail/compensation/includes/states-before.html:41 #: compensation/templates/compensation/detail/eco_account/includes/actions.html:39 -#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:38 +#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:43 #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:41 #: compensation/templates/compensation/detail/eco_account/includes/documents.html:38 #: compensation/templates/compensation/detail/eco_account/includes/states-after.html:41 #: compensation/templates/compensation/detail/eco_account/includes/states-before.html:41 #: ema/templates/ema/detail/includes/actions.html:38 -#: ema/templates/ema/detail/includes/deadlines.html:38 +#: ema/templates/ema/detail/includes/deadlines.html:43 #: ema/templates/ema/detail/includes/documents.html:38 #: ema/templates/ema/detail/includes/states-after.html:40 #: ema/templates/ema/detail/includes/states-before.html:40 @@ -883,12 +883,14 @@ msgid "Add new deadline" msgstr "Frist/Termin hinzufügen" #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:25 +#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:25 +#: ema/templates/ema/detail/includes/deadlines.html:25 msgid "Missing finished deadline " msgstr "Umsetzungstermin fehlt" #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:67 -#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:60 -#: ema/templates/ema/detail/includes/deadlines.html:60 +#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:65 +#: ema/templates/ema/detail/includes/deadlines.html:65 msgid "Remove deadline" msgstr "Frist löschen" @@ -932,7 +934,7 @@ msgstr "Dokument löschen" #: compensation/templates/compensation/detail/compensation/includes/states-after.html:8 #: compensation/templates/compensation/detail/eco_account/includes/states-after.html:8 -#: compensation/utils/quality.py:42 +#: compensation/utils/quality.py:40 #: ema/templates/ema/detail/includes/states-after.html:8 msgid "States after" msgstr "Zielzustand" @@ -978,7 +980,7 @@ msgstr "Zustand entfernen" #: compensation/templates/compensation/detail/compensation/includes/states-before.html:8 #: compensation/templates/compensation/detail/eco_account/includes/states-before.html:8 -#: compensation/utils/quality.py:40 +#: compensation/utils/quality.py:38 #: ema/templates/ema/detail/includes/states-before.html:8 msgid "States before" msgstr "Ausgangszustand" @@ -1188,25 +1190,25 @@ msgstr "Abbuchungen für" msgid "None" msgstr "-" -#: compensation/utils/quality.py:37 +#: compensation/utils/quality.py:35 msgid "States unequal" msgstr "Ungleiche Zustandsflächenmengen" -#: compensation/utils/quality.py:61 +#: compensation/utils/quality.py:59 msgid "Finished deadlines" msgstr "Umsetzungstermin" -#: compensation/utils/quality.py:87 intervention/utils/quality.py:84 +#: compensation/utils/quality.py:85 intervention/utils/quality.py:84 msgid "Legal data" msgstr "Rechtliche Daten" -#: compensation/utils/quality.py:101 +#: compensation/utils/quality.py:99 msgid "Deductable surface can not be larger than state surface" msgstr "" "Die abbuchbare Fläche darf die Gesamtfläche der Zielzustände nicht " "überschreiten" -#: compensation/utils/quality.py:117 ema/utils/quality.py:30 +#: compensation/utils/quality.py:115 ema/utils/quality.py:30 #: intervention/utils/quality.py:55 msgid "Responsible data" msgstr "Daten zu den verantwortlichen Stellen" @@ -1220,17 +1222,17 @@ msgid "Compensation {} edited" msgstr "Kompensation {} bearbeitet" #: compensation/views/compensation.py:182 compensation/views/eco_account.py:173 -#: ema/views.py:240 intervention/views.py:338 +#: ema/views.py:241 intervention/views.py:338 msgid "Edit {}" msgstr "Bearbeite {}" -#: compensation/views/compensation.py:269 compensation/views/eco_account.py:359 -#: ema/views.py:194 intervention/views.py:542 +#: compensation/views/compensation.py:269 compensation/views/eco_account.py:360 +#: ema/views.py:195 intervention/views.py:542 msgid "Log" msgstr "Log" -#: compensation/views/compensation.py:613 compensation/views/eco_account.py:727 -#: ema/views.py:558 intervention/views.py:688 +#: compensation/views/compensation.py:613 compensation/views/eco_account.py:728 +#: ema/views.py:559 intervention/views.py:688 msgid "Report {}" msgstr "Bericht {}" @@ -1246,36 +1248,36 @@ msgstr "Ökokonto {} hinzugefügt" msgid "Eco-Account {} edited" msgstr "Ökokonto {} bearbeitet" -#: compensation/views/eco_account.py:276 +#: compensation/views/eco_account.py:277 msgid "Eco-account removed" msgstr "Ökokonto entfernt" -#: compensation/views/eco_account.py:380 ema/views.py:282 +#: compensation/views/eco_account.py:381 ema/views.py:283 #: intervention/views.py:641 msgid "{} unrecorded" msgstr "{} entzeichnet" -#: compensation/views/eco_account.py:380 ema/views.py:282 +#: compensation/views/eco_account.py:381 ema/views.py:283 #: intervention/views.py:641 msgid "{} recorded" msgstr "{} verzeichnet" -#: compensation/views/eco_account.py:804 ema/views.py:628 +#: compensation/views/eco_account.py:805 ema/views.py:629 #: intervention/views.py:439 msgid "{} has already been shared with you" msgstr "{} wurde bereits für Sie freigegeben" -#: compensation/views/eco_account.py:809 ema/views.py:633 +#: compensation/views/eco_account.py:810 ema/views.py:634 #: intervention/views.py:444 msgid "{} has been shared with you" msgstr "{} ist nun für Sie freigegeben" -#: compensation/views/eco_account.py:816 ema/views.py:640 +#: compensation/views/eco_account.py:817 ema/views.py:641 #: intervention/views.py:451 msgid "Share link invalid" msgstr "Freigabelink ungültig" -#: compensation/views/eco_account.py:839 ema/views.py:663 +#: compensation/views/eco_account.py:840 ema/views.py:664 #: intervention/views.py:474 msgid "Share settings updated" msgstr "Freigabe Einstellungen aktualisiert" @@ -1316,11 +1318,11 @@ msgstr "EMAs - Übersicht" msgid "EMA {} added" msgstr "EMA {} hinzugefügt" -#: ema/views.py:230 +#: ema/views.py:231 msgid "EMA {} edited" msgstr "EMA {} bearbeitet" -#: ema/views.py:263 +#: ema/views.py:264 msgid "EMA removed" msgstr "EMA entfernt" @@ -1799,6 +1801,10 @@ msgstr "Wenn meine freigegebenen Daten gelöscht wurden" msgid "On shared data checked" msgstr "Wenn meine freigegebenen Daten geprüft wurden" +#: konova/management/commands/setup_data.py:31 +msgid "On deduction changes" +msgstr "Wenn eine Abbuchung zu meinem Ökokonto verändert oder gelöscht wird" + #: konova/models/deadline.py:18 msgid "Finished" msgstr "Umgesetzt bis" diff --git a/user/enums.py b/user/enums.py index 8d0c34d..04f27b7 100644 --- a/user/enums.py +++ b/user/enums.py @@ -13,4 +13,5 @@ class UserNotificationEnum(BaseEnum): NOTIFY_ON_SHARED_DATA_RECORDED = "NOTIFY_ON_SHARED_DATA_RECORDED" # notifies in case data has been "verzeichnet" NOTIFY_ON_SHARED_DATA_DELETED = "NOTIFY_ON_SHARED_DATA_DELETED" # notifies in case data has been deleted NOTIFY_ON_SHARED_DATA_CHECKED = "NOTIFY_ON_SHARED_DATA_CHECKED" # notifies in case shared data has been checked - NOTIFY_ON_SHARED_ACCESS_GAINED = "NOTIFY_ON_SHARED_ACCESS_GAINED" # notifies in case new access has been gained \ No newline at end of file + NOTIFY_ON_SHARED_ACCESS_GAINED = "NOTIFY_ON_SHARED_ACCESS_GAINED" # notifies in case new access has been gained + NOTIFY_ON_DEDUCTION_CHANGES = "NOTIFY_ON_DEDUCTION_CHANGES" # notifies in case any changes (edit|remove) have been performed on a deduction of the user's ecoaccounts \ No newline at end of file diff --git a/user/forms.py b/user/forms.py index a92c6b0..12688b4 100644 --- a/user/forms.py +++ b/user/forms.py @@ -7,7 +7,7 @@ Created on: 08.07.21 """ from dal import autocomplete from django import forms -from django.db import IntegrityError, transaction +from django.db import transaction from django.urls import reverse, reverse_lazy from django.utils.translation import gettext_lazy as _