#25 Public reports

* adds public report for compensations * adds/updates translations * prepares EMA and eco account reports
2021-10-13 17:35:11 +02:00
parent 7daceb947f
commit 354ec4c929
17 changed files with 303 additions and 88 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-13 13:55+0200\n"
+"POT-Creation-Date: 2021-10-13 17:26+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"
@@ -50,13 +50,14 @@ msgstr "Automatisch generiert"
 #: compensation/templates/compensation/detail/compensation/view.html:31
 #: compensation/templates/compensation/detail/eco_account/includes/documents.html:28
 #: compensation/templates/compensation/detail/eco_account/view.html:31
+#: compensation/templates/compensation/report/compensation/report.html:12
 #: ema/tables.py:33 ema/templates/ema/detail/includes/documents.html:28
 #: ema/templates/ema/detail/view.html:24 intervention/forms/forms.py:39
 #: intervention/tables.py:28
 #: 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:11
+#: intervention/templates/intervention/report/report.html:12
 #: konova/forms.py:336
 msgid "Title"
 msgstr "Bezeichnung"
@@ -114,7 +115,7 @@ msgstr "Zusätzlicher Kommentar"
 #: compensation/templates/compensation/detail/eco_account/view.html:58
 #: ema/templates/ema/detail/view.html:42 intervention/forms/forms.py:101
 #: intervention/templates/intervention/detail/view.html:56
-#: intervention/templates/intervention/report/report.html:36
+#: intervention/templates/intervention/report/report.html:37
 msgid "Conservation office"
 msgstr "Eintragungsstelle"

@@ -126,7 +127,7 @@ msgstr "Verantwortliche Stelle"
 #: compensation/templates/compensation/detail/eco_account/view.html:62
 #: ema/templates/ema/detail/view.html:46 intervention/forms/forms.py:129
 #: intervention/templates/intervention/detail/view.html:60
-#: intervention/templates/intervention/report/report.html:40
+#: intervention/templates/intervention/report/report.html:41
 msgid "Conservation office file number"
 msgstr "Aktenzeichen Eintragungsstelle"

@@ -148,6 +149,7 @@ msgstr "Firma Mustermann"

 #: compensation/forms/forms.py:146
 #: compensation/templates/compensation/detail/compensation/view.html:35
+#: compensation/templates/compensation/report/compensation/report.html:16
 msgid "compensates intervention"
 msgstr "kompensiert Eingriff"

@@ -298,11 +300,11 @@ msgid "Select the action type"
 msgstr "Maßnahmentyp wählen"

 #: compensation/forms/modalForms.py:334
-#: compensation/templates/compensation/detail/compensation/includes/actions.html:37
+#: compensation/templates/compensation/detail/compensation/includes/actions.html:38
 #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:37
 #: compensation/templates/compensation/detail/compensation/includes/documents.html:34
-#: compensation/templates/compensation/detail/compensation/includes/states-after.html:39
-#: compensation/templates/compensation/detail/compensation/includes/states-before.html:39
+#: compensation/templates/compensation/detail/compensation/includes/states-after.html:40
+#: compensation/templates/compensation/detail/compensation/includes/states-before.html:40
 #: compensation/templates/compensation/detail/eco_account/includes/actions.html:37
 #: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:37
 #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:40
@@ -421,7 +423,7 @@ msgstr "Zuletzt bearbeitet"

 #: compensation/tables.py:62
 #: intervention/templates/intervention/detail/includes/compensations.html:8
-#: intervention/templates/intervention/report/report.html:48
+#: intervention/templates/intervention/report/report.html:49
 msgid "Compensations"
 msgstr "Kompensationen"

@@ -448,13 +450,13 @@ msgstr "Am {} von {} geprüft worden"
 #: compensation/templates/compensation/detail/compensation/view.html:60
 #: compensation/templates/compensation/detail/eco_account/view.html:47
 #: ema/tables.py:101 ema/templates/ema/detail/view.html:31
-#: intervention/models.py:385 intervention/tables.py:131
+#: intervention/models.py:384 intervention/tables.py:131
 #: intervention/templates/intervention/detail/view.html:85
 msgid "Not recorded yet"
 msgstr "Noch nicht verzeichnet"

 #: compensation/tables.py:134 compensation/tables.py:263 ema/tables.py:106
-#: intervention/models.py:390 intervention/tables.py:136
+#: intervention/models.py:389 intervention/tables.py:136
 msgid "Recorded on {} by {}"
 msgstr "Am {} von {} verzeichnet worden"

@@ -516,7 +518,7 @@ msgctxt "Compensation"
 msgid "Amount"
 msgstr "Menge"

-#: compensation/templates/compensation/detail/compensation/includes/actions.html:51
+#: compensation/templates/compensation/detail/compensation/includes/actions.html:53
 #: compensation/templates/compensation/detail/eco_account/includes/actions.html:51
 #: ema/templates/ema/detail/includes/actions.html:51
 msgid "Remove action"
@@ -631,8 +633,8 @@ msgstr "Fehlende Flächenmengen laut Ausgangszustand: "
 msgid "Biotope type"
 msgstr "Biotoptyp"

-#: compensation/templates/compensation/detail/compensation/includes/states-after.html:52
-#: compensation/templates/compensation/detail/compensation/includes/states-before.html:52
+#: compensation/templates/compensation/detail/compensation/includes/states-after.html:54
+#: compensation/templates/compensation/detail/compensation/includes/states-before.html:54
 #: compensation/templates/compensation/detail/eco_account/includes/states-after.html:52
 #: compensation/templates/compensation/detail/eco_account/includes/states-before.html:52
 #: ema/templates/ema/detail/includes/states-after.html:52
@@ -681,6 +683,7 @@ msgstr "Verzeichnet am"

 #: compensation/templates/compensation/detail/compensation/view.html:71
 #: compensation/templates/compensation/detail/eco_account/view.html:70
+#: compensation/templates/compensation/report/compensation/report.html:24
 #: ema/templates/ema/detail/view.html:54
 msgid "Funded by"
 msgstr "Gefördert mit"
@@ -688,16 +691,17 @@ msgstr "Gefördert mit"
 #: compensation/templates/compensation/detail/compensation/view.html:79
 #: compensation/templates/compensation/detail/eco_account/view.html:78
 #: ema/templates/ema/detail/view.html:62
-#: intervention/templates/intervention/report/report.html:56
-#: intervention/templates/intervention/report/report.html:77
+#: intervention/templates/intervention/report/report.html:57
+#: intervention/templates/intervention/report/report.html:78
 msgid "None"
 msgstr ""

 #: compensation/templates/compensation/detail/compensation/view.html:84
 #: compensation/templates/compensation/detail/eco_account/view.html:83
+#: compensation/templates/compensation/report/compensation/report.html:33
 #: ema/templates/ema/detail/view.html:67
 #: intervention/templates/intervention/detail/view.html:108
-#: intervention/templates/intervention/report/report.html:90
+#: intervention/templates/intervention/report/report.html:91
 msgid "Last modified"
 msgstr "Zuletzt bearbeitet"

@@ -770,84 +774,99 @@ msgstr "Fehlt"
 #: compensation/templates/compensation/detail/eco_account/view.html:66
 #: ema/templates/ema/detail/view.html:50 intervention/forms/forms.py:141
 #: intervention/templates/intervention/detail/view.html:64
-#: intervention/templates/intervention/report/report.html:44
+#: intervention/templates/intervention/report/report.html:45
 msgid "Intervention handler"
 msgstr "Eingriffsverursacher"

-#: compensation/views/compensation_views.py:76
+#: compensation/templates/compensation/report/compensation/report.html:7
+#: intervention/templates/intervention/report/report.html:7
+msgid "Report"
+msgstr "Bericht"
+
+#: compensation/templates/compensation/report/compensation/report.html:54
+#: intervention/templates/intervention/report/report.html:108
+msgid "Open in browser"
+msgstr "Im Browser öffnen"
+
+#: compensation/templates/compensation/report/compensation/report.html:58
+#: intervention/templates/intervention/report/report.html:112
+msgid "View in LANIS"
+msgstr "In LANIS öffnen"
+
+#: compensation/views/compensation_views.py:77
 msgid "Compensation {} added"
 msgstr "Kompensation {} hinzugefügt"

-#: compensation/views/compensation_views.py:131
+#: compensation/views/compensation_views.py:132
 msgid "Compensation {} edited"
 msgstr "Kompensation {} bearbeitet"

-#: compensation/views/compensation_views.py:210
-#: compensation/views/eco_account_views.py:277 ema/views.py:174
+#: compensation/views/compensation_views.py:211
+#: compensation/views/eco_account_views.py:278 ema/views.py:175
 #: intervention/views.py:428
 msgid "Log"
 msgstr "Log"

-#: compensation/views/compensation_views.py:231
+#: compensation/views/compensation_views.py:232
 msgid "Compensation removed"
 msgstr "Kompensation entfernt"

-#: compensation/views/compensation_views.py:250
-#: compensation/views/eco_account_views.py:376 ema/views.py:327
+#: compensation/views/compensation_views.py:251
+#: compensation/views/eco_account_views.py:377 ema/views.py:328
 #: intervention/views.py:124
 msgid "Document added"
 msgstr "Dokument hinzugefügt"

-#: compensation/views/compensation_views.py:306
-#: compensation/views/eco_account_views.py:320 ema/views.py:271
+#: compensation/views/compensation_views.py:307
+#: compensation/views/eco_account_views.py:321 ema/views.py:272
 msgid "State added"
 msgstr "Zustand hinzugefügt"

-#: compensation/views/compensation_views.py:325
-#: compensation/views/eco_account_views.py:339 ema/views.py:290
+#: compensation/views/compensation_views.py:326
+#: compensation/views/eco_account_views.py:340 ema/views.py:291
 msgid "Action added"
 msgstr "Maßnahme hinzugefügt"

-#: compensation/views/compensation_views.py:344
-#: compensation/views/eco_account_views.py:358 ema/views.py:309
+#: compensation/views/compensation_views.py:345
+#: compensation/views/eco_account_views.py:359 ema/views.py:310
 msgid "Deadline added"
 msgstr "Frist/Termin hinzugefügt"

-#: compensation/views/compensation_views.py:363
+#: compensation/views/compensation_views.py:364
 msgid "State removed"
 msgstr "Zustand gelöscht"

-#: compensation/views/compensation_views.py:382
+#: compensation/views/compensation_views.py:383
 msgid "Action removed"
 msgstr "Maßnahme entfernt"

-#: compensation/views/eco_account_views.py:86
+#: compensation/views/eco_account_views.py:87
 msgid "Eco-Account {} added"
 msgstr "Ökokonto {} hinzugefügt"

-#: compensation/views/eco_account_views.py:141
+#: compensation/views/eco_account_views.py:142
 msgid "Eco-Account {} edited"
 msgstr "Ökokonto {} bearbeitet"

-#: compensation/views/eco_account_views.py:227
+#: compensation/views/eco_account_views.py:228
 msgid "Eco-account removed"
 msgstr "Ökokonto entfernt"

-#: compensation/views/eco_account_views.py:254
+#: compensation/views/eco_account_views.py:255
 msgid "Deduction removed"
 msgstr "Abbuchung entfernt"

-#: compensation/views/eco_account_views.py:297 ema/views.py:248
+#: compensation/views/eco_account_views.py:298 ema/views.py:249
 #: intervention/views.py:468
 msgid "{} unrecorded"
 msgstr "{} entzeichnet"

-#: compensation/views/eco_account_views.py:297 ema/views.py:248
+#: compensation/views/eco_account_views.py:298 ema/views.py:249
 #: intervention/views.py:468
 msgid "{} recorded"
 msgstr "{} verzeichnet"

-#: compensation/views/eco_account_views.py:433 intervention/views.py:450
+#: compensation/views/eco_account_views.py:434 intervention/views.py:450
 msgid "Deduction added"
 msgstr "Abbuchung hinzugefügt"

@@ -887,15 +906,15 @@ msgstr ""
 msgid "Payment funded compensation"
 msgstr "Ersatzzahlungsmaßnahme"

-#: ema/views.py:77
+#: ema/views.py:78
 msgid "EMA {} added"
 msgstr "EMA {} hinzugefügt"

-#: ema/views.py:201
+#: ema/views.py:202
 msgid "EMA {} edited"
 msgstr "EMA {} bearbeitet"

-#: ema/views.py:231
+#: ema/views.py:232
 msgid "EMA removed"
 msgstr "EMA entfernt"

@@ -921,13 +940,13 @@ msgstr "Bauvorhaben XY; Flur ABC"

 #: intervention/forms/forms.py:51
 #: intervention/templates/intervention/detail/view.html:35
-#: intervention/templates/intervention/report/report.html:15
+#: intervention/templates/intervention/report/report.html:16
 msgid "Process type"
 msgstr "Verfahrenstyp"

 #: intervention/forms/forms.py:68
 #: intervention/templates/intervention/detail/view.html:39
-#: intervention/templates/intervention/report/report.html:19
+#: intervention/templates/intervention/report/report.html:20
 msgid "Law"
 msgstr "Gesetz"

@@ -937,13 +956,13 @@ msgstr "Mehrfachauswahl möglich"

 #: intervention/forms/forms.py:85
 #: intervention/templates/intervention/detail/view.html:48
-#: intervention/templates/intervention/report/report.html:28
+#: intervention/templates/intervention/report/report.html:29
 msgid "Registration office"
 msgstr "Zulassungsbehörde"

 #: intervention/forms/forms.py:117
 #: intervention/templates/intervention/detail/view.html:52
-#: intervention/templates/intervention/report/report.html:32
+#: intervention/templates/intervention/report/report.html:33
 msgid "Registration office file number"
 msgstr "Aktenzeichen Zulassungsbehörde"

@@ -957,13 +976,13 @@ msgstr "Wer führt den Eingriff durch"

 #: intervention/forms/forms.py:154
 #: intervention/templates/intervention/detail/view.html:96
-#: intervention/templates/intervention/report/report.html:82
+#: intervention/templates/intervention/report/report.html:83
 msgid "Registration date"
 msgstr "Datum Zulassung bzw. Satzungsbeschluss"

 #: intervention/forms/forms.py:166
 #: intervention/templates/intervention/detail/view.html:100
-#: intervention/templates/intervention/report/report.html:86
+#: intervention/templates/intervention/report/report.html:87
 msgid "Binding on"
 msgstr "Datum Bestandskraft"

@@ -1074,31 +1093,31 @@ msgstr ""
 "Das Ökokonto {} hat für eine Abbuchung von {} m² nicht ausreichend "
 "Restfläche. Es stehen noch {} m² zur Verfügung."

-#: intervention/models.py:325
+#: intervention/models.py:324
 msgid "Registration office file number missing"
 msgstr "Aktenzeichen Zulassungsbehörde fehlt"

-#: intervention/models.py:328
+#: intervention/models.py:327
 msgid "Conservation office file number missing"
 msgstr "Aktenzeichen Naturschutzbehörde fehlt"

-#: intervention/models.py:331
+#: intervention/models.py:330
 msgid "Responsible data missing"
 msgstr "Daten zu Verantwortlichen fehlen"

-#: intervention/models.py:345
+#: intervention/models.py:344
 msgid "Revocation exists"
 msgstr "Widerspruch liegt vor"

-#: intervention/models.py:348
+#: intervention/models.py:347
 msgid "Registration date missing"
 msgstr "Datum Zulassung bzw. Satzungsbeschluss fehlt"

-#: intervention/models.py:351
+#: intervention/models.py:350
 msgid "Binding on missing"
 msgstr "Datum Bestandskraft fehlt"

-#: intervention/models.py:353
+#: intervention/models.py:352
 msgid "Legal data missing"
 msgstr "Rechtliche Daten fehlen"

@@ -1142,7 +1161,7 @@ msgid "Eco-account not recorded! Deduction invalid!"
 msgstr "Ökokonto nicht verzeichnet! Abbuchung ungültig!"

 #: intervention/templates/intervention/detail/includes/payments.html:8
-#: intervention/templates/intervention/report/report.html:72
+#: intervention/templates/intervention/report/report.html:73
 msgid "Payments"
 msgstr "Ersatzzahlungen"

@@ -1172,38 +1191,14 @@ msgstr "Widerspruch entfernen"
 msgid "Exists"
 msgstr "vorhanden"

-#: intervention/templates/intervention/report/report.html:61
+#: intervention/templates/intervention/report/report.html:62
 msgid "Deductions of eco-accounts"
 msgstr "Abbuchungen von Ökokonten"

-#: intervention/templates/intervention/report/report.html:75
+#: intervention/templates/intervention/report/report.html:76
 msgid "Exist"
 msgstr "Vorhanden"

-#: intervention/templates/intervention/report/report.html:107
-msgid "Open in browser"
-msgstr "Im Browser öffnen"
-
-#: intervention/templates/intervention/report/report.html:111
-msgid "View in LANIS"
-msgstr "In LANIS öffnen"
-
-#: intervention/templates/intervention/report/unavailable.html:6
-msgid "Unrecorded data"
-msgstr "Daten nicht veröffentlicht"
-
-#: intervention/templates/intervention/report/unavailable.html:9
-msgid ""
-"\n"
-"            The data you want to see is not recorded and might still be work "
-"in progress. Please come back another time.\n"
-"            "
-msgstr ""
-"\n"
-"            Die Daten, die Sie einsehen möchten, sind in Bearbeitung und daher aktuell nicht öffentlich einsehbar. "
-"Schauen Sie zu einem späteren Zeitpunkt wieder vorbei. \n"
-"            "
-
 #: intervention/views.py:77
 msgid "Intervention {} added"
 msgstr "Eingriff {} hinzugefügt"
@@ -1624,6 +1619,23 @@ msgstr "Einstellungen"
 msgid "Logout"
 msgstr "Abmelden"

+#: templates/report/unavailable.html:6
+msgid "Unrecorded data"
+msgstr "Daten nicht veröffentlicht"
+
+#: templates/report/unavailable.html:9
+msgid ""
+"\n"
+"            The data you want to see is not recorded and might still be work "
+"in progress. Please come back another time.\n"
+"            "
+msgstr ""
+"\n"
+"            Die Daten, die Sie einsehen möchten, sind in Bearbeitung und "
+"daher aktuell nicht öffentlich einsehbar. Schauen Sie zu einem späteren "
+"Zeitpunkt wieder vorbei. \n"
+"            "
+
 #: user/forms.py:23
 msgid "Notifications"
 msgstr "Benachrichtigungen"