From 17d697da92159c8fd406fe872500bd2f53ccc22b Mon Sep 17 00:00:00 2001
From: mipel <hadunan@gmail.com>
Date: Mon, 9 Aug 2021 15:09:43 +0200
Subject: [PATCH] EcoAccount template and logic

* adds eco-account own includes for simpler maintainability instead of refactoring to generic includes for compensation app and predefining urls and stuff on the backend
* adds before-state, after-state, actions, deadlines, documents and withdraws to eco account detail view
* adds hint for invalid withdraw in intervention detail view in case of deleted eco account
* adds/updates translations
---
 .../{ => compensation}/includes/actions.html  |   0
 .../{ => compensation}/includes/controls.html |   0
 .../includes/deadlines.html                   |   0
 .../includes/documents.html                   |   0
 .../includes/states-after.html                |   0
 .../includes/states-before.html               |   0
 .../detail/{ => compensation}/view.html       |  12 +-
 .../detail/eco_account/includes/actions.html  |  61 +++
 .../detail/eco_account/includes/controls.html |  29 ++
 .../eco_account/includes/deadlines.html       |  61 +++
 .../eco_account/includes/documents.html       |  59 +++
 .../eco_account/includes/states-after.html    |  62 +++
 .../eco_account/includes/states-before.html   |  62 +++
 .../compensation/detail/eco_account/view.html |  12 +-
 compensation/urls.py                          |  19 +-
 compensation/views/compensation_views.py      |   2 +-
 compensation/views/eco_account_views.py       | 129 +++++-
 .../detail/includes/withdraws.html            |   5 +-
 locale/de/LC_MESSAGES/django.mo               | Bin 16047 -> 16199 bytes
 locale/de/LC_MESSAGES/django.po               | 435 ++++++++++--------
 20 files changed, 728 insertions(+), 220 deletions(-)
 rename compensation/templates/compensation/detail/{ => compensation}/includes/actions.html (100%)
 rename compensation/templates/compensation/detail/{ => compensation}/includes/controls.html (100%)
 rename compensation/templates/compensation/detail/{ => compensation}/includes/deadlines.html (100%)
 rename compensation/templates/compensation/detail/{ => compensation}/includes/documents.html (100%)
 rename compensation/templates/compensation/detail/{ => compensation}/includes/states-after.html (100%)
 rename compensation/templates/compensation/detail/{ => compensation}/includes/states-before.html (100%)
 rename compensation/templates/compensation/detail/{ => compensation}/view.html (89%)
 create mode 100644 compensation/templates/compensation/detail/eco_account/includes/actions.html
 create mode 100644 compensation/templates/compensation/detail/eco_account/includes/controls.html
 create mode 100644 compensation/templates/compensation/detail/eco_account/includes/deadlines.html
 create mode 100644 compensation/templates/compensation/detail/eco_account/includes/documents.html
 create mode 100644 compensation/templates/compensation/detail/eco_account/includes/states-after.html
 create mode 100644 compensation/templates/compensation/detail/eco_account/includes/states-before.html

diff --git a/compensation/templates/compensation/detail/includes/actions.html b/compensation/templates/compensation/detail/compensation/includes/actions.html
similarity index 100%
rename from compensation/templates/compensation/detail/includes/actions.html
rename to compensation/templates/compensation/detail/compensation/includes/actions.html
diff --git a/compensation/templates/compensation/detail/includes/controls.html b/compensation/templates/compensation/detail/compensation/includes/controls.html
similarity index 100%
rename from compensation/templates/compensation/detail/includes/controls.html
rename to compensation/templates/compensation/detail/compensation/includes/controls.html
diff --git a/compensation/templates/compensation/detail/includes/deadlines.html b/compensation/templates/compensation/detail/compensation/includes/deadlines.html
similarity index 100%
rename from compensation/templates/compensation/detail/includes/deadlines.html
rename to compensation/templates/compensation/detail/compensation/includes/deadlines.html
diff --git a/compensation/templates/compensation/detail/includes/documents.html b/compensation/templates/compensation/detail/compensation/includes/documents.html
similarity index 100%
rename from compensation/templates/compensation/detail/includes/documents.html
rename to compensation/templates/compensation/detail/compensation/includes/documents.html
diff --git a/compensation/templates/compensation/detail/includes/states-after.html b/compensation/templates/compensation/detail/compensation/includes/states-after.html
similarity index 100%
rename from compensation/templates/compensation/detail/includes/states-after.html
rename to compensation/templates/compensation/detail/compensation/includes/states-after.html
diff --git a/compensation/templates/compensation/detail/includes/states-before.html b/compensation/templates/compensation/detail/compensation/includes/states-before.html
similarity index 100%
rename from compensation/templates/compensation/detail/includes/states-before.html
rename to compensation/templates/compensation/detail/compensation/includes/states-before.html
diff --git a/compensation/templates/compensation/detail/view.html b/compensation/templates/compensation/detail/compensation/view.html
similarity index 89%
rename from compensation/templates/compensation/detail/view.html
rename to compensation/templates/compensation/detail/compensation/view.html
index a2b6ad81..310e7eb0 100644
--- a/compensation/templates/compensation/detail/view.html
+++ b/compensation/templates/compensation/detail/compensation/view.html
@@ -12,7 +12,7 @@
             <h3>{% trans 'Compensation' %} {{obj.identifier}}</h3>
         </div>
         <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/includes/controls.html' %}
+            {% include 'compensation/detail/compensation/includes/controls.html' %}
         </div>
     </div>
     <hr>
@@ -91,23 +91,23 @@
 
     <div class="row">
         <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/includes/states-before.html' %}
+            {% include 'compensation/detail/compensation/includes/states-before.html' %}
         </div>
         <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/includes/states-after.html' %}
+            {% include 'compensation/detail/compensation/includes/states-after.html' %}
         </div>
     </div>
     <div class="row">
         <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/includes/actions.html' %}
+            {% include 'compensation/detail/compensation/includes/actions.html' %}
         </div>
         <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/includes/deadlines.html' %}
+            {% include 'compensation/detail/compensation/includes/deadlines.html' %}
         </div>
     </div>
     <div class="row">
         <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/includes/documents.html' %}
+            {% include 'compensation/detail/compensation/includes/documents.html' %}
         </div>
     </div>
 
diff --git a/compensation/templates/compensation/detail/eco_account/includes/actions.html b/compensation/templates/compensation/detail/eco_account/includes/actions.html
new file mode 100644
index 00000000..23b3f069
--- /dev/null
+++ b/compensation/templates/compensation/detail/eco_account/includes/actions.html
@@ -0,0 +1,61 @@
+{% load i18n l10n fontawesome_5 humanize %}
+<div id="actions" class="card">
+    <div class="card-header rlp-r">
+        <div class="row">
+            <div class="col-sm-6">
+                <h5>
+                    <span class="badge badge-light">{{obj.actions.count}}</span>
+                    {% trans 'Actions' context 'Compensation' %}
+                </h5>
+            </div>
+            <div class="col-sm-6">
+                <div class="d-flex justify-content-end">
+                    {% if is_default_member and has_access  %}
+                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc-new-action' obj.id %}" title="{% trans 'Add new action' %}">
+                        {% fa5_icon 'plus' %}
+                        {% fa5_icon 'seedling' %}
+                    </button>
+                    {% endif %}
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="card-body scroll-300">
+        <table class="table table-hover">
+            <thead>
+            <tr>
+                <th scope="col">
+                    {% trans 'Action type' %}
+                </th>
+                <th scope="col">
+                    {% trans 'Amount' context 'Compensation' %}
+                </th>
+                <th scope="col">
+                    {% trans 'Comment' %}
+                </th>
+                <th scope="col">
+                    {% trans 'Action' %}
+                </th>
+            </tr>
+            </thead>
+            <tbody>
+            {% for action in obj.actions.all %}
+            <tr>
+                <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.comment|default_if_none:"" }}</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' %}">
+                        {% fa5_icon 'trash' %}
+                    </button>
+                    {% endif %}
+                </td>
+            </tr>
+            {% endfor %}
+            </tbody>
+        </table>
+    </div>
+</div>
\ No newline at end of file
diff --git a/compensation/templates/compensation/detail/eco_account/includes/controls.html b/compensation/templates/compensation/detail/eco_account/includes/controls.html
new file mode 100644
index 00000000..c66ba97e
--- /dev/null
+++ b/compensation/templates/compensation/detail/eco_account/includes/controls.html
@@ -0,0 +1,29 @@
+{% 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 mr-2" data-form-url="{% url 'compensation:acc-log' obj.id %}" title="{% trans 'Show log' %}">
+            {% fa5_icon 'history' %}
+        </button>
+        <button class="btn btn-default btn-modal" data-form-url="{% url 'compensation:acc-remove' obj.id %}" title="{% trans 'Delete' %}">
+            {% fa5_icon 'trash' %}
+        </button>
+        {% endif %}
+    {% endif %}
+</div>
\ No newline at end of file
diff --git a/compensation/templates/compensation/detail/eco_account/includes/deadlines.html b/compensation/templates/compensation/detail/eco_account/includes/deadlines.html
new file mode 100644
index 00000000..2bd7d2c8
--- /dev/null
+++ b/compensation/templates/compensation/detail/eco_account/includes/deadlines.html
@@ -0,0 +1,61 @@
+{% load i18n l10n fontawesome_5 %}
+<div id="deadlines" class="card">
+    <div class="card-header rlp-r">
+        <div class="row">
+            <div class="col-sm-6">
+                <h5>
+                    <span class="badge badge-light">{{obj.deadlines.count}}</span>
+                    {% trans 'Deadlines' %}
+                </h5>
+            </div>
+            <div class="col-sm-6">
+                <div class="d-flex justify-content-end">
+                    {% if is_default_member and has_access  %}
+                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc-new-deadline' obj.id %}" title="{% trans 'Add new deadline' %}">
+                        {% fa5_icon 'plus' %}
+                        {% fa5_icon 'calendar-check' %}
+                    </button>
+                    {% endif %}
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="card-body scroll-300">
+        <table class="table table-hover">
+            <thead>
+            <tr>
+                <th scope="col">
+                    {% trans 'Type' %}
+                </th>
+                <th scope="col">
+                    {% trans 'Date' %}
+                </th>
+                <th scope="col">
+                    {% trans 'Comment' %}
+                </th>
+                <th scope="col">
+                    {% trans 'Action' %}
+                </th>
+            </tr>
+            </thead>
+            <tbody>
+            {% for deadline in obj.deadlines.all %}
+            <tr>
+                <td class="align-middle">
+                    {% trans deadline.type_humanized %}
+                </td>
+                <td class="align-middle">{{ deadline.date }}</td>
+                <td class="align-middle">{{ deadline.comment }}</td>
+                <td>
+                    {% if is_default_member and has_access  %}
+                    <button data-form-url="{% url 'deadline-remove' deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove deadline' %}">
+                        {% fa5_icon 'trash' %}
+                    </button>
+                    {% endif %}
+                </td>
+            </tr>
+            {% endfor %}
+            </tbody>
+        </table>
+    </div>
+</div>
\ No newline at end of file
diff --git a/compensation/templates/compensation/detail/eco_account/includes/documents.html b/compensation/templates/compensation/detail/eco_account/includes/documents.html
new file mode 100644
index 00000000..0c4b9ddd
--- /dev/null
+++ b/compensation/templates/compensation/detail/eco_account/includes/documents.html
@@ -0,0 +1,59 @@
+{% load i18n l10n fontawesome_5 %}
+<div id="documents" class="card">
+    <div class="card-header rlp-r">
+        <div class="row">
+            <div class="col-sm-6">
+                <h5>
+                    <span class="badge badge-light">{{obj.documents.count}}</span>
+                    {% trans 'Documents' %}
+                </h5>
+            </div>
+            <div class="col-sm-6">
+                <div class="d-flex justify-content-end">
+                    {% if is_default_member and has_access  %}
+                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc-new-doc' obj.id %}" title="{% trans 'Add new document' %}">
+                        {% fa5_icon 'plus' %}
+                        {% fa5_icon 'file' %}
+                    </button>
+                    {% endif %}
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="card-body scroll-300">
+        <table class="table table-hover">
+            <thead>
+            <tr>
+                <th scope="col">
+                    {% trans 'Title' %}
+                </th>
+                <th scope="col">
+                    {% trans 'Comment' %}
+                </th>
+                <th scope="col">
+                    {% trans 'Action' %}
+                </th>
+            </tr>
+            </thead>
+            <tbody>
+            {% for doc in obj.documents.all %}
+            <tr>
+                <td class="align-middle">
+                    <a href="{% url 'doc-open' doc.id %}">
+                        {{ doc.title }}
+                    </a>
+                </td>
+                <td class="align-middle">{{ doc.comment }}</td>
+                <td>
+                    {% if is_default_member and has_access  %}
+                    <button data-form-url="{% url 'doc-remove' doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}">
+                        {% fa5_icon 'trash' %}
+                    </button>
+                    {% endif %}
+                </td>
+            </tr>
+            {% endfor %}
+            </tbody>
+        </table>
+    </div>
+</div>
\ No newline at end of file
diff --git a/compensation/templates/compensation/detail/eco_account/includes/states-after.html b/compensation/templates/compensation/detail/eco_account/includes/states-after.html
new file mode 100644
index 00000000..da88db0e
--- /dev/null
+++ b/compensation/templates/compensation/detail/eco_account/includes/states-after.html
@@ -0,0 +1,62 @@
+{% load i18n l10n fontawesome_5 %}
+<div id="states-after" class="card">
+    <div class="card-header rlp-r">
+        <div class="row">
+            <div class="col-sm-6">
+                <h5>
+                    <span class="badge badge-light">{{obj.after_states.count}}</span>
+                    {% trans 'States after' %}
+                </h5>
+            </div>
+            <div class="col-sm-6">
+                <div class="d-flex justify-content-end">
+                    {% if is_default_member and has_access  %}
+                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc-new-state' obj.id %}" title="{% trans 'Add new state after' %}">
+                        {% fa5_icon 'plus' %}
+                        {% fa5_icon 'layer-group' %}
+                    </button>
+                    {% endif %}
+                </div>
+            </div>
+        </div>
+    </div>
+    <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²
+            </div>
+        {% endif %}
+        <table class="table table-hover">
+            <thead>
+            <tr>
+                <th scope="col">
+                    {% trans 'Biotope type' %}
+                </th>
+                <th scope="col">
+                    {% trans 'Surface' %}
+                </th>
+                <th scope="col">
+                    {% trans 'Action' %}
+                </th>
+            </tr>
+            </thead>
+            <tbody>
+            {% for state in after_states %}
+            <tr>
+                <td class="align-middle">
+                    {{ state.biotope_type }}
+                </td>
+                <td class="align-middle">{{ state.surface|floatformat:2 }} m²</td>
+                <td>
+                    {% if is_default_member and has_access  %}
+                    <button data-form-url="{% url 'compensation:state-remove' state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}">
+                        {% fa5_icon 'trash' %}
+                    </button>
+                    {% endif %}
+                </td>
+            </tr>
+            {% endfor %}
+            </tbody>
+        </table>
+    </div>
+</div>
\ No newline at end of file
diff --git a/compensation/templates/compensation/detail/eco_account/includes/states-before.html b/compensation/templates/compensation/detail/eco_account/includes/states-before.html
new file mode 100644
index 00000000..33591509
--- /dev/null
+++ b/compensation/templates/compensation/detail/eco_account/includes/states-before.html
@@ -0,0 +1,62 @@
+{% load i18n l10n fontawesome_5 %}
+<div id="states-before" class="card">
+    <div class="card-header rlp-r">
+        <div class="row">
+            <div class="col-sm-6">
+                <h5>
+                    <span class="badge badge-light">{{obj.before_states.count}}</span>
+                    {% trans 'States before' %}
+                </h5>
+            </div>
+            <div class="col-sm-6">
+                <div class="d-flex justify-content-end">
+                    {% if is_default_member and has_access  %}
+                    <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc-new-state' obj.id %}?before=true" title="{% trans 'Add new state before' %}">
+                        {% fa5_icon 'plus' %}
+                        {% fa5_icon 'layer-group' %}
+                    </button>
+                    {% endif %}
+                </div>
+            </div>
+        </div>
+    </div>
+    <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²
+            </div>
+        {% endif %}
+        <table class="table table-hover">
+            <thead>
+            <tr>
+                <th scope="col">
+                    {% trans 'Biotope type' %}
+                </th>
+                <th scope="col">
+                    {% trans 'Surface' %}
+                </th>
+                <th scope="col">
+                    {% trans 'Action' %}
+                </th>
+            </tr>
+            </thead>
+            <tbody>
+            {% for state in before_states %}
+            <tr>
+                <td class="align-middle">
+                    {{ state.biotope_type }}
+                </td>
+                <td class="align-middle">{{ state.surface|floatformat:2 }} m²</td>
+                <td>
+                    {% if is_default_member and has_access  %}
+                    <button data-form-url="{% url 'compensation:state-remove' state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}">
+                        {% fa5_icon 'trash' %}
+                    </button>
+                    {% endif %}
+                </td>
+            </tr>
+            {% endfor %}
+            </tbody>
+        </table>
+    </div>
+</div>
\ No newline at end of file
diff --git a/compensation/templates/compensation/detail/eco_account/view.html b/compensation/templates/compensation/detail/eco_account/view.html
index e42a9b32..098d7a3d 100644
--- a/compensation/templates/compensation/detail/eco_account/view.html
+++ b/compensation/templates/compensation/detail/eco_account/view.html
@@ -12,7 +12,7 @@
             <h3>{% trans 'Eco-account' %} {{obj.identifier}}</h3>
         </div>
         <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/includes/controls.html' %}
+            {% include 'compensation/detail/eco_account/includes/controls.html' %}
         </div>
     </div>
     <hr>
@@ -77,23 +77,23 @@
 
     <div class="row">
         <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/includes/states-before.html' %}
+            {% include 'compensation/detail/eco_account/includes/states-before.html' %}
         </div>
         <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/includes/states-after.html' %}
+            {% include 'compensation/detail/eco_account/includes/states-after.html' %}
         </div>
     </div>
     <div class="row">
         <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/includes/actions.html' %}
+            {% include 'compensation/detail/eco_account/includes/actions.html' %}
         </div>
         <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/includes/deadlines.html' %}
+            {% include 'compensation/detail/eco_account/includes/deadlines.html' %}
         </div>
     </div>
     <div class="row">
         <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/includes/documents.html' %}
+            {% include 'compensation/detail/eco_account/includes/documents.html' %}
         </div>
         <div class="col-sm-12 col-md-12 col-lg-6">
             {% include 'compensation/detail/eco_account/includes/withdraws.html' %}
diff --git a/compensation/urls.py b/compensation/urls.py
index 0014e933..4600e850 100644
--- a/compensation/urls.py
+++ b/compensation/urls.py
@@ -20,11 +20,19 @@ urlpatterns_payment = [
 ]
 
 urlaptterns_eco_acc = [
-    path("acc/", eco_account_views.account_index_view, name="acc-index"),
-    path('acc/new/', eco_account_views.account_new_view, name='acc-new'),
-    path('acc/<id>', eco_account_views.account_open_view, name='acc-open'),
-    path('acc/<id>/edit', eco_account_views.account_edit_view, name='acc-edit'),
-    path('acc/<id>/remove', eco_account_views.account_remove_view, name='acc-remove'),
+    path("acc/", eco_account_views.index_view, name="acc-index"),
+    path('acc/new/', eco_account_views.new_view, name='acc-new'),
+    path('acc/<id>', eco_account_views.open_view, name='acc-open'),
+    path('acc/<id>/log', eco_account_views.log_view, name='acc-log'),
+    path('acc/<id>/edit', eco_account_views.edit_view, name='acc-edit'),
+    path('acc/<id>/remove', eco_account_views.remove_view, name='acc-remove'),
+    path('acc/<id>/state/new', eco_account_views.state_new_view, name='acc-new-state'),
+    path('acc/<id>/action/new', eco_account_views.action_new_view, name='acc-new-action'),
+    path('acc/<id>/deadline/new', eco_account_views.deadline_new_view, name="acc-new-deadline"),
+
+    # Documents
+    # Document remove route can be found in konova/urls.py
+    path('acc/<id>/document/new/', eco_account_views.new_document_view, name='acc-new-doc'),
 
     # Eco-account withdraws
     path('acc/<id>/remove/<withdraw_id>', eco_account_views.withdraw_remove_view, name='withdraw-remove'),
@@ -43,6 +51,7 @@ urlpatterns_compensation = [
     path('<id>/deadline/new', compensation_views.deadline_new_view, name="new-deadline"),
 
     # Documents
+    # Document remove route can be found in konova/urls.py
     path('<id>/document/new/', compensation_views.new_document_view, name='new-doc'),
 
     # Generic state routes
diff --git a/compensation/views/compensation_views.py b/compensation/views/compensation_views.py
index 1ed61165..900827be 100644
--- a/compensation/views/compensation_views.py
+++ b/compensation/views/compensation_views.py
@@ -67,7 +67,7 @@ def open_view(request: HttpRequest, id: str):
     Returns:
 
     """
-    template = "compensation/detail/view.html"
+    template = "compensation/detail/compensation/view.html"
     comp = get_object_or_404(Compensation, id=id)
     geom_form = SimpleGeomForm(instance=comp)
     _user = request.user
diff --git a/compensation/views/eco_account_views.py b/compensation/views/eco_account_views.py
index 5552db94..d0ba4a9f 100644
--- a/compensation/views/eco_account_views.py
+++ b/compensation/views/eco_account_views.py
@@ -6,24 +6,26 @@ Created on: 09.08.21
 
 """
 from django.db.models import Sum
+from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 from django.contrib.auth.decorators import login_required
 from django.core.exceptions import ObjectDoesNotExist
 from django.http import HttpRequest, Http404
 from django.shortcuts import render, get_object_or_404
 
+from compensation.forms import NewStateModalForm, NewActionModalForm, NewDeadlineModalForm
 from compensation.models import EcoAccount
 from compensation.tables import EcoAccountTable
 from konova.contexts import BaseContext
 from konova.decorators import any_group_check, default_group_required
-from konova.forms import RemoveModalForm, SimpleGeomForm
+from konova.forms import RemoveModalForm, SimpleGeomForm, NewDocumentForm
 from konova.settings import DEFAULT_GROUP, ZB_GROUP, ETS_GROUP
 from konova.utils.user_checks import in_group
 
 
 @login_required
 @any_group_check
-def account_index_view(request: HttpRequest):
+def index_view(request: HttpRequest):
     """
     Renders the index view for eco accounts
 
@@ -51,21 +53,21 @@ def account_index_view(request: HttpRequest):
 
 @login_required
 @default_group_required
-def account_new_view(request: HttpRequest):
+def new_view(request: HttpRequest):
     # ToDo
     pass
 
 
 @login_required
 @default_group_required
-def account_edit_view(request: HttpRequest, id: str):
+def edit_view(request: HttpRequest, id: str):
     # ToDo
     pass
 
 
 @login_required
 @any_group_check
-def account_open_view(request: HttpRequest, id: str):
+def open_view(request: HttpRequest, id: str):
     """ Renders a detail view for a compensation
 
     Args:
@@ -115,11 +117,23 @@ def account_open_view(request: HttpRequest, id: str):
 
 
 @login_required
-def account_remove_view(request: HttpRequest, id: str):
-    # ToDo
-    pass
+def remove_view(request: HttpRequest, id: str):
+    """ Renders a modal view for removing the eco account
 
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The account's id
 
+    Returns:
+
+    """
+    acc = get_object_or_404(EcoAccount, id=id)
+    form = RemoveModalForm(request.POST or None, instance=acc, user=request.user)
+    return form.process_request(
+        request=request,
+        msg_success=_("Eco-account removed"),
+        redirect_url=reverse("compensation:acc-index"),
+    )
 
 
 @login_required
@@ -147,3 +161,102 @@ def withdraw_remove_view(request: HttpRequest, id: str, withdraw_id: str):
         msg_success=_("Withdraw removed")
     )
 
+
+@login_required
+@default_group_required
+def log_view(request: HttpRequest, id: str):
+    """ Renders a log view using modal
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The eco acount's id
+
+    Returns:
+
+    """
+    comp = get_object_or_404(EcoAccount, id=id)
+    template = "modal/modal_generic.html"
+    body_template = "log.html"
+
+    context = {
+        "modal_body_template": body_template,
+        "log": comp.log.all().order_by("-timestamp"),
+        "modal_title": _("Log"),
+    }
+    context = BaseContext(request, context).context
+    return render(request, template, context)
+
+
+@login_required
+def state_new_view(request: HttpRequest, id: str):
+    """ Renders a form for adding new states for an eco account
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The account's id to which the new state will be related
+
+    Returns:
+
+    """
+    acc = get_object_or_404(EcoAccount, id=id)
+    form = NewStateModalForm(request.POST or None, instance=acc, user=request.user)
+    return form.process_request(
+        request,
+        msg_success=_("State added")
+    )
+
+
+@login_required
+def action_new_view(request: HttpRequest, id: str):
+    """ Renders a form for adding new actions for an eco account
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The account's id to which the new state will be related
+
+    Returns:
+
+    """
+    acc = get_object_or_404(EcoAccount, id=id)
+    form = NewActionModalForm(request.POST or None, instance=acc, user=request.user)
+    return form.process_request(
+        request,
+        msg_success=_("Action added")
+    )
+
+
+@login_required
+def deadline_new_view(request: HttpRequest, id: str):
+    """ Renders a form for adding new states for an eco account
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The account's id to which the new state will be related
+
+    Returns:
+
+    """
+    acc = get_object_or_404(EcoAccount, id=id)
+    form = NewDeadlineModalForm(request.POST or None, instance=acc, user=request.user)
+    return form.process_request(
+        request,
+        msg_success=_("Deadline added")
+    )
+
+
+@login_required
+def new_document_view(request: HttpRequest, id: str):
+    """ Renders a form for uploading new documents
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The account's id to which the new document will be related
+    Returns:
+
+    """
+    acc = get_object_or_404(EcoAccount, id=id)
+    form = NewDocumentForm(request.POST or None, request.FILES or None, instance=acc, user=request.user)
+    return form.process_request(
+        request,
+        msg_success=_("Document added")
+    )
\ No newline at end of file
diff --git a/intervention/templates/intervention/detail/includes/withdraws.html b/intervention/templates/intervention/detail/includes/withdraws.html
index 24199e40..8a170bd7 100644
--- a/intervention/templates/intervention/detail/includes/withdraws.html
+++ b/intervention/templates/intervention/detail/includes/withdraws.html
@@ -39,9 +39,12 @@
             </thead>
             <tbody>
             {% for withdraw in intervention.withdraws.all %}
-            <tr>
+            <tr {% if withdraw.account.deleted %}class="align-middle alert-danger" title="{% trans 'Eco-account deleted! Withdraw invalid!' %}" {% endif %}>
                 <td class="align-middle">
                     <a href="{% url 'compensation:acc-open' withdraw.account.id %}">
+                        {% if withdraw.account.deleted %}
+                        {% fa5_icon 'exclamation-triangle' %}
+                        {% endif %}
                         {{ withdraw.account.identifier }}
                     </a>
                 </td>
diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo
index 9f58486233c4890ff5303b3c0c96d40cb2319269..da217ac55128b31910c4d840edbf0a02c472833b 100644
GIT binary patch
delta 5474
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
J2E?uj{2y-}LD>KR

delta 5322
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

diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index e0de290e..85e87190 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-09 14:35+0200\n"
+"POT-Creation-Date: 2021-08-09 15:06+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"
@@ -74,8 +74,10 @@ msgid "Select the biotope type"
 msgstr "Biotoptyp wählen"
 
 #: compensation/forms.py:103
-#: compensation/templates/compensation/detail/includes/states-after.html:36
-#: compensation/templates/compensation/detail/includes/states-before.html:36
+#: compensation/templates/compensation/detail/compensation/includes/states-after.html:36
+#: compensation/templates/compensation/detail/compensation/includes/states-before.html:36
+#: compensation/templates/compensation/detail/eco_account/includes/states-after.html:36
+#: compensation/templates/compensation/detail/eco_account/includes/states-before.html:36
 msgid "Surface"
 msgstr "Fläche"
 
@@ -108,7 +110,8 @@ msgid "Select the deadline type"
 msgstr "Fristart wählen"
 
 #: compensation/forms.py:187
-#: compensation/templates/compensation/detail/includes/deadlines.html:31
+#: compensation/templates/compensation/detail/compensation/includes/deadlines.html:31
+#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:31
 #: intervention/forms.py:317
 msgid "Date"
 msgstr "Datum"
@@ -118,9 +121,12 @@ msgid "Select date"
 msgstr "Datum wählen"
 
 #: compensation/forms.py:202 compensation/forms.py:270
-#: compensation/templates/compensation/detail/includes/actions.html:34
-#: compensation/templates/compensation/detail/includes/deadlines.html:34
-#: compensation/templates/compensation/detail/includes/documents.html:31
+#: compensation/templates/compensation/detail/compensation/includes/actions.html:34
+#: compensation/templates/compensation/detail/compensation/includes/deadlines.html:34
+#: compensation/templates/compensation/detail/compensation/includes/documents.html:31
+#: compensation/templates/compensation/detail/eco_account/includes/actions.html:34
+#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:34
+#: compensation/templates/compensation/detail/eco_account/includes/documents.html:31
 #: intervention/forms.py:341
 #: intervention/templates/intervention/detail/includes/documents.html:31
 #: intervention/templates/intervention/detail/includes/revocation.html:35
@@ -208,9 +214,10 @@ msgid "Identifier"
 msgstr "Kennung"
 
 #: compensation/tables.py:31 compensation/tables.py:171
+#: compensation/templates/compensation/detail/compensation/includes/documents.html:28
+#: compensation/templates/compensation/detail/compensation/view.html:24
+#: compensation/templates/compensation/detail/eco_account/includes/documents.html:28
 #: compensation/templates/compensation/detail/eco_account/view.html:24
-#: compensation/templates/compensation/detail/includes/documents.html:28
-#: 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
@@ -219,15 +226,15 @@ msgid "Title"
 msgstr "Bezeichnung"
 
 #: compensation/tables.py:36
-#: compensation/templates/compensation/detail/view.html:36
+#: compensation/templates/compensation/detail/compensation/view.html:36
 #: intervention/tables.py:33
 #: intervention/templates/intervention/detail/view.html:56 user/models.py:48
 msgid "Checked"
 msgstr "Geprüft"
 
 #: compensation/tables.py:42 compensation/tables.py:181
+#: compensation/templates/compensation/detail/compensation/view.html:50
 #: compensation/templates/compensation/detail/eco_account/view.html:36
-#: compensation/templates/compensation/detail/view.html:50
 #: intervention/tables.py:39
 #: intervention/templates/intervention/detail/view.html:70 user/models.py:49
 msgid "Recorded"
@@ -254,7 +261,7 @@ msgid "Open {}"
 msgstr "Öffne {}"
 
 #: compensation/tables.py:85
-#: compensation/templates/compensation/detail/view.html:12
+#: compensation/templates/compensation/detail/compensation/view.html:12
 #: konova/templates/konova/home.html:49 templates/navbar.html:28
 msgid "Compensation"
 msgstr "Kompensation"
@@ -268,8 +275,8 @@ msgid "Checked on {} by {}"
 msgstr "Am {} von {} geprüft worden"
 
 #: compensation/tables.py:130
+#: compensation/templates/compensation/detail/compensation/view.html:53
 #: compensation/templates/compensation/detail/eco_account/view.html:39
-#: compensation/templates/compensation/detail/view.html:53
 #: intervention/tables.py:135
 #: intervention/templates/intervention/detail/view.html:73
 msgid "Not recorded yet"
@@ -292,6 +299,7 @@ msgstr "Nicht freigegeben - Datensatz nur lesbar"
 
 #: compensation/tables.py:176
 #: compensation/templates/compensation/detail/eco_account/view.html:28
+#: konova/templates/konova/custom_widgets/progressbar.html:3
 msgid "Available"
 msgstr "Verfügbar"
 
@@ -310,6 +318,210 @@ msgid "Not recorded yet. Can not be used for withdraws, yet."
 msgstr ""
 "Noch nicht verzeichnet. Kann noch nicht für Abbuchungen genutzt werden."
 
+#: compensation/templates/compensation/detail/compensation/includes/actions.html:8
+#: compensation/templates/compensation/detail/eco_account/includes/actions.html:8
+msgctxt "Compensation"
+msgid "Actions"
+msgstr "Maßnahmen"
+
+#: compensation/templates/compensation/detail/compensation/includes/actions.html:14
+#: compensation/templates/compensation/detail/eco_account/includes/actions.html:14
+msgid "Add new action"
+msgstr "Neue Maßnahme hinzufügen"
+
+#: compensation/templates/compensation/detail/compensation/includes/actions.html:28
+#: compensation/templates/compensation/detail/eco_account/includes/actions.html:28
+msgid "Action type"
+msgstr "Maßnahmentyp"
+
+#: compensation/templates/compensation/detail/compensation/includes/actions.html:31
+#: compensation/templates/compensation/detail/eco_account/includes/actions.html:31
+msgctxt "Compensation"
+msgid "Amount"
+msgstr "Menge"
+
+#: compensation/templates/compensation/detail/compensation/includes/actions.html:37
+#: 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/eco_account/includes/actions.html:37
+#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:37
+#: compensation/templates/compensation/detail/eco_account/includes/documents.html:34
+#: compensation/templates/compensation/detail/eco_account/includes/states-after.html:39
+#: compensation/templates/compensation/detail/eco_account/includes/states-before.html:39
+#: compensation/templates/compensation/detail/eco_account/includes/withdraws.html:36
+#: intervention/templates/intervention/detail/includes/compensations.html:36
+#: intervention/templates/intervention/detail/includes/documents.html:34
+#: intervention/templates/intervention/detail/includes/payments.html:37
+#: intervention/templates/intervention/detail/includes/revocation.html:41
+#: intervention/templates/intervention/detail/includes/withdraws.html:36
+#: templates/log.html:10
+msgid "Action"
+msgstr "Aktionen"
+
+#: compensation/templates/compensation/detail/compensation/includes/actions.html:51
+#: compensation/templates/compensation/detail/eco_account/includes/actions.html:51
+msgid "Remove action"
+msgstr "Maßnahme entfernen"
+
+#: compensation/templates/compensation/detail/compensation/includes/controls.html:5
+#: compensation/templates/compensation/detail/eco_account/includes/controls.html:5
+#: intervention/templates/intervention/detail/includes/controls.html:5
+msgid "Open in LANIS"
+msgstr "In LANIS öffnen"
+
+#: compensation/templates/compensation/detail/compensation/includes/controls.html:10
+#: compensation/templates/compensation/detail/eco_account/includes/controls.html:10
+#: intervention/templates/intervention/detail/includes/controls.html:10
+msgid "Public report"
+msgstr "Öffentlicher Bericht"
+
+#: compensation/templates/compensation/detail/compensation/includes/controls.html:17
+#: compensation/templates/compensation/detail/eco_account/includes/controls.html:17
+#: intervention/templates/intervention/detail/includes/controls.html:32
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: compensation/templates/compensation/detail/compensation/includes/controls.html:21
+#: compensation/templates/compensation/detail/eco_account/includes/controls.html:21
+#: intervention/templates/intervention/detail/includes/controls.html:36
+msgid "Show log"
+msgstr "Log anzeigen"
+
+#: compensation/templates/compensation/detail/compensation/includes/controls.html:24
+#: compensation/templates/compensation/detail/eco_account/includes/controls.html:24
+#: intervention/templates/intervention/detail/includes/controls.html:39
+#: venv/lib/python3.7/site-packages/django/forms/formsets.py:391
+msgid "Delete"
+msgstr "Löschen"
+
+#: compensation/templates/compensation/detail/compensation/includes/deadlines.html:8
+#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:8
+msgid "Deadlines"
+msgstr "Termine und Fristen"
+
+#: compensation/templates/compensation/detail/compensation/includes/deadlines.html:14
+#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:14
+msgid "Add new deadline"
+msgstr "Neue Frist hinzufügen"
+
+#: compensation/templates/compensation/detail/compensation/includes/deadlines.html:28
+#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:28
+#: intervention/forms.py:40
+msgid "Type"
+msgstr "Typ"
+
+#: compensation/templates/compensation/detail/compensation/includes/deadlines.html:51
+#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:51
+msgid "Remove deadline"
+msgstr "Frist löschen"
+
+#: compensation/templates/compensation/detail/compensation/includes/documents.html:8
+#: compensation/templates/compensation/detail/eco_account/includes/documents.html:8
+#: intervention/templates/intervention/detail/includes/documents.html:8
+msgid "Documents"
+msgstr "Dokumente"
+
+#: compensation/templates/compensation/detail/compensation/includes/documents.html:14
+#: compensation/templates/compensation/detail/eco_account/includes/documents.html:14
+#: intervention/templates/intervention/detail/includes/documents.html:14
+#: konova/forms.py:301
+msgid "Add new document"
+msgstr "Neues Dokument hinzufügen"
+
+#: compensation/templates/compensation/detail/compensation/includes/documents.html:49
+#: compensation/templates/compensation/detail/eco_account/includes/documents.html:49
+#: intervention/templates/intervention/detail/includes/documents.html:49
+msgid "Remove document"
+msgstr "Dokument löschen"
+
+#: compensation/templates/compensation/detail/compensation/includes/states-after.html:8
+#: compensation/templates/compensation/detail/eco_account/includes/states-after.html:8
+msgid "States after"
+msgstr "Zielzustand"
+
+#: compensation/templates/compensation/detail/compensation/includes/states-after.html:14
+#: compensation/templates/compensation/detail/eco_account/includes/states-after.html:14
+msgid "Add new state after"
+msgstr "Neuen Zielzustand hinzufügen"
+
+#: compensation/templates/compensation/detail/compensation/includes/states-after.html:26
+#: compensation/templates/compensation/detail/eco_account/includes/states-after.html:26
+msgid "Missing surfaces according to states before: "
+msgstr "Fehlende Flächenmengen aus Ausgangszustand: "
+
+#: compensation/templates/compensation/detail/compensation/includes/states-after.html:33
+#: compensation/templates/compensation/detail/compensation/includes/states-before.html:33
+#: compensation/templates/compensation/detail/eco_account/includes/states-after.html:33
+#: compensation/templates/compensation/detail/eco_account/includes/states-before.html:33
+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/eco_account/includes/states-after.html:52
+#: compensation/templates/compensation/detail/eco_account/includes/states-before.html:52
+msgid "Remove state"
+msgstr "Zustand entfernen"
+
+#: compensation/templates/compensation/detail/compensation/includes/states-before.html:8
+#: compensation/templates/compensation/detail/eco_account/includes/states-before.html:8
+msgid "States before"
+msgstr "Ausgangszustand"
+
+#: compensation/templates/compensation/detail/compensation/includes/states-before.html:14
+#: compensation/templates/compensation/detail/eco_account/includes/states-before.html:14
+msgid "Add new state before"
+msgstr "Neuen Ausgangszustand hinzufügen"
+
+#: compensation/templates/compensation/detail/compensation/includes/states-before.html:26
+#: compensation/templates/compensation/detail/eco_account/includes/states-before.html:26
+msgid "Missing surfaces according to states after: "
+msgstr "Fehlende Flächenmengen aus Zielzustand: "
+
+#: compensation/templates/compensation/detail/compensation/view.html:28
+msgid "compensates intervention"
+msgstr "kompensiert Eingriff"
+
+#: compensation/templates/compensation/detail/compensation/view.html:43
+#: intervention/templates/intervention/detail/view.html:63
+msgid "Checked on "
+msgstr "Geprüft am "
+
+#: compensation/templates/compensation/detail/compensation/view.html:43
+#: compensation/templates/compensation/detail/compensation/view.html:57
+#: compensation/templates/compensation/detail/eco_account/view.html:43
+#: intervention/templates/intervention/detail/view.html:63
+#: intervention/templates/intervention/detail/view.html:77
+msgid "by"
+msgstr "von"
+
+#: compensation/templates/compensation/detail/compensation/view.html:57
+#: compensation/templates/compensation/detail/eco_account/view.html:43
+#: intervention/templates/intervention/detail/view.html:77
+msgid "Recorded on "
+msgstr "Verzeichnet am"
+
+#: compensation/templates/compensation/detail/compensation/view.html:64
+#: compensation/templates/compensation/detail/eco_account/view.html:50
+#: intervention/templates/intervention/detail/view.html:96
+msgid "Last modified"
+msgstr "Zuletzt bearbeitet"
+
+#: compensation/templates/compensation/detail/compensation/view.html:72
+#: compensation/templates/compensation/detail/eco_account/view.html:58
+#: intervention/forms.py:251
+#: intervention/templates/intervention/detail/view.html:104
+msgid "Shared with"
+msgstr "Freigegeben für"
+
+#: compensation/templates/compensation/detail/compensation/view.html:84
+#: compensation/templates/compensation/detail/eco_account/view.html:70
+#: intervention/templates/intervention/detail/view.html:116
+msgid "No geometry added, yet."
+msgstr "Keine Geometrie vorhanden"
+
 #: compensation/templates/compensation/detail/eco_account/includes/withdraws.html:8
 #: intervention/templates/intervention/detail/includes/withdraws.html:8
 msgid "Eco Account Withdraws"
@@ -324,184 +536,13 @@ msgstr "Neue Abbuchung hinzufügen"
 msgid "Intervention Identifier"
 msgstr "Eingriffskennung"
 
-#: compensation/templates/compensation/detail/eco_account/includes/withdraws.html:36
-#: compensation/templates/compensation/detail/includes/actions.html:37
-#: compensation/templates/compensation/detail/includes/deadlines.html:37
-#: compensation/templates/compensation/detail/includes/documents.html:34
-#: compensation/templates/compensation/detail/includes/states-after.html:39
-#: compensation/templates/compensation/detail/includes/states-before.html:39
-#: intervention/templates/intervention/detail/includes/compensations.html:36
-#: intervention/templates/intervention/detail/includes/documents.html:34
-#: intervention/templates/intervention/detail/includes/payments.html:37
-#: intervention/templates/intervention/detail/includes/revocation.html:41
-#: intervention/templates/intervention/detail/includes/withdraws.html:36
-#: templates/log.html:10
-msgid "Action"
-msgstr "Aktionen"
-
 #: compensation/templates/compensation/detail/eco_account/includes/withdraws.html:51
-#: intervention/templates/intervention/detail/includes/withdraws.html:51
+#: intervention/templates/intervention/detail/includes/withdraws.html:54
 msgid "Remove Withdraw"
 msgstr "Abbuchung entfernen"
 
-#: compensation/templates/compensation/detail/eco_account/view.html:43
-#: compensation/templates/compensation/detail/view.html:57
-#: intervention/templates/intervention/detail/view.html:77
-msgid "Recorded on "
-msgstr "Verzeichnet am"
-
-#: compensation/templates/compensation/detail/eco_account/view.html:43
-#: 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/eco_account/view.html:50
-#: compensation/templates/compensation/detail/view.html:64
-#: intervention/templates/intervention/detail/view.html:96
-msgid "Last modified"
-msgstr "Zuletzt bearbeitet"
-
-#: compensation/templates/compensation/detail/eco_account/view.html:58
-#: compensation/templates/compensation/detail/view.html:72
-#: intervention/forms.py:251
-#: intervention/templates/intervention/detail/view.html:104
-msgid "Shared with"
-msgstr "Freigegeben für"
-
-#: compensation/templates/compensation/detail/eco_account/view.html:70
-#: compensation/templates/compensation/detail/view.html:84
-#: intervention/templates/intervention/detail/view.html:116
-msgid "No geometry added, yet."
-msgstr "Keine Geometrie vorhanden"
-
-#: compensation/templates/compensation/detail/includes/actions.html:8
-msgctxt "Compensation"
-msgid "Actions"
-msgstr "Maßnahmen"
-
-#: compensation/templates/compensation/detail/includes/actions.html:14
-msgid "Add new action"
-msgstr "Neue Maßnahme hinzufügen"
-
-#: compensation/templates/compensation/detail/includes/actions.html:28
-msgid "Action type"
-msgstr "Maßnahmentyp"
-
-#: compensation/templates/compensation/detail/includes/actions.html:31
-msgctxt "Compensation"
-msgid "Amount"
-msgstr "Menge"
-
-#: compensation/templates/compensation/detail/includes/actions.html:51
-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:32
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: compensation/templates/compensation/detail/includes/controls.html:21
-#: intervention/templates/intervention/detail/includes/controls.html:36
-msgid "Show log"
-msgstr "Log anzeigen"
-
-#: compensation/templates/compensation/detail/includes/controls.html:24
-#: intervention/templates/intervention/detail/includes/controls.html:39
-#: 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"
-
-#: compensation/templates/compensation/detail/includes/deadlines.html:14
-msgid "Add new deadline"
-msgstr "Neue Frist hinzufügen"
-
-#: compensation/templates/compensation/detail/includes/deadlines.html:28
-#: intervention/forms.py:40
-msgid "Type"
-msgstr "Typ"
-
-#: compensation/templates/compensation/detail/includes/deadlines.html:51
-msgid "Remove deadline"
-msgstr "Frist löschen"
-
-#: compensation/templates/compensation/detail/includes/documents.html:8
-#: intervention/templates/intervention/detail/includes/documents.html:8
-msgid "Documents"
-msgstr "Dokumente"
-
-#: compensation/templates/compensation/detail/includes/documents.html:14
-#: intervention/templates/intervention/detail/includes/documents.html:14
-#: konova/forms.py:301
-msgid "Add new document"
-msgstr "Neues Dokument hinzufügen"
-
-#: compensation/templates/compensation/detail/includes/documents.html:49
-#: intervention/templates/intervention/detail/includes/documents.html:49
-msgid "Remove document"
-msgstr "Dokument löschen"
-
-#: compensation/templates/compensation/detail/includes/states-after.html:8
-msgid "States after"
-msgstr "Zielzustand"
-
-#: compensation/templates/compensation/detail/includes/states-after.html:14
-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: "
-msgstr "Fehlende Flächenmengen aus Ausgangszustand: "
-
-#: compensation/templates/compensation/detail/includes/states-after.html:33
-#: compensation/templates/compensation/detail/includes/states-before.html:33
-msgid "Biotope type"
-msgstr "Biotoptyp"
-
-#: compensation/templates/compensation/detail/includes/states-after.html:52
-#: compensation/templates/compensation/detail/includes/states-before.html:52
-msgid "Remove state"
-msgstr "Zustand entfernen"
-
-#: compensation/templates/compensation/detail/includes/states-before.html:8
-msgid "States before"
-msgstr "Ausgangszustand"
-
-#: compensation/templates/compensation/detail/includes/states-before.html:14
-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:28
-msgid "compensates intervention"
-msgstr "kompensiert Eingriff"
-
-#: compensation/templates/compensation/detail/view.html:43
-#: intervention/templates/intervention/detail/view.html:63
-msgid "Checked on "
-msgstr "Geprüft am "
-
-#: compensation/views/compensation_views.py:121 intervention/views.py:391
+#: compensation/views/compensation_views.py:121
+#: compensation/views/eco_account_views.py:184 intervention/views.py:391
 msgid "Log"
 msgstr "Log"
 
@@ -509,19 +550,23 @@ msgstr "Log"
 msgid "Compensation removed"
 msgstr "Kompensation entfernt"
 
-#: compensation/views/compensation_views.py:161 intervention/views.py:96
+#: compensation/views/compensation_views.py:161
+#: compensation/views/eco_account_views.py:261 intervention/views.py:96
 msgid "Document added"
 msgstr "Dokument hinzugefügt"
 
 #: compensation/views/compensation_views.py:180
+#: compensation/views/eco_account_views.py:205
 msgid "State added"
 msgstr "Zustand hinzugefügt"
 
 #: compensation/views/compensation_views.py:199
+#: compensation/views/eco_account_views.py:224
 msgid "Action added"
 msgstr "Maßnahme hinzugefügt"
 
 #: compensation/views/compensation_views.py:218
+#: compensation/views/eco_account_views.py:243
 msgid "Deadline added"
 msgstr "Frist hinzugefügt"
 
@@ -533,7 +578,11 @@ msgstr "Zustand gelöscht"
 msgid "Action removed"
 msgstr "Maßnahme entfernt"
 
-#: compensation/views/eco_account_views.py:147
+#: compensation/views/eco_account_views.py:134
+msgid "Eco-account removed"
+msgstr "Ökokonto entfernt"
+
+#: compensation/views/eco_account_views.py:161
 msgid "Withdraw removed"
 msgstr "Abbuchung entfernt"
 
@@ -772,6 +821,10 @@ msgstr "Widerspruch entfernen"
 msgid "Account Identifier"
 msgstr "Ökokonto Kennung"
 
+#: intervention/templates/intervention/detail/includes/withdraws.html:42
+msgid "Eco-account deleted! Withdraw invalid!"
+msgstr "Ökokonto gelöscht! Abbuchung ungültig!"
+
 #: intervention/templates/intervention/detail/view.html:28
 msgid "Process type"
 msgstr "Verfahrenstyp"
@@ -964,10 +1017,6 @@ msgstr "Kontrolle am"
 msgid "Other"
 msgstr "Sonstige"
 
-#: konova/templates/konova/custom_widgets/progressbar.html:3
-msgid "Available: "
-msgstr ""
-
 #: konova/templates/konova/custom_widgets/text-to-clipboard-input.html:6
 msgid "Copy to clipboard"
 msgstr "In Zwischenablage kopieren"