From 91c07df3149a89bbca70c7b022d7e9891641ba5b Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Fri, 22 Oct 2021 13:32:05 +0200 Subject: [PATCH] #26 Annual conservation report * adds LegalData to EcoAccount to provide registration_date support ("agreement date") for old-data report generating * adds/updates translations --- analysis/utils/report.py | 2 +- compensation/forms/forms.py | 31 ++- compensation/models.py | 10 +- .../compensation/detail/eco_account/view.html | 4 + locale/de/LC_MESSAGES/django.mo | Bin 26698 -> 26795 bytes locale/de/LC_MESSAGES/django.po | 194 ++++++++++-------- 6 files changed, 147 insertions(+), 94 deletions(-) diff --git a/analysis/utils/report.py b/analysis/utils/report.py index 1fd86604..3bfd6370 100644 --- a/analysis/utils/report.py +++ b/analysis/utils/report.py @@ -498,7 +498,7 @@ class TimespanReport: self.queryset_comps_recorded_count = self.queryset_comps_recorded.count() self.queryset_acc = EcoAccount.objects.filter( - #legal__registration_date__lte=LKOMPVZVO_PUBLISH_DATE, + legal__registration_date__lte=LKOMPVZVO_PUBLISH_DATE, responsible__conservation_office__id=id, deleted=None, created__timestamp__gte=date_from, diff --git a/compensation/forms/forms.py b/compensation/forms/forms.py index 59054836..eadee2f4 100644 --- a/compensation/forms/forms.py +++ b/compensation/forms/forms.py @@ -16,7 +16,7 @@ from codelist.models import KonovaCode from codelist.settings import CODELIST_COMPENSATION_FUNDING_ID, CODELIST_CONSERVATION_OFFICE_ID from compensation.models import Compensation, EcoAccount from intervention.inputs import GenerateInput -from intervention.models import Intervention, ResponsibilityData +from intervention.models import Intervention, ResponsibilityData, LegalData from konova.forms import BaseForm, SimpleGeomForm from user.models import UserActionLogEntry, UserAction @@ -298,11 +298,25 @@ class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMix } ) ) + registration_date = forms.DateField( + label=_("Agreement date"), + label_suffix="", + help_text=_("When did the parties agree on this?"), + required=False, + widget=forms.DateInput( + attrs={ + "type": "date", + "class": "form-control", + }, + format="%d.%m.%Y" + ) + ) field_order = [ "identifier", "title", "conservation_office", + "registration_date", "surface", "conservation_file_number", "handler", @@ -329,6 +343,7 @@ class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMix identifier = self.cleaned_data.get("identifier", None) title = self.cleaned_data.get("title", None) fundings = self.cleaned_data.get("fundings", None) + registration_date = self.cleaned_data.get("registration_date", None) handler = self.cleaned_data.get("handler", None) surface = self.cleaned_data.get("surface", None) conservation_office = self.cleaned_data.get("conservation_office", None) @@ -349,6 +364,10 @@ class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMix conservation_office=conservation_office, ) + legal = LegalData.objects.create( + registration_date=registration_date + ) + # Finally create main object acc = EcoAccount.objects.create( identifier=identifier, @@ -358,6 +377,7 @@ class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMix created=action, geometry=geometry, comment=comment, + legal=legal ) acc.fundings.set(fundings) acc.users.add(user) @@ -380,11 +400,15 @@ class EditEcoAccountForm(NewEcoAccountForm): self.cancel_redirect = reverse("compensation:acc-detail", args=(self.instance.id,)) # Initialize form data + reg_date = self.instance.legal.registration_date + if reg_date is not None: + reg_date = reg_date.isoformat() form_data = { "identifier": self.instance.identifier, "title": self.instance.title, "surface": self.instance.deductable_surface, "handler": self.instance.responsible.handler, + "registration_date": reg_date, "conservation_office": self.instance.responsible.conservation_office, "conservation_file_number": self.instance.responsible.conservation_file_number, "fundings": self.instance.fundings.all(), @@ -402,6 +426,7 @@ class EditEcoAccountForm(NewEcoAccountForm): identifier = self.cleaned_data.get("identifier", None) title = self.cleaned_data.get("title", None) fundings = self.cleaned_data.get("fundings", None) + registration_date = self.cleaned_data.get("registration_date", None) handler = self.cleaned_data.get("handler", None) surface = self.cleaned_data.get("surface", None) conservation_office = self.cleaned_data.get("conservation_office", None) @@ -422,6 +447,10 @@ class EditEcoAccountForm(NewEcoAccountForm): self.instance.responsible.conservation_file_number = conservation_file_number self.instance.responsible.save() + # Update legal data + self.instance.legal.registration_date = registration_date + self.instance.legal.save() + # Update main oject data self.instance.identifier = identifier self.instance.title = title diff --git a/compensation/models.py b/compensation/models.py index 4f9cc919..d2d18be5 100644 --- a/compensation/models.py +++ b/compensation/models.py @@ -19,7 +19,7 @@ from codelist.settings import CODELIST_COMPENSATION_ACTION_ID, CODELIST_BIOTOPES CODELIST_COMPENSATION_FUNDING_ID from compensation.managers import CompensationStateManager, EcoAccountDeductionManager, CompensationActionManager, \ EcoAccountManager, CompensationManager -from intervention.models import Intervention, ResponsibilityData +from intervention.models import Intervention, ResponsibilityData, LegalData from konova.models import BaseObject, BaseResource, Geometry, UuidModel, AbstractDocument, \ generate_document_file_upload_path from konova.settings import DEFAULT_SRID_RLP, LANIS_LINK_TEMPLATE @@ -309,6 +309,14 @@ class EcoAccount(AbstractCompensation): default=0, ) + legal = models.OneToOneField( + LegalData, + on_delete=models.SET_NULL, + null=True, + blank=True, + help_text="Holds data on legal dates or law" + ) + objects = EcoAccountManager() def __str__(self): diff --git a/compensation/templates/compensation/detail/eco_account/view.html b/compensation/templates/compensation/detail/eco_account/view.html index e839e6e9..6f7eca99 100644 --- a/compensation/templates/compensation/detail/eco_account/view.html +++ b/compensation/templates/compensation/detail/eco_account/view.html @@ -61,6 +61,10 @@ {% trans 'Conservation office file number' %} {{obj.responsible.conservation_file_number|default_if_none:""}} + + {% trans 'Agreement date' %} + {{obj.legal.registration_date|default_if_none:""}} + {% trans 'Action handler' %} {{obj.responsible.handler|default_if_none:""}} diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index baf99f19c210ba8ab7f63c1ae584e0b6c60c5519..8a1e11b3bf85fc2addccaff72983a2c4993babf7 100644 GIT binary patch delta 7560 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 delta 7483 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 diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 74b0ecab..2ac3f918 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -11,15 +11,15 @@ #: intervention/forms/forms.py:53 intervention/forms/forms.py:155 #: intervention/forms/forms.py:167 intervention/forms/modalForms.py:107 #: intervention/forms/modalForms.py:120 intervention/forms/modalForms.py:133 -#: konova/forms.py:142 konova/forms.py:246 konova/forms.py:312 -#: konova/forms.py:339 konova/forms.py:349 konova/forms.py:362 -#: konova/forms.py:374 konova/forms.py:395 user/forms.py:38 +#: konova/forms.py:142 konova/forms.py:247 konova/forms.py:313 +#: konova/forms.py:340 konova/forms.py:350 konova/forms.py:363 +#: konova/forms.py:375 konova/forms.py:396 user/forms.py:38 #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-10-20 13:37+0200\n" +"POT-Creation-Date: 2021-10-22 13:14+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -37,7 +37,7 @@ msgstr "Vom" msgid "To" msgstr "Bis" -#: analysis/forms.py:47 compensation/forms/forms.py:93 +#: analysis/forms.py:47 compensation/forms/forms.py:94 #: compensation/templates/compensation/detail/eco_account/view.html:58 #: compensation/templates/compensation/report/eco_account/report.html:16 #: ema/templates/ema/detail/view.html:42 @@ -47,12 +47,12 @@ msgstr "Bis" msgid "Conservation office" msgstr "Eintragungsstelle" -#: analysis/forms.py:49 compensation/forms/forms.py:95 +#: analysis/forms.py:49 compensation/forms/forms.py:96 msgid "Select the responsible office" msgstr "Verantwortliche Stelle" -#: analysis/forms.py:58 compensation/forms/forms.py:67 -#: compensation/forms/forms.py:104 compensation/forms/forms.py:155 +#: analysis/forms.py:58 compensation/forms/forms.py:68 +#: compensation/forms/forms.py:105 compensation/forms/forms.py:156 #: intervention/forms/forms.py:63 intervention/forms/forms.py:80 #: intervention/forms/forms.py:96 intervention/forms/forms.py:112 msgid "Click for selection" @@ -66,6 +66,10 @@ msgstr "Bericht generieren" msgid "Select a timespan and the desired conservation office" msgstr "Wählen Sie die Zeitspanne und die gewünschte Eintragungsstelle" +#: analysis/forms.py:69 konova/forms.py:194 +msgid "Continue" +msgstr "Weiter" + #: analysis/templates/analysis/reports/detail.html:7 msgid "Evaluation report" msgstr "Auswertungsbericht" @@ -74,6 +78,10 @@ msgstr "Auswertungsbericht" msgid "to" msgstr "bis" +#: analysis/templates/analysis/reports/detail.html:14 +msgid "Download" +msgstr "" + #: analysis/templates/analysis/reports/includes/compensation/amount.html:3 #: analysis/templates/analysis/reports/includes/eco_account/amount.html:3 #: analysis/templates/analysis/reports/includes/intervention/amount.html:3 @@ -85,7 +93,6 @@ msgid "Amount" msgstr "Menge" #: analysis/templates/analysis/reports/includes/compensation/amount.html:5 -#: analysis/templates/analysis/reports/includes/eco_account/amount.html:5 #: analysis/templates/analysis/reports/includes/intervention/amount.html:5 #: analysis/templates/analysis/reports/includes/old_data/amount.html:5 msgid "" @@ -99,7 +106,7 @@ msgstr "" " " #: analysis/templates/analysis/reports/includes/compensation/amount.html:9 -#: analysis/templates/analysis/reports/includes/eco_account/amount.html:9 +#: analysis/templates/analysis/reports/includes/eco_account/amount.html:5 #: analysis/templates/analysis/reports/includes/intervention/amount.html:9 #: analysis/templates/analysis/reports/includes/old_data/amount.html:9 msgid "" @@ -120,7 +127,6 @@ msgstr "Zuständigkeitsbereich" #: analysis/templates/analysis/reports/includes/intervention/amount.html:17 #: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:8 #: analysis/templates/analysis/reports/includes/intervention/laws.html:17 -#: analysis/templates/analysis/reports/includes/old_data/amount.html:17 #: compensation/tables.py:35 #: compensation/templates/compensation/detail/compensation/view.html:43 #: intervention/tables.py:33 @@ -129,7 +135,7 @@ msgid "Checked" msgstr "Geprüft" #: analysis/templates/analysis/reports/includes/compensation/amount.html:19 -#: analysis/templates/analysis/reports/includes/eco_account/amount.html:19 +#: analysis/templates/analysis/reports/includes/eco_account/amount.html:13 #: analysis/templates/analysis/reports/includes/eco_account/deductions.html:8 #: analysis/templates/analysis/reports/includes/eco_account/deductions.html:9 #: analysis/templates/analysis/reports/includes/intervention/amount.html:18 @@ -152,7 +158,7 @@ msgstr "Einzelflächen" #: analysis/templates/analysis/reports/includes/compensation/amount.html:21 #: analysis/templates/analysis/reports/includes/compensation/amount.html:47 -#: analysis/templates/analysis/reports/includes/eco_account/amount.html:20 +#: analysis/templates/analysis/reports/includes/eco_account/amount.html:14 #: analysis/templates/analysis/reports/includes/eco_account/deductions.html:10 #: analysis/templates/analysis/reports/includes/eco_account/deductions.html:11 #: analysis/templates/analysis/reports/includes/intervention/amount.html:19 @@ -184,15 +190,6 @@ msgstr "Andere Zulassungsbehörden" msgid "Compensations" msgstr "Kompensationen" -#: analysis/templates/analysis/reports/includes/eco_account/amount.html:17 -#: analysis/templates/analysis/reports/includes/old_data/card_old_interventions.html:13 -msgid "Before" -msgstr "Vor" - -#: analysis/templates/analysis/reports/includes/eco_account/amount.html:18 -msgid "After" -msgstr "Nach" - #: analysis/templates/analysis/reports/includes/eco_account/card_eco_account.html:11 msgid "Eco-Accounts" msgstr "Ökokonten" @@ -229,6 +226,7 @@ msgid "Compensation type" msgstr "Kompensationsart" #: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:15 +#: analysis/templates/analysis/reports/includes/old_data/amount.html:29 #: compensation/tables.py:84 #: compensation/templates/compensation/detail/compensation/view.html:19 #: konova/templates/konova/home.html:49 templates/navbars/navbar.html:28 @@ -265,26 +263,53 @@ msgstr "" msgid "Law" msgstr "Gesetz" +#: analysis/templates/analysis/reports/includes/old_data/amount.html:17 +#: compensation/templates/compensation/detail/compensation/includes/deadlines.html:28 +#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:28 +#: ema/templates/ema/detail/includes/deadlines.html:28 +msgid "Type" +msgstr "Typ" + +#: analysis/templates/analysis/reports/includes/old_data/amount.html:24 +#: intervention/forms/modalForms.py:285 intervention/forms/modalForms.py:292 +#: intervention/tables.py:88 +#: intervention/templates/intervention/detail/view.html:19 +#: konova/templates/konova/home.html:11 templates/navbars/navbar.html:22 +msgid "Intervention" +msgstr "Eingriff" + +#: analysis/templates/analysis/reports/includes/old_data/amount.html:34 +#: compensation/tables.py:224 +#: compensation/templates/compensation/detail/eco_account/view.html:19 +#: intervention/forms/modalForms.py:258 intervention/forms/modalForms.py:265 +#: konova/templates/konova/home.html:88 templates/navbars/navbar.html:34 +msgid "Eco-account" +msgstr "Ökokonto" + #: analysis/templates/analysis/reports/includes/old_data/card_old_interventions.html:11 msgid "Old interventions" msgstr "Altfälle" +#: analysis/templates/analysis/reports/includes/old_data/card_old_interventions.html:13 +msgid "Before" +msgstr "Vor" + #: compensation/filters.py:70 msgid "Show only unrecorded" msgstr "Nur unverzeichnete anzeigen" -#: compensation/forms/forms.py:31 compensation/tables.py:25 +#: compensation/forms/forms.py:32 compensation/tables.py:25 #: compensation/tables.py:166 ema/tables.py:28 intervention/forms/forms.py:27 #: intervention/tables.py:23 #: intervention/templates/intervention/detail/includes/compensations.html:30 msgid "Identifier" msgstr "Kennung" -#: compensation/forms/forms.py:34 intervention/forms/forms.py:30 +#: compensation/forms/forms.py:35 intervention/forms/forms.py:30 msgid "Generated automatically" msgstr "Automatisch generiert" -#: compensation/forms/forms.py:43 compensation/tables.py:30 +#: compensation/forms/forms.py:44 compensation/tables.py:30 #: compensation/tables.py:171 #: compensation/templates/compensation/detail/compensation/includes/documents.html:28 #: compensation/templates/compensation/detail/compensation/view.html:31 @@ -300,27 +325,27 @@ msgstr "Automatisch generiert" #: 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:339 msgid "Title" msgstr "Bezeichnung" -#: compensation/forms/forms.py:45 intervention/forms/forms.py:41 +#: compensation/forms/forms.py:46 intervention/forms/forms.py:41 msgid "An explanatory name" msgstr "Aussagekräftiger Titel" -#: compensation/forms/forms.py:49 ema/forms.py:47 ema/forms.py:105 +#: compensation/forms/forms.py:50 ema/forms.py:47 ema/forms.py:105 msgid "Compensation XY; Location ABC" msgstr "Kompensation XY; Flur ABC" -#: compensation/forms/forms.py:55 +#: compensation/forms/forms.py:56 msgid "Fundings" msgstr "Förderungen" -#: compensation/forms/forms.py:58 +#: compensation/forms/forms.py:59 msgid "Select fundings for this compensation" msgstr "Wählen Sie ggf. Fördermittelprojekte" -#: compensation/forms/forms.py:73 compensation/forms/modalForms.py:61 +#: compensation/forms/forms.py:74 compensation/forms/modalForms.py:61 #: compensation/forms/modalForms.py:272 compensation/forms/modalForms.py:367 #: compensation/templates/compensation/detail/compensation/includes/actions.html:34 #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:34 @@ -335,15 +360,15 @@ msgstr "Wählen Sie ggf. Fördermittelprojekte" #: 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/comment_card.html:16 +#: konova/forms.py:374 konova/templates/konova/comment_card.html:16 msgid "Comment" msgstr "Kommentar" -#: compensation/forms/forms.py:75 intervention/forms/forms.py:181 +#: compensation/forms/forms.py:76 intervention/forms/forms.py:181 msgid "Additional comment" msgstr "Zusätzlicher Kommentar" -#: compensation/forms/forms.py:109 +#: compensation/forms/forms.py:110 #: compensation/templates/compensation/detail/eco_account/view.html:62 #: compensation/templates/compensation/report/eco_account/report.html:20 #: ema/templates/ema/detail/view.html:46 @@ -353,57 +378,65 @@ msgstr "Zusätzlicher Kommentar" msgid "Conservation office file number" msgstr "Aktenzeichen Eintragungsstelle" -#: compensation/forms/forms.py:115 intervention/forms/forms.py:135 +#: compensation/forms/forms.py:116 intervention/forms/forms.py:135 msgid "ETS-123/ABC.456" msgstr "" -#: compensation/forms/forms.py:121 +#: compensation/forms/forms.py:122 msgid "Eco-account handler" msgstr "Maßnahmenträger" -#: compensation/forms/forms.py:125 +#: compensation/forms/forms.py:126 msgid "Who handles the eco-account" msgstr "Wer für die Herrichtung des Ökokontos verantwortlich ist" -#: compensation/forms/forms.py:128 intervention/forms/forms.py:148 +#: compensation/forms/forms.py:129 intervention/forms/forms.py:148 msgid "Company Mustermann" msgstr "Firma Mustermann" -#: compensation/forms/forms.py:146 +#: compensation/forms/forms.py:147 #: compensation/templates/compensation/detail/compensation/view.html:35 #: compensation/templates/compensation/report/compensation/report.html:16 msgid "compensates intervention" msgstr "kompensiert Eingriff" -#: compensation/forms/forms.py:148 +#: compensation/forms/forms.py:149 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:173 +#: compensation/forms/forms.py:174 msgid "New compensation" msgstr "Neue Kompensation" -#: compensation/forms/forms.py:231 +#: compensation/forms/forms.py:232 msgid "Edit compensation" msgstr "Bearbeite Kompensation" -#: compensation/forms/forms.py:290 +#: compensation/forms/forms.py:291 msgid "Available Surface" msgstr "Verfügbare Fläche" -#: compensation/forms/forms.py:293 +#: compensation/forms/forms.py:294 msgid "The amount that can be used for deductions" msgstr "Die für Abbuchungen zur Verfügung stehende Menge" -#: compensation/forms/forms.py:315 +#: compensation/forms/forms.py:303 +msgid "Agreement date" +msgstr "Vereinbarungsdatum" + +#: compensation/forms/forms.py:304 +msgid "When did the parties agree on this?" +msgstr "Wann wurde dieses Ökokonto offiziell vereinbart?" + +#: compensation/forms/forms.py:329 msgid "New Eco-Account" msgstr "Neues Ökokonto" -#: compensation/forms/forms.py:324 +#: compensation/forms/forms.py:338 msgid "Eco-Account XY; Location ABC" msgstr "Ökokonto XY; Flur ABC" -#: compensation/forms/forms.py:377 +#: compensation/forms/forms.py:397 msgid "Edit Eco-Account" msgstr "Ökokonto bearbeiten" @@ -422,7 +455,7 @@ msgstr "Zahlung wird an diesem Datum erwartet" #: compensation/forms/modalForms.py:63 compensation/forms/modalForms.py:274 #: compensation/forms/modalForms.py:369 intervention/forms/modalForms.py:134 -#: konova/forms.py:375 +#: konova/forms.py:376 msgid "Additional comment, maximum {} letters" msgstr "Zusätzlicher Kommentar, maximal {} Zeichen" @@ -462,7 +495,7 @@ msgstr "Geben Sie die Daten des neuen Zustandes ein" msgid "Added state" msgstr "Zustand hinzugefügt" -#: compensation/forms/modalForms.py:190 konova/forms.py:195 +#: compensation/forms/modalForms.py:190 konova/forms.py:196 msgid "Object removed" msgstr "Objekt entfernt" @@ -580,14 +613,14 @@ msgstr "" msgid "Pieces" msgstr "Stück" -#: compensation/models.py:321 +#: compensation/models.py:329 msgid "" "Deductable surface can not be larger than existing surfaces in after states" msgstr "" "Die abbuchbare Fläche darf die Gesamtfläche der Zielzustände nicht " "überschreiten" -#: compensation/models.py:328 +#: compensation/models.py:336 msgid "" "Deductable surface can not be smaller than the sum of already existing " "deductions. Please contact the responsible users for the deductions!" @@ -653,13 +686,6 @@ msgstr "Verfügbar" msgid "Eco Accounts" msgstr "Ökokonten" -#: compensation/tables.py:224 -#: compensation/templates/compensation/detail/eco_account/view.html:19 -#: intervention/forms/modalForms.py:258 intervention/forms/modalForms.py:265 -#: konova/templates/konova/home.html:88 templates/navbars/navbar.html:34 -msgid "Eco-account" -msgstr "Ökokonto" - #: compensation/tables.py:257 msgid "Not recorded yet. Can not be used for deductions, yet." msgstr "" @@ -745,12 +771,6 @@ msgstr "Termine und Fristen" msgid "Add new deadline" msgstr "Frist/Termin hinzufügen" -#: compensation/templates/compensation/detail/compensation/includes/deadlines.html:28 -#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:28 -#: ema/templates/ema/detail/includes/deadlines.html:28 -msgid "Type" -msgstr "Typ" - #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:53 #: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:51 #: ema/templates/ema/detail/includes/deadlines.html:51 @@ -768,7 +788,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:394 +#: konova/forms.py:395 msgid "Add new document" msgstr "Neues Dokument hinzufügen" @@ -1220,7 +1240,7 @@ msgstr "Datum des Widerspruchs" msgid "Document" msgstr "Dokument" -#: intervention/forms/modalForms.py:122 konova/forms.py:363 +#: intervention/forms/modalForms.py:122 konova/forms.py:364 msgid "Must be smaller than 15 Mb" msgstr "Muss kleiner als 15 Mb sein" @@ -1242,7 +1262,7 @@ msgstr "Kompensationen und Zahlungen geprüft" msgid "Run check" msgstr "Prüfung vornehmen" -#: intervention/forms/modalForms.py:201 konova/forms.py:448 +#: intervention/forms/modalForms.py:201 konova/forms.py:449 msgid "" "I, {} {}, confirm that all necessary control steps have been performed by " "myself." @@ -1254,13 +1274,6 @@ msgstr "" msgid "Only recorded accounts can be selected for deductions" msgstr "Nur verzeichnete Ökokonten können für Abbuchungen verwendet werden." -#: intervention/forms/modalForms.py:285 intervention/forms/modalForms.py:292 -#: intervention/tables.py:88 -#: intervention/templates/intervention/detail/view.html:19 -#: konova/templates/konova/home.html:11 templates/navbars/navbar.html:22 -msgid "Intervention" -msgstr "Eingriff" - #: intervention/forms/modalForms.py:287 msgid "Only shared interventions can be selected" msgstr "Nur freigegebene Eingriffe können gewählt werden" @@ -1474,11 +1487,11 @@ msgstr "Speichern" msgid "Not editable" msgstr "Nicht editierbar" -#: konova/forms.py:141 konova/forms.py:311 +#: konova/forms.py:141 konova/forms.py:312 msgid "Confirm" msgstr "Bestätige" -#: konova/forms.py:153 konova/forms.py:320 +#: konova/forms.py:153 konova/forms.py:321 msgid "Remove" msgstr "Löschen" @@ -1486,48 +1499,48 @@ msgstr "Löschen" msgid "You are about to remove {} {}" msgstr "Sie sind dabei {} {} zu löschen" -#: konova/forms.py:245 templates/form/collapsable/form.html:45 +#: konova/forms.py:246 templates/form/collapsable/form.html:45 msgid "Geometry" msgstr "Geometrie" -#: konova/forms.py:321 +#: konova/forms.py:322 msgid "Are you sure?" msgstr "Sind Sie sicher?" -#: konova/forms.py:348 +#: konova/forms.py:349 msgid "Created on" msgstr "Erstellt" -#: konova/forms.py:350 +#: konova/forms.py:351 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:362 #: venv/lib/python3.7/site-packages/django/db/models/fields/files.py:231 msgid "File" msgstr "Datei" -#: konova/forms.py:425 +#: konova/forms.py:426 msgid "Added document" msgstr "Dokument hinzugefügt" -#: konova/forms.py:439 +#: konova/forms.py:440 msgid "Confirm record" msgstr "Verzeichnen bestätigen" -#: konova/forms.py:447 +#: konova/forms.py:448 msgid "Record data" msgstr "Daten verzeichnen" -#: konova/forms.py:454 +#: konova/forms.py:455 msgid "Confirm unrecord" msgstr "Entzeichnen bestätigen" -#: konova/forms.py:455 +#: konova/forms.py:456 msgid "Unrecord data" msgstr "Daten entzeichnen" -#: konova/forms.py:456 +#: konova/forms.py:457 msgid "I, {} {}, confirm that this data must be unrecorded." msgstr "" "Ich, {} {}, bestätige, dass diese Daten wieder entzeichnet werden müssen." @@ -1777,10 +1790,6 @@ msgstr "Nutzer" msgid "No geometry added, yet." msgstr "Keine Geometrie vorhanden" -#: templates/modal/modal_form.html:25 -msgid "Continue" -msgstr "Weiter" - #: templates/navbars/navbar.html:4 msgid "Kompensationsverzeichnis Service Portal" msgstr "" @@ -3106,6 +3115,9 @@ msgstr "" msgid "A fontawesome icon field" msgstr "" +#~ msgid "After" +#~ msgstr "Nach" + #~ msgid "Total interventions" #~ msgstr "Insgesamt"