#26 Annual conservation report

* WIP: EcoAccountReport
2021-10-19 16:06:19 +02:00
parent b9b1d64278
commit 31ae3dd430
9 changed files with 208 additions and 70 deletions
--- a/locale/de/LC_MESSAGES/django.mo
+++ b/locale/de/LC_MESSAGES/django.mo
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-19 13:23+0200\n"
+"POT-Creation-Date: 2021-10-19 16:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -37,20 +37,10 @@ msgstr ""
 msgid "Report"
 msgstr "Bericht"

-#: analysis/templates/analysis/reports/includes/card_eco_account.html:11
-msgid "Eco-Accounts"
-msgstr "Ökokonten"
-
-#: analysis/templates/analysis/reports/includes/card_old_interventions.html:11
-msgid "Old interventions"
-msgstr "Altfälle"
-
-#: analysis/templates/analysis/reports/includes/card_old_interventions.html:13
-msgid "Before"
-msgstr "Vor"
-
 #: 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
+#: analysis/templates/analysis/reports/includes/old_intervention/amount.html:3
 #: compensation/forms/modalForms.py:351
 #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:34
 #: intervention/templates/intervention/detail/includes/deductions.html:31
@@ -58,7 +48,9 @@ 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_intervention/amount.html:5
 msgid ""
 "\n"
 "    Checked = Has been checked by the registration office according to "
@@ -70,7 +62,9 @@ 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/intervention/amount.html:9
+#: analysis/templates/analysis/reports/includes/old_intervention/amount.html:9
 msgid ""
 "\n"
 "    Recorded = Has been checked and published by the conservation office\n"
@@ -86,17 +80,25 @@ msgid "Area of responsibility"
 msgstr "Zuständigkeitsbereich"

 #: analysis/templates/analysis/reports/includes/compensation/amount.html:18
-#: analysis/templates/analysis/reports/includes/compensation/card_compensation.html:11
-#: compensation/tables.py:62
-#: intervention/templates/intervention/detail/includes/compensations.html:8
-#: intervention/templates/intervention/report/report.html:49
-msgid "Compensations"
-msgstr "Kompensationen"
+#: 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_intervention/amount.html:17
+#: compensation/tables.py:35
+#: compensation/templates/compensation/detail/compensation/view.html:43
+#: intervention/tables.py:33
+#: intervention/templates/intervention/detail/view.html:68 user/models.py:48
+msgid "Checked"
+msgstr "Geprüft"

 #: analysis/templates/analysis/reports/includes/compensation/amount.html:19
-#: analysis/templates/analysis/reports/includes/intervention/amount.html:19
-#: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:10
+#: analysis/templates/analysis/reports/includes/eco_account/amount.html:19
+#: 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
+#: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:9
 #: analysis/templates/analysis/reports/includes/intervention/laws.html:20
+#: analysis/templates/analysis/reports/includes/old_intervention/amount.html:18
 #: compensation/tables.py:41 compensation/tables.py:181
 #: compensation/templates/compensation/detail/compensation/view.html:57
 #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:31
@@ -111,37 +113,70 @@ msgstr "Verzeichnet"
 msgid "Number single areas"
 msgstr "Einzelflächen"

-#: analysis/templates/analysis/reports/includes/compensation/amount.html:25
-msgid "Conservation office by law"
-msgstr "Naturschutzbehörde (§17 Abs.3 BNatSchG)"
-
-#: analysis/templates/analysis/reports/includes/compensation/amount.html:31
-msgid "Other registration office"
-msgstr "Andere Zulassungsbehörden"
-
-#: analysis/templates/analysis/reports/includes/compensation/amount.html:37
-msgid "Land-use planning"
-msgstr "Träger Bauleitplanung"
-
-#: analysis/templates/analysis/reports/includes/compensation/amount.html:43
-#: analysis/templates/analysis/reports/includes/intervention/amount.html:17
-#: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:8
+#: 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/deductions.html:10
+#: analysis/templates/analysis/reports/includes/eco_account/deductions.html:11
+#: analysis/templates/analysis/reports/includes/intervention/amount.html:19
+#: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:10
 #: analysis/templates/analysis/reports/includes/intervention/laws.html:23
 #: analysis/templates/analysis/reports/includes/intervention/laws.html:43
+#: analysis/templates/analysis/reports/includes/old_intervention/amount.html:19
 #: konova/templates/konova/home.html:23 konova/templates/konova/home.html:61
 #: konova/templates/konova/home.html:100
 msgid "Total"
 msgstr "Insgesamt"

-#: analysis/templates/analysis/reports/includes/intervention/amount.html:18
-#: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:9
-#: analysis/templates/analysis/reports/includes/intervention/laws.html:17
-#: compensation/tables.py:35
-#: compensation/templates/compensation/detail/compensation/view.html:43
-#: intervention/tables.py:33
-#: intervention/templates/intervention/detail/view.html:68 user/models.py:48
-msgid "Checked"
-msgstr "Geprüft"
+#: analysis/templates/analysis/reports/includes/compensation/amount.html:26
+msgid "Conservation office by law"
+msgstr "Naturschutzbehörde (§17 Abs.3 BNatSchG)"
+
+#: analysis/templates/analysis/reports/includes/compensation/amount.html:33
+msgid "Land-use planning"
+msgstr "Träger Bauleitplanung"
+
+#: analysis/templates/analysis/reports/includes/compensation/amount.html:40
+msgid "Other registration office"
+msgstr "Andere Zulassungsbehörden"
+
+#: analysis/templates/analysis/reports/includes/compensation/card_compensation.html:11
+#: compensation/tables.py:62
+#: intervention/templates/intervention/detail/includes/compensations.html:8
+#: intervention/templates/intervention/report/report.html:49
+msgid "Compensations"
+msgstr "Kompensationen"
+
+#: analysis/templates/analysis/reports/includes/eco_account/amount.html:17
+#: analysis/templates/analysis/reports/includes/old_intervention/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"
+
+#: analysis/templates/analysis/reports/includes/eco_account/deductions.html:3
+#: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:27
+msgid "Deductions"
+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:152
+#: 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:274
+msgid "Surface"
+msgstr "Fläche"

 #: analysis/templates/analysis/reports/includes/intervention/card_intervention.html:10
 #: intervention/tables.py:66
@@ -168,10 +203,6 @@ msgstr "Kompensation"
 msgid "Payment"
 msgstr "Zahlung"

-#: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:27
-msgid "Deductions"
-msgstr "Abbuchungen"
-
 #: analysis/templates/analysis/reports/includes/intervention/laws.html:2
 msgid "Law usage"
 msgstr "Gesetzesanwendungen"
@@ -197,6 +228,10 @@ msgstr ""
 msgid "Law"
 msgstr "Gesetz"

+#: analysis/templates/analysis/reports/includes/old_intervention/card_old_interventions.html:11
+msgid "Old interventions"
+msgstr "Altfälle"
+
 #: analysis/templates/analysis/reports/index.html:6
 #: templates/navbars/navbar.html:46
 msgid "Reports"
@@ -400,17 +435,6 @@ msgstr "Biotoptyp"
 msgid "Select the biotope type"
 msgstr "Biotoptyp wählen"

-#: compensation/forms/modalForms.py:152
-#: 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:274
-msgid "Surface"
-msgstr "Fläche"
-
 #: compensation/forms/modalForms.py:155 intervention/forms/modalForms.py:276
 msgid "in m²"
 msgstr ""