Compensation control

* removes CompensationControl model
* adds comment field to CompensationAction
* adds max length of 200 for comment fields in forms
* adds rendering of error messages in case of invalid form input
* adds/updates translations

locale/de/LC_MESSAGES/django.po

@@ -3,18 +3,18 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: compensation/forms.py:34 compensation/forms.py:39 compensation/forms.py:52
-#: compensation/forms.py:182 compensation/forms.py:243
+#: compensation/forms.py:35 compensation/forms.py:40 compensation/forms.py:53
+#: compensation/forms.py:184 compensation/forms.py:246
 #: intervention/filters.py:26 intervention/filters.py:40
 #: intervention/filters.py:47 intervention/filters.py:48 konova/forms.py:91
-#: konova/forms.py:220 konova/forms.py:251 konova/forms.py:256
-#: konova/forms.py:268 konova/forms.py:279 konova/forms.py:292 user/forms.py:38
+#: konova/forms.py:227 konova/forms.py:258 konova/forms.py:263
+#: konova/forms.py:275 konova/forms.py:287 konova/forms.py:300 user/forms.py:38
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-04 10:57+0200\n"
+"POT-Creation-Date: 2021-08-04 11:52+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"
@@ -24,157 +24,157 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: compensation/forms.py:33 compensation/forms.py:233
+#: compensation/forms.py:34 compensation/forms.py:235
 #: intervention/templates/intervention/detail/includes/eco-account-withdraws.html:33
 msgid "Amount"
 msgstr "Menge"
 
-#: compensation/forms.py:35
+#: compensation/forms.py:36
 msgid "Amount in Euro"
 msgstr "Betrag in Euro"
 
-#: compensation/forms.py:38
+#: compensation/forms.py:39
 #: intervention/templates/intervention/detail/includes/payments.html:31
 msgid "Due on"
 msgstr "Fällig am"
 
-#: compensation/forms.py:40
+#: compensation/forms.py:41
 msgid "Due on which date"
 msgstr "Zahlung wird an diesem Datum erwartet"
 
-#: compensation/forms.py:53
+#: compensation/forms.py:54
 msgid "Transfer note"
 msgstr "Verwendungszweck"
 
-#: compensation/forms.py:54
+#: compensation/forms.py:55
 msgid "Note for money transfer"
 msgstr "Verwendungszweck für Überweisung"
 
-#: compensation/forms.py:61
+#: compensation/forms.py:62
 msgid "Payment"
 msgstr "Zahlung"
 
-#: compensation/forms.py:62
+#: compensation/forms.py:63
 msgid "Add a payment for intervention '{}'"
 msgstr "Neue Ersatzzahlung zu Eingriff '{}' hinzufügen"
 
-#: compensation/forms.py:82
+#: compensation/forms.py:83
 msgid "Biotope Type"
 msgstr "Biotoptyp"
 
-#: compensation/forms.py:85
+#: compensation/forms.py:86
 msgid "Select the biotope type"
 msgstr "Biotoptyp wählen"
 
-#: compensation/forms.py:90
+#: compensation/forms.py:91
 #: compensation/templates/compensation/detail/includes/states-after.html:36
 #: compensation/templates/compensation/detail/includes/states-before.html:36
 msgid "Surface"
 msgstr "Fläche"
 
-#: compensation/forms.py:93
+#: compensation/forms.py:94
 msgid "in m²"
 msgstr ""
 
-#: compensation/forms.py:98
+#: compensation/forms.py:99
 msgid "New state"
 msgstr "Neuer Zustand"
 
-#: compensation/forms.py:99
+#: compensation/forms.py:100
 msgid "Insert data for the new state"
 msgstr "Geben Sie die Daten des neuen Zustandes ein"
 
-#: compensation/forms.py:113 konova/forms.py:141
+#: compensation/forms.py:114 konova/forms.py:141
 msgid "Object removed"
 msgstr "Objekt entfernt"
 
-#: compensation/forms.py:155
+#: compensation/forms.py:156
 msgid "Deadline Type"
 msgstr "Fristart"
 
-#: compensation/forms.py:158
+#: compensation/forms.py:159
 msgid "Select the deadline type"
 msgstr "Fristart wählen"
 
-#: compensation/forms.py:167
+#: compensation/forms.py:168
 #: compensation/templates/compensation/detail/includes/deadlines.html:31
 msgid "Date"
 msgstr "Datum"
 
-#: compensation/forms.py:170
+#: compensation/forms.py:171
 msgid "Select date"
 msgstr "Datum wählen"
 
-#: compensation/forms.py:181 compensation/forms.py:242
+#: compensation/forms.py:183 compensation/forms.py:245
+#: compensation/templates/compensation/detail/includes/actions.html:34
 #: compensation/templates/compensation/detail/includes/deadlines.html:34
 #: compensation/templates/compensation/detail/includes/documents.html:31
 #: intervention/templates/intervention/detail/includes/documents.html:31
-#: konova/forms.py:278
+#: konova/forms.py:286
 msgid "Comment"
 msgstr "Kommentar"
 
-#: compensation/forms.py:183 compensation/forms.py:244
-msgid "Additional comment"
-msgstr "Zusätzlicher Kommentar"
+#: compensation/forms.py:185 compensation/forms.py:247 konova/forms.py:288
+msgid "Additional comment, maximum {} letters"
+msgstr "Zusätzlicher Kommentar, maximal {} Zeichen"
 
-#: compensation/forms.py:194
+#: compensation/forms.py:196
 msgid "New deadline"
 msgstr "Neue Frist"
 
-#: compensation/forms.py:195
+#: compensation/forms.py:197
 msgid "Insert data for the new deadline"
 msgstr "Geben Sie die Daten der neuen Frist ein"
 
-#: compensation/forms.py:215
+#: compensation/forms.py:217
 msgid "Action Type"
 msgstr "Maßnahmentyp"
 
-#: compensation/forms.py:218
+#: compensation/forms.py:220
 msgid "Select the action type"
 msgstr "Maßnahmentyp wählen"
 
-#: compensation/forms.py:221
-#: compensation/templates/compensation/detail/includes/actions.html:34
+#: compensation/forms.py:223
 msgid "Unit"
 msgstr "Einheit"
 
-#: compensation/forms.py:224
+#: compensation/forms.py:226
 msgid "Select the unit"
 msgstr "Einheit wählen"
 
-#: compensation/forms.py:236
+#: compensation/forms.py:238
 msgid "Insert the amount"
 msgstr "Menge eingeben"
 
-#: compensation/forms.py:255
+#: compensation/forms.py:258
 msgid "New action"
 msgstr "Neue Maßnahme"
 
-#: compensation/forms.py:256
+#: compensation/forms.py:259
 msgid "Insert data for the new action"
 msgstr "Geben Sie die Daten der neuen Maßnahme ein"
 
-#: compensation/models.py:71
+#: compensation/models.py:60
 msgid "cm"
 msgstr ""
 
-#: compensation/models.py:72
+#: compensation/models.py:61
 msgid "m"
 msgstr ""
 
-#: compensation/models.py:73
+#: compensation/models.py:62
 msgid "km"
 msgstr ""
 
-#: compensation/models.py:74
+#: compensation/models.py:63
 msgid "m²"
 msgstr ""
 
-#: compensation/models.py:75
+#: compensation/models.py:64
 msgid "ha"
 msgstr ""
 
-#: compensation/models.py:76
+#: compensation/models.py:65
 msgid "Pieces"
 msgstr "Stück"
 
@@ -190,7 +190,7 @@ msgstr "Kennung"
 #: intervention/forms.py:35 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:64 konova/forms.py:250
+#: intervention/templates/intervention/detail/view.html:64 konova/forms.py:257
 msgid "Title"
 msgstr "Bezeichnung"
 
@@ -259,7 +259,7 @@ msgstr "Für Sie freigegeben - Datensatz kann bearbeitet werden"
 msgid "Access not granted"
 msgstr "Nicht freigegeben - Datensatz nur lesbar"
 
-#: compensation/tables.py:174 konova/forms.py:255
+#: compensation/tables.py:174 konova/forms.py:262
 msgid "Created on"
 msgstr "Erstellt"
 
@@ -337,7 +337,7 @@ msgstr "Dokumente"
 
 #: compensation/templates/compensation/detail/includes/documents.html:14
 #: intervention/templates/intervention/detail/includes/documents.html:14
-#: konova/forms.py:291
+#: konova/forms.py:299
 msgid "Add new document"
 msgstr "Neues Dokument hinzufügen"
 
@@ -355,9 +355,8 @@ msgid "Add new state after"
 msgstr "Neuen Zielzustand hinzufügen"
 
 #: compensation/templates/compensation/detail/includes/states-after.html:26
-#: compensation/templates/compensation/detail/includes/states-before.html:26
-msgid "Missing surfaces: "
-msgstr "Fehlende Flächen: "
+msgid "Missing surfaces according to states before: "
+msgstr "Fehlende Flächenmengen aus Ausgangszustand: "
 
 #: compensation/templates/compensation/detail/includes/states-after.html:33
 #: compensation/templates/compensation/detail/includes/states-before.html:33
@@ -377,6 +376,10 @@ msgstr "Ausgangszustand"
 msgid "Add new state before"
 msgstr "Neuen Ausgangszustand hinzufügen"
 
+#: compensation/templates/compensation/detail/includes/states-before.html:26
+msgid "Missing surfaces according to states after: "
+msgstr "Fehlende Flächenmengen aus Zielzustand: "
+
 #: compensation/templates/compensation/detail/view.html:17
 #: intervention/templates/intervention/detail/view.html:17
 msgid "Open in LANIS"
@@ -736,11 +739,11 @@ msgstr "Hierfür müssen Sie einer anderen Nutzergruppe angehören!"
 msgid "Not editable"
 msgstr "Nicht editierbar"
 
-#: konova/forms.py:90 konova/forms.py:219
+#: konova/forms.py:90 konova/forms.py:226
 msgid "Confirm"
 msgstr "Bestätige"
 
-#: konova/forms.py:102 konova/forms.py:228
+#: konova/forms.py:102 konova/forms.py:235
 msgid "Remove"
 msgstr "Löschen"
 
@@ -748,27 +751,23 @@ msgstr "Löschen"
 msgid "You are about to remove {} {}"
 msgstr "Sie sind dabei {} {} zu löschen"
 
-#: konova/forms.py:229
+#: konova/forms.py:236
 msgid "Are you sure?"
 msgstr "Sind Sie sicher?"
 
-#: konova/forms.py:257
+#: konova/forms.py:264
 msgid "When has this file been created? Important for photos."
 msgstr "Wann wurde diese Datei erstellt oder das Foto aufgenommen?"
 
-#: konova/forms.py:267
+#: konova/forms.py:274
 #: venv/lib/python3.7/site-packages/django/db/models/fields/files.py:231
 msgid "File"
 msgstr "Datei"
 
-#: konova/forms.py:269
+#: konova/forms.py:276
 msgid "Must be smaller than 15 Mb"
 msgstr "Muss kleiner als 15 Mb sein"
 
-#: konova/forms.py:280
-msgid "Additional comment on this file"
-msgstr "Zusätzlicher Kommentar"
-
 #: konova/management/commands/setup_data.py:42
 msgid "On new related data"
 msgstr "Wenn neue Daten für mich angelegt werden"
@@ -2253,6 +2252,12 @@ msgstr ""
 msgid "A fontawesome icon field"
 msgstr ""
 
+#~ msgid "Additional comment"
+#~ msgstr "Zusätzlicher Kommentar"
+
+#~ msgid "Missing surfaces: "
+#~ msgstr "Fehlende Flächen: "
+
 #~ msgid "Show all"
 #~ msgstr "Alle anzeigen"