From 23c04c88834b4c481e7f9105cfbc6e43607d4d5b Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Tue, 8 Feb 2022 14:51:53 +0100 Subject: [PATCH] #86 Parcel districts instead of revocation * drops revocation column in favour of a parcel district column --- intervention/tables.py | 60 ++-- locale/de/LC_MESSAGES/django.mo | Bin 36538 -> 36677 bytes locale/de/LC_MESSAGES/django.po | 467 ++++++++++++++++---------------- templates/table/gmrkng_col.html | 9 + 4 files changed, 272 insertions(+), 264 deletions(-) create mode 100644 templates/table/gmrkng_col.html diff --git a/intervention/tables.py b/intervention/tables.py index 0ed003fa..223cd8a4 100644 --- a/intervention/tables.py +++ b/intervention/tables.py @@ -6,6 +6,7 @@ Created on: 01.12.20 """ from django.http import HttpRequest +from django.template.loader import render_to_string from django.urls import reverse from django.utils.html import format_html from django.utils.timezone import localtime @@ -29,6 +30,11 @@ class InterventionTable(BaseTable, TableRenderMixin): orderable=True, accessor="title", ) + d = tables.Column( + verbose_name=_("Parcel gmrkng"), + orderable=True, + accessor="geometry", + ) c = tables.Column( verbose_name=_("Checked"), orderable=True, @@ -41,12 +47,6 @@ class InterventionTable(BaseTable, TableRenderMixin): empty_values=[], accessor="recorded", ) - rev = tables.Column( - verbose_name=_("Revocation"), - orderable=True, - empty_values=[], - accessor="legal__revocation", - ) e = tables.Column( verbose_name=_("Editable"), orderable=True, @@ -117,6 +117,29 @@ class InterventionTable(BaseTable, TableRenderMixin): ) return format_html(html) + def render_d(self, value, record: Intervention): + """ Renders the parcel district column for an intervention + + Args: + value (str): The intervention geometry + record (Intervention): The intervention record + + Returns: + + """ + parcels = value.parcels.all().values_list( + "gmrkng", + flat=True + ).distinct() + html = render_to_string( + "table/gmrkng_col.html", + { + "entries": parcels + } + ) + return html + + def render_r(self, value, record: Intervention): """ Renders the recorded column for an intervention @@ -162,28 +185,3 @@ class InterventionTable(BaseTable, TableRenderMixin): ) return format_html(html) - def render_rev(self, value, record: Intervention): - """ Renders the revocation column for an intervention - - Args: - value (str): The revocation value - record (Intervention): The intervention record - - Returns: - - """ - html = "" - exists = value is not None - tooltip = _("No revocation") - if exists: - _date = value.date - added_ts = localtime(value.created.timestamp) - added_ts = added_ts.strftime(DEFAULT_DATE_TIME_FORMAT) - on = _date.strftime(DEFAULT_DATE_FORMAT) - tooltip = _("Revocation from {}, added on {} by {}").format(on, added_ts, value.created.user) - html += self.render_stop( - tooltip=tooltip, - icn_filled=exists, - ) - return format_html(html) - diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index 7fe3a4ee71d0b17b766706edd33f285e920fe645..c9d4293ad8de176ef64a6005d1b1cb3428ecc471 100644 GIT binary patch delta 10483 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 O82x?0oF$W^ivJgx^UF8@ delta 10561 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 jIcVJYG2<4%0=GbiiZFzydrV;-I6#Dc_ diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index f7a36715..f280137d 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ # #: compensation/filters.py:122 compensation/forms/modalForms.py:35 #: compensation/forms/modalForms.py:46 compensation/forms/modalForms.py:62 -#: compensation/forms/modalForms.py:256 compensation/forms/modalForms.py:350 +#: compensation/forms/modalForms.py:306 compensation/forms/modalForms.py:399 #: intervention/forms/forms.py:54 intervention/forms/forms.py:156 #: intervention/forms/forms.py:168 intervention/forms/modalForms.py:124 #: intervention/forms/modalForms.py:137 intervention/forms/modalForms.py:150 @@ -19,14 +19,14 @@ #: konova/filters/mixins.py:353 konova/filters/mixins.py:354 #: konova/filters/mixins.py:385 konova/filters/mixins.py:386 #: konova/forms.py:140 konova/forms.py:241 konova/forms.py:312 -#: konova/forms.py:339 konova/forms.py:349 konova/forms.py:362 -#: konova/forms.py:374 konova/forms.py:392 user/forms.py:42 +#: konova/forms.py:356 konova/forms.py:366 konova/forms.py:379 +#: konova/forms.py:391 konova/forms.py:409 user/forms.py:42 #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-02-03 13:37+0100\n" +"POT-Creation-Date: 2022-02-08 14:48+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -95,7 +95,7 @@ msgstr "" #: analysis/templates/analysis/reports/includes/eco_account/amount.html:3 #: analysis/templates/analysis/reports/includes/intervention/amount.html:3 #: analysis/templates/analysis/reports/includes/old_data/amount.html:3 -#: compensation/forms/modalForms.py:334 +#: compensation/forms/modalForms.py:383 #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:34 #: intervention/templates/intervention/detail/includes/deductions.html:31 msgid "Amount" @@ -138,7 +138,7 @@ msgstr "Zuständigkeitsbereich" #: analysis/templates/analysis/reports/includes/intervention/laws.html:17 #: compensation/tables.py:35 #: compensation/templates/compensation/detail/compensation/view.html:63 -#: intervention/tables.py:33 +#: intervention/tables.py:39 #: intervention/templates/intervention/detail/view.html:68 #: user/models/user_action.py:20 msgid "Checked" @@ -157,7 +157,7 @@ msgstr "Geprüft" #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:31 #: compensation/templates/compensation/detail/eco_account/view.html:44 #: ema/tables.py:38 ema/templates/ema/detail/view.html:35 -#: intervention/tables.py:39 +#: intervention/tables.py:45 #: intervention/templates/intervention/detail/view.html:82 #: user/models/user_action.py:21 msgid "Recorded" @@ -213,14 +213,14 @@ msgstr "Abbuchungen" #: analysis/templates/analysis/reports/includes/eco_account/deductions.html:9 #: analysis/templates/analysis/reports/includes/eco_account/deductions.html:11 -#: compensation/forms/modalForms.py:151 +#: compensation/forms/modalForms.py:167 #: compensation/templates/compensation/detail/compensation/includes/states-after.html:36 #: compensation/templates/compensation/detail/compensation/includes/states-before.html:36 #: compensation/templates/compensation/detail/eco_account/includes/states-after.html:36 #: compensation/templates/compensation/detail/eco_account/includes/states-before.html:36 #: ema/templates/ema/detail/includes/states-after.html:36 #: ema/templates/ema/detail/includes/states-before.html:36 -#: intervention/forms/modalForms.py:294 +#: intervention/forms/modalForms.py:311 msgid "Surface" msgstr "Fläche" @@ -284,7 +284,7 @@ msgid "Type" msgstr "Typ" #: analysis/templates/analysis/reports/includes/old_data/amount.html:24 -#: intervention/forms/modalForms.py:305 intervention/forms/modalForms.py:312 +#: intervention/forms/modalForms.py:322 intervention/forms/modalForms.py:329 #: intervention/tables.py:89 #: intervention/templates/intervention/detail/view.html:19 #: konova/templates/konova/includes/quickstart/interventions.html:4 @@ -295,7 +295,7 @@ msgstr "Eingriff" #: analysis/templates/analysis/reports/includes/old_data/amount.html:34 #: compensation/tables.py:226 #: compensation/templates/compensation/detail/eco_account/view.html:19 -#: intervention/forms/modalForms.py:278 intervention/forms/modalForms.py:285 +#: intervention/forms/modalForms.py:295 intervention/forms/modalForms.py:302 #: konova/templates/konova/includes/quickstart/ecoaccounts.html:4 #: templates/navbars/navbar.html:34 msgid "Eco-account" @@ -315,7 +315,7 @@ msgstr "Nur unverzeichnete anzeigen" #: compensation/forms/forms.py:32 compensation/tables.py:25 #: compensation/tables.py:167 ema/tables.py:28 intervention/forms/forms.py:28 -#: intervention/tables.py:23 +#: intervention/tables.py:24 #: intervention/templates/intervention/detail/includes/compensations.html:30 msgid "Identifier" msgstr "Kennung" @@ -336,12 +336,12 @@ msgstr "Automatisch generiert" #: ema/tables.py:33 ema/templates/ema/detail/includes/documents.html:28 #: ema/templates/ema/detail/view.html:31 #: ema/templates/ema/report/report.html:12 intervention/forms/forms.py:40 -#: intervention/tables.py:28 +#: intervention/tables.py:29 #: intervention/templates/intervention/detail/includes/compensations.html:33 #: intervention/templates/intervention/detail/includes/documents.html:28 #: intervention/templates/intervention/detail/view.html:31 #: intervention/templates/intervention/report/report.html:12 -#: konova/forms.py:338 +#: konova/forms.py:355 msgid "Title" msgstr "Bezeichnung" @@ -354,7 +354,7 @@ msgid "Compensation XY; Location ABC" msgstr "Kompensation XY; Flur ABC" #: compensation/forms/forms.py:57 compensation/forms/modalForms.py:61 -#: compensation/forms/modalForms.py:255 compensation/forms/modalForms.py:349 +#: compensation/forms/modalForms.py:305 compensation/forms/modalForms.py:398 #: compensation/templates/compensation/detail/compensation/includes/actions.html:35 #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:34 #: compensation/templates/compensation/detail/compensation/includes/documents.html:31 @@ -368,11 +368,11 @@ msgstr "Kompensation XY; Flur ABC" #: intervention/templates/intervention/detail/includes/documents.html:31 #: intervention/templates/intervention/detail/includes/payments.html:34 #: intervention/templates/intervention/detail/includes/revocation.html:38 -#: konova/forms.py:373 konova/templates/konova/includes/comment_card.html:16 +#: konova/forms.py:390 konova/templates/konova/includes/comment_card.html:16 msgid "Comment" msgstr "Kommentar" -#: compensation/forms/forms.py:59 compensation/forms/modalForms.py:351 +#: compensation/forms/forms.py:59 compensation/forms/modalForms.py:400 #: intervention/forms/forms.py:182 msgid "Additional comment" msgstr "Zusätzlicher Kommentar" @@ -432,7 +432,7 @@ msgstr "kompensiert Eingriff" msgid "Select the intervention for which this compensation compensates" msgstr "Wählen Sie den Eingriff, für den diese Kompensation bestimmt ist" -#: compensation/forms/forms.py:184 compensation/views/compensation.py:92 +#: compensation/forms/forms.py:184 compensation/views/compensation.py:94 msgid "New compensation" msgstr "Neue Kompensation" @@ -458,7 +458,7 @@ msgstr "Vereinbarungsdatum" msgid "When did the parties agree on this?" msgstr "Wann wurde dieses Ökokonto offiziell vereinbart?" -#: compensation/forms/forms.py:354 compensation/views/eco_account.py:102 +#: compensation/forms/forms.py:354 compensation/views/eco_account.py:103 msgid "New Eco-Account" msgstr "Neues Ökokonto" @@ -483,8 +483,8 @@ msgstr "Fällig am" msgid "Due on which date" msgstr "Zahlung wird an diesem Datum erwartet" -#: compensation/forms/modalForms.py:63 compensation/forms/modalForms.py:257 -#: intervention/forms/modalForms.py:151 konova/forms.py:375 +#: compensation/forms/modalForms.py:63 compensation/forms/modalForms.py:307 +#: intervention/forms/modalForms.py:151 konova/forms.py:392 msgid "Additional comment, maximum {} letters" msgstr "Zusätzlicher Kommentar, maximal {} Zeichen" @@ -496,47 +496,47 @@ msgstr "Neue Ersatzzahlung zu Eingriff '{}' hinzufügen" msgid "If there is no date you can enter, please explain why." msgstr "Falls Sie kein Datum angeben können, erklären Sie bitte weshalb." -#: compensation/forms/modalForms.py:115 compensation/forms/modalForms.py:127 +#: compensation/forms/modalForms.py:131 compensation/forms/modalForms.py:143 msgid "Biotope Type" msgstr "Biotoptyp" -#: compensation/forms/modalForms.py:118 +#: compensation/forms/modalForms.py:134 msgid "Select the biotope type" msgstr "Biotoptyp wählen" -#: compensation/forms/modalForms.py:132 compensation/forms/modalForms.py:144 +#: compensation/forms/modalForms.py:148 compensation/forms/modalForms.py:160 msgid "Biotope additional type" msgstr "Zusatzbezeichnung" -#: compensation/forms/modalForms.py:135 +#: compensation/forms/modalForms.py:151 msgid "Select an additional biotope type" msgstr "Zusatzbezeichnung wählen" -#: compensation/forms/modalForms.py:154 intervention/forms/modalForms.py:296 +#: compensation/forms/modalForms.py:170 intervention/forms/modalForms.py:313 msgid "in m²" msgstr "" -#: compensation/forms/modalForms.py:165 +#: compensation/forms/modalForms.py:181 msgid "New state" msgstr "Neuer Zustand" -#: compensation/forms/modalForms.py:166 +#: compensation/forms/modalForms.py:182 msgid "Insert data for the new state" msgstr "Geben Sie die Daten des neuen Zustandes ein" -#: compensation/forms/modalForms.py:173 konova/forms.py:190 +#: compensation/forms/modalForms.py:189 konova/forms.py:190 msgid "Object removed" msgstr "Objekt entfernt" -#: compensation/forms/modalForms.py:227 +#: compensation/forms/modalForms.py:277 msgid "Deadline Type" msgstr "Fristart" -#: compensation/forms/modalForms.py:230 +#: compensation/forms/modalForms.py:280 msgid "Select the deadline type" msgstr "Fristart wählen" -#: compensation/forms/modalForms.py:239 +#: compensation/forms/modalForms.py:289 #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:31 #: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:31 #: ema/templates/ema/detail/includes/deadlines.html:31 @@ -544,27 +544,27 @@ msgstr "Fristart wählen" msgid "Date" msgstr "Datum" -#: compensation/forms/modalForms.py:242 +#: compensation/forms/modalForms.py:292 msgid "Select date" msgstr "Datum wählen" -#: compensation/forms/modalForms.py:269 +#: compensation/forms/modalForms.py:319 msgid "New deadline" msgstr "Neue Frist" -#: compensation/forms/modalForms.py:270 +#: compensation/forms/modalForms.py:320 msgid "Insert data for the new deadline" msgstr "Geben Sie die Daten der neuen Frist ein" -#: compensation/forms/modalForms.py:288 +#: compensation/forms/modalForms.py:337 msgid "Action Type" msgstr "Maßnahmentyp" -#: compensation/forms/modalForms.py:291 +#: compensation/forms/modalForms.py:340 msgid "Select the action type" msgstr "Maßnahmentyp wählen" -#: compensation/forms/modalForms.py:300 +#: compensation/forms/modalForms.py:349 #: compensation/templates/compensation/detail/compensation/includes/actions.html:40 #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:39 #: compensation/templates/compensation/detail/compensation/includes/documents.html:36 @@ -590,62 +590,58 @@ msgstr "Maßnahmentyp wählen" msgid "Action" msgstr "Aktionen" -#: compensation/forms/modalForms.py:305 compensation/forms/modalForms.py:317 +#: compensation/forms/modalForms.py:354 compensation/forms/modalForms.py:366 msgid "Action Type detail" msgstr "Zusatzmerkmal" -#: compensation/forms/modalForms.py:308 +#: compensation/forms/modalForms.py:357 msgid "Select the action type detail" msgstr "Zusatzmerkmal wählen" -#: compensation/forms/modalForms.py:322 +#: compensation/forms/modalForms.py:371 msgid "Unit" msgstr "Einheit" -#: compensation/forms/modalForms.py:325 +#: compensation/forms/modalForms.py:374 msgid "Select the unit" msgstr "Einheit wählen" -#: compensation/forms/modalForms.py:337 +#: compensation/forms/modalForms.py:386 msgid "Insert the amount" msgstr "Menge eingeben" -#: compensation/forms/modalForms.py:362 +#: compensation/forms/modalForms.py:411 msgid "New action" msgstr "Neue Maßnahme" -#: compensation/forms/modalForms.py:363 +#: compensation/forms/modalForms.py:412 msgid "Insert data for the new action" msgstr "Geben Sie die Daten der neuen Maßnahme ein" -#: compensation/models/action.py:21 +#: compensation/models/action.py:22 msgid "cm" msgstr "" -#: compensation/models/action.py:22 +#: compensation/models/action.py:23 msgid "m" msgstr "" -#: compensation/models/action.py:23 +#: compensation/models/action.py:24 msgid "km" msgstr "" -#: compensation/models/action.py:24 +#: compensation/models/action.py:25 msgid "m²" msgstr "" -#: compensation/models/action.py:25 +#: compensation/models/action.py:26 msgid "ha" msgstr "" -#: compensation/models/action.py:26 +#: compensation/models/action.py:27 msgid "Pieces" msgstr "Stück" -#: compensation/models/compensation.py:63 konova/utils/message_templates.py:43 -msgid "Added deadline" -msgstr "Frist/Termin hinzugefügt" - #: compensation/models/eco_account.py:56 msgid "" "Deductable surface can not be larger than existing surfaces in after states" @@ -689,23 +685,23 @@ msgstr "Am {} von {} geprüft worden" #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:58 #: compensation/templates/compensation/detail/eco_account/view.html:47 #: ema/tables.py:102 ema/templates/ema/detail/view.html:38 -#: intervention/tables.py:132 +#: intervention/tables.py:146 #: intervention/templates/intervention/detail/view.html:85 msgid "Not recorded yet" msgstr "Noch nicht verzeichnet" #: compensation/tables.py:135 compensation/tables.py:264 ema/tables.py:107 -#: intervention/tables.py:137 +#: intervention/tables.py:151 msgid "Recorded on {} by {}" msgstr "Am {} von {} verzeichnet worden" #: compensation/tables.py:159 compensation/tables.py:286 ema/tables.py:130 -#: intervention/tables.py:160 +#: intervention/tables.py:174 msgid "Full access granted" msgstr "Für Sie freigegeben - Datensatz kann bearbeitet werden" #: compensation/tables.py:159 compensation/tables.py:286 ema/tables.py:130 -#: intervention/tables.py:160 +#: intervention/tables.py:174 msgid "Access not granted" msgstr "Nicht freigegeben - Datensatz nur lesbar" @@ -821,7 +817,7 @@ msgstr "Dokumente" #: compensation/templates/compensation/detail/eco_account/includes/documents.html:14 #: ema/templates/ema/detail/includes/documents.html:14 #: intervention/templates/intervention/detail/includes/documents.html:14 -#: konova/forms.py:391 +#: konova/forms.py:408 msgid "Add new document" msgstr "Neues Dokument hinzufügen" @@ -1076,111 +1072,76 @@ msgstr "" msgid "Responsible data" msgstr "Daten zu den verantwortlichen Stellen" -#: compensation/views/compensation.py:48 +#: compensation/views/compensation.py:50 msgid "Compensations - Overview" msgstr "Kompensationen - Übersicht" -#: compensation/views/compensation.py:147 +#: compensation/views/compensation.py:149 konova/utils/message_templates.py:27 msgid "Compensation {} edited" msgstr "Kompensation {} bearbeitet" -#: compensation/views/compensation.py:157 compensation/views/eco_account.py:160 -#: ema/views.py:227 intervention/views.py:311 +#: compensation/views/compensation.py:159 compensation/views/eco_account.py:161 +#: ema/views.py:230 intervention/views.py:313 msgid "Edit {}" msgstr "Bearbeite {}" -#: compensation/views/compensation.py:236 compensation/views/eco_account.py:316 -#: ema/views.py:188 intervention/views.py:487 +#: compensation/views/compensation.py:238 compensation/views/eco_account.py:317 +#: ema/views.py:191 intervention/views.py:491 msgid "Log" msgstr "Log" -#: compensation/views/compensation.py:280 compensation/views/eco_account.py:496 -#: ema/views.py:359 intervention/views.py:133 -msgid "Document added" -msgstr "Dokument hinzugefügt" - -#: compensation/views/compensation.py:350 compensation/views/eco_account.py:362 -#: ema/views.py:294 -msgid "State added" -msgstr "Zustand hinzugefügt" - -#: compensation/views/compensation.py:372 compensation/views/eco_account.py:384 -#: ema/views.py:316 -msgid "Action added" -msgstr "Maßnahme hinzugefügt" - -#: compensation/views/compensation.py:394 compensation/views/eco_account.py:475 -#: ema/views.py:338 -msgid "Deadline added" -msgstr "Frist/Termin hinzugefügt" - -#: compensation/views/compensation.py:417 compensation/views/eco_account.py:453 -#: ema/views.py:595 -msgid "Deadline removed" -msgstr "Frist/Termin gelöscht" - -#: compensation/views/compensation.py:440 compensation/views/eco_account.py:407 -#: ema/views.py:430 -msgid "State removed" -msgstr "Zustand gelöscht" - -#: compensation/views/compensation.py:463 compensation/views/eco_account.py:430 -#: ema/views.py:453 -msgid "Action removed" -msgstr "Maßnahme entfernt" - -#: compensation/views/compensation.py:482 compensation/views/eco_account.py:586 -#: ema/views.py:472 intervention/views.py:580 +#: compensation/views/compensation.py:487 compensation/views/eco_account.py:590 +#: ema/views.py:477 intervention/views.py:609 msgid "Report {}" msgstr "Bericht {}" -#: compensation/views/eco_account.py:59 +#: compensation/views/eco_account.py:60 msgid "Eco-account - Overview" msgstr "Ökokonten - Übersicht" -#: compensation/views/eco_account.py:92 +#: compensation/views/eco_account.py:93 msgid "Eco-Account {} added" msgstr "Ökokonto {} hinzugefügt" -#: compensation/views/eco_account.py:150 +#: compensation/views/eco_account.py:151 msgid "Eco-Account {} edited" msgstr "Ökokonto {} bearbeitet" -#: compensation/views/eco_account.py:263 +#: compensation/views/eco_account.py:264 msgid "Eco-account removed" msgstr "Ökokonto entfernt" -#: compensation/views/eco_account.py:337 ema/views.py:269 -#: intervention/views.py:558 +#: compensation/views/eco_account.py:338 ema/views.py:272 +#: intervention/views.py:562 msgid "{} unrecorded" msgstr "{} entzeichnet" -#: compensation/views/eco_account.py:337 ema/views.py:269 -#: intervention/views.py:558 +#: compensation/views/eco_account.py:338 ema/views.py:272 +#: intervention/views.py:562 msgid "{} recorded" msgstr "{} verzeichnet" -#: compensation/views/eco_account.py:659 ema/views.py:538 -#: intervention/views.py:384 +#: compensation/views/eco_account.py:663 ema/views.py:543 +#: intervention/views.py:388 msgid "{} has already been shared with you" msgstr "{} wurde bereits für Sie freigegeben" -#: compensation/views/eco_account.py:664 ema/views.py:543 -#: intervention/views.py:389 +#: compensation/views/eco_account.py:668 ema/views.py:548 +#: intervention/views.py:393 msgid "{} has been shared with you" msgstr "{} ist nun für Sie freigegeben" -#: compensation/views/eco_account.py:671 ema/views.py:550 -#: intervention/views.py:396 +#: compensation/views/eco_account.py:675 ema/views.py:555 +#: intervention/views.py:400 msgid "Share link invalid" msgstr "Freigabelink ungültig" -#: compensation/views/eco_account.py:694 ema/views.py:573 -#: intervention/views.py:419 +#: compensation/views/eco_account.py:698 ema/views.py:578 +#: intervention/views.py:423 msgid "Share settings updated" msgstr "Freigabe Einstellungen aktualisiert" -#: ema/forms.py:40 ema/views.py:92 +#: ema/forms.py:40 ema/views.py:95 msgid "New EMA" msgstr "Neue EMA hinzufügen" @@ -1208,19 +1169,19 @@ msgstr "" msgid "Payment funded compensation" msgstr "Ersatzzahlungsmaßnahme" -#: ema/views.py:49 +#: ema/views.py:52 msgid "EMAs - Overview" msgstr "EMAs - Übersicht" -#: ema/views.py:82 +#: ema/views.py:85 msgid "EMA {} added" msgstr "EMA {} hinzugefügt" -#: ema/views.py:217 +#: ema/views.py:220 msgid "EMA {} edited" msgstr "EMA {} bearbeitet" -#: ema/views.py:250 +#: ema/views.py:253 msgid "EMA removed" msgstr "EMA entfernt" @@ -1281,7 +1242,7 @@ msgstr "Datum Zulassung bzw. Satzungsbeschluss" msgid "Binding on" msgstr "Datum Bestandskraft" -#: intervention/forms/forms.py:193 intervention/views.py:92 +#: intervention/forms/forms.py:193 intervention/views.py:94 msgid "New intervention" msgstr "Neuer Eingriff" @@ -1335,20 +1296,20 @@ msgstr "Muss kleiner als 15 Mb sein" msgid "Add revocation" msgstr "Widerspruch hinzufügen" -#: intervention/forms/modalForms.py:180 +#: intervention/forms/modalForms.py:197 msgid "Checked intervention data" msgstr "Eingriffsdaten geprüft" -#: intervention/forms/modalForms.py:186 +#: intervention/forms/modalForms.py:203 msgid "Checked compensations data and payments" msgstr "Kompensationen und Zahlungen geprüft" -#: intervention/forms/modalForms.py:195 +#: intervention/forms/modalForms.py:212 #: intervention/templates/intervention/detail/includes/controls.html:19 msgid "Run check" msgstr "Prüfung vornehmen" -#: intervention/forms/modalForms.py:196 konova/forms.py:457 +#: intervention/forms/modalForms.py:213 konova/forms.py:474 msgid "" "I, {} {}, confirm that all necessary control steps have been performed by " "myself." @@ -1356,23 +1317,23 @@ msgstr "" "Ich, {} {}, bestätige, dass die notwendigen Kontrollschritte durchgeführt " "wurden:" -#: intervention/forms/modalForms.py:280 +#: intervention/forms/modalForms.py:297 msgid "Only recorded accounts can be selected for deductions" msgstr "Nur verzeichnete Ökokonten können für Abbuchungen verwendet werden." -#: intervention/forms/modalForms.py:307 +#: intervention/forms/modalForms.py:324 msgid "Only shared interventions can be selected" msgstr "Nur freigegebene Eingriffe können gewählt werden" -#: intervention/forms/modalForms.py:320 +#: intervention/forms/modalForms.py:337 msgid "New Deduction" msgstr "Neue Abbuchung" -#: intervention/forms/modalForms.py:321 +#: intervention/forms/modalForms.py:338 msgid "Enter the information for a new deduction from a chosen eco-account" msgstr "Geben Sie die Informationen für eine neue Abbuchung ein." -#: intervention/forms/modalForms.py:349 +#: intervention/forms/modalForms.py:366 msgid "" "Eco-account {} is not recorded yet. You can only deduct from recorded " "accounts." @@ -1380,7 +1341,7 @@ msgstr "" "Ökokonto {} ist noch nicht verzeichnet. Abbuchungen können nur von " "verzeichneten Ökokonten erfolgen." -#: intervention/forms/modalForms.py:362 +#: intervention/forms/modalForms.py:379 msgid "" "The account {} has not enough surface for a deduction of {} m². There are " "only {} m² left" @@ -1388,18 +1349,9 @@ msgstr "" "Das Ökokonto {} hat für eine Abbuchung von {} m² nicht ausreichend " "Restfläche. Es stehen noch {} m² zur Verfügung." -#: intervention/tables.py:45 -#: intervention/templates/intervention/detail/includes/revocation.html:58 -msgid "Revocation" -msgstr "Widerspruch" - -#: intervention/tables.py:177 -msgid "No revocation" -msgstr "Kein Widerspruch" - -#: intervention/tables.py:183 -msgid "Revocation from {}, added on {} by {}" -msgstr "Widerspruch vom {}, am {} von {} hinzugefügt" +#: intervention/tables.py:34 konova/filters/mixins.py:98 +msgid "Parcel gmrkng" +msgstr "Gemarkung" #: intervention/templates/intervention/detail/includes/compensations.html:14 msgid "Add new compensation" @@ -1449,6 +1401,10 @@ msgctxt "Revocation" msgid "From" msgstr "Vom" +#: intervention/templates/intervention/detail/includes/revocation.html:58 +msgid "Revocation" +msgstr "Widerspruch" + #: intervention/templates/intervention/detail/includes/revocation.html:69 msgid "Remove revocation" msgstr "Widerspruch entfernen" @@ -1465,6 +1421,17 @@ msgstr "Abbuchungen von Ökokonten" msgid "Exist" msgstr "Vorhanden" +#: intervention/templates/intervention/table/gmrkng_col.html:6 +msgid "" +"\n" +"If the geometry is not empty, the parcels are currently recalculated. Please " +"refresh this page in a few moments." +msgstr "" +"\n" +"Falls die Geometrie nicht leer ist, werden die Flurstücke aktuell berechnet. " +"Bitte laden Sie diese Seite in ein paar Augenblicken erneut... \n" +" " + #: intervention/utils/quality.py:70 msgid "Revocations exists" msgstr "Widersprüche liegen vor" @@ -1477,37 +1444,37 @@ msgstr "Datum Bestandskraft" msgid "Laws" msgstr "Gesetze" -#: intervention/utils/quality.py:98 +#: intervention/utils/quality.py:101 msgid "No compensation of any type found (Compensation, Payment, Deduction)" msgstr "" "Kein Ausgleich jeglicher Art gefunden (Kompensation, Ersatzzahlung, " "Abbuchung)" -#: intervention/views.py:49 +#: intervention/views.py:51 msgid "Interventions - Overview" msgstr "Eingriffe - Übersicht" -#: intervention/views.py:82 +#: intervention/views.py:84 msgid "Intervention {} added" msgstr "Eingriff {} hinzugefügt" -#: intervention/views.py:250 +#: intervention/views.py:252 msgid "This intervention has {} revocations" msgstr "Dem Eingriff liegen {} Widersprüche vor" -#: intervention/views.py:299 +#: intervention/views.py:301 msgid "Intervention {} edited" msgstr "Eingriff {} bearbeitet" -#: intervention/views.py:335 +#: intervention/views.py:337 msgid "{} removed" msgstr "{} entfernt" -#: intervention/views.py:440 +#: intervention/views.py:444 msgid "Check performed" msgstr "Prüfung durchgeführt" -#: intervention/views.py:563 +#: intervention/views.py:567 msgid "There are errors on this intervention:" msgstr "Es liegen Fehler in diesem Eingriff vor:" @@ -1544,10 +1511,6 @@ msgstr "Kreis" msgid "Search for district" msgstr "Nach Kreis suchen" -#: konova/filters/mixins.py:98 -msgid "Parcel gmrkng" -msgstr "Gemarkung" - #: konova/filters/mixins.py:99 msgid "Search for parcel gmrkng" msgstr "Nach Gemarkung suchen" @@ -1624,52 +1587,52 @@ msgstr "Geometrie" msgid "Are you sure?" msgstr "Sind Sie sicher?" -#: konova/forms.py:348 +#: konova/forms.py:365 msgid "Created on" msgstr "Erstellt" -#: konova/forms.py:350 +#: konova/forms.py:367 msgid "When has this file been created? Important for photos." msgstr "Wann wurde diese Datei erstellt oder das Foto aufgenommen?" -#: konova/forms.py:361 +#: konova/forms.py:378 #: venv/lib/python3.7/site-packages/django/db/models/fields/files.py:231 msgid "File" msgstr "Datei" -#: konova/forms.py:363 +#: konova/forms.py:380 msgid "Allowed formats: pdf, jpg, png. Max size 15 MB." msgstr "Formate: pdf, jpg, png. Maximal 15 MB." -#: konova/forms.py:409 +#: konova/forms.py:426 msgid "Unsupported file type" msgstr "Dateiformat nicht unterstützt" -#: konova/forms.py:416 +#: konova/forms.py:433 msgid "File too large" msgstr "Datei zu groß" -#: konova/forms.py:425 +#: konova/forms.py:442 msgid "Added document" msgstr "Dokument hinzugefügt" -#: konova/forms.py:448 +#: konova/forms.py:465 msgid "Confirm record" msgstr "Verzeichnen bestätigen" -#: konova/forms.py:456 +#: konova/forms.py:473 msgid "Record data" msgstr "Daten verzeichnen" -#: konova/forms.py:463 +#: konova/forms.py:480 msgid "Confirm unrecord" msgstr "Entzeichnen bestätigen" -#: konova/forms.py:464 +#: konova/forms.py:481 msgid "Unrecord data" msgstr "Daten entzeichnen" -#: konova/forms.py:465 +#: konova/forms.py:482 msgid "I, {} {}, confirm that this data must be unrecorded." msgstr "" "Ich, {} {}, bestätige, dass diese Daten wieder entzeichnet werden müssen." @@ -1772,35 +1735,31 @@ msgstr "In Zwischenablage kopieren" msgid "Copied to clipboard" msgstr "In Zwischenablage kopiert" -#: konova/utils/documents.py:52 -msgid "Document '{}' deleted" -msgstr "Dokument '{}' gelöscht" - -#: konova/utils/mailer.py:66 +#: konova/utils/mailer.py:68 msgid "{} - Shared access removed" msgstr "{} - Zugriff entzogen" -#: konova/utils/mailer.py:88 +#: konova/utils/mailer.py:91 msgid "{} - Shared access given" msgstr "{} - Zugriff freigegeben" -#: konova/utils/mailer.py:110 +#: konova/utils/mailer.py:114 msgid "{} - Shared data recorded" msgstr "{} - Freigegebene Daten verzeichnet" -#: konova/utils/mailer.py:132 +#: konova/utils/mailer.py:137 msgid "{} - Shared data unrecorded" msgstr "{} - Freigegebene Daten entzeichnet" -#: konova/utils/mailer.py:154 +#: konova/utils/mailer.py:160 msgid "{} - Shared data deleted" msgstr "{} - Freigegebene Daten gelöscht" -#: konova/utils/mailer.py:176 +#: konova/utils/mailer.py:183 msgid "{} - Shared data checked" msgstr "{} - Freigegebene Daten geprüft" -#: konova/utils/mailer.py:197 templates/email/api/verify_token.html:4 +#: konova/utils/mailer.py:204 templates/email/api/verify_token.html:4 msgid "Request for new API token" msgstr "Anfrage für neuen API Token" @@ -1862,43 +1821,79 @@ msgstr "Kompensation {} hinzugefügt" msgid "Compensation {} removed" msgstr "Kompensation {} entfernt" -#: konova/utils/message_templates.py:29 -msgid "Deduction added" -msgstr "Abbuchung hinzugefügt" - -#: konova/utils/message_templates.py:30 -msgid "Deduction removed" -msgstr "Abbuchung entfernt" - -#: konova/utils/message_templates.py:33 -msgid "Payment added" -msgstr "Zahlung hinzugefügt" - -#: konova/utils/message_templates.py:34 -msgid "Payment removed" -msgstr "Zahlung gelöscht" - -#: konova/utils/message_templates.py:37 -msgid "Revocation added" -msgstr "Widerspruch hinzugefügt" - -#: konova/utils/message_templates.py:38 -msgid "Revocation removed" -msgstr "Widerspruch entfernt" - -#: konova/utils/message_templates.py:41 -msgid "Edited general data" -msgstr "Allgemeine Daten bearbeitet" - -#: konova/utils/message_templates.py:42 -msgid "Added compensation state" -msgstr "Zustand hinzugefügt" - -#: konova/utils/message_templates.py:44 +#: konova/utils/message_templates.py:28 msgid "Added compensation action" msgstr "Maßnahme hinzugefügt" -#: konova/utils/message_templates.py:47 +#: konova/utils/message_templates.py:29 +msgid "Added compensation state" +msgstr "Zustand hinzugefügt" + +#: konova/utils/message_templates.py:32 +msgid "State removed" +msgstr "Zustand gelöscht" + +#: konova/utils/message_templates.py:33 +msgid "State added" +msgstr "Zustand hinzugefügt" + +#: konova/utils/message_templates.py:36 +msgid "Action added" +msgstr "Maßnahme hinzugefügt" + +#: konova/utils/message_templates.py:37 +msgid "Action removed" +msgstr "Maßnahme entfernt" + +#: konova/utils/message_templates.py:40 +msgid "Deduction added" +msgstr "Abbuchung hinzugefügt" + +#: konova/utils/message_templates.py:41 +msgid "Deduction removed" +msgstr "Abbuchung entfernt" + +#: konova/utils/message_templates.py:44 +msgid "Deadline added" +msgstr "Frist/Termin hinzugefügt" + +#: konova/utils/message_templates.py:45 +msgid "Deadline removed" +msgstr "Frist/Termin gelöscht" + +#: konova/utils/message_templates.py:48 +msgid "Payment added" +msgstr "Zahlung hinzugefügt" + +#: konova/utils/message_templates.py:49 +msgid "Payment removed" +msgstr "Zahlung gelöscht" + +#: konova/utils/message_templates.py:52 +msgid "Revocation added" +msgstr "Widerspruch hinzugefügt" + +#: konova/utils/message_templates.py:53 +msgid "Revocation removed" +msgstr "Widerspruch entfernt" + +#: konova/utils/message_templates.py:56 +msgid "Document '{}' deleted" +msgstr "Dokument '{}' gelöscht" + +#: konova/utils/message_templates.py:57 +msgid "Document added" +msgstr "Dokument hinzugefügt" + +#: konova/utils/message_templates.py:60 +msgid "Edited general data" +msgstr "Allgemeine Daten bearbeitet" + +#: konova/utils/message_templates.py:61 +msgid "Added deadline" +msgstr "Frist/Termin hinzugefügt" + +#: konova/utils/message_templates.py:64 msgid "Geometry conflict detected with {}" msgstr "Geometriekonflikt mit folgenden Einträgen erkannt: {}" @@ -1984,12 +1979,12 @@ msgstr "" "Admin Backend aktiviert worden ist." #: templates/email/api/verify_token.html:18 -#: templates/email/checking/shared_data_checked.html:17 -#: templates/email/deleting/shared_data_deleted.html:17 -#: templates/email/recording/shared_data_recorded.html:17 -#: templates/email/recording/shared_data_unrecorded.html:17 -#: templates/email/sharing/shared_access_given.html:18 -#: templates/email/sharing/shared_access_removed.html:18 +#: templates/email/checking/shared_data_checked.html:19 +#: templates/email/deleting/shared_data_deleted.html:19 +#: templates/email/recording/shared_data_recorded.html:19 +#: templates/email/recording/shared_data_unrecorded.html:19 +#: templates/email/sharing/shared_access_given.html:20 +#: templates/email/sharing/shared_access_removed.html:20 msgid "Best regards" msgstr "Beste Grüße" @@ -2010,7 +2005,7 @@ msgstr "Hallo " msgid "the following dataset has just been checked" msgstr "der folgende Datensatz wurde soeben geprüft " -#: templates/email/checking/shared_data_checked.html:14 +#: templates/email/checking/shared_data_checked.html:16 msgid "" "This means, the responsible registration office just confirmed the " "correctness of this dataset." @@ -2026,7 +2021,7 @@ msgstr "Freigegebene Daten gelöscht" msgid "the following dataset has just been deleted" msgstr "der folgende Datensatz wurde soeben gelöscht " -#: templates/email/deleting/shared_data_deleted.html:14 +#: templates/email/deleting/shared_data_deleted.html:16 msgid "" "If this should not have been happened, please contact us. See the signature " "for details." @@ -2042,12 +2037,12 @@ msgstr "Freigegebene Daten verzeichnet" msgid "the following dataset has just been recorded" msgstr "der folgende Datensatz wurde soeben verzeichnet " -#: templates/email/recording/shared_data_recorded.html:14 +#: templates/email/recording/shared_data_recorded.html:16 msgid "This means the data is now publicly available, e.g. in LANIS" msgstr "" "Das bedeutet, dass die Daten nun öffentlich verfügbar sind, z.B. im LANIS." -#: templates/email/recording/shared_data_recorded.html:24 +#: templates/email/recording/shared_data_recorded.html:26 msgid "" "Please note: Recorded intervention means the compensations are recorded as " "well." @@ -2063,11 +2058,11 @@ msgstr "Freigegebene Daten entzeichnet" msgid "the following dataset has just been unrecorded" msgstr "der folgende Datensatz wurde soeben entzeichnet " -#: templates/email/recording/shared_data_unrecorded.html:14 +#: templates/email/recording/shared_data_unrecorded.html:16 msgid "This means the data is no longer publicly available." msgstr "Das bedeutet, dass die Daten nicht länger öffentlich verfügbar sind." -#: templates/email/recording/shared_data_unrecorded.html:24 +#: templates/email/recording/shared_data_unrecorded.html:26 msgid "" "Please note: Unrecorded intervention means the compensations are unrecorded " "as well." @@ -2083,11 +2078,11 @@ msgstr "Zugriff freigegeben" msgid "the following dataset has just been shared with you" msgstr "der folgende Datensatz wurde soeben für Sie freigegeben " -#: templates/email/sharing/shared_access_given.html:14 +#: templates/email/sharing/shared_access_given.html:16 msgid "This means you can now edit this dataset." msgstr "Das bedeutet, dass Sie diesen Datensatz nun auch bearbeiten können." -#: templates/email/sharing/shared_access_given.html:15 +#: templates/email/sharing/shared_access_given.html:17 msgid "" "The shared dataset appears now by default on your overview for this dataset " "type." @@ -2095,7 +2090,7 @@ msgstr "" "Der freigegebene Datensatz ist nun standardmäßig in Ihrer Übersicht für den " "Datensatztyp im KSP gelistet." -#: templates/email/sharing/shared_access_given.html:25 +#: templates/email/sharing/shared_access_given.html:27 msgid "" "Please note: Shared access on an intervention means you automatically have " "editing access to related compensations." @@ -2115,11 +2110,11 @@ msgstr "" "Ihnen wurde soeben der bearbeitende Zugriff auf den folgenden Datensatz " "entzogen: " -#: templates/email/sharing/shared_access_removed.html:14 +#: templates/email/sharing/shared_access_removed.html:16 msgid "However, you are still able to view the dataset content." msgstr "Sie können den Datensatz aber immer noch im KSP einsehen." -#: templates/email/sharing/shared_access_removed.html:15 +#: templates/email/sharing/shared_access_removed.html:17 msgid "" "Please use the provided search filter on the dataset`s overview pages to " "find them." @@ -3918,6 +3913,12 @@ msgstr "" msgid "Unable to connect to qpid with SASL mechanism %s" msgstr "" +#~ msgid "No revocation" +#~ msgstr "Kein Widerspruch" + +#~ msgid "Revocation from {}, added on {} by {}" +#~ msgstr "Widerspruch vom {}, am {} von {} hinzugefügt" + #~ msgid "General data edited" #~ msgstr "Allgemeine Daten bearbeitet" diff --git a/templates/table/gmrkng_col.html b/templates/table/gmrkng_col.html new file mode 100644 index 00000000..bd8878de --- /dev/null +++ b/templates/table/gmrkng_col.html @@ -0,0 +1,9 @@ +{% load i18n fontawesome_5 %} + +{% for entry in entries %} + {{entry}} +{% empty %} + + {% fa5_icon 'hourglass-half' %} + +{% endfor %} \ No newline at end of file