From 6818ef290e70c49ddf0a98b00a6c251ee44d53ea Mon Sep 17 00:00:00 2001
From: mipel <hadunan@gmail.com>
Date: Wed, 4 Aug 2021 13:32:35 +0200
Subject: [PATCH] Intervention revocation

* adds Revocation model to interventions/models.py
* adds revocations to interventions detail view
* fixes duplicated ids in html includes
* refactors controls for detail view into included template files (controls.html)
* reduces max length for payment transfer notes from 1000 to 200
* adds RevocationAdmin to intervention/admin.py
* adds new form for adding a Revocation to an intervention's legal_data
  * only one revocation per intervention possible
  * removes add button in case of an existing revocation
* adds revocation routes to intervention app
* renames document field in Document model into file for more clarity
* adds/updates translations
---
 compensation/forms.py                         |   3 +-
 .../compensation/detail/includes/actions.html |   2 +-
 .../detail/includes/controls.html             |  26 ++
 .../detail/includes/deadlines.html            |   2 +-
 .../detail/includes/documents.html            |   2 +-
 .../detail/includes/states-after.html         |   2 +-
 .../detail/includes/states-before.html        |   2 +-
 .../templates/compensation/detail/view.html   |  25 +-
 intervention/admin.py                         |  12 +-
 intervention/forms.py                         |  70 ++++-
 intervention/models.py                        |  18 +-
 .../detail/includes/compensations.html        |   2 +-
 .../detail/includes/controls.html             |  43 +++
 .../detail/includes/documents.html            |   2 +-
 .../includes/eco-account-withdraws.html       |   2 +-
 .../detail/includes/payments.html             |   2 +-
 .../detail/includes/revocation.html           |  70 +++++
 .../templates/intervention/detail/view.html   |  53 +---
 intervention/urls.py                          |   6 +-
 intervention/views.py                         |  71 ++++-
 konova/forms.py                               |   2 +-
 konova/models.py                              |   4 +-
 konova/sub_settings/django_settings.py        |   6 +-
 locale/de/LC_MESSAGES/django.mo               | Bin 14290 -> 14793 bytes
 locale/de/LC_MESSAGES/django.po               | 265 +++++++++++-------
 25 files changed, 495 insertions(+), 197 deletions(-)
 create mode 100644 compensation/templates/compensation/detail/includes/controls.html
 create mode 100644 intervention/templates/intervention/detail/includes/controls.html
 create mode 100644 intervention/templates/intervention/detail/includes/revocation.html

diff --git a/compensation/forms.py b/compensation/forms.py
index b6d801eb..ccba35cd 100644
--- a/compensation/forms.py
+++ b/compensation/forms.py
@@ -47,7 +47,7 @@ class NewPaymentForm(BaseModalForm):
         )
     )
     transfer_note = forms.CharField(
-        max_length=1000,
+        max_length=200,
         required=False,
         label_suffix=_(""),
         label=_("Transfer note"),
@@ -55,7 +55,6 @@ class NewPaymentForm(BaseModalForm):
     )
 
     def __init__(self, *args, **kwargs):
-        self.template = "modal/modal_form.html"
         super().__init__(*args, **kwargs)
         self.intervention = self.instance
         self.form_title = _("Payment")
diff --git a/compensation/templates/compensation/detail/includes/actions.html b/compensation/templates/compensation/detail/includes/actions.html
index 5a56e80c..ec6fd4ab 100644
--- a/compensation/templates/compensation/detail/includes/actions.html
+++ b/compensation/templates/compensation/detail/includes/actions.html
@@ -1,5 +1,5 @@
 {% load i18n l10n fontawesome_5 humanize %}
-<div id="related-documents" class="card">
+<div id="actions" class="card">
     <div class="card-header rlp-r">
         <div class="row">
             <div class="col-sm-6">
diff --git a/compensation/templates/compensation/detail/includes/controls.html b/compensation/templates/compensation/detail/includes/controls.html
new file mode 100644
index 00000000..18ce4321
--- /dev/null
+++ b/compensation/templates/compensation/detail/includes/controls.html
@@ -0,0 +1,26 @@
+{% load i18n l10n fontawesome_5 %}
+
+<div class="d-flex justify-content-end">
+    <a href="{% url 'home' %}" class="mr-2">
+        <button class="btn btn-default" title="{% trans 'Open in LANIS' %}">
+            LANIS
+        </button>
+    </a>
+    <a href="{% url 'home' %}" class="mr-2">
+        <button class="btn btn-default" title="{% trans 'Public report' %}">
+            {% fa5_icon 'file-alt' %}
+        </button>
+    </a>
+    {% if has_access %}
+    {% if is_default_member %}
+    <a href="{% url 'home' %}" class="mr-2">
+        <button class="btn btn-default" title="{% trans 'Edit' %}">
+            {% fa5_icon 'edit' %}
+        </button>
+    </a>
+    <button class="btn btn-default btn-modal" data-form-url="{% url 'compensation:remove' comp.id %}" title="{% trans 'Delete' %}">
+        {% fa5_icon 'trash' %}
+    </button>
+    {% endif %}
+    {% endif %}
+</div>
\ No newline at end of file
diff --git a/compensation/templates/compensation/detail/includes/deadlines.html b/compensation/templates/compensation/detail/includes/deadlines.html
index 5764edda..2463acda 100644
--- a/compensation/templates/compensation/detail/includes/deadlines.html
+++ b/compensation/templates/compensation/detail/includes/deadlines.html
@@ -1,5 +1,5 @@
 {% load i18n l10n fontawesome_5 %}
-<div id="related-documents" class="card">
+<div id="deadlines" class="card">
     <div class="card-header rlp-r">
         <div class="row">
             <div class="col-sm-6">
diff --git a/compensation/templates/compensation/detail/includes/documents.html b/compensation/templates/compensation/detail/includes/documents.html
index 109366ff..8f4c8f5f 100644
--- a/compensation/templates/compensation/detail/includes/documents.html
+++ b/compensation/templates/compensation/detail/includes/documents.html
@@ -1,5 +1,5 @@
 {% load i18n l10n fontawesome_5 %}
-<div id="related-documents" class="card">
+<div id="documents" class="card">
     <div class="card-header rlp-r">
         <div class="row">
             <div class="col-sm-6">
diff --git a/compensation/templates/compensation/detail/includes/states-after.html b/compensation/templates/compensation/detail/includes/states-after.html
index 08fa20a9..993ceadc 100644
--- a/compensation/templates/compensation/detail/includes/states-after.html
+++ b/compensation/templates/compensation/detail/includes/states-after.html
@@ -1,5 +1,5 @@
 {% load i18n l10n fontawesome_5 %}
-<div id="related-documents" class="card">
+<div id="states-after" class="card">
     <div class="card-header rlp-r">
         <div class="row">
             <div class="col-sm-6">
diff --git a/compensation/templates/compensation/detail/includes/states-before.html b/compensation/templates/compensation/detail/includes/states-before.html
index 69e0fe21..2a440f5e 100644
--- a/compensation/templates/compensation/detail/includes/states-before.html
+++ b/compensation/templates/compensation/detail/includes/states-before.html
@@ -1,5 +1,5 @@
 {% load i18n l10n fontawesome_5 %}
-<div id="related-documents" class="card">
+<div id="states-before" class="card">
     <div class="card-header rlp-r">
         <div class="row">
             <div class="col-sm-6">
diff --git a/compensation/templates/compensation/detail/view.html b/compensation/templates/compensation/detail/view.html
index cbdb5a30..cf7ba0e2 100644
--- a/compensation/templates/compensation/detail/view.html
+++ b/compensation/templates/compensation/detail/view.html
@@ -12,30 +12,7 @@
             <h3>{% trans 'Compensation' %} {{comp.identifier}}</h3>
         </div>
         <div class="col-sm-12 col-md-12 col-lg-6">
-            <div class="d-flex justify-content-end">
-                <a href="{% url 'home' %}" class="mr-2">
-                    <button class="btn btn-default" title="{% trans 'Open in LANIS' %}">
-                        LANIS
-                    </button>
-                </a>
-                <a href="{% url 'home' %}" class="mr-2">
-                    <button class="btn btn-default" title="{% trans 'Public report' %}">
-                        {% fa5_icon 'file-alt' %}
-                    </button>
-                </a>
-                {% if has_access %}
-                {% if is_default_member %}
-                <a href="{% url 'home' %}" class="mr-2">
-                    <button class="btn btn-default" title="{% trans 'Edit' %}">
-                        {% fa5_icon 'edit' %}
-                    </button>
-                </a>
-                <button class="btn btn-default btn-modal" data-form-url="{% url 'compensation:remove' comp.id %}" title="{% trans 'Delete' %}">
-                    {% fa5_icon 'trash' %}
-                </button>
-                {% endif %}
-                {% endif %}
-            </div>
+            {% include 'compensation/detail/includes/controls.html' %}
         </div>
     </div>
     <hr>
diff --git a/intervention/admin.py b/intervention/admin.py
index 591a9a6e..8854df9e 100644
--- a/intervention/admin.py
+++ b/intervention/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from intervention.models import Intervention, ResponsibilityData, LegalData
+from intervention.models import Intervention, ResponsibilityData, LegalData, Revocation
 
 
 class InterventionAdmin(admin.ModelAdmin):
@@ -33,6 +33,16 @@ class LegalAdmin(admin.ModelAdmin):
     ]
 
 
+class RevocationAdmin(admin.ModelAdmin):
+    list_display = [
+        "id",
+        "date",
+        "comment",
+        "created",
+    ]
+
+
 admin.site.register(Intervention, InterventionAdmin)
 admin.site.register(ResponsibilityData, ResponsibilityAdmin)
 admin.site.register(LegalData, LegalAdmin)
+admin.site.register(Revocation, RevocationAdmin)
diff --git a/intervention/forms.py b/intervention/forms.py
index aa7e0d3b..87375f7b 100644
--- a/intervention/forms.py
+++ b/intervention/forms.py
@@ -14,7 +14,7 @@ from django.db import transaction
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
-from intervention.models import Intervention
+from intervention.models import Intervention, Revocation
 from konova.forms import BaseForm, BaseModalForm
 from konova.models import Document
 from konova.settings import DEFAULT_LAT, DEFAULT_LON, DEFAULT_ZOOM, ZB_GROUP, ETS_GROUP
@@ -315,3 +315,71 @@ class ShareInterventionForm(BaseModalForm):
             id__in=self.cleaned_data["users"]
         )
         self.instance.users.set(accessing_users)
+
+
+class NewRevocationForm(BaseModalForm):
+    date = forms.DateField(
+        label=_("Date"),
+        label_suffix=_(""),
+        help_text=_("Date of revocation"),
+        widget=forms.DateInput(
+            attrs={
+                "type": "date",
+                "data-provide": "datepicker",
+            },
+            format="%d.%m.%Y"
+        )
+    )
+    file = forms.FileField(
+        label=_("Document"),
+        label_suffix=_(""),
+        help_text=_("Must be smaller than 15 Mb"),
+        widget=forms.FileInput(
+            attrs={
+                "class": "w-75"
+            }
+        )
+    )
+    comment = forms.CharField(
+        required=False,
+        max_length=200,
+        label=_("Comment"),
+        label_suffix=_(""),
+        help_text=_("Additional comment, maximum {} letters").format(200),
+        widget=forms.Textarea(
+            attrs={
+                "cols": 30,
+                "rows": 5,
+            }
+        )
+    )
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.form_title = _("Add revocation")
+        self.form_caption = ""
+        self.form_attrs = {
+            "enctype": "multipart/form-data",  # important for file upload
+        }
+
+    def save(self):
+        with transaction.atomic():
+            user_action = UserActionLogEntry.objects.create(
+                user=self.user,
+                action=UserAction.CREATED
+            )
+            document = Document.objects.create(
+                title="revocation_of_{}".format(self.instance.identifier),
+                date_of_creation=self.cleaned_data["date"],
+                comment=self.cleaned_data["comment"],
+                file=self.cleaned_data["file"],
+            )
+            revocation = Revocation.objects.create(
+                date=self.cleaned_data["date"],
+                comment=self.cleaned_data["comment"],
+                document=document,
+                created=user_action,
+            )
+            self.instance.legal.revocation = revocation
+            self.instance.legal.save()
+        return revocation
diff --git a/intervention/models.py b/intervention/models.py
index 53b8b0bf..4a0e4d8e 100644
--- a/intervention/models.py
+++ b/intervention/models.py
@@ -12,7 +12,7 @@ from django.utils import timezone
 from django.utils.timezone import now
 
 from intervention.settings import INTERVENTION_IDENTIFIER_LENGTH, INTERVENTION_IDENTIFIER_TEMPLATE
-from konova.models import BaseObject, Geometry, UuidModel
+from konova.models import BaseObject, Geometry, UuidModel, BaseResource
 from konova.utils import generators
 from konova.utils.generators import generate_random_string
 from organisation.models import Organisation
@@ -38,6 +38,20 @@ class ResponsibilityData(UuidModel):
         )
 
 
+class Revocation(BaseResource):
+    """
+    Holds revocation data e.g. for intervention objects
+    """
+    date = models.DateField(null=True, blank=True, help_text="Revocation from")
+    comment = models.TextField(null=True, blank=True)
+    document = models.ForeignKey("konova.Document", blank=True, null=True, on_delete=models.SET_NULL)
+
+    def delete(self):
+        # Make sure related objects are being removed as well
+        self.document.delete()
+        super().delete()
+
+
 class LegalData(UuidModel):
     """
     Holds intervention legal data such as important dates, laws or responsible handler
@@ -51,6 +65,8 @@ class LegalData(UuidModel):
     process_type = models.CharField(max_length=500, null=True, blank=True)
     law = models.CharField(max_length=500, null=True, blank=True)
 
+    revocation = models.ForeignKey(Revocation, null=True, blank=True, help_text="Refers to 'Widerspruch am'", on_delete=models.SET_NULL)
+
     def __str__(self):
         return "{} | {} | {}".format(
             self.process_type,
diff --git a/intervention/templates/intervention/detail/includes/compensations.html b/intervention/templates/intervention/detail/includes/compensations.html
index 792fcc3b..f195d551 100644
--- a/intervention/templates/intervention/detail/includes/compensations.html
+++ b/intervention/templates/intervention/detail/includes/compensations.html
@@ -1,5 +1,5 @@
 {% load i18n l10n fontawesome_5 %}
-<div id="related-compensations" class="card">
+<div id="compensations" class="card">
     <div class="card-header rlp-r">
         <div class="row">
             <div class="col-sm-6">
diff --git a/intervention/templates/intervention/detail/includes/controls.html b/intervention/templates/intervention/detail/includes/controls.html
new file mode 100644
index 00000000..84a41567
--- /dev/null
+++ b/intervention/templates/intervention/detail/includes/controls.html
@@ -0,0 +1,43 @@
+{% load i18n l10n fontawesome_5 %}
+
+<div class="d-flex justify-content-end">
+    <a href="{% url 'home' %}" class="mr-2">
+        <button class="btn btn-default" title="{% trans 'Open in LANIS' %}">
+            LANIS
+        </button>
+    </a>
+    <a href="{% url 'home' %}" class="mr-2">
+        <button class="btn btn-default" title="{% trans 'Public report' %}">
+            {% fa5_icon 'file-alt' %}
+        </button>
+    </a>
+    {% if has_access %}
+    <button class="btn btn-default btn-modal mr-2" title="{% trans 'Share' %}" data-form-url="{% url 'intervention:share-create' intervention.id %}">
+        {% fa5_icon 'share-alt' %}
+    </button>
+    {% if is_zb_member %}
+    <a href="{% url 'home' %}" class="mr-2">
+        <button class="btn btn-default" title="{% trans 'Run check' %}">
+            {% fa5_icon 'star' %}
+        </button>
+    </a>
+    {% endif %}
+    {% if is_ets_member %}
+    <a href="{% url 'home' %}" class="mr-2">
+        <button class="btn btn-default" title="{% trans 'Record' %}">
+            {% fa5_icon 'bookmark' %}
+        </button>
+    </a>
+    {% endif %}
+    {% if is_default_member %}
+    <a href="{% url 'home' %}" class="mr-2">
+        <button class="btn btn-default" title="{% trans 'Edit' %}">
+            {% fa5_icon 'edit' %}
+        </button>
+    </a>
+    <button class="btn btn-default btn-modal" data-form-url="{% url 'intervention:remove' intervention.id %}" title="{% trans 'Delete' %}">
+        {% fa5_icon 'trash' %}
+    </button>
+    {% endif %}
+    {% endif %}
+</div>
\ No newline at end of file
diff --git a/intervention/templates/intervention/detail/includes/documents.html b/intervention/templates/intervention/detail/includes/documents.html
index 40159b5d..c0bea2b0 100644
--- a/intervention/templates/intervention/detail/includes/documents.html
+++ b/intervention/templates/intervention/detail/includes/documents.html
@@ -1,5 +1,5 @@
 {% load i18n l10n fontawesome_5 %}
-<div id="related-documents" class="card">
+<div id="documents" class="card">
     <div class="card-header rlp-r">
         <div class="row">
             <div class="col-sm-6">
diff --git a/intervention/templates/intervention/detail/includes/eco-account-withdraws.html b/intervention/templates/intervention/detail/includes/eco-account-withdraws.html
index 043e644c..0aad1d8c 100644
--- a/intervention/templates/intervention/detail/includes/eco-account-withdraws.html
+++ b/intervention/templates/intervention/detail/includes/eco-account-withdraws.html
@@ -1,5 +1,5 @@
 {% load i18n l10n fontawesome_5 %}
-<div id="related-eco-account-withdraws" class="card">
+<div id="eco-account-withdraws" class="card">
     <div class="card-header rlp-r">
         <div class="row">
             <div class="col-sm-6">
diff --git a/intervention/templates/intervention/detail/includes/payments.html b/intervention/templates/intervention/detail/includes/payments.html
index a556d3ae..767d0e4a 100644
--- a/intervention/templates/intervention/detail/includes/payments.html
+++ b/intervention/templates/intervention/detail/includes/payments.html
@@ -1,5 +1,5 @@
 {% load i18n l10n fontawesome_5 %}
-<div id="related-payments" class="card">
+<div id="payments" class="card">
     <div class="card-header rlp-r">
         <div class="row">
             <div class="col-sm-6">
diff --git a/intervention/templates/intervention/detail/includes/revocation.html b/intervention/templates/intervention/detail/includes/revocation.html
new file mode 100644
index 00000000..22f78e6e
--- /dev/null
+++ b/intervention/templates/intervention/detail/includes/revocation.html
@@ -0,0 +1,70 @@
+{% load i18n l10n fontawesome_5 %}
+<div id="revocation" class="card">
+    <div class="card-header rlp-r">
+        <div class="row">
+            <div class="col-sm-6">
+                <h5>
+                    <span class="badge badge-light">{% if intervention.legal.revocation %}1{% else %}0{% endif %}</span>
+                    {% trans 'Revocation' %}
+                </h5>
+            </div>
+            <div class="col-sm-6">
+                <div class="d-flex justify-content-end">
+                    {% comment %}
+                        Only show add-button if no revocation exists, yet.
+                    {% endcomment %}
+                    {% if is_default_member and has_access and not intervention.legal.revocation %}
+                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'intervention:revocation-new' intervention.id %}" title="{% trans 'Add revocation' %}">
+                        {% fa5_icon 'plus' %}
+                        {% fa5_icon 'ban' %}
+                    </button>
+                    {% endif %}
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="card-body scroll-300">
+        <table class="table table-hover">
+            <thead>
+            <tr>
+                <th scope="col">
+                    {% trans 'From' context 'Revocation' %}
+                </th>
+                <th scope="col">
+                    {% trans 'Comment' %}
+                </th>
+                <th scope="col">
+                    {% trans 'Document' %}
+                </th>
+                <th scope="col">
+                    {% trans 'Action' %}
+                </th>
+            </tr>
+            </thead>
+            <tbody>
+            {% if intervention.legal.revocation %}
+            {% with intervention.legal.revocation as rev %}
+            <tr>
+                <td class="align-middle">
+                    {{ rev.date }}
+                </td>
+                <td class="align-middle">{{ rev.comment }}</td>
+                <td class="align-middle">
+                    <a href="{% url 'doc-open' rev.document.id %}">
+                        {{ rev.document.file }}
+                    </a>
+                </td>
+                <td>
+                    {% if is_default_member and has_access  %}
+                    <button data-form-url="{% url 'intervention:revocation-remove' rev.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove revocation' %}">
+                        {% fa5_icon 'trash' %}
+                    </button>
+                    {% endif %}
+                </td>
+            </tr>
+            {% endwith %}
+            {% endif %}
+            </tbody>
+        </table>
+    </div>
+</div>
diff --git a/intervention/templates/intervention/detail/view.html b/intervention/templates/intervention/detail/view.html
index 5c0396f8..0eb5642a 100644
--- a/intervention/templates/intervention/detail/view.html
+++ b/intervention/templates/intervention/detail/view.html
@@ -12,47 +12,7 @@
             <h3>{% trans 'Intervention' %} {{intervention.identifier}}</h3>
         </div>
         <div class="col-sm-12 col-md-12 col-lg-6">
-            <div class="d-flex justify-content-end">
-                <a href="{% url 'home' %}" class="mr-2">
-                    <button class="btn btn-default" title="{% trans 'Open in LANIS' %}">
-                        LANIS
-                    </button>
-                </a>
-                <a href="{% url 'home' %}" class="mr-2">
-                    <button class="btn btn-default" title="{% trans 'Public report' %}">
-                        {% fa5_icon 'file-alt' %}
-                    </button>
-                </a>
-                {% if has_access %}
-                <button class="btn btn-default btn-modal mr-2" title="{% trans 'Share' %}" data-form-url="{% url 'intervention:share-create' intervention.id %}">
-                    {% fa5_icon 'share-alt' %}
-                </button>
-                {% if is_zb_member %}
-                <a href="{% url 'home' %}" class="mr-2">
-                    <button class="btn btn-default" title="{% trans 'Run check' %}">
-                        {% fa5_icon 'star' %}
-                    </button>
-                </a>
-                {% endif %}
-                {% if is_ets_member %}
-                <a href="{% url 'home' %}" class="mr-2">
-                    <button class="btn btn-default" title="{% trans 'Record' %}">
-                        {% fa5_icon 'bookmark' %}
-                    </button>
-                </a>
-                {% endif %}
-                {% if is_default_member %}
-                <a href="{% url 'home' %}" class="mr-2">
-                    <button class="btn btn-default" title="{% trans 'Edit' %}">
-                        {% fa5_icon 'edit' %}
-                    </button>
-                </a>
-                <button class="btn btn-default btn-modal" data-form-url="{% url 'intervention:remove' intervention.id %}" title="{% trans 'Delete' %}">
-                    {% fa5_icon 'trash' %}
-                </button>
-                {% endif %}
-                {% endif %}
-            </div>
+            {% include 'intervention/detail/includes/controls.html' %}
         </div>
     </div>
     <hr>
@@ -128,6 +88,10 @@
                         <th scope="row">{% trans 'Binding on' %}</th>
                         <td class="align-middle">{{intervention.legal.binding_date|default_if_none:""}}</td>
                     </tr>
+                    <tr {% if intervention.legal.revocation %}class="alert alert-danger"{% endif %}>
+                        <th scope="row">{% trans 'Revocation' %}</th>
+                        <td class="align-middle">{{intervention.legal.revocation.date|naturalday|default_if_none:""}}</td>
+                    </tr>
                     <tr>
                         <th scope="row">{% trans 'Last modified' %}</th>
                         <td class="align-middle">
@@ -171,9 +135,16 @@
         <div class="col-sm-12 col-md-12 col-lg-6">
             {% include 'intervention/detail/includes/eco-account-withdraws.html' %}
         </div>
+        <div class="col-sm-12 col-md-12 col-lg-6">
+            {% include 'intervention/detail/includes/revocation.html' %}
+        </div>
+    </div>
+    <div class="row">
         <div class="col-sm-12 col-md-12 col-lg-6">
             {% include 'intervention/detail/includes/documents.html' %}
         </div>
+        <div class="col-sm-12 col-md-12 col-lg-6">
+        </div>
     </div>
 
 
diff --git a/intervention/urls.py b/intervention/urls.py
index 912072a9..92bda1ae 100644
--- a/intervention/urls.py
+++ b/intervention/urls.py
@@ -8,7 +8,7 @@ Created on: 30.11.20
 from django.urls import path
 
 from intervention.views import index_view, new_view, open_view, edit_view, remove_view, new_document_view, share_view, \
-    create_share_view
+    create_share_view, remove_revocation_view, new_revocation_view
 
 app_name = "intervention"
 urlpatterns = [
@@ -20,4 +20,8 @@ urlpatterns = [
     path('<id>/remove', remove_view, name='remove'),
     path('<id>/share/<token>', share_view, name='share'),
     path('<id>/share', create_share_view, name='share-create'),
+
+    # Revocation routes
+    path('<id>/revocation/new', new_revocation_view, name='revocation-new'),
+    path('revocation/<id>/remove', remove_revocation_view, name='revocation-remove'),
 ]
\ No newline at end of file
diff --git a/intervention/views.py b/intervention/views.py
index cbbcf834..d7448ce7 100644
--- a/intervention/views.py
+++ b/intervention/views.py
@@ -4,12 +4,14 @@ from django.utils.translation import gettext_lazy as _
 from django.http import HttpRequest
 from django.shortcuts import render, get_object_or_404
 
-from intervention.forms import NewInterventionForm, EditInterventionForm, ShareInterventionForm
-from intervention.models import Intervention
+from intervention.forms import NewInterventionForm, EditInterventionForm, ShareInterventionForm, NewRevocationForm
+from intervention.models import Intervention, Revocation
 from intervention.tables import InterventionTable
 from konova.contexts import BaseContext
 from konova.decorators import *
 from konova.forms import SimpleGeomForm, NewDocumentForm, RemoveModalForm
+from konova.sub_settings.django_settings import DEFAULT_DATE_TIME_FORMAT, DEFAULT_DATE_FORMAT
+from konova.utils.message_templates import FORM_INVALID
 from konova.utils.user_checks import in_group
 
 
@@ -117,6 +119,14 @@ def open_view(request: HttpRequest, id: str):
         instance=intervention
     )
 
+    # Inform user about revocation
+    if intervention.legal.revocation:
+        messages.error(
+            request,
+            _("This intervention has a revocation from {}").format(intervention.legal.revocation.date.strftime(DEFAULT_DATE_FORMAT)),
+            extra_tags="danger",
+        )
+
     context = {
         "intervention": intervention,
         "compensations": compensations,
@@ -185,6 +195,26 @@ def remove_view(request: HttpRequest, id: str):
     )
 
 
+@login_required
+@default_group_required
+def remove_revocation_view(request: HttpRequest, id: str):
+    """ Renders a remove view for a revocation
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The revocation's id as string
+
+    Returns:
+
+    """
+    obj = Revocation.objects.get(id=id)
+    form = RemoveModalForm(request.POST or None, instance=obj, user=request.user)
+    return form.process_request(
+        request,
+        _("Revocation removed"),
+    )
+
+
 @login_required
 def share_view(request: HttpRequest, id: str, token: str):
     """ Performs sharing of an intervention
@@ -256,3 +286,40 @@ def create_share_view(request: HttpRequest, id: str):
         raise NotImplementedError
 
 
+@login_required
+def new_revocation_view(request: HttpRequest, id: str):
+    """ Renders sharing form for an intervention
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): Intervention's id
+
+    Returns:
+
+    """
+    intervention = get_object_or_404(Intervention, id=id)
+    form = NewRevocationForm(request.POST or None, request.FILES or None, instance=intervention, user=request.user)
+    if request.method == "POST":
+        if form.is_valid():
+            form.save()
+            messages.info(
+                request,
+                _("Revocation added")
+            )
+        else:
+            messages.error(
+                request,
+                FORM_INVALID,
+                extra_tags="danger",
+            )
+        return redirect(request.META.get("HTTP_REFERER", "home"))
+    elif request.method == "GET":
+        context = {
+            "form": form,
+        }
+        context = BaseContext(request, context).context
+        return render(request, form.template, context)
+    else:
+        raise NotImplementedError
+
+
diff --git a/konova/forms.py b/konova/forms.py
index 17f56de5..b1024003 100644
--- a/konova/forms.py
+++ b/konova/forms.py
@@ -300,7 +300,7 @@ class NewDocumentForm(BaseModalForm):
         self.form_caption = _("")
         self.template = "modal/modal_form.html"
         self.form_attrs = {
-            "enctype": "multipart/form-data",
+            "enctype": "multipart/form-data",  # important for file upload
         }
 
     def save(self):
diff --git a/konova/models.py b/konova/models.py
index 7c75273a..12d5e67e 100644
--- a/konova/models.py
+++ b/konova/models.py
@@ -98,7 +98,7 @@ class Document(BaseResource):
     """
     title = models.CharField(max_length=500, null=True, blank=True)
     date_of_creation = models.DateField()
-    document = models.FileField()
+    file = models.FileField()
     comment = models.TextField()
 
     def delete(self, using=None, keep_parents=False):
@@ -111,7 +111,7 @@ class Document(BaseResource):
         Returns:
 
         """
-        os.remove(self.document.file.name)
+        os.remove(self.file.file.name)
         super().delete(using=using, keep_parents=keep_parents)
 
 
diff --git a/konova/sub_settings/django_settings.py b/konova/sub_settings/django_settings.py
index ece5d073..0a89afaa 100644
--- a/konova/sub_settings/django_settings.py
+++ b/konova/sub_settings/django_settings.py
@@ -38,8 +38,8 @@ ALLOWED_HOSTS = []
 LOGIN_URL = "/login/"
 
 # Session settings
-SESSION_COOKIE_AGE = 30 * 60  # 30 minutes
-SESSION_SAVE_EVERY_REQUEST = True
+#SESSION_COOKIE_AGE = 30 * 60  # 30 minutes
+#SESSION_SAVE_EVERY_REQUEST = True
 
 # Application definition
 
@@ -149,7 +149,7 @@ LANGUAGE_CODE = 'de'
 USE_THOUSAND_SEPARATOR = True
 
 DEFAULT_DATE_TIME_FORMAT = '%d.%m.%Y %H:%M:%S'
-DATE_FORMAT = '%d.%m.%Y'
+DEFAULT_DATE_FORMAT = '%d.%m.%Y'
 
 TIME_ZONE = 'Europe/Berlin'
 
diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo
index f4338d9c80290a33fbc4cd1ef6382700df160819..f5b0009ccbc6e82150c6585c8e452b16ebcd3fd4 100644
GIT binary patch
delta 5392
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
M%G|+@Nh^=|FA$?p>;M1&

delta 4941
zcmZwKdwfs#9mnynABjjv+C<_u@<WG+xJJXu7@MRnTT|1nlxFJE7E4oGS4}yoAyrBx
zqC@DEhGJ2EVy;tJP%Rzp3|rb-%cJa~d92k(R@(0MKIfCi!yi2l@89!#zUTJ6os;&&
z?056M4-%V{Ikt=BJ4#dM`ZdCMcG#{YI#-HUaRJUva*m=4wG2$gX!g5d9QMNIco*sx
zIaYr^a%=Z6cE%aOanCKMz(2R1pW85E)?fnrXOU;R%g8_XKYnyxe6n+0Fcll)2vkEx
zq8^-!YDgZoz*(q<7h)_f^N)MZt@aDfRiJJV!3^Awo$v~(<#8!N50g+0N=4Q8L%+wU
z2IkoDiMC&WYQQ4Y`77;sx%PR!d!0fI?zIz+U@H43P!GC_x8ql+1}3x$Zj^%RNe9#e
z(vY^gENp^fto~lqh~%M0E+3m=5qfIT^AvRB5<9RORlgC{ux+Rt??&C|Ez}JzpsxEE
z)xdwE&bx^kk;K-)h^3+$l#V*DH)<+|wRWEWpm9{_K@+hZPD5QVAEU6?j=z8!kyWU*
zu@%#BKdK>@P}lv-tV4~^b?ktyjdNj0#r8O~4dbsCO`<|AejGK2b5T7hK@IH|a}TQL
zHMai_YVp;g8gLQSkx#6?4t3wpt-euP=X$Uoi&|q@9tE{{D)P@g#*c2e5Y_U<s2i+A
zJ$M6Z4!7C<LDcofkWqJUqekXq)ODYs&eyQ&`0c2UrJ*|J4WXbOk3r4tWYmKSkoD#Y
zQA1vWbi!32qv_tT;}=jju0!20hL4EWP71049Z*x4ZuNao=M6*}>bYzR8nXLQACNrM
zP|if%U^eQ4BHLeP$Je5+d&TOvp*pe`HKnIe4gV1JHhqTcF^P%S{dZvk&v*MM=m94%
z9nYaIY|M($P_{C=qDCkS)vyt$o{mKg@dVV!%|uPflc)z3qV6}}T!rfBR!rgfZVv?w
z;VIP6UdF-rHL3xFXnr=1M)i0lYDm|i*2qTG>r{!F+asu{JBNDEHPn5+L^Uin9E?x`
zdg^&c3bGffXM<4}jzrbphpL}q`vs_;d&oam%#Rwh#jHe)$Zpj2M^O)c&peNsqW8m$
zzk2j36}n+P-ifYb@NLgR8to<_v*PAqcPvL;cO3Pg({}tHn92S(sPi)Ue)qtKFoa7{
z4PA~J>9S5<(6dS^G<OG3f1QpZ3))>p4RI8e!y550+|2&iJDfX&H?SM-`)<&qk5CQ!
z9M$u$P*V}tC77a4sQUh>^M-pAdQljSysGXQR8L<*U07xHCs8f_#E!eJ{vf#ysOyGe
zI!-_hbumWaQq-a?L9Kxes1e(VdY!#$3R<1Ds1c|$zcicBJ&i;>@@&@~)$&}_ni!9~
zS#CP&`UO_M3^j6VQ4Og;Eza$z22}^gJ$HtJ-vDgNfjW%Fdej5H!7w&Y3tF6k>Tx#e
zOF0>1aGIHqdK;cXowo%22H5fKcDxGx_y0`_YQT9r;os(UR1dz!X4s4sC6iFEYkO3W
z`dj@djAefuGVLx8b$pT4m!q!VZ2LPgiS_3WQqY{AM)mj_>h-&Ux<OMWRy}Bs8lldp
zMU;+NI1n|r1*o<3Eb6?SsO$Ej*2H0}uR;E~ll*v0v#Ym?Fz<@yW;AL@C!jv5Q&5X<
z4yp$ws39&lcbL_vsXL3hz81CEE~6Uqg?SU>*bim!{-;rh&j|h;4nVbZ8fwwaK+SP6
zs$oko7S~`4eAVhBwqK39@oCiRu0>7l7pR8B_6**tcF3FU`u1e})st~l$VX69QHUDS
z)u<c3hFbkqs0P<!Z;WQVxwp$g4gFMp`d}IAfyYrJb{?DKN2rnc6g5Tl9t91t?xs&-
zGA3YG)JSBZhIA0Nz~QJhk&9~ZbW{VMHWy($`z5F^=LS^6kD$)KV)Zxh6#HH~nyVIF
zMGe(|&FH?)4Pn16>O(Xhb>jk5LyOE3a}(-5du;zOCbEA9H3FAV9l3_;z;)#H^juuO
zpl4lB2QpC)7>T#xgGig)EY!%njNiu{s1dn_dhkuu5J&L`Kn+er{(!nP<g4v+Q1_dO
zEpaZ!@O)Q7A(4u;s0LJ`7GDkOh8M9V{s+~tQ2$`aTcR2iM$Kh!4C4Sh{s5}yQ&A7j
zH;Yh<dIkFb{a;2w4_b#>-CK14tMGex2=$4rM>Qn*&R~&tN2**7Y6Rw?I#P^bT!Y>4
z0N#a{P-`K~M?($BMo$kMML{>d4>d<KP(%9!>PuFHT1*wF#dZw&W9XhF+Ct<xGMqe2
zrjeN>k7yfAs>mNmC3%WyTdn!m&}jPwDJOp=+~41N@;ja|wf;7n-<Jp-aepU2B-*qd
z{!HE@d^Cg3;9+uztRUw}!}co*7fFB3zZS_XqOCXCP4u-(AsV(jh_;`Rr6f$WEer5R
zMC(GE){VA<0d5S|l6!4mADtOi9)Tx$zI%aa-X0}sMBDxVx5Mm(dJAsderr1wxRbOZ
zOUUoYFrul{wwRnEbBNZ%I`TL22Jxow^A>5?o}o}mULzZ<vc!DC6h9@?ZU24DvGQ3Q
zW#w(ShiDBwMD8J-$v%=!7HR%FQur}>fNUju$wYGN)|j0K$&biF5=90OZGR-q$n!*_
zsW;{b(bk5%NeZ>YR!q+LCH{ZImn$w%c#&+f0~4@-{F)?_cgc1#i1Z*0+hbOEq@e;&
zkWAYjjgMRTfZ5#4#j)gNwfNSpjGcV4mYgF)$WgM2oF*}(1!>rRLSY`MCO;ru$?N3z
zWHT8_8n(Y!p$WcfW&inY+4;Fu#N%8mZ#3`5`D7|tKr)E7rsQqXg(Q(8qHQI4)-O5t
z4j#Aix8V6-yyYBOV@D^M3FdnIfb1fFBB>-oeo0;-<486cNS-EriMHR6_I@e&da5{?
zd}wuIs9xSJ6poRa$ik$-p~#u!KB3a&){jPtTd#;N?VcKrEKVI1iqv)76&=~%EjLu!
bDSb|4Q@R&ZIxsUMvMKYqP~@JhIiddpyw%zs

diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index 0091f617..6bd46caa 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -3,18 +3,20 @@
 # 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:184 compensation/forms.py:246
+#: compensation/forms.py:34 compensation/forms.py:39 compensation/forms.py:52
+#: compensation/forms.py:182 compensation/forms.py:244
 #: 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:275 konova/forms.py:287 konova/forms.py:300 user/forms.py:38
+#: intervention/filters.py:47 intervention/filters.py:48
+#: intervention/forms.py:323 intervention/forms.py:335
+#: intervention/forms.py:347 konova/forms.py:91 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 11:52+0200\n"
+"POT-Creation-Date: 2021-08-04 13:27+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,133 +26,137 @@ 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:60
 msgid "Payment"
 msgstr "Zahlung"
 
-#: compensation/forms.py:63
+#: compensation/forms.py:61
 msgid "Add a payment for intervention '{}'"
 msgstr "Neue Ersatzzahlung zu Eingriff '{}' hinzufügen"
 
-#: compensation/forms.py:83
+#: compensation/forms.py:81
 msgid "Biotope Type"
 msgstr "Biotoptyp"
 
-#: compensation/forms.py:86
+#: compensation/forms.py:84
 msgid "Select the biotope type"
 msgstr "Biotoptyp wählen"
 
-#: compensation/forms.py:91
+#: compensation/forms.py:89
 #: 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:92
 msgid "in m²"
 msgstr ""
 
-#: compensation/forms.py:99
+#: compensation/forms.py:97
 msgid "New state"
 msgstr "Neuer Zustand"
 
-#: compensation/forms.py:100
+#: compensation/forms.py:98
 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:112 konova/forms.py:141
 msgid "Object removed"
 msgstr "Objekt entfernt"
 
-#: compensation/forms.py:156
+#: compensation/forms.py:154
 msgid "Deadline Type"
 msgstr "Fristart"
 
-#: compensation/forms.py:159
+#: compensation/forms.py:157
 msgid "Select the deadline type"
 msgstr "Fristart wählen"
 
-#: compensation/forms.py:168
+#: compensation/forms.py:166
 #: compensation/templates/compensation/detail/includes/deadlines.html:31
+#: intervention/forms.py:322
 msgid "Date"
 msgstr "Datum"
 
-#: compensation/forms.py:171
+#: compensation/forms.py:169
 msgid "Select date"
 msgstr "Datum wählen"
 
-#: compensation/forms.py:183 compensation/forms.py:245
+#: compensation/forms.py:181 compensation/forms.py:243
 #: 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/forms.py:346
 #: intervention/templates/intervention/detail/includes/documents.html:31
+#: intervention/templates/intervention/detail/includes/revocation.html:35
 #: konova/forms.py:286
 msgid "Comment"
 msgstr "Kommentar"
 
-#: compensation/forms.py:185 compensation/forms.py:247 konova/forms.py:288
+#: compensation/forms.py:183 compensation/forms.py:245
+#: intervention/forms.py:348 konova/forms.py:288
 msgid "Additional comment, maximum {} letters"
 msgstr "Zusätzlicher Kommentar, maximal {} Zeichen"
 
-#: 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:218
 msgid "Select the action type"
 msgstr "Maßnahmentyp wählen"
 
-#: compensation/forms.py:223
+#: compensation/forms.py:221
 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:256
 msgid "New action"
 msgstr "Neue Maßnahme"
 
-#: compensation/forms.py:259
+#: compensation/forms.py:257
 msgid "Insert data for the new action"
 msgstr "Geben Sie die Daten der neuen Maßnahme ein"
 
@@ -186,25 +192,25 @@ msgstr "Kennung"
 
 #: compensation/tables.py:29 compensation/tables.py:169
 #: compensation/templates/compensation/detail/includes/documents.html:28
-#: compensation/templates/compensation/detail/view.html:47
+#: compensation/templates/compensation/detail/view.html:24
 #: 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:24 konova/forms.py:257
 msgid "Title"
 msgstr "Bezeichnung"
 
 #: compensation/tables.py:34
-#: compensation/templates/compensation/detail/view.html:59
+#: compensation/templates/compensation/detail/view.html:36
 #: intervention/tables.py:33
-#: intervention/templates/intervention/detail/view.html:96 user/models.py:48
+#: intervention/templates/intervention/detail/view.html:56 user/models.py:48
 msgid "Checked"
 msgstr "Geprüft"
 
 #: compensation/tables.py:40
-#: compensation/templates/compensation/detail/view.html:73
+#: compensation/templates/compensation/detail/view.html:50
 #: intervention/tables.py:39
-#: intervention/templates/intervention/detail/view.html:110 user/models.py:49
+#: intervention/templates/intervention/detail/view.html:70 user/models.py:49
 msgid "Recorded"
 msgstr "Verzeichnet"
 
@@ -241,9 +247,9 @@ msgid "Checked on {} by {}"
 msgstr "Am {} von {} geprüft worden"
 
 #: compensation/tables.py:128
-#: compensation/templates/compensation/detail/view.html:76
+#: compensation/templates/compensation/detail/view.html:53
 #: intervention/tables.py:135
-#: intervention/templates/intervention/detail/view.html:113
+#: intervention/templates/intervention/detail/view.html:73
 msgid "Not recorded yet"
 msgstr "Noch nicht verzeichnet"
 
@@ -306,6 +312,7 @@ msgstr "Menge"
 #: intervention/templates/intervention/detail/includes/documents.html:34
 #: intervention/templates/intervention/detail/includes/eco-account-withdraws.html:36
 #: intervention/templates/intervention/detail/includes/payments.html:37
+#: intervention/templates/intervention/detail/includes/revocation.html:41
 msgid "Action"
 msgstr "Aktionen"
 
@@ -313,6 +320,27 @@ msgstr "Aktionen"
 msgid "Remove action"
 msgstr "Maßnahme entfernen"
 
+#: compensation/templates/compensation/detail/includes/controls.html:5
+#: intervention/templates/intervention/detail/includes/controls.html:5
+msgid "Open in LANIS"
+msgstr "In LANIS öffnen"
+
+#: compensation/templates/compensation/detail/includes/controls.html:10
+#: intervention/templates/intervention/detail/includes/controls.html:10
+msgid "Public report"
+msgstr "Öffentlicher Bericht"
+
+#: compensation/templates/compensation/detail/includes/controls.html:17
+#: intervention/templates/intervention/detail/includes/controls.html:34
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: compensation/templates/compensation/detail/includes/controls.html:21
+#: intervention/templates/intervention/detail/includes/controls.html:38
+#: venv/lib/python3.7/site-packages/django/forms/formsets.py:391
+msgid "Delete"
+msgstr "Löschen"
+
 #: compensation/templates/compensation/detail/includes/deadlines.html:8
 msgid "Deadlines"
 msgstr "Termine und Fristen"
@@ -380,61 +408,40 @@ msgstr "Neuen Ausgangszustand hinzufügen"
 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"
-msgstr "In LANIS öffnen"
-
-#: compensation/templates/compensation/detail/view.html:22
-#: intervention/templates/intervention/detail/view.html:22
-msgid "Public report"
-msgstr "Öffentlicher Bericht"
-
-#: compensation/templates/compensation/detail/view.html:29
-#: intervention/templates/intervention/detail/view.html:46
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: compensation/templates/compensation/detail/view.html:33
-#: intervention/templates/intervention/detail/view.html:50
-#: venv/lib/python3.7/site-packages/django/forms/formsets.py:391
-msgid "Delete"
-msgstr "Löschen"
-
-#: compensation/templates/compensation/detail/view.html:51
+#: compensation/templates/compensation/detail/view.html:28
 msgid "compensates intervention"
 msgstr "kompensiert Eingriff"
 
-#: compensation/templates/compensation/detail/view.html:66
-#: intervention/templates/intervention/detail/view.html:103
+#: compensation/templates/compensation/detail/view.html:43
+#: intervention/templates/intervention/detail/view.html:63
 msgid "Checked on "
 msgstr "Geprüft am "
 
-#: compensation/templates/compensation/detail/view.html:66
-#: compensation/templates/compensation/detail/view.html:80
-#: intervention/templates/intervention/detail/view.html:103
-#: intervention/templates/intervention/detail/view.html:117
+#: compensation/templates/compensation/detail/view.html:43
+#: compensation/templates/compensation/detail/view.html:57
+#: intervention/templates/intervention/detail/view.html:63
+#: intervention/templates/intervention/detail/view.html:77
 msgid "by"
 msgstr "von"
 
-#: compensation/templates/compensation/detail/view.html:80
-#: intervention/templates/intervention/detail/view.html:117
+#: compensation/templates/compensation/detail/view.html:57
+#: intervention/templates/intervention/detail/view.html:77
 msgid "Recorded on "
 msgstr "Verzeichnet am"
 
-#: compensation/templates/compensation/detail/view.html:87
-#: intervention/templates/intervention/detail/view.html:132
+#: compensation/templates/compensation/detail/view.html:64
+#: intervention/templates/intervention/detail/view.html:96
 msgid "Last modified"
 msgstr "Zuletzt bearbeitet"
 
-#: compensation/templates/compensation/detail/view.html:97
+#: compensation/templates/compensation/detail/view.html:74
 #: intervention/forms.py:256
-#: intervention/templates/intervention/detail/view.html:142
+#: intervention/templates/intervention/detail/view.html:106
 msgid "Shared with"
 msgstr "Freigegeben für"
 
-#: compensation/templates/compensation/detail/view.html:109
-#: intervention/templates/intervention/detail/view.html:154
+#: compensation/templates/compensation/detail/view.html:86
+#: intervention/templates/intervention/detail/view.html:118
 msgid "No geometry added, yet."
 msgstr "Keine Geometrie vorhanden"
 
@@ -503,7 +510,7 @@ msgid "Which intervention type is this"
 msgstr "Welcher Eingriffstyp"
 
 #: intervention/forms.py:46
-#: intervention/templates/intervention/detail/view.html:72
+#: intervention/templates/intervention/detail/view.html:32
 msgid "Law"
 msgstr "Gesetz"
 
@@ -512,7 +519,7 @@ msgid "Based on which law"
 msgstr "Basiert auf welchem Recht"
 
 #: intervention/forms.py:52
-#: intervention/templates/intervention/detail/view.html:92
+#: intervention/templates/intervention/detail/view.html:52
 msgid "Intervention handler"
 msgstr "Eingriffsverursacher"
 
@@ -573,7 +580,7 @@ msgid "Remove check to remove access for this user"
 msgstr "Wählen Sie die Nutzer ab, die keinen Zugriff mehr haben sollen"
 
 #: intervention/forms.py:270
-#: intervention/templates/intervention/detail/view.html:27
+#: intervention/templates/intervention/detail/includes/controls.html:15
 msgid "Share"
 msgstr "Freigabe"
 
@@ -581,6 +588,24 @@ msgstr "Freigabe"
 msgid "Share settings for {}"
 msgstr "Freigabe Einstellungen für {}"
 
+#: intervention/forms.py:324
+msgid "Date of revocation"
+msgstr "Datum des Widerspruchs"
+
+#: intervention/forms.py:334
+#: intervention/templates/intervention/detail/includes/revocation.html:38
+msgid "Document"
+msgstr "Dokument"
+
+#: intervention/forms.py:336 konova/forms.py:276
+msgid "Must be smaller than 15 Mb"
+msgstr "Muss kleiner als 15 Mb sein"
+
+#: intervention/forms.py:359
+#: intervention/templates/intervention/detail/includes/revocation.html:18
+msgid "Add revocation"
+msgstr "Widerspruch hinzufügen"
+
 #: intervention/tables.py:70
 msgid "Interventions"
 msgstr "Eingriffe"
@@ -599,6 +624,14 @@ msgstr "Neue Kompensation hinzufügen"
 msgid "Remove compensation"
 msgstr "Kompensation entfernen"
 
+#: intervention/templates/intervention/detail/includes/controls.html:20
+msgid "Run check"
+msgstr "Prüfung vornehmen"
+
+#: intervention/templates/intervention/detail/includes/controls.html:27
+msgid "Record"
+msgstr "Verzeichnen"
+
 #: intervention/templates/intervention/detail/includes/eco-account-withdraws.html:8
 msgid "Eco Account Withdraws"
 msgstr "Ökokonto Abbuchungen"
@@ -636,51 +669,61 @@ msgstr "Verwendungszweck"
 msgid "Remove payment"
 msgstr "Zahlung entfernen"
 
-#: intervention/templates/intervention/detail/view.html:32
-msgid "Run check"
-msgstr "Prüfung vornehmen"
+#: intervention/templates/intervention/detail/includes/revocation.html:8
+#: intervention/templates/intervention/detail/view.html:92
+msgid "Revocation"
+msgstr "Widerspruch"
 
-#: intervention/templates/intervention/detail/view.html:39
-msgid "Record"
-msgstr "Verzeichnen"
+#: intervention/templates/intervention/detail/includes/revocation.html:32
+msgctxt "Revocation"
+msgid "From"
+msgstr "Vom"
 
-#: intervention/templates/intervention/detail/view.html:68
+#: intervention/templates/intervention/detail/includes/revocation.html:60
+msgid "Remove revocation"
+msgstr "Widerspruch entfernen"
+
+#: intervention/templates/intervention/detail/view.html:28
 msgid "Process type"
 msgstr "Verfahrenstyp"
 
-#: intervention/templates/intervention/detail/view.html:76
+#: intervention/templates/intervention/detail/view.html:36
 msgid "Registration office"
 msgstr "Zulassungsbehörde"
 
-#: intervention/templates/intervention/detail/view.html:80
+#: intervention/templates/intervention/detail/view.html:40
 msgid "Registration office file number"
 msgstr "Aktenzeichen Zulassungsbehörde"
 
-#: intervention/templates/intervention/detail/view.html:84
+#: intervention/templates/intervention/detail/view.html:44
 msgid "Conservation office"
 msgstr "Naturschutzbehörde"
 
-#: intervention/templates/intervention/detail/view.html:88
+#: intervention/templates/intervention/detail/view.html:48
 msgid "Conversation office file number"
 msgstr "Aktenzeichen Naturschutzbehörde"
 
-#: intervention/templates/intervention/detail/view.html:124
+#: intervention/templates/intervention/detail/view.html:84
 msgid "Registration date"
 msgstr "Datum Zulassung bzw. Satzungsbeschluss"
 
-#: intervention/templates/intervention/detail/view.html:128
+#: intervention/templates/intervention/detail/view.html:88
 msgid "Binding on"
 msgstr "Datum Bestandskraft"
 
-#: intervention/views.py:65
+#: intervention/views.py:67
 msgid "Intervention {} added"
 msgstr "Eingriff {} hinzugefügt"
 
-#: intervention/views.py:68 intervention/views.py:157
+#: intervention/views.py:70 intervention/views.py:167
 msgid "Invalid input"
 msgstr "Eingabe fehlerhaft"
 
-#: intervention/views.py:131
+#: intervention/views.py:126
+msgid "This intervention has a revocation from {}"
+msgstr "Es existiert ein Widerspruch vom {}"
+
+#: intervention/views.py:141
 msgid ""
 "Remember: This data has not been shared with you, yet. This means you can "
 "only read but can not edit or perform any actions like running a check or "
@@ -690,30 +733,38 @@ msgstr ""
 "bedeutet, dass Sie nur lesenden Zugriff hierauf haben und weder bearbeiten, "
 "noch Prüfungen durchführen oder verzeichnen können."
 
-#: intervention/views.py:154
+#: intervention/views.py:164
 msgid "{} edited"
 msgstr "{} bearbeitet"
 
-#: intervention/views.py:183
+#: intervention/views.py:193
 msgid "{} removed"
 msgstr "{} entfernt"
 
-#: intervention/views.py:210
+#: intervention/views.py:214
+msgid "Revocation removed"
+msgstr "Widerspruch entfernt"
+
+#: intervention/views.py:240
 msgid "{} has already been shared with you"
 msgstr "{} wurde bereits für Sie freigegeben"
 
-#: intervention/views.py:215
+#: intervention/views.py:245
 msgid "{} has been shared with you"
 msgstr "{} ist nun für Sie freigegeben"
 
-#: intervention/views.py:222
+#: intervention/views.py:252
 msgid "Share link invalid"
 msgstr "Freigabelink ungültig"
 
-#: intervention/views.py:246
+#: intervention/views.py:276
 msgid "Share settings updated"
 msgstr "Freigabe Einstellungen aktualisiert"
 
+#: intervention/views.py:307
+msgid "Revocation added"
+msgstr "Widerspruch hinzugefügt"
+
 #: konova/decorators.py:29
 msgid "You need to be staff to perform this action!"
 msgstr "Hierfür müssen Sie Mitarbeiter sein!"
@@ -764,10 +815,6 @@ msgstr "Wann wurde diese Datei erstellt oder das Foto aufgenommen?"
 msgid "File"
 msgstr "Datei"
 
-#: konova/forms.py:276
-msgid "Must be smaller than 15 Mb"
-msgstr "Muss kleiner als 15 Mb sein"
-
 #: konova/management/commands/setup_data.py:42
 msgid "On new related data"
 msgstr "Wenn neue Daten für mich angelegt werden"