compensation/admin.py

@@ -1,9 +1,19 @@
 from django.contrib import admin
 
-from compensation.models import Compensation, CompensationAction, CompensationState, Payment, \
+from compensation.models import Compensation, CompensationAction, CompensationState, CompensationControl, Payment, \
     EcoAccountWithdraw, EcoAccount
 
 
+class CompensationControlAdmin(admin.ModelAdmin):
+    list_display = [
+        "id",
+        "type",
+        "deadline",
+        "expected_result",
+        "by_authority",
+    ]
+
+
 class CompensationStateAdmin(admin.ModelAdmin):
     list_display = [
         "id",
@@ -18,7 +28,7 @@ class CompensationActionAdmin(admin.ModelAdmin):
         "action_type",
         "amount",
         "unit",
-        "comment",
+        "control",
     ]
 
 
@@ -60,5 +70,6 @@ admin.site.register(Compensation, CompensationAdmin)
 admin.site.register(Payment, PaymentAdmin)
 admin.site.register(CompensationAction, CompensationActionAdmin)
 admin.site.register(CompensationState, CompensationStateAdmin)
+admin.site.register(CompensationControl, CompensationControlAdmin)
 admin.site.register(EcoAccount, EcoAccountAdmin)
 admin.site.register(EcoAccountWithdraw, EcoAccountWithdrawAdmin)

compensation/forms.py

@@ -178,10 +178,9 @@ class NewDeadlineModalForm(BaseModalForm):
     )
     comment = forms.CharField(
         required=False,
-        max_length=200,
         label=_("Comment"),
         label_suffix=_(""),
-        help_text=_("Additional comment, maximum {} letters").format(200),
+        help_text=_("Additional comment"),
         widget=forms.Textarea(
             attrs={
                 "cols": 30,
@@ -216,7 +215,7 @@ class NewActionModalForm(BaseModalForm):
         label=_("Action Type"),
         label_suffix="",
         required=True,
-        help_text=_("Select the action type"),
+        help_text=_("Select the deadline type"),
     )
     unit = forms.ChoiceField(
         label=_("Unit"),
@@ -240,10 +239,9 @@ class NewActionModalForm(BaseModalForm):
     )
     comment = forms.CharField(
         required=False,
-        max_length=200,
         label=_("Comment"),
         label_suffix=_(""),
-        help_text=_("Additional comment, maximum {} letters").format(200),
+        help_text=_("Additional comment"),
         widget=forms.Textarea(
             attrs={
                 "cols": 30,
@@ -267,7 +265,6 @@ class NewActionModalForm(BaseModalForm):
                 action_type=self.cleaned_data["action_type"],
                 amount=self.cleaned_data["amount"],
                 unit=self.cleaned_data["unit"],
-                comment=self.cleaned_data["comment"],
                 created=user_action,
             )
             self.instance.actions.add(comp_action)

compensation/models.py

@@ -42,6 +42,17 @@ class Payment(BaseResource):
     )
 
 
+class CompensationControl(BaseResource):
+    """
+    Holds data on how a compensation shall be controlled
+    """
+    deadline = models.ForeignKey("konova.Deadline", on_delete=models.SET_NULL, null=True, blank=True)
+    type = models.CharField(max_length=500, null=True, blank=True)
+    expected_result = models.CharField(max_length=500, null=True, blank=True, help_text="The expected outcome, that needs to be controlled")
+    by_authority = models.ForeignKey(Organisation, null=True, blank=True, on_delete=models.SET_NULL)
+    comment = models.TextField()
+
+
 class CompensationState(UuidModel):
     """
     Compensations must define the state of an area before and after the compensation.
@@ -72,7 +83,7 @@ class CompensationAction(BaseResource):
     action_type = models.CharField(max_length=500, null=True, blank=True)
     amount = models.FloatField()
     unit = models.CharField(max_length=100, null=True, blank=True, choices=UnitChoices.choices)
-    comment = models.TextField(blank=True, null=True, help_text="Additional comment")
+    control = models.ForeignKey(CompensationControl, on_delete=models.SET_NULL, null=True, blank=True)
 
     def __str__(self):
         return "{} | {} {}".format(self.action_type, self.amount, self.unit)

compensation/templates/compensation/detail/includes/actions.html

@@ -1,4 +1,4 @@
-{% load i18n l10n fontawesome_5 humanize %}
+{% load i18n l10n fontawesome_5 %}
 <div id="related-documents" class="card">
     <div class="card-header rlp-r">
         <div class="row">
@@ -31,7 +31,7 @@
                     {% trans 'Amount' context 'Compensation' %}
                 </th>
                 <th scope="col">
-                    {% trans 'Comment' %}
+                    {% trans 'Unit' %}
                 </th>
                 <th scope="col">
                     {% trans 'Action' %}
@@ -44,8 +44,8 @@
                 <td class="align-middle">
                     {{ action.action_type }}
                 </td>
-                <td class="align-middle">{{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }}</td>
+                <td class="align-middle">{{ action.amount }}</td>
-                <td class="align-middle">{{ action.comment|default_if_none:"" }}</td>
+                <td class="align-middle">{{ action.unit_humanize }}</td>
                 <td>
                     {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'compensation:action-remove' action.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove action' %}">

compensation/templates/compensation/detail/includes/states-after.html

@@ -23,7 +23,7 @@
     <div class="card-body scroll-300">
         {% if sum_before_states > sum_after_states %}
             <div class="row alert alert-danger">
-                {% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m²
+                {% trans 'Missing surfaces: ' %}{{ diff_states|floatformat:2 }} m²
             </div>
         {% endif %}
         <table class="table table-hover">

compensation/templates/compensation/detail/includes/states-before.html

@@ -23,7 +23,7 @@
     <div class="card-body scroll-300">
         {% if sum_before_states < sum_after_states %}
             <div class="row alert alert-danger">
-                {% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m²
+                {% trans 'Missing surfaces: ' %}{{ diff_states|floatformat:2 }} m²
             </div>
         {% endif %}
         <table class="table table-hover">

konova/forms.py

@@ -162,17 +162,10 @@ class BaseModalForm(BaseForm, BSModalForm):
                 )
                 return redirect(redirect_url)
             else:
-                messages.error(
+                messages.info(
                     request,
-                    msg_error,
+                    msg_error
-                    extra_tags="danger"
                 )
-                for field, error in self.errors.items():
-                    messages.error(
-                        request,
-                        "{}: {}".format(self.fields[field].label, _(error[0])),
-                        extra_tags="danger"
-                    )
                 return redirect(redirect_url)
         elif request.method == "GET":
             context = {
@@ -282,10 +275,9 @@ class NewDocumentForm(BaseModalForm):
     )
     comment = forms.CharField(
         required=False,
-        max_length=200,
         label=_("Comment"),
         label_suffix=_(""),
-        help_text=_("Additional comment, maximum {} letters").format(200),
+        help_text=_("Additional comment on this file"),
         widget=forms.Textarea(
             attrs={
                 "cols": 30,

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:35 compensation/forms.py:40 compensation/forms.py:53
+#: compensation/forms.py:34 compensation/forms.py:39 compensation/forms.py:52
-#: compensation/forms.py:184 compensation/forms.py:246
+#: compensation/forms.py:182 compensation/forms.py:241
 #: intervention/filters.py:26 intervention/filters.py:40
 #: intervention/filters.py:47 intervention/filters.py:48 konova/forms.py:91
-#: konova/forms.py:227 konova/forms.py:258 konova/forms.py:263
+#: konova/forms.py:220 konova/forms.py:251 konova/forms.py:256
-#: konova/forms.py:275 konova/forms.py:287 konova/forms.py:300 user/forms.py:38
+#: konova/forms.py:268 konova/forms.py:279 konova/forms.py:292 user/forms.py:38
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-04 11:52+0200\n"
+"POT-Creation-Date: 2021-08-04 10:37+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,153 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: compensation/forms.py:34 compensation/forms.py:235
+#: compensation/forms.py:33 compensation/forms.py:233
 #: intervention/templates/intervention/detail/includes/eco-account-withdraws.html:33
 msgid "Amount"
 msgstr "Menge"
 
-#: compensation/forms.py:36
+#: compensation/forms.py:35
 msgid "Amount in Euro"
 msgstr "Betrag in Euro"
 
-#: compensation/forms.py:39
+#: compensation/forms.py:38
 #: intervention/templates/intervention/detail/includes/payments.html:31
 msgid "Due on"
 msgstr "Fällig am"
 
-#: compensation/forms.py:41
+#: compensation/forms.py:40
 msgid "Due on which date"
 msgstr "Zahlung wird an diesem Datum erwartet"
 
-#: compensation/forms.py:54
+#: compensation/forms.py:53
 msgid "Transfer note"
 msgstr "Verwendungszweck"
 
-#: compensation/forms.py:55
+#: compensation/forms.py:54
 msgid "Note for money transfer"
 msgstr "Verwendungszweck für Überweisung"
 
-#: compensation/forms.py:62
+#: compensation/forms.py:61
 msgid "Payment"
 msgstr "Zahlung"
 
-#: compensation/forms.py:63
+#: compensation/forms.py:62
 msgid "Add a payment for intervention '{}'"
 msgstr "Neue Ersatzzahlung zu Eingriff '{}' hinzufügen"
 
-#: compensation/forms.py:83
+#: compensation/forms.py:82
 msgid "Biotope Type"
 msgstr "Biotoptyp"
 
-#: compensation/forms.py:86
+#: compensation/forms.py:85
 msgid "Select the biotope type"
 msgstr "Biotoptyp wählen"
 
-#: compensation/forms.py:91
+#: compensation/forms.py:90
 #: 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:94
+#: compensation/forms.py:93
 msgid "in m²"
 msgstr ""
 
-#: compensation/forms.py:99
+#: compensation/forms.py:98
 msgid "New state"
 msgstr "Neuer Zustand"
 
-#: compensation/forms.py:100
+#: compensation/forms.py:99
 msgid "Insert data for the new state"
 msgstr "Geben Sie die Daten des neuen Zustandes ein"
 
-#: compensation/forms.py:114 konova/forms.py:141
+#: compensation/forms.py:113 konova/forms.py:141
 msgid "Object removed"
 msgstr "Objekt entfernt"
 
-#: compensation/forms.py:156
+#: compensation/forms.py:155
 msgid "Deadline Type"
 msgstr "Fristart"
 
-#: compensation/forms.py:159
+#: compensation/forms.py:158 compensation/forms.py:218
 msgid "Select the deadline type"
 msgstr "Fristart wählen"
 
-#: compensation/forms.py:168
+#: compensation/forms.py:167
 #: compensation/templates/compensation/detail/includes/deadlines.html:31
 msgid "Date"
 msgstr "Datum"
 
-#: compensation/forms.py:171
+#: compensation/forms.py:170
 msgid "Select date"
 msgstr "Datum wählen"
 
-#: compensation/forms.py:183 compensation/forms.py:245
+#: compensation/forms.py:181 compensation/forms.py:240
-#: 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:286
+#: konova/forms.py:278
 msgid "Comment"
 msgstr "Kommentar"
 
-#: compensation/forms.py:185 compensation/forms.py:247 konova/forms.py:288
+#: compensation/forms.py:183 compensation/forms.py:242
-msgid "Additional comment, maximum {} letters"
+msgid "Additional comment"
-msgstr "Zusätzlicher Kommentar, maximal {} Zeichen"
+msgstr "Zusätzlicher Kommentar"
 
-#: compensation/forms.py:196
+#: compensation/forms.py:194
 msgid "New deadline"
 msgstr "Neue Frist"
 
-#: compensation/forms.py:197
+#: compensation/forms.py:195
 msgid "Insert data for the new deadline"
 msgstr "Geben Sie die Daten der neuen Frist ein"
 
-#: compensation/forms.py:217
+#: compensation/forms.py:215
 msgid "Action Type"
 msgstr "Maßnahmentyp"
 
-#: compensation/forms.py:220
+#: compensation/forms.py:221
-msgid "Select the action type"
+#: compensation/templates/compensation/detail/includes/actions.html:34
-msgstr "Maßnahmentyp wählen"
-
-#: compensation/forms.py:223
 msgid "Unit"
 msgstr "Einheit"
 
-#: compensation/forms.py:226
+#: compensation/forms.py:224
 msgid "Select the unit"
 msgstr "Einheit wählen"
 
-#: compensation/forms.py:238
+#: compensation/forms.py:236
 msgid "Insert the amount"
 msgstr "Menge eingeben"
 
-#: compensation/forms.py:258
+#: compensation/forms.py:253
 msgid "New action"
 msgstr "Neue Maßnahme"
 
-#: compensation/forms.py:259
+#: compensation/forms.py:254
 msgid "Insert data for the new action"
 msgstr "Geben Sie die Daten der neuen Maßnahme ein"
 
-#: compensation/models.py:60
+#: compensation/models.py:71
 msgid "cm"
 msgstr ""
 
-#: compensation/models.py:61
+#: compensation/models.py:72
 msgid "m"
 msgstr ""
 
-#: compensation/models.py:62
+#: compensation/models.py:73
 msgid "km"
 msgstr ""
 
-#: compensation/models.py:63
+#: compensation/models.py:74
 msgid "m²"
 msgstr ""
 
-#: compensation/models.py:64
+#: compensation/models.py:75
 msgid "ha"
 msgstr ""
 
-#: compensation/models.py:65
+#: compensation/models.py:76
 msgid "Pieces"
 msgstr "Stück"
 
@@ -190,7 +186,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:257
+#: intervention/templates/intervention/detail/view.html:64 konova/forms.py:250
 msgid "Title"
 msgstr "Bezeichnung"
 
@@ -259,7 +255,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:262
+#: compensation/tables.py:174 konova/forms.py:255
 msgid "Created on"
 msgstr "Erstellt"
 
@@ -337,7 +333,7 @@ msgstr "Dokumente"
 
 #: compensation/templates/compensation/detail/includes/documents.html:14
 #: intervention/templates/intervention/detail/includes/documents.html:14
-#: konova/forms.py:299
+#: konova/forms.py:291
 msgid "Add new document"
 msgstr "Neues Dokument hinzufügen"
 
@@ -355,8 +351,9 @@ msgid "Add new state after"
 msgstr "Neuen Zielzustand hinzufügen"
 
 #: compensation/templates/compensation/detail/includes/states-after.html:26
-msgid "Missing surfaces according to states before: "
+#: compensation/templates/compensation/detail/includes/states-before.html:26
-msgstr "Fehlende Flächenmengen aus Ausgangszustand: "
+msgid "Missing surfaces: "
+msgstr "Fehlende Flächen: "
 
 #: compensation/templates/compensation/detail/includes/states-after.html:33
 #: compensation/templates/compensation/detail/includes/states-before.html:33
@@ -376,10 +373,6 @@ 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"
@@ -739,11 +732,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:226
+#: konova/forms.py:90 konova/forms.py:219
 msgid "Confirm"
 msgstr "Bestätige"
 
-#: konova/forms.py:102 konova/forms.py:235
+#: konova/forms.py:102 konova/forms.py:228
 msgid "Remove"
 msgstr "Löschen"
 
@@ -751,23 +744,27 @@ msgstr "Löschen"
 msgid "You are about to remove {} {}"
 msgstr "Sie sind dabei {} {} zu löschen"
 
-#: konova/forms.py:236
+#: konova/forms.py:229
 msgid "Are you sure?"
 msgstr "Sind Sie sicher?"
 
-#: konova/forms.py:264
+#: konova/forms.py:257
 msgid "When has this file been created? Important for photos."
 msgstr "Wann wurde diese Datei erstellt oder das Foto aufgenommen?"
 
-#: konova/forms.py:274
+#: konova/forms.py:267
 #: venv/lib/python3.7/site-packages/django/db/models/fields/files.py:231
 msgid "File"
 msgstr "Datei"
 
-#: konova/forms.py:276
+#: konova/forms.py:269
 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"
@@ -2252,12 +2249,6 @@ 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"