Switch to githubb.com for actions loaded

Reviewed-on: SGD-Nord/konova#394

.gitea/workflows/demo.yaml

@@ -0,0 +1,19 @@
+name: Gitea Actions Demo
+run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
+on: [push]
+
+jobs:
+  Explore-Gitea-Actions:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "The job was automatically triggered by a ${{ gitea.event_name }} event."
+      - run: echo "This job is now running on a ${{ runner.os }} server hosted by Gitea!"
+      - run: echo "The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}."
+      - name: Check out repository code
+        uses: https://github.com/actions/checkout@v3
+      - run: echo "The ${{ gitea.repository }} repository has been cloned to the runner."
+      - run: echo "The workflow is now ready to test your code on the runner."
+      - name: List files in the repository
+        run: |
+          ls ${{ gitea.workspace }}
+      - run: echo "This job's status is ${{ job.status }}."

.gitignore

@@ -1,3 +1,5 @@
 # Project exclude paths
 /venv/
-/.idea/
+/.idea/
+/.coverage
+/htmlcov/

analysis/forms.py

@@ -13,6 +13,7 @@ from django.utils.translation import gettext_lazy as _
 from codelist.models import KonovaCode
 from codelist.settings import CODELIST_CONSERVATION_OFFICE_ID
 from konova.forms import BaseForm
+from konova.utils import validators
 
 
 class TimespanReportForm(BaseForm):
@@ -22,6 +23,7 @@ class TimespanReportForm(BaseForm):
     date_from = forms.DateField(
         label_suffix="",
         label=_("From"),
+        validators=[validators.reasonable_date],
         help_text=_("Entries created from..."),
         widget=forms.DateInput(
             attrs={
@@ -35,6 +37,7 @@ class TimespanReportForm(BaseForm):
     date_to = forms.DateField(
         label_suffix="",
         label=_("To"),
+        validators=[validators.reasonable_date],
         help_text=_("Entries created until..."),
         widget=forms.DateInput(
             attrs={

analysis/settings.py

@@ -9,4 +9,8 @@ Created on: 19.10.21
 # Defines the date of the legal publishing of the LKompVzVo
 from django.utils import timezone
 
-LKOMPVZVO_PUBLISH_DATE = timezone.make_aware(timezone.datetime.fromisoformat("2018-06-16"))
+LKOMPVZVO_PUBLISH_DATE = timezone.make_aware(
+    timezone.datetime.fromisoformat(
+        "2018-06-16"
+    )
+).date()

analysis/templates/analysis/reports/detail.html

@@ -31,6 +31,6 @@
     {% include 'analysis/reports/includes/intervention/card_intervention.html' %}
     {% include 'analysis/reports/includes/compensation/card_compensation.html' %}
     {% include 'analysis/reports/includes/eco_account/card_eco_account.html' %}
-    {% include 'analysis/reports/includes/old_data/card_old_interventions.html' %}
+    {% include 'analysis/reports/includes/old_data/card_old_data.html' %}
     </div>
 {% endblock %}

analysis/templates/analysis/reports/includes/compensation/card_compensation.html

@@ -10,6 +10,7 @@
                                 {% fa5_icon 'leaf' %}
                                 {% trans 'Compensations' %}
                             </h5>
+                            <span>{% trans 'Binding date after' %} 16.06.2018</span>
                         </div>
                     </div>
                 </div>

analysis/templates/analysis/reports/includes/eco_account/card_eco_account.html

@@ -10,6 +10,7 @@
                                 {% fa5_icon 'tree' %}
                                 {% trans 'Eco-Accounts' %}
                             </h5>
+                            <span>{% trans 'Binding date after' %} 16.06.2018</span>
                         </div>
                     </div>
                 </div>

analysis/templates/analysis/reports/includes/intervention/card_intervention.html

@@ -9,6 +9,7 @@
                                 {% fa5_icon 'pencil-ruler' %}
                                 {% trans 'Interventions' %}
                             </h5>
+                            <span>{% trans 'Binding date after' %} 16.06.2018</span>
                         </div>
                     </div>
                 </div>

analysis/tests.py

@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

analysis/tests/__init__.py

@@ -0,0 +1,7 @@
+"""
+Author: Michel Peltriaux
+Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
+Contact: ksp-servicestelle@sgdnord.rlp.de
+Created on: 15.08.23
+
+"""

analysis/tests/unit/__init__.py

@@ -0,0 +1,7 @@
+"""
+Author: Michel Peltriaux
+Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
+Contact: ksp-servicestelle@sgdnord.rlp.de
+Created on: 15.08.23
+
+"""

analysis/tests/unit/test_forms.py

@@ -0,0 +1,47 @@
+"""
+Author: Michel Peltriaux
+Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
+Contact: ksp-servicestelle@sgdnord.rlp.de
+Created on: 15.08.23
+
+"""
+from datetime import timedelta
+
+from django.urls import reverse
+from django.utils.timezone import now
+from django.utils.translation import gettext_lazy as _
+
+from analysis.forms import TimespanReportForm
+from konova.tests.test_views import BaseTestCase
+
+
+class TimeSpanReportFormTestCase(BaseTestCase):
+    def setUp(self) -> None:
+        super().setUp()
+        eiv = self.create_dummy_intervention()
+
+    def test_init(self):
+        form = TimespanReportForm()
+        self.assertEqual(form.form_title, str(_("Generate report")))
+        self.assertEqual(form.form_caption, str(_("Select a timespan and the desired conservation office") ))
+        self.assertEqual(form.action_url, reverse("analysis:reports"))
+        self.assertFalse(form.show_cancel_btn)
+        self.assertEqual(form.action_btn_label, str(_("Continue")))
+
+    def test_save(self):
+        date_from = now().date() - timedelta(days=365)
+        date_to = now().date()
+        office = self.get_conservation_office_code()
+        data = {
+            "date_from": date_from,
+            "date_to": date_to,
+            "conservation_office": office,
+        }
+        form = TimespanReportForm(data)
+        self.assertTrue(form.is_valid(), msg=f"{form.errors}")
+
+        detail_report_url = form.save()
+        self.assertEqual(
+            detail_report_url,
+            reverse("analysis:report-detail", args=(office.id,)) + f"?df={date_from}&dt={date_to}"
+        )

analysis/tests/unit/test_report.py

@@ -0,0 +1,98 @@
+"""
+Author: Michel Peltriaux
+Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
+Contact: ksp-servicestelle@sgdnord.rlp.de
+Created on: 17.08.23
+
+"""
+from datetime import timedelta
+
+from django.utils.timezone import now
+
+from analysis.settings import LKOMPVZVO_PUBLISH_DATE
+from analysis.utils.report import TimespanReport
+from konova.sub_settings.django_settings import DEFAULT_DATE_FORMAT
+from konova.tests.test_views import BaseTestCase
+
+
+class TimeSpanReportTestCase(BaseTestCase):
+    def setUp(self) -> None:
+        super().setUp()
+
+        today = now().date()
+        old_date = LKOMPVZVO_PUBLISH_DATE - timedelta(days=1)
+
+        self.conservation_office = self.get_conservation_office_code()
+        self.eiv_old = self.create_dummy_intervention()
+        self.kom_old = self.create_dummy_compensation(interv=self.eiv_old)
+        self.assertNotEqual(self.compensation.intervention, self.kom_old.intervention)
+        self.eiv = self.compensation.intervention
+        self.oek_old = self.create_dummy_eco_account()
+
+        self.eiv_old.responsible.conservation_office = self.conservation_office
+        self.eiv_old.legal.binding_date = old_date
+        self.eiv_old.legal.registration_date = old_date
+
+        self.eiv.responsible.conservation_office = self.conservation_office
+        self.eiv.legal.binding_date = today
+        self.eiv.legal.registration_date = today
+
+        self.eco_account.responsible.conservation_office = self.conservation_office
+        self.eco_account.legal.registration_date = today
+        self.eco_account.legal.binding_date = today
+
+        self.oek_old.responsible.conservation_office = self.conservation_office
+        self.oek_old.legal.registration_date = old_date
+        self.oek_old.legal.binding_date = old_date
+
+        self.eiv.legal.save()
+        self.eiv.responsible.save()
+
+        self.eiv_old.legal.save()
+        self.eiv_old.responsible.save()
+
+        self.eco_account.legal.save()
+        self.eco_account.responsible.save()
+
+        self.oek_old.legal.save()
+        self.oek_old.responsible.save()
+
+        self.deduction.account = self.eco_account
+        self.deduction.intervention = self.eiv
+        self.deduction.save()
+
+    def test_init(self):
+        date_from = now().date() - timedelta(days=365)
+        date_to = now().date()
+        report = TimespanReport(self.conservation_office.id, date_from, date_to)
+
+        self.assertEqual(report.office_id, self.conservation_office.id)
+        self.assertEqual(report.date_from, date_from)
+        self.assertEqual(report.date_to, date_to)
+
+        self.assertIsNotNone(report.intervention_report)
+        self.assertIsNotNone(report.compensation_report)
+        self.assertIsNotNone(report.eco_account_report)
+        self.assertIsNotNone(report.old_data_report)
+
+        self.assertEqual(report.excel_map["date_from"], date_from.strftime(DEFAULT_DATE_FORMAT))
+        self.assertEqual(report.excel_map["date_to"], date_to.strftime(DEFAULT_DATE_FORMAT))
+
+        self.assertEqual(report.old_data_report.queryset_intervention_count, 1)
+        self.assertEqual(report.old_data_report.queryset_intervention_recorded_count, 0)
+        self.assertEqual(report.old_data_report.queryset_comps_count, 1)
+        self.assertEqual(report.old_data_report.queryset_acc_count, 1)
+        self.assertEqual(report.old_data_report.queryset_acc_recorded_count, 0)
+
+        self.assertEqual(report.intervention_report.queryset_count, 1)
+        self.assertEqual(report.intervention_report.queryset_checked_count, 0)
+        self.assertEqual(report.intervention_report.queryset_recorded_count, 0)
+
+        self.assertEqual(report.compensation_report.queryset_count, 1)
+        self.assertEqual(report.compensation_report.queryset_checked_count, 0)
+        self.assertEqual(report.compensation_report.queryset_recorded_count, 0)
+
+        self.assertEqual(report.eco_account_report.queryset_count, 1)
+        self.assertEqual(report.eco_account_report.queryset_recorded_count, 0)
+        self.assertEqual(report.eco_account_report.queryset_deductions_count, 1)
+        self.assertEqual(report.eco_account_report.queryset_deductions_recorded_count, 0)

analysis/utils/report.py

@@ -17,6 +17,7 @@ from compensation.models import Compensation, Payment, EcoAccountDeduction, EcoA
 from intervention.models import Intervention
 from konova.models import Geometry
 from konova.sub_settings.django_settings import BASE_DIR, DEFAULT_DATE_FORMAT
+from konova.sub_settings.lanis_settings import DEFAULT_SRID_RLP
 
 
 class TimespanReport:
@@ -103,9 +104,9 @@ class TimespanReport:
                     "iterable": self.evaluated_laws,
                     "attrs": [
                         "short_name",
+                        "num",
                         "num_checked",
                         "num_recorded",
-                        "num",
                     ]
                 },
                 "i_laws_checked": self.law_sum_checked,
@@ -333,7 +334,7 @@ class TimespanReport:
             return Geometry.objects.filter(
                 id__in=ids
             ).annotate(
-                geom_cast=Cast("geom", MultiPolygonField())
+                geom_cast=Cast("geom", MultiPolygonField(srid=DEFAULT_SRID_RLP))
             ).annotate(
                 num=NumGeometries("geom_cast")
             ).aggregate(
@@ -412,6 +413,7 @@ class TimespanReport:
         def __init__(self, id: str, date_from: str, date_to: str):
             # First fetch all eco account for this office
             self.queryset = EcoAccount.objects.filter(
+                legal__registration_date__gt=LKOMPVZVO_PUBLISH_DATE,
                 responsible__conservation_office__id=id,
                 deleted=None,
                 created__timestamp__date__gte=date_from,
@@ -515,8 +517,8 @@ class TimespanReport:
                 legal__registration_date__lte=LKOMPVZVO_PUBLISH_DATE,
                 responsible__conservation_office__id=id,
                 deleted=None,
-                created__timestamp__gte=date_from,
+                created__timestamp__date__gte=date_from,
-                created__timestamp__lte=date_to,
+                created__timestamp__date__lte=date_to,
             )
             self.queryset_acc_recorded = self.queryset_acc.filter(
                 recorded__isnull=False,

api/migrations/0002_alter_apiusertoken_valid_until.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.6 on 2023-11-30 11:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='apiusertoken',
+            name='valid_until',
+            field=models.DateField(blank=True, help_text='Token is only valid until this date. Forever if null/blank.', null=True),
+        ),
+    ]

api/models/token.py

@@ -14,7 +14,7 @@ class APIUserToken(models.Model):
     valid_until = models.DateField(
         blank=True,
         null=True,
-        help_text="Token is only valid until this date",
+        help_text="Token is only valid until this date. Forever if null/blank.",
     )
     is_active = models.BooleanField(
         default=False,
@@ -25,12 +25,11 @@ class APIUserToken(models.Model):
         return self.token
 
     @staticmethod
-    def get_user_from_token(token: str, username: str):
+    def get_user_from_token(token: str):
         """ Getter for the related user object
 
         Args:
             token (str): The used token
-            username (str): The username
 
         Returns:
             user (User): Otherwise None
@@ -39,7 +38,6 @@ class APIUserToken(models.Model):
         try:
             token_obj = APIUserToken.objects.get(
                 token=token,
-                user__username=username
             )
             if not token_obj.is_active:
                 raise PermissionError("Token unverified")

api/tests/unit/__init__.py

@@ -0,0 +1,7 @@
+"""
+Author: Michel Peltriaux
+Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
+Contact: ksp-servicestelle@sgdnord.rlp.de
+Created on: 17.08.23
+
+"""

api/tests/unit/test_token.py

@@ -0,0 +1,71 @@
+"""
+Author: Michel Peltriaux
+Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
+Contact: ksp-servicestelle@sgdnord.rlp.de
+Created on: 17.08.23
+
+"""
+from datetime import timedelta
+
+from django.utils.timezone import now
+
+from api.models import APIUserToken
+from konova.tests.test_views import BaseTestCase
+
+
+class APIUserTokenTestCase(BaseTestCase):
+    def setUp(self) -> None:
+        super().setUp()
+
+        self.token = APIUserToken.objects.create()
+        self.superuser.api_token = self.token
+        self.superuser.save()
+
+    def test_str(self):
+        self.assertEqual(str(self.token), self.token.token)
+
+    def test_get_user_from_token(self):
+        a_day = timedelta(days=1)
+        today = now().date()
+
+        self.assertFalse(self.token.is_active)
+        self.assertIsNone(self.token.valid_until)
+
+        try:
+            #Token not existing --> fail
+            token_user = APIUserToken.get_user_from_token(self.token.token[::-1])
+            self.fail("There should not have been any token")
+        except PermissionError:
+            pass
+
+        try:
+            # Token not active --> fail
+            token_user = APIUserToken.get_user_from_token(self.token.token)
+            self.fail("Token is unverified but token user has been fetchable.")
+        except PermissionError:
+            pass
+        self.token.is_active = True
+        self.token.valid_until = today - a_day
+        self.token.save()
+
+        try:
+            # Token valid until yesterday --> fail
+            token_user = APIUserToken.get_user_from_token(self.token.token)
+            self.fail("Token reached end of lifetime but token user has been fetchable.")
+        except PermissionError:
+            pass
+
+        # Token valid until tomorrow --> success
+        self.token.valid_until = today + a_day
+        self.token.save()
+
+        token_user = APIUserToken.get_user_from_token(self.token.token)
+        self.assertEqual(token_user, self.superuser)
+        del token_user
+
+        # Token valid forever --> success
+        self.token.valid_until = None
+        self.token.save()
+        token_user = APIUserToken.get_user_from_token(self.token.token)
+        self.assertEqual(token_user, self.superuser)
+

api/tests/v1/create/deduction_create_post_body.json

@@ -1,5 +1,5 @@
 {
     "eco_account": "CHANGE_BEFORE_RUN!!!",
-    "surface": 500.0,
+    "surface": 500.50,
     "intervention": "CHANGE_BEFORE_RUN!!!"
 }

api/tests/v1/share/test_api_sharing.py

@@ -4,7 +4,6 @@ from django.urls import reverse
 
 from konova.settings import DEFAULT_GROUP
 from konova.tests.test_views import BaseTestCase
-from konova.utils.user_checks import is_default_group_only
 
 
 class BaseAPIV1TestCase(BaseTestCase):
@@ -138,7 +137,7 @@ class APIV1SharingTestCase(BaseAPIV1TestCase):
         # Give the user only default group rights
         default_group = self.groups.get(name=DEFAULT_GROUP)
         self.superuser.groups.set([default_group])
-        self.assertTrue(is_default_group_only(self.superuser))
+        self.assertTrue(self.superuser.is_default_group_only())
 
         # Add only him as shared_users an object
         self.intervention.users.set([self.superuser])

api/tests/v1/update/deduction_update_put_body.json

@@ -1,5 +1,5 @@
 {
     "eco_account": "CHANGE_BEFORE_RUN!!!",
-    "surface": 523400.0,
+    "surface": 523400.50,
     "intervention": "CHANGE_BEFORE_RUN!!!"
 }

api/utils/serializer/serializer.py

@@ -136,8 +136,6 @@ class AbstractModelAPISerializer:
         geometry = geos.fromstr(geojson)
         if geometry.srid != DEFAULT_SRID_RLP:
             geometry.transform(DEFAULT_SRID_RLP)
-        if geometry.empty:
-            geometry = None
         return geometry
 
     def _get_obj_from_db(self, id, user):

api/utils/serializer/v1/compensation.py

@@ -11,7 +11,7 @@ from api.utils.serializer.v1.serializer import AbstractModelAPISerializerV1, Abs
 from compensation.models import Compensation
 from intervention.models import Intervention
 from konova.models import Geometry
-from konova.tasks import celery_update_parcels
+from konova.tasks import celery_update_parcels, celery_check_for_geometry_conflicts
 from konova.utils.message_templates import DATA_UNSHARED
 from user.models import UserActionLogEntry
 
@@ -64,6 +64,7 @@ class CompensationAPISerializerV1(AbstractModelAPISerializerV1, AbstractCompensa
         obj = Compensation()
         created = create_action
         obj.created = created
+        obj.modified = created
         obj.geometry = geometry
         return obj
 
@@ -125,11 +126,12 @@ class CompensationAPISerializerV1(AbstractModelAPISerializerV1, AbstractCompensa
             obj = self._set_compensation_states(obj, properties["after_states"], obj.after_states)
             obj = self._set_deadlines(obj, properties["deadlines"])
 
-            obj.log.add(obj.created)
+        obj.log.add(obj.created)
 
-            celery_update_parcels.delay(obj.geometry.id)
+        celery_update_parcels.delay(obj.geometry.id)
+        celery_check_for_geometry_conflicts.delay(obj.geometry.id)
 
-            return obj.id
+        return obj.id
 
     def update_model_from_json(self, id, json_model, user):
         """ Updates an entry for the model based on the contents of json_model
@@ -165,8 +167,8 @@ class CompensationAPISerializerV1(AbstractModelAPISerializerV1, AbstractCompensa
             obj = self._set_compensation_states(obj, properties["after_states"], obj.after_states)
             obj = self._set_deadlines(obj, properties["deadlines"])
 
-            obj.log.add(update_action)
+        obj.log.add(update_action)
 
-            celery_update_parcels.delay(obj.geometry.id)
+        celery_update_parcels.delay(obj.geometry.id)
 
-            return obj.id
+        return obj.id

api/utils/serializer/v1/ecoaccount.py

@@ -13,7 +13,7 @@ from codelist.settings import CODELIST_CONSERVATION_OFFICE_ID, CODELIST_HANDLER_
 from compensation.models import EcoAccount
 from intervention.models import Legal, Responsibility, Handler
 from konova.models import Geometry
-from konova.tasks import celery_update_parcels
+from konova.tasks import celery_update_parcels, celery_check_for_geometry_conflicts
 from user.models import UserActionLogEntry
 
 
@@ -103,6 +103,7 @@ class EcoAccountAPISerializerV1(AbstractModelAPISerializerV1,
         obj.legal = Legal()
         created = create_action
         obj.created = created
+        obj.modified = created
         obj.geometry = geometry
         return obj
 
@@ -146,12 +147,13 @@ class EcoAccountAPISerializerV1(AbstractModelAPISerializerV1,
             obj = self._set_compensation_states(obj, properties["after_states"], obj.after_states)
             obj = self._set_deadlines(obj, properties["deadlines"])
 
-            obj.log.add(obj.created)
+        obj.log.add(obj.created)
-            obj.users.add(user)
+        obj.users.add(user)
 
-            celery_update_parcels.delay(obj.geometry.id)
+        celery_update_parcels.delay(obj.geometry.id)
+        celery_check_for_geometry_conflicts.delay(obj.geometry.id)
 
-            return obj.id
+        return obj.id
 
     def update_model_from_json(self, id, json_model, user):
         """ Updates an entry for the model based on the contents of json_model
@@ -190,8 +192,8 @@ class EcoAccountAPISerializerV1(AbstractModelAPISerializerV1,
             obj = self._set_compensation_states(obj, properties["after_states"], obj.after_states)
             obj = self._set_deadlines(obj, properties["deadlines"])
 
-            obj.log.add(update_action)
+        obj.log.add(update_action)
 
-            celery_update_parcels.delay(obj.geometry.id)
+        celery_update_parcels.delay(obj.geometry.id)
 
-            return obj.id
+        return obj.id

api/utils/serializer/v1/ema.py

@@ -13,7 +13,7 @@ from codelist.settings import CODELIST_CONSERVATION_OFFICE_ID, CODELIST_HANDLER_
 from ema.models import Ema
 from intervention.models import Responsibility, Handler
 from konova.models import Geometry
-from konova.tasks import celery_update_parcels
+from konova.tasks import celery_update_parcels, celery_check_for_geometry_conflicts
 from user.models import UserActionLogEntry
 
 
@@ -85,6 +85,7 @@ class EmaAPISerializerV1(AbstractModelAPISerializerV1, AbstractCompensationAPISe
         )
         created = create_action
         obj.created = created
+        obj.modified = created
         obj.geometry = geometry
         return obj
 
@@ -118,12 +119,13 @@ class EmaAPISerializerV1(AbstractModelAPISerializerV1, AbstractCompensationAPISe
             obj = self._set_compensation_states(obj, properties["after_states"], obj.after_states)
             obj = self._set_deadlines(obj, properties["deadlines"])
 
-            obj.log.add(obj.created)
+        obj.log.add(obj.created)
-            obj.users.add(user)
+        obj.users.add(user)
 
-            celery_update_parcels.delay(obj.geometry.id)
+        celery_update_parcels.delay(obj.geometry.id)
+        celery_check_for_geometry_conflicts.delay(obj.geometry.id)
 
-            return obj.id
+        return obj.id
 
     def update_model_from_json(self, id, json_model, user):
         """ Updates an entry for the model based on the contents of json_model
@@ -159,8 +161,8 @@ class EmaAPISerializerV1(AbstractModelAPISerializerV1, AbstractCompensationAPISe
             obj = self._set_compensation_states(obj, properties["after_states"], obj.after_states)
             obj = self._set_deadlines(obj, properties["deadlines"])
 
-            obj.log.add(update_action)
+        obj.log.add(update_action)
 
-            celery_update_parcels.delay(obj.geometry.id)
+        celery_update_parcels.delay(obj.geometry.id)
 
-            return obj.id
+        return obj.id

api/utils/serializer/v1/intervention.py

@@ -13,7 +13,7 @@ from api.utils.serializer.v1.serializer import AbstractModelAPISerializerV1, \
 from compensation.models import Payment
 from intervention.models import Intervention, Responsibility, Legal, Handler
 from konova.models import Geometry
-from konova.tasks import celery_update_parcels
+from konova.tasks import celery_update_parcels, celery_check_for_geometry_conflicts
 from user.models import UserActionLogEntry
 
 
@@ -76,6 +76,7 @@ class InterventionAPISerializerV1(AbstractModelAPISerializerV1,
         created = create_action
         obj.legal = legal
         obj.created = created
+        obj.modified = created
         obj.geometry = geometry
         obj.responsible = resp
         return obj
@@ -132,7 +133,6 @@ class InterventionAPISerializerV1(AbstractModelAPISerializerV1,
             id__in=payments
         )
         obj.payments.set(payments)
-        obj.send_data_to_egon()
         return obj
 
     def create_model_from_json(self, json_model, user):
@@ -161,12 +161,13 @@ class InterventionAPISerializerV1(AbstractModelAPISerializerV1,
             obj.legal.save()
             obj.save()
 
-            obj.users.add(user)
+        obj.users.add(user)
-            obj.log.add(obj.created)
+        obj.log.add(obj.created)
 
-            celery_update_parcels.delay(obj.geometry.id)
+        celery_update_parcels.delay(obj.geometry.id)
+        celery_check_for_geometry_conflicts.delay(obj.geometry.id)
 
-            return obj.id
+        return obj.id
 
     def update_model_from_json(self, id, json_model, user):
         """ Updates an entry for the model based on the contents of json_model
@@ -198,8 +199,9 @@ class InterventionAPISerializerV1(AbstractModelAPISerializerV1,
             obj.legal.save()
             obj.save()
 
-            obj.mark_as_edited(user, edit_comment="API update")
+        obj.mark_as_edited(user, edit_comment="API update")
+        obj.send_data_to_egon()
 
-            celery_update_parcels.delay(obj.geometry.id)
+        celery_update_parcels.delay(obj.geometry.id)
 
-            return obj.id
+        return obj.id

api/utils/serializer/v1/serializer.py

@@ -9,6 +9,7 @@ Created on: 24.01.22
 import json
 
 from django.contrib.gis.geos import MultiPolygon
+from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import QuerySet
 
 from api.utils.serializer.serializer import AbstractModelAPISerializer
@@ -60,7 +61,7 @@ class AbstractModelAPISerializerV1(AbstractModelAPISerializer):
         if konova_code is None:
             return None
         return {
-            "atom_id": konova_code.atom_id,
+            "id": konova_code.id,
             "long_name": konova_code.long_name,
             "short_name": konova_code.short_name,
         }
@@ -69,7 +70,7 @@ class AbstractModelAPISerializerV1(AbstractModelAPISerializer):
         """ Returns a konova code instance
 
         Args:
-            json_str (str): The value for the code (atom id)
+            json_str (str): The value for the code (id)
             code_list_identifier (str): From which konova code list this code is supposed to be from
 
         Returns:
@@ -80,10 +81,14 @@ class AbstractModelAPISerializerV1(AbstractModelAPISerializer):
         json_str = str(json_str)
         if len(json_str) == 0:
             return None
-        code = KonovaCode.objects.get(
+        try:
-            atom_id=json_str,
+            code = KonovaCode.objects.get(
-            code_lists__in=[code_list_identifier]
+                id=json_str,
-        )
+                code_lists__in=[code_list_identifier]
+            )
+        except ObjectDoesNotExist as e:
+            msg = f"{e.args[0]} ({json_str} not found in official list {code_list_identifier})"
+            raise ObjectDoesNotExist(msg)
         return code
 
     def _created_on_to_json(self, entry):
@@ -292,9 +297,12 @@ class AbstractCompensationAPISerializerV1Mixin:
         """
         deadlines = []
         for entry in deadline_data:
-            deadline_type = entry["type"]
+            try:
-            date = entry["date"]
+                deadline_type = entry["type"]
-            comment = entry["comment"]
+                date = entry["date"]
+                comment = entry["comment"]
+            except KeyError:
+                raise ValueError(f"Invalid deadline content. Content was {entry} but should follow the specification")
 
             # Check on validity
             if deadline_type not in DeadlineType:
@@ -336,11 +344,14 @@ class AbstractCompensationAPISerializerV1Mixin:
         """
         states = []
         for entry in states_data:
-            biotope_type = entry["biotope"]
+            try:
-            biotope_details = [
+                biotope_type = entry["biotope"]
-                self._konova_code_from_json(e, CODELIST_BIOTOPES_EXTRA_CODES_ID) for e in entry["biotope_details"]
+                biotope_details = [
-            ]
+                    self._konova_code_from_json(e, CODELIST_BIOTOPES_EXTRA_CODES_ID) for e in entry["biotope_details"]
-            surface = float(entry["surface"])
+                ]
+                surface = float(entry["surface"])
+            except KeyError:
+                raise ValueError(f"Invalid biotope content. Content was {entry} but should follow the specification ")
 
             # Check on validity
             if surface <= 0:
@@ -349,7 +360,7 @@ class AbstractCompensationAPISerializerV1Mixin:
             # If this exact data is already existing, we do not create it new. Instead put it's id in the list of
             # entries, we will use to set the new actions
             state = states_manager.filter(
-                biotope_type__atom_id=biotope_type,
+                biotope_type__id=biotope_type,
                 surface=surface,
             ).exclude(
                 id__in=states
@@ -380,15 +391,19 @@ class AbstractCompensationAPISerializerV1Mixin:
         """
         actions = []
         for entry in actions_data:
-            action_types = [
+            try:
-                self._konova_code_from_json(e, CODELIST_COMPENSATION_ACTION_ID) for e in entry["action_types"]
+                action_types = [
-            ]
+                    self._konova_code_from_json(e, CODELIST_COMPENSATION_ACTION_ID) for e in entry["action_types"]
-            action_details = [
+                ]
-                self._konova_code_from_json(e, CODELIST_COMPENSATION_ACTION_DETAIL_ID) for e in entry["action_details"]
+                action_details = [
-            ]
+                    self._konova_code_from_json(e, CODELIST_COMPENSATION_ACTION_DETAIL_ID) for e in entry["action_details"]
-            amount = float(entry["amount"])
+                ]
-            unit = entry["unit"]
+                amount = float(entry["amount"])
-            comment = entry["comment"]
+                # Mapping of old "qm" into "m²"
+                unit = UnitChoices.m2.value if entry["unit"] == "qm" else entry["unit"]
+                comment = entry["comment"]
+            except KeyError:
+                raise ValueError(f"Invalid action content. Content was {entry} but should follow specification")
 
             # Check on validity
             if amount <= 0:

api/views/views.py

@@ -18,7 +18,6 @@ from compensation.models import EcoAccount
 from ema.models import Ema
 from intervention.models import Intervention
 from konova.utils.message_templates import DATA_UNSHARED
-from konova.utils.user_checks import is_default_group_only
 from user.models import User, Team
 
 
@@ -53,7 +52,13 @@ class AbstractAPIView(View):
             # Fetch the proper user from the given request header token
             ksp_token = request.headers.get(KSP_TOKEN_HEADER_IDENTIFIER, None)
             ksp_user = request.headers.get(KSP_USER_HEADER_IDENTIFIER, None)
-            self.user = APIUserToken.get_user_from_token(ksp_token, ksp_user)
+            token_user = APIUserToken.get_user_from_token(ksp_token)
+
+            if ksp_user != token_user.username:
+                raise PermissionError(f"Invalid token for {ksp_user}")
+            else:
+                self.user = token_user
+
             request.user = self.user
             if not self.user.is_default_user():
                 raise PermissionError("Default permissions required")
@@ -315,7 +320,7 @@ class AbstractModelShareAPIView(AbstractAPIView):
         for team_name in new_teams:
             new_teams_objs.append(Team.objects.get(name=team_name))
 
-        if is_default_group_only(self.user):
+        if self.user.is_default_group_only():
             # Default only users are not allowed to remove other users from having access. They can only add new ones!
             new_users_to_be_added = User.objects.filter(
                 username__in=new_users

compensation/admin.py

@@ -81,13 +81,15 @@ class EcoAccountAdmin(AbstractCompensationAdmin):
     ]
 
     filter_horizontal = [
-        "users"
+        "users",
+        "teams",
     ]
 
     def get_fields(self, request, obj=None):
         return super().get_fields(request, obj) + [
             "deductable_surface",
-            "users"
+            "users",
+            "teams",
         ]
 
 
@@ -146,7 +148,7 @@ class CompensationActionAdmin(admin.ModelAdmin):
 
 admin.site.register(Compensation, CompensationAdmin)
 admin.site.register(EcoAccount, EcoAccountAdmin)
-admin.site.register(EcoAccountDeduction, EcoAccountDeductionAdmin)
+#admin.site.register(EcoAccountDeduction, EcoAccountDeductionAdmin)
 
 # For a more cleaner admin interface these rarely used admin views are not important for deployment
 #admin.site.register(Payment, PaymentAdmin)

compensation/autocomplete/eco_account.py

@@ -32,3 +32,9 @@ class EcoAccountAutocomplete(Select2QuerySetView):
                 Q(title__icontains=self.q)
             ).distinct()
         return qs
+
+    def get_result_label(self, result):
+        return str(result)
+
+    def get_selected_result_label(self, result):
+        return str(result)

compensation/filters/compensation.py

@@ -55,10 +55,12 @@ class CheckboxCompensationTableFilter(CheckboxTableFilter):
 
         """
         if not value:
-            return queryset.filter(
+            user_teams = self.user.shared_teams
+            result = queryset.filter(
                 Q(intervention__users__in=[self.user]) |  # requesting user has access
-                Q(intervention__teams__in=self.user.shared_teams)
+                Q(intervention__teams__in=user_teams)
             ).distinct()
+            return result
         else:
             return queryset
 

compensation/forms/compensation.py

@@ -30,11 +30,12 @@ class AbstractCompensationForm(BaseForm):
         label=_("Identifier"),
         label_suffix="",
         max_length=255,
-        help_text=_("Generated automatically"),
+        help_text=_("Generated automatically - not editable"),
         widget=GenerateInput(
             attrs={
                 "class": "form-control",
                 "url": None,  # Needs to be set in inheriting constructors
+                "readonly": True,
             }
         )
     )
@@ -129,12 +130,11 @@ class NewCompensationForm(AbstractCompensationForm,
         self.initialize_form_field("identifier", identifier)
         self.fields["identifier"].widget.attrs["url"] = reverse_lazy("compensation:new-id")
 
-    def __create_comp(self, user, geom_form) -> Compensation:
+    def __create_comp(self, user):
         """ Creates the compensation from form data
 
         Args:
             user (User): The performing user
-            geom_form (SimpleGeomForm): The geometry form
 
         Returns:
             comp (Compensation): The compensation object
@@ -150,8 +150,6 @@ class NewCompensationForm(AbstractCompensationForm,
 
         # Create log entry
         action = UserActionLogEntry.get_created_action(user)
-        # Process the geometry form
-        geometry = geom_form.save(action)
 
         # Finally create main object
         comp = Compensation.objects.create(
@@ -159,21 +157,27 @@ class NewCompensationForm(AbstractCompensationForm,
             title=title,
             intervention=intervention,
             created=action,
+            modified=action,
             is_cef=is_cef,
             is_coherence_keeping=is_coherence_keeping,
             is_pik=is_pik,
-            geometry=geometry,
             comment=comment,
         )
 
         # Add the log entry to the main objects log list
         comp.log.add(action)
-        return comp
+        return comp, action
 
     def save(self, user: User, geom_form: SimpleGeomForm):
         with transaction.atomic():
-            comp = self.__create_comp(user, geom_form)
+            comp, action = self.__create_comp(user)
             comp.intervention.mark_as_edited(user, edit_comment=COMPENSATION_ADDED_TEMPLATE.format(comp.identifier))
+
+        # Process the geometry form
+        geometry = geom_form.save(action)
+        comp.geometry = geometry
+        comp.save()
+
         return comp
 
 
@@ -205,8 +209,10 @@ class EditCompensationForm(NewCompensationForm):
 
     def save(self, user: User, geom_form: SimpleGeomForm):
         with transaction.atomic():
+            # Create log entry
+            action = UserActionLogEntry.get_edited_action(user)
+
             # Fetch data from cleaned POST values
-            identifier = self.cleaned_data.get("identifier", None)
             title = self.cleaned_data.get("title", None)
             intervention = self.cleaned_data.get("intervention", None)
             is_cef = self.cleaned_data.get("is_cef", None)
@@ -214,17 +220,8 @@ class EditCompensationForm(NewCompensationForm):
             is_pik = self.cleaned_data.get("is_pik", None)
             comment = self.cleaned_data.get("comment", None)
 
-            # Create log entry
-            action = UserActionLogEntry.get_edited_action(user)
-
-            # Process the geometry form
-            geometry = geom_form.save(action)
-
-            # Finally create main object
-            self.instance.identifier = identifier
             self.instance.title = title
             self.instance.intervention = intervention
-            self.instance.geometry = geometry
             self.instance.is_cef = is_cef
             self.instance.is_coherence_keeping = is_coherence_keeping
             self.instance.comment = comment
@@ -233,6 +230,11 @@ class EditCompensationForm(NewCompensationForm):
             self.instance.save()
 
             self.instance.log.add(action)
-
             intervention.mark_as_edited(user, self.request, EDITED_GENERAL_DATA)
-        return self.instance
+
+        # Process the geometry form (NOT ATOMIC TRANSACTION DUE TO CELERY!)
+        geometry = geom_form.save(action)
+        self.instance.geometry = geometry
+        self.instance.save()
+
+        return self.instance

compensation/forms/eco_account.py

@@ -14,6 +14,8 @@ from compensation.forms.mixins import CompensationResponsibleFormMixin, PikCompe
 from compensation.models import EcoAccount
 from intervention.models import Handler, Responsibility, Legal
 from konova.forms import SimpleGeomForm
+from konova.forms.modals import RemoveModalForm
+from konova.utils import validators
 from user.models import User, UserActionLogEntry
 
 
@@ -42,6 +44,7 @@ class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMix
         label_suffix="",
         help_text=_("When did the parties agree on this?"),
         required=False,
+        validators=[validators.reasonable_date],
         widget=forms.DateInput(
             attrs={
                 "type": "date",
@@ -93,8 +96,6 @@ class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMix
 
             # Create log entry
             action = UserActionLogEntry.get_created_action(user)
-            # Process the geometry form
-            geometry = geom_form.save(action)
 
             handler = Handler.objects.create(
                 type=handler_type,
@@ -118,7 +119,7 @@ class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMix
                 responsible=responsible,
                 deductable_surface=surface,
                 created=action,
-                geometry=geometry,
+                modified=action,
                 comment=comment,
                 is_pik=is_pik,
                 legal=legal
@@ -127,6 +128,12 @@ class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMix
 
             # Add the log entry to the main objects log list
             acc.log.add(action)
+
+        # Process the geometry form
+        geometry = geom_form.save(action)
+        acc.geometry = geometry
+        acc.save()
+        acc.update_deductable_rest()
         return acc
 
 
@@ -165,10 +172,26 @@ class EditEcoAccountForm(NewEcoAccountForm):
             disabled_fields
         )
 
+    def is_valid(self):
+        valid = super().is_valid()
+
+        deductable_surface = self.cleaned_data.get("surface") or 0.0
+        deduction_surface_sum = self.instance.get_deductions_surface()
+        if deductable_surface < deduction_surface_sum:
+            self.add_error(
+                "surface",
+                _("{}m² have been deducted from this eco account so far. The given value of {} would be too low.").format(
+                    deduction_surface_sum,
+                    deductable_surface
+                )
+            )
+            valid &= False
+
+        return valid
+
     def save(self, user: User, geom_form: SimpleGeomForm):
         with transaction.atomic():
             # Fetch data from cleaned POST values
-            identifier = self.cleaned_data.get("identifier", None)
             title = self.cleaned_data.get("title", None)
             registration_date = self.cleaned_data.get("registration_date", None)
             handler_type = self.cleaned_data.get("handler_type", None)
@@ -182,9 +205,6 @@ class EditEcoAccountForm(NewEcoAccountForm):
             # Create log entry
             action = UserActionLogEntry.get_edited_action(user)
 
-            # Process the geometry form
-            geometry = geom_form.save(action)
-
             # Update responsible data
             self.instance.responsible.handler.type = handler_type
             self.instance.responsible.handler.detail = handler_detail
@@ -198,10 +218,8 @@ class EditEcoAccountForm(NewEcoAccountForm):
             self.instance.legal.save()
 
             # Update main oject data
-            self.instance.identifier = identifier
             self.instance.title = title
             self.instance.deductable_surface = surface
-            self.instance.geometry = geometry
             self.instance.comment = comment
             self.instance.is_pik = is_pik
             self.instance.modified = action
@@ -209,4 +227,23 @@ class EditEcoAccountForm(NewEcoAccountForm):
 
             # Add the log entry to the main objects log list
             self.instance.log.add(action)
+
+        # Process the geometry form (NOT ATOMIC TRANSACTION DUE TO CELERY!)
+        geometry = geom_form.save(action)
+        self.instance.geometry = geometry
+        self.instance.save()
+        self.instance.update_deductable_rest()
         return self.instance
+
+
+class RemoveEcoAccountModalForm(RemoveModalForm):
+
+    def is_valid(self):
+        super_valid = super().is_valid()
+        has_deductions = self.instance.deductions.exists()
+        if has_deductions:
+            self.add_error(
+                "confirm",
+                _("The account can not be removed, since there are still deductions.")
+            )
+        return super_valid and not has_deductions

compensation/forms/modals/compensation_action.py

@@ -93,7 +93,7 @@ class NewCompensationActionModalForm(BaseModalForm):
         super().__init__(*args, **kwargs)
         self.form_title = _("New action")
         self.form_caption = _("Insert data for the new action")
-        choices =KonovaCode.objects.filter(
+        choices = KonovaCode.objects.filter(
             code_lists__in=[CODELIST_COMPENSATION_ACTION_ID],
             is_archived=False,
             is_leaf=True,

compensation/forms/modals/deadline.py

@@ -10,6 +10,7 @@ from django.utils.translation import gettext_lazy as _
 
 from konova.forms.modals import BaseModalForm
 from konova.models import DeadlineType
+from konova.utils import validators
 from konova.utils.message_templates import DEADLINE_EDITED
 
 
@@ -34,6 +35,7 @@ class NewDeadlineModalForm(BaseModalForm):
         label_suffix="",
         required=True,
         help_text=_("Select date"),
+        validators=[validators.reasonable_date],
         widget=forms.DateInput(
             attrs={
                 "type": "date",
@@ -63,6 +65,22 @@ class NewDeadlineModalForm(BaseModalForm):
         self.form_title = _("New deadline")
         self.form_caption = _("Insert data for the new deadline")
 
+    def is_valid(self):
+        valid = super().is_valid()
+        deadline_type = self.cleaned_data.get("type")
+        comment = self.cleaned_data.get("comment") or None
+
+        other_deadline_without_comment = deadline_type == DeadlineType.OTHER and comment is None
+
+        if other_deadline_without_comment:
+            self.add_error(
+                "comment",
+                _("Please explain this 'other' type of deadline.")
+            )
+            valid &= False
+
+        return valid
+
     def save(self):
         deadline = self.instance.add_deadline(self)
         return deadline

compensation/forms/modals/payment.py

@@ -9,6 +9,7 @@ from django import forms
 from django.utils.translation import pgettext_lazy as _con, gettext_lazy as _
 
 from konova.forms.modals import RemoveModalForm, BaseModalForm
+from konova.utils import validators
 from konova.utils.message_templates import PAYMENT_EDITED
 
 
@@ -33,6 +34,7 @@ class NewPaymentForm(BaseModalForm):
         label=_("Due on"),
         label_suffix=_(""),
         required=False,
+        validators=[validators.reasonable_date],
         help_text=_("Due on which date"),
         widget=forms.DateInput(
             attrs={
@@ -75,8 +77,11 @@ class NewPaymentForm(BaseModalForm):
             is_valid (bool): True if valid, False otherwise
         """
         super_valid = super().is_valid()
-        date = self.cleaned_data["due"]
+        if not super_valid:
-        comment = self.cleaned_data["comment"] or None
+            return super_valid
+
+        date = self.cleaned_data.get("due", None)
+        comment = self.cleaned_data.get("comment", None)
         if not date and not comment:
             # At least one needs to be set!
             self.add_error(

compensation/forms/modals/state.py

@@ -5,7 +5,7 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 18.08.22
 
 """
-from bootstrap_modal_forms.utils import is_ajax
+from bootstrap_modal_forms.mixins import is_ajax
 from dal import autocomplete
 from django import forms
 from django.contrib import messages

compensation/migrations/0011_ecoaccount_deductable_rest.py

@@ -0,0 +1,36 @@
+# Generated by Django 3.1.3 on 2022-10-11 11:39
+
+from django.db import migrations, models
+from django.db.models import Sum
+
+
+def fill_deductable_rest(apps, schema_editor):
+    EcoAccount = apps.get_model("compensation", "EcoAccount")
+    accs = EcoAccount.objects.all()
+    for acc in accs:
+
+        deductions = acc.deductions.filter(
+            intervention__deleted=None,
+        )
+        deductions_surfaces = deductions.aggregate(Sum("surface"))["surface__sum"] or 0
+        available_surfaces = acc.deductable_surface or deductions_surfaces
+        rest = available_surfaces - deductions_surfaces
+
+        acc.deductable_rest = rest
+        acc.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('compensation', '0010_auto_20220815_1030'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='ecoaccount',
+            name='deductable_rest',
+            field=models.FloatField(blank=True, default=0, help_text='Amount of deductable rest', null=True),
+        ),
+        migrations.RunPython(fill_deductable_rest)
+    ]

compensation/migrations/0012_auto_20221116_1322.py

@@ -0,0 +1,26 @@
+# Generated by Django 3.1.3 on 2022-11-16 12:22
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user', '0006_auto_20220815_0759'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('compensation', '0011_ecoaccount_deductable_rest'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='ecoaccount',
+            name='teams',
+            field=models.ManyToManyField(blank=True, help_text='Teams having access (data shared with)', to='user.Team'),
+        ),
+        migrations.AlterField(
+            model_name='ecoaccount',
+            name='users',
+            field=models.ManyToManyField(blank=True, help_text='Users having access (data shared with)', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

compensation/migrations/0013_auto_20221117_0819.py

@@ -0,0 +1,35 @@
+# Generated by Django 3.1.3 on 2022-11-17 07:19
+
+from django.db import migrations
+
+from compensation.models import UnitChoices
+
+
+def harmonize_action_units(apps, schema_editor):
+    """
+    CompensationAction units (based on UnitChoices) can be mixed up at this point where
+        * qm represents m²  and
+        * m2 represents m²
+
+    We drop qm in support of m2
+
+    """
+    CompensationAction = apps.get_model("compensation", "CompensationAction")
+    actions = CompensationAction.objects.filter(
+        unit="qm"
+    )
+
+    for action in actions:
+        action.unit = UnitChoices.m2
+        action.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('compensation', '0012_auto_20221116_1322'),
+    ]
+
+    operations = [
+        migrations.RunPython(harmonize_action_units),
+    ]

compensation/migrations/0014_auto_20221118_1620.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.3 on 2022-11-18 15:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('compensation', '0013_auto_20221117_0819'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='compensationaction',
+            name='unit',
+            field=models.CharField(blank=True, choices=[('cm', 'cm'), ('m', 'm'), ('m2', 'm²'), ('m3', 'm³'), ('km', 'km'), ('ha', 'ha'), ('pcs', 'Pieces')], max_length=100, null=True),
+        ),
+    ]

compensation/migrations/0015_alter_compensation_after_states_and_more.py

@@ -0,0 +1,70 @@
+# Generated by Django 4.2.6 on 2023-11-30 11:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('codelist', '0001_initial'),
+        ('konova', '0014_resubmission'),
+        ('compensation', '0014_auto_20221118_1620'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='compensation',
+            name='after_states',
+            field=models.ManyToManyField(blank=True, help_text="Refers to 'Zielzustand Biotop'", related_name='+', to='compensation.compensationstate'),
+        ),
+        migrations.AlterField(
+            model_name='compensation',
+            name='before_states',
+            field=models.ManyToManyField(blank=True, help_text="Refers to 'Ausgangszustand Biotop'", related_name='+', to='compensation.compensationstate'),
+        ),
+        migrations.AlterField(
+            model_name='compensation',
+            name='deadlines',
+            field=models.ManyToManyField(blank=True, related_name='+', to='konova.deadline'),
+        ),
+        migrations.AlterField(
+            model_name='compensation',
+            name='resubmissions',
+            field=models.ManyToManyField(blank=True, related_name='+', to='konova.resubmission'),
+        ),
+        migrations.AlterField(
+            model_name='compensationaction',
+            name='action_type',
+            field=models.ManyToManyField(blank=True, limit_choices_to={'code_lists__in': [1026], 'is_archived': False, 'is_selectable': True}, related_name='+', to='codelist.konovacode'),
+        ),
+        migrations.AlterField(
+            model_name='compensationaction',
+            name='action_type_details',
+            field=models.ManyToManyField(blank=True, limit_choices_to={'code_lists__in': [1035], 'is_archived': False, 'is_selectable': True}, related_name='+', to='codelist.konovacode'),
+        ),
+        migrations.AlterField(
+            model_name='compensationstate',
+            name='biotope_type_details',
+            field=models.ManyToManyField(blank=True, limit_choices_to={'code_lists__in': [975], 'is_archived': False, 'is_selectable': True}, related_name='+', to='codelist.konovacode'),
+        ),
+        migrations.AlterField(
+            model_name='ecoaccount',
+            name='after_states',
+            field=models.ManyToManyField(blank=True, help_text="Refers to 'Zielzustand Biotop'", related_name='+', to='compensation.compensationstate'),
+        ),
+        migrations.AlterField(
+            model_name='ecoaccount',
+            name='before_states',
+            field=models.ManyToManyField(blank=True, help_text="Refers to 'Ausgangszustand Biotop'", related_name='+', to='compensation.compensationstate'),
+        ),
+        migrations.AlterField(
+            model_name='ecoaccount',
+            name='deadlines',
+            field=models.ManyToManyField(blank=True, related_name='+', to='konova.deadline'),
+        ),
+        migrations.AlterField(
+            model_name='ecoaccount',
+            name='resubmissions',
+            field=models.ManyToManyField(blank=True, related_name='+', to='konova.resubmission'),
+        ),
+    ]

compensation/models/action.py

@@ -19,8 +19,9 @@ class UnitChoices(models.TextChoices):
     """
     cm = "cm", _("cm")
     m = "m", _("m")
+    m2 = "m2", _("m²")
+    m3 = "m3", _("m³")
     km = "km", _("km")
-    qm = "qm", _("m²")
     ha = "ha", _("ha")
     st = "pcs", _("Pieces")  # pieces
 

compensation/models/compensation.py

@@ -8,8 +8,13 @@ Created on: 16.11.21
 import shutil
 
 from django.contrib import messages
+from django.urls import reverse
 
+from analysis.settings import LKOMPVZVO_PUBLISH_DATE
 from codelist.models import KonovaCode
+from compensation.settings import COMPENSATION_IDENTIFIER_TEMPLATE, COMPENSATION_IDENTIFIER_LENGTH, \
+    COMPENSATION_LANIS_LAYER_NAME_RECORDED, COMPENSATION_LANIS_LAYER_NAME_UNRECORDED, COMPENSATION_LANIS_LAYER_NAME_UNRECORDED_OLD_ENTRY
+from konova.sub_settings.django_settings import BASE_URL
 from user.models import User, Team
 from django.db import models, transaction
 from django.db.models import QuerySet, Sum
@@ -21,7 +26,7 @@ from compensation.utils.quality import CompensationQualityChecker
 from konova.models import BaseObject, AbstractDocument, Deadline, generate_document_file_upload_path, \
     GeoReferencedMixin, DeadlineType, ResubmitableObjectMixin
 from konova.utils.message_templates import DATA_UNSHARED_EXPLANATION, COMPENSATION_REMOVED_TEMPLATE, \
-    DOCUMENT_REMOVED_TEMPLATE, DEADLINE_REMOVED, ADDED_DEADLINE, \
+    DOCUMENT_REMOVED_TEMPLATE, DEADLINE_REMOVED, DEADLINE_ADDED, \
     COMPENSATION_ACTION_REMOVED, COMPENSATION_STATE_REMOVED, INTERVENTION_HAS_REVOCATIONS_TEMPLATE
 from user.models import UserActionLogEntry
 
@@ -75,7 +80,7 @@ class AbstractCompensation(BaseObject,
 
             self.save()
             self.deadlines.add(deadline)
-            self.mark_as_edited(user, edit_comment=ADDED_DEADLINE)
+            self.mark_as_edited(user, edit_comment=DEADLINE_ADDED)
             return deadline
 
     def remove_deadline(self, form):
@@ -199,7 +204,9 @@ class AbstractCompensation(BaseObject,
         Returns:
 
         """
-        return qs.aggregate(Sum("surface"))["surface__sum"] or 0
+        val = qs.aggregate(Sum("surface"))["surface__sum"] or 0
+        val = float('{:0.2f}'.format(val))
+        return val
 
     def quality_check(self) -> CompensationQualityChecker:
         """ Performs data quality check
@@ -296,9 +303,18 @@ class Compensation(AbstractCompensation, CEFMixin, CoherenceMixin, PikMixin):
 
     objects = CompensationManager()
 
+    identifier_length = COMPENSATION_IDENTIFIER_LENGTH
+    identifier_template = COMPENSATION_IDENTIFIER_TEMPLATE
+
     def __str__(self):
         return "{}".format(self.identifier)
 
+    def get_detail_url(self):
+        return reverse("compensation:detail", args=(self.id,))
+
+    def get_detail_url_absolute(self):
+        return BASE_URL + self.get_detail_url()
+
     def save(self, *args, **kwargs):
         if self.identifier is None or len(self.identifier) == 0:
             # Create new identifier is none was given
@@ -328,6 +344,20 @@ class Compensation(AbstractCompensation, CEFMixin, CoherenceMixin, PikMixin):
         # Compensations inherit their shared state from the interventions
         return self.intervention.is_shared_with(user)
 
+    def is_only_shared_with(self, user: User):
+        """ Share check
+
+        Checks whether a given user is the only one having shared access to this entry
+
+        Args:
+            user (User): The user to be checked
+
+        Returns:
+
+        """
+        # Compensations inherit their shared state from the interventions
+        return self.intervention.is_only_shared_with(user)
+
     def share_with_user(self, user: User):
         """ Adds user to list of shared access users
 
@@ -379,7 +409,7 @@ class Compensation(AbstractCompensation, CEFMixin, CoherenceMixin, PikMixin):
         Returns:
             users (QuerySet)
         """
-        return self.intervention.users.all()
+        return self.intervention.shared_users
 
     @property
     def shared_teams(self) -> QuerySet:
@@ -388,7 +418,7 @@ class Compensation(AbstractCompensation, CEFMixin, CoherenceMixin, PikMixin):
         Returns:
             users (QuerySet)
         """
-        return self.intervention.teams.all()
+        return self.intervention.shared_teams
 
     def get_documents(self) -> QuerySet:
         """ Getter for all documents of a compensation
@@ -401,19 +431,18 @@ class Compensation(AbstractCompensation, CEFMixin, CoherenceMixin, PikMixin):
         )
         return docs
 
-    def mark_as_edited(self, user: User, request: HttpRequest = None, edit_comment: str = None, reset_recorded: bool = True):
+    def mark_as_edited(self, user: User, request: HttpRequest = None, edit_comment: str = None):
-        """ Performs internal logic for setting the recordedd/checked state of the related intervention
+        """ Performs internal logic for setting the checked state of the related intervention
 
         Args:
             user (User): The performing user
             request (HttpRequest): The performing request
             edit_comment (str): Additional comment for the log entry
-            reset_recorded (bool): Whether the record-state of the object should be reset
 
         Returns:
 
         """
-        self.intervention.unrecord(user, request)
+        self.intervention.set_unchecked()
         action = super().mark_as_edited(user, edit_comment=edit_comment)
         return action
 
@@ -459,6 +488,28 @@ class Compensation(AbstractCompensation, CEFMixin, CoherenceMixin, PikMixin):
         """
         return self.intervention.is_recorded
 
+    def get_lanis_layer_name(self):
+        """ Getter for specific LANIS/WFS object layer
+
+        Returns:
+
+        """
+        retval = None
+        if self.is_recorded:
+            retval = COMPENSATION_LANIS_LAYER_NAME_RECORDED
+        else:
+            try:
+                is_old_entry = self.intervention.legal.binding_date < LKOMPVZVO_PUBLISH_DATE
+            except TypeError:
+                is_old_entry = False
+
+            if is_old_entry:
+                retval = COMPENSATION_LANIS_LAYER_NAME_UNRECORDED_OLD_ENTRY
+            else:
+                retval = COMPENSATION_LANIS_LAYER_NAME_UNRECORDED
+
+        return retval
+
 
 class CompensationDocument(AbstractDocument):
     """
@@ -493,8 +544,11 @@ class CompensationDocument(AbstractDocument):
             # The only file left for this compensation is the one which is currently processed and will be deleted
             # Make sure that the compensation folder itself is deleted as well, not only the file
             # Therefore take the folder path from the file path
-            folder_path = self.file.path.split("/")[:-1]
+            try:
-            folder_path = "/".join(folder_path)
+                folder_path = self.file.path.split("/")[:-1]
+                folder_path = "/".join(folder_path)
+            except ValueError:
+                folder_path = None
 
         if user:
             self.instance.mark_as_edited(user, edit_comment=DOCUMENT_REMOVED_TEMPLATE.format(self.title))

compensation/models/eco_account.py

@@ -9,12 +9,13 @@ import shutil
 
 from django.urls import reverse
 
+from compensation.settings import ECO_ACCOUNT_IDENTIFIER_TEMPLATE, ECO_ACCOUNT_IDENTIFIER_LENGTH, \
+    ECO_ACCOUNT_LANIS_LAYER_NAME_RECORDED, ECO_ACCOUNT_LANIS_LAYER_NAME_UNRECORDED
+from konova.sub_settings.django_settings import BASE_URL
 from konova.utils.message_templates import DEDUCTION_REMOVED, DOCUMENT_REMOVED_TEMPLATE
-from django.core.exceptions import ValidationError
 from django.core.validators import MinValueValidator
 from django.db import models
 from django.db.models import Sum, QuerySet
-from django.utils.translation import gettext_lazy as _
 
 from compensation.managers import EcoAccountManager, EcoAccountDeductionManager
 from compensation.models.compensation import AbstractCompensation, PikMixin
@@ -35,6 +36,12 @@ class EcoAccount(AbstractCompensation, ShareableObjectMixin, RecordableObjectMix
         help_text="Amount of deductable surface - can be lower than the total surface due to deduction limitations",
         default=0,
     )
+    deductable_rest = models.FloatField(
+        blank=True,
+        null=True,
+        help_text="Amount of deductable rest",
+        default=0,
+    )
 
     legal = models.OneToOneField(
         "intervention.Legal",
@@ -46,22 +53,17 @@ class EcoAccount(AbstractCompensation, ShareableObjectMixin, RecordableObjectMix
 
     objects = EcoAccountManager()
 
+    identifier_length = ECO_ACCOUNT_IDENTIFIER_LENGTH
+    identifier_template = ECO_ACCOUNT_IDENTIFIER_TEMPLATE
+
     def __str__(self):
         return f"{self.identifier} ({self.title})"
 
-    def clean(self):
+    def get_detail_url(self):
-        # Deductable surface can not be larger than added states after surface
+        return reverse("compensation:acc:detail", args=(self.id,))
-        after_state_sum = self.get_state_after_surface_sum()
-        if self.deductable_surface > after_state_sum:
-            raise ValidationError(_("Deductable surface can not be larger than existing surfaces in after states"))
 
-        # Deductable surface can not be lower than amount of already deducted surfaces
+    def get_detail_url_absolute(self):
-        # User needs to contact deducting user in case of further problems
+        return BASE_URL + self.get_detail_url()
-        deducted_sum = self.get_deductions_surface()
-        if self.deductable_surface < deducted_sum:
-            raise ValidationError(
-                _("Deductable surface can not be smaller than the sum of already existing deductions. Please contact the responsible users for the deductions!")
-            )
 
     def save(self, *args, **kwargs):
         if self.identifier is None or len(self.identifier) == 0:
@@ -90,38 +92,30 @@ class EcoAccount(AbstractCompensation, ShareableObjectMixin, RecordableObjectMix
         Returns:
             sum_surface (float)
         """
-        return self.deductions.all().aggregate(Sum("surface"))["surface__sum"] or 0
+        val = self.deductions.all().aggregate(Sum("surface"))["surface__sum"] or 0
+        val = float('{:0.2f}'.format(val))
+        return val
 
-    def get_state_after_surface_sum(self) -> float:
+    def __calculate_deductable_rest(self):
-        """ Calculates the account's after state surface sum
-
-        Returns:
-            sum_surface (float)
-        """
-        return self.after_states.all().aggregate(Sum("surface"))["surface__sum"] or 0
-
-    def get_available_rest(self) -> (float, float):
         """ Calculates available rest surface of the eco account
 
         Args:
 
         Returns:
             ret_val_total (float): Total amount
-            ret_val_relative (float): Amount as percentage (0-100)
         """
-        deductions = self.deductions.filter(
+        deductions_surfaces = self.get_deductions_surface()
-            intervention__deleted=None,
-        )
-        deductions_surfaces = deductions.aggregate(Sum("surface"))["surface__sum"] or 0
-        available_surfaces = self.deductable_surface or deductions_surfaces ## no division by zero
-        ret_val_total = available_surfaces - deductions_surfaces
 
-        if available_surfaces > 0:
+        available_surface = self.deductable_surface
-            ret_val_relative = int((ret_val_total / available_surfaces) * 100)
+        if available_surface is None:
+            # Fallback!
+            available_surface = deductions_surfaces
         else:
-            ret_val_relative = 0
+            available_surface = float(available_surface)
 
-        return ret_val_total, ret_val_relative
+        ret_val = available_surface - deductions_surfaces
+
+        return ret_val
 
     def quality_check(self) -> EcoAccountQualityChecker:
         """ Quality check
@@ -174,13 +168,49 @@ class EcoAccount(AbstractCompensation, ShareableObjectMixin, RecordableObjectMix
         # Send mail
         shared_users = self.shared_users.values_list("id", flat=True)
         for user_id in shared_users:
-            celery_send_mail_deduction_changed.delay(self.identifier, self.title, user_id, data_change)
+            celery_send_mail_deduction_changed.delay(self.id, self.get_app_object_tuple(), user_id, data_change)
 
         # Send mail
         shared_teams = self.shared_teams.values_list("id", flat=True)
         for team_id in shared_teams:
-            celery_send_mail_deduction_changed_team.delay(self.identifier, self.title, team_id, data_change)
+            celery_send_mail_deduction_changed_team.delay(self.id, self.get_app_object_tuple(), team_id, data_change)
 
+    def update_deductable_rest(self):
+        """
+        Updates deductable_rest, which holds the amount of rest surface for this account.
+
+        Returns:
+
+        """
+        self.deductable_rest = self.__calculate_deductable_rest()
+        self.save()
+
+    def get_deductable_rest_relative(self):
+        """
+        Returns deductable_rest relative to deductable_surface mapped to [0,100]
+
+        Returns:
+
+        """
+        try:
+            ret_val = int((self.deductable_rest / (self.deductable_surface or 0)) * 100)
+        except ZeroDivisionError:
+            ret_val = 0
+        return ret_val
+
+    def get_lanis_layer_name(self):
+        """ Getter for specific LANIS/WFS object layer
+
+        Returns:
+
+        """
+        retval = None
+        if self.is_recorded:
+            retval = ECO_ACCOUNT_LANIS_LAYER_NAME_RECORDED
+        else:
+            retval = ECO_ACCOUNT_LANIS_LAYER_NAME_UNRECORDED
+
+        return retval
 
 class EcoAccountDocument(AbstractDocument):
     """
@@ -215,8 +245,11 @@ class EcoAccountDocument(AbstractDocument):
             # The only file left for this eco account is the one which is currently processed and will be deleted
             # Make sure that the compensation folder itself is deleted as well, not only the file
             # Therefore take the folder path from the file path
-            folder_path = self.file.path.split("/")[:-1]
+            try:
-            folder_path = "/".join(folder_path)
+                folder_path = self.file.path.split("/")[:-1]
+                folder_path = "/".join(folder_path)
+            except ValueError:
+                folder_path = None
 
         if user:
             self.instance.mark_as_edited(user, edit_comment=DOCUMENT_REMOVED_TEMPLATE.format(self.title))
@@ -272,3 +305,8 @@ class EcoAccountDeduction(BaseResource):
             self.intervention.mark_as_edited(user, edit_comment=DEDUCTION_REMOVED)
             self.account.mark_as_edited(user, edit_comment=DEDUCTION_REMOVED)
         super().delete(*args, **kwargs)
+        self.account.update_deductable_rest()
+
+    def save(self, *args, **kwargs):
+        super().save(*args, **kwargs)
+        self.account.update_deductable_rest()

compensation/models/payment.py

@@ -10,8 +10,6 @@ from django.db import models
 
 from intervention.models import Intervention
 from konova.models import BaseResource
-from konova.utils.message_templates import PAYMENT_REMOVED
-from user.models import UserActionLogEntry
 
 
 class Payment(BaseResource):

compensation/settings.py

@@ -7,6 +7,11 @@ Created on: 18.12.20
 """
 COMPENSATION_IDENTIFIER_LENGTH = 6
 COMPENSATION_IDENTIFIER_TEMPLATE = "KOM-{}"
+COMPENSATION_LANIS_LAYER_NAME_RECORDED = "kom_recorded"
+COMPENSATION_LANIS_LAYER_NAME_UNRECORDED = "kom_unrecorded"
+COMPENSATION_LANIS_LAYER_NAME_UNRECORDED_OLD_ENTRY = "kom_unrecorded_old_entries"
 
 ECO_ACCOUNT_IDENTIFIER_LENGTH = 6
-ECO_ACCOUNT_IDENTIFIER_TEMPLATE = "OEK-{}"
+ECO_ACCOUNT_IDENTIFIER_TEMPLATE = "OEK-{}"
+ECO_ACCOUNT_LANIS_LAYER_NAME_RECORDED = "oek_recorded"
+ECO_ACCOUNT_LANIS_LAYER_NAME_UNRECORDED = "oek_unrecorded"

compensation/tables/compensation.py

@@ -14,11 +14,11 @@ from django.utils.translation import gettext_lazy as _
 from compensation.filters.compensation import CompensationTableFilter
 from compensation.models import Compensation
 from konova.utils.message_templates import DATA_IS_UNCHECKED, DATA_CHECKED_ON_TEMPLATE, DATA_CHECKED_PREVIOUSLY_TEMPLATE
-from konova.utils.tables import BaseTable, TableRenderMixin
+from konova.utils.tables import BaseTable, TableRenderMixin, TableOrderMixin
 import django_tables2 as tables
 
 
-class CompensationTable(BaseTable, TableRenderMixin):
+class CompensationTable(BaseTable, TableRenderMixin, TableOrderMixin):
     id = tables.Column(
         verbose_name=_("Identifier"),
         orderable=True,
@@ -31,7 +31,7 @@ class CompensationTable(BaseTable, TableRenderMixin):
     )
     d = tables.Column(
         verbose_name=_("Parcel gmrkng"),
-        orderable=True,
+        orderable=False,
         accessor="geometry",
     )
     c = tables.Column(
@@ -126,28 +126,6 @@ class CompensationTable(BaseTable, TableRenderMixin):
             )
         return format_html(html)
 
-    def render_d(self, value, record: Compensation):
-        """ Renders the parcel district column for a compensation
-
-        Args:
-            value (str): The geometry
-            record (Compensation): The compensation record
-
-        Returns:
-
-        """
-        parcels = value.get_underlying_parcels().values_list(
-            "parcel_group__name",
-            flat=True
-        ).distinct()
-        html = render_to_string(
-            "table/gmrkng_col.html",
-            {
-                "entries": parcels
-            }
-        )
-        return html
-
     def render_r(self, value, record: Compensation):
         """ Renders the registered column for a compensation
 
@@ -170,20 +148,3 @@ class CompensationTable(BaseTable, TableRenderMixin):
         )
         return format_html(html)
 
-    def render_e(self, value, record: Compensation):
-        """ Renders the editable column for a compensation
-
-        Args:
-            value (str): The identifier value
-            record (Compensation): The compensation record
-
-        Returns:
-
-        """
-        has_access = record.is_shared_with(self.user)
-
-        html = self.render_icn(
-            tooltip=_("Full access granted") if has_access else _("Access not granted"),
-            icn_class="fas fa-edit rlp-r-inv" if has_access else "far fa-edit",
-        )
-        return format_html(html)

compensation/tables/eco_account.py

@@ -8,17 +8,18 @@ Created on: 18.08.22
 from django.http import HttpRequest
 from django.template.loader import render_to_string
 from django.urls import reverse
+from django.utils.formats import number_format
 from django.utils.html import format_html
 from django.utils.translation import gettext_lazy as _
 
 from compensation.filters.eco_account import EcoAccountTableFilter
 from compensation.models import EcoAccount
-from konova.utils.tables import TableRenderMixin, BaseTable
+from konova.utils.tables import TableRenderMixin, BaseTable, TableOrderMixin
 
 import django_tables2 as tables
 
 
-class EcoAccountTable(BaseTable, TableRenderMixin):
+class EcoAccountTable(BaseTable, TableRenderMixin, TableOrderMixin):
     id = tables.Column(
         verbose_name=_("Identifier"),
         orderable=True,
@@ -31,13 +32,13 @@ class EcoAccountTable(BaseTable, TableRenderMixin):
     )
     d = tables.Column(
         verbose_name=_("Parcel gmrkng"),
-        orderable=True,
+        orderable=False,
         accessor="geometry",
     )
     av = tables.Column(
         verbose_name=_("Available"),
         orderable=True,
-        empty_values=[],
+        accessor="deductable_rest",
         attrs={
             "th": {
                 "class": "w-20",
@@ -100,38 +101,20 @@ class EcoAccountTable(BaseTable, TableRenderMixin):
         """ Renders the available column for an eco account
 
         Args:
-            value (str): The identifier value
+            value (float): The deductable_rest
             record (EcoAccount): The eco account record
 
         Returns:
 
         """
-        value_total, value_relative = record.get_available_rest()
+        try:
+            value_relative = record.get_deductable_rest_relative()
+        except ZeroDivisionError:
+            value_relative = 0
         html = render_to_string("konova/widgets/progressbar.html", {"value": value_relative})
+        html += f"{number_format(record.deductable_rest, decimal_pos=2)} m²"
         return format_html(html)
 
-    def render_d(self, value, record):
-        """ Renders the parcel district column for a compensation
-
-        Args:
-            value (str): The geometry
-            record (Compensation): The compensation record
-
-        Returns:
-
-        """
-        parcels = value.get_underlying_parcels().values_list(
-            "parcel_group__name",
-            flat=True
-        ).distinct()
-        html = render_to_string(
-            "table/gmrkng_col.html",
-            {
-                "entries": parcels
-            }
-        )
-        return html
-
     def render_r(self, value, record: EcoAccount):
         """ Renders the recorded column for an eco account
 
@@ -153,23 +136,3 @@ class EcoAccountTable(BaseTable, TableRenderMixin):
             icn_filled=checked,
         )
         return format_html(html)
-
-    def render_e(self, value, record: EcoAccount):
-        """ Renders the editable column for an eco account
-
-        Args:
-            value (str): The identifier value
-            record (EcoAccount): The eco account record
-
-        Returns:
-
-        """
-        html = ""
-        # Do not use value in here, since value does use unprefetched 'users' manager, where record has already
-        # prefetched users data
-        has_access = record.is_shared_with(self.user)
-        html += self.render_icn(
-            tooltip=_("Full access granted") if has_access else _("Access not granted"),
-            icn_class="fas fa-edit rlp-r-inv" if has_access else "far fa-edit",
-        )
-        return format_html(html)

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

@@ -21,7 +21,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -74,6 +74,10 @@
                     {% endif %}
                 </td>
             </tr>
+            {% empty %}
+            <div class="alert alert-danger mb-0">
+                {% trans 'Missing' %}
+            </div>
             {% endfor %}
             </tbody>
         </table>

compensation/templates/compensation/detail/compensation/includes/deadlines.html

@@ -25,7 +25,7 @@
         {% trans 'Missing finished deadline ' %}
     </div>
     {% endif %}
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
         <table class="table table-hover">
             <thead>
             <tr>

compensation/templates/compensation/detail/compensation/includes/documents.html

@@ -20,7 +20,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
         <table class="table table-hover">
             <thead>
             <tr>

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

@@ -25,7 +25,7 @@
         {% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m²
     </div>
     {% endif %}
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -68,6 +68,10 @@
                     {% endif %}
                 </td>
             </tr>
+            {% empty %}
+            <div class="alert alert-danger mb-0">
+                {% trans 'Missing' %}
+            </div>
             {% endfor %}
             </tbody>
         </table>

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

@@ -25,7 +25,7 @@
         {% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m²
     </div>
     {% endif %}
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -68,6 +68,10 @@
                     {% endif %}
                 </td>
             </tr>
+            {% empty %}
+            <div class="alert alert-danger mb-0">
+                {% trans 'Missing' %}
+            </div>
             {% endfor %}
             </tbody>
         </table>

compensation/templates/compensation/detail/compensation/view.html

@@ -124,13 +124,13 @@
                             {% endfor %}
                             <hr>
                             {% if has_access %}
-                                {% for user in obj.users.all %}
+                                {% for user in obj.intervention.shared_users %}
                                     {% include 'user/includes/contact_modal_button.html' %}
                                 {% endfor %}
                             {% else %}
                             <span title="{% trans 'The data must be shared with you, if you want to see which other users have shared access as well.' %}">
                                 {% fa5_icon 'eye-slash' %}
-                                {{obj.users.count}} {% trans 'other users' %}
+                                {{obj.intervention.users.count}} {% trans 'other users' %}
                             </span>
                             {% endif %}
                         </td>

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

@@ -20,7 +20,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -73,6 +73,10 @@
                     {% endif %}
                 </td>
             </tr>
+            {% empty %}
+            <div class="alert alert-danger mb-0">
+                {% trans 'Missing' %}
+            </div>
             {% endfor %}
             </tbody>
         </table>

compensation/templates/compensation/detail/eco_account/includes/deadlines.html

@@ -25,7 +25,7 @@
         {% trans 'Missing finished deadline ' %}
     </div>
     {% endif %}
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
         <table class="table table-hover">
             <thead>
             <tr>

compensation/templates/compensation/detail/eco_account/includes/deductions.html

@@ -20,7 +20,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
         <table class="table table-hover">
             <thead>
             <tr>

compensation/templates/compensation/detail/eco_account/includes/documents.html

@@ -20,7 +20,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
         <table class="table table-hover">
             <thead>
             <tr>

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

@@ -25,7 +25,7 @@
         {% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m²
     </div>
     {% endif %}
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -68,6 +68,10 @@
                     {% endif %}
                 </td>
             </tr>
+            {% empty %}
+            <div class="alert alert-danger mb-0">
+                {% trans 'Missing' %}
+            </div>
             {% endfor %}
             </tbody>
         </table>

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

@@ -25,7 +25,7 @@
         {% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m²
     </div>
     {% endif %}
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -68,6 +68,10 @@
                     {% endif %}
                 </td>
             </tr>
+            {% empty %}
+            <div class="alert alert-danger mb-0">
+                {% trans 'Missing' %}
+            </div>
             {% endfor %}
             </tbody>
         </table>

compensation/tests/compensation/test_workflow.py

@@ -71,6 +71,7 @@ class CompensationWorkflowTestCase(BaseWorkflowTestCase):
         self.assertEqual(new_compensation.title, test_title)
         self.assert_equal_geometries(new_compensation.geometry.geom, test_geom)
         self.assertEqual(new_compensation.log.count(), 1)
+        self.assertEqual(new_compensation.created, new_compensation.modified)
 
         # Expect logs to be set
         self.assertEqual(pre_creation_intervention_log_count + 1, self.intervention.log.count())
@@ -124,10 +125,16 @@ class CompensationWorkflowTestCase(BaseWorkflowTestCase):
         self.compensation = self.fill_out_compensation(self.compensation)
         pre_edit_log_count = self.compensation.log.count()
 
+        self.assertTrue(self.compensation.is_shared_with(self.superuser))
+
+        old_identifier = self.compensation.identifier
         new_title = self.create_dummy_string()
         new_identifier = self.create_dummy_string()
         new_comment = self.create_dummy_string()
-        new_geometry = MultiPolygon(srid=4326)  # Create an empty geometry
+        new_geometry = MultiPolygon(
+            self.compensation.geometry.geom.buffer(10),
+            srid=self.compensation.geometry.geom.srid
+        )  # Create a geometry which differs from the stored one
         geojson = self.create_geojson(new_geometry)
 
         check_on_elements = {
@@ -150,19 +157,21 @@ class CompensationWorkflowTestCase(BaseWorkflowTestCase):
 
         check_on_elements = {
             self.compensation.title: new_title,
-            self.compensation.identifier: new_identifier,
             self.compensation.comment: new_comment,
         }
 
         for k, v in check_on_elements.items():
             self.assertEqual(k, v)
 
-        self.assert_equal_geometries(self.compensation.geometry.geom, new_geometry)
+        # Expect identifier to not be editable
+        self.assertEqual(self.compensation.identifier, old_identifier, msg="Identifier was editable!")
 
         # Expect logs to be set
         self.assertEqual(pre_edit_log_count + 1, self.compensation.log.count())
         self.assertEqual(self.compensation.log.first().action, UserAction.EDITED)
 
+        self.assert_equal_geometries(self.compensation.geometry.geom, new_geometry)
+
     def test_checkability(self):
         """
         This tests if the checkability of the compensation (which is defined by the linked intervention's checked
@@ -243,6 +252,7 @@ class CompensationWorkflowTestCase(BaseWorkflowTestCase):
         self.client_user.post(record_url, post_data)
 
         # Check that the intervention is still not recorded
+        self.intervention.refresh_from_db()
         self.assertIsNone(self.intervention.recorded)
 
         # Now fill out the data for a compensation

compensation/tests/compensation/unit/__init__.py

@@ -0,0 +1,7 @@
+"""
+Author: Michel Peltriaux
+Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
+Contact: ksp-servicestelle@sgdnord.rlp.de
+Created on: 21.08.23
+
+"""

compensation/tests/compensation/unit/test_forms.py

@@ -0,0 +1,318 @@
+"""
+Author: Michel Peltriaux
+Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
+Contact: ksp-servicestelle@sgdnord.rlp.de
+Created on: 21.08.23
+
+"""
+from django.core.exceptions import ObjectDoesNotExist
+from django.test import RequestFactory
+from django.utils.translation import gettext_lazy as _
+
+from codelist.models import KonovaCodeList
+from codelist.settings import CODELIST_COMPENSATION_ACTION_ID, CODELIST_BIOTOPES_ID
+from compensation.forms.modals.compensation_action import NewCompensationActionModalForm, \
+    EditCompensationActionModalForm, RemoveCompensationActionModalForm
+from compensation.forms.modals.state import NewCompensationStateModalForm, EditCompensationStateModalForm, \
+    RemoveCompensationStateModalForm
+from compensation.models import UnitChoices
+from konova.tests.test_views import BaseTestCase
+from konova.utils.generators import generate_random_string
+from konova.utils.message_templates import COMPENSATION_ACTION_EDITED, ADDED_COMPENSATION_ACTION, \
+    COMPENSATION_ACTION_REMOVED, ADDED_COMPENSATION_STATE, COMPENSATION_STATE_EDITED, \
+    COMPENSATION_STATE_REMOVED
+from user.models import UserAction
+
+
+class NewCompensationActionModalFormTestCase(BaseTestCase):
+
+    def setUp(self) -> None:
+        super().setUp()
+        self.request = RequestFactory().request()
+        self.request.user = self.superuser
+
+        self.action_dummy_code = self.create_dummy_codes().first()
+        action_list = KonovaCodeList.objects.get_or_create(
+            id=CODELIST_COMPENSATION_ACTION_ID,
+        )[0]
+        action_list.codes.add(self.action_dummy_code)
+
+    def test_init(self):
+        form = NewCompensationActionModalForm()
+        self.assertEqual(form.form_title, str(_("New action")))
+        self.assertEqual(form.form_caption, str(_("Insert data for the new action")))
+        self.assertTrue(len(form.fields["action_type"].choices) == 1)
+
+    def test_save(self):
+        comment = "TEST_comment"
+        unit = UnitChoices.km
+        amount = 2.5
+
+        data = {
+            "action_type": [self.action_dummy_code.id],
+            "action_type_details": [],
+            "unit": unit,
+            "amount": amount,
+            "comment": comment,
+        }
+        form = NewCompensationActionModalForm(data, request=self.request, instance=self.compensation)
+        self.assertTrue(form.is_valid(), msg=form.errors)
+
+        comp_action = form.save()
+        last_log = self.compensation.log.first()
+        self.assertIn(comp_action, self.compensation.actions.all())
+        self.assertEqual(last_log.action, UserAction.EDITED)
+        self.assertEqual(last_log.user, self.superuser)
+        self.assertEqual(last_log.comment, ADDED_COMPENSATION_ACTION)
+        self.assertEqual(comp_action.amount, amount)
+        self.assertEqual(comp_action.unit, unit)
+        self.assertEqual(comp_action.comment, comment)
+        comp_action_types = comp_action.action_type.all()
+        self.assertEqual(comp_action_types.count(), 1)
+        self.assertEqual(comp_action_types.first(), self.action_dummy_code)
+
+
+class EditCompensationActionModalFormTestCase(NewCompensationActionModalFormTestCase):
+
+    def setUp(self) -> None:
+        super().setUp()
+        self.comp_action = self.create_dummy_action()
+        self.compensation.actions.add(self.comp_action)
+
+    def test_init(self):
+        form = EditCompensationActionModalForm(request=self.request, instance=self.compensation, action=self.comp_action)
+        self.assertEqual(form.form_title, str(_("Edit action")))
+        self.assertEqual(len(form.fields["action_type"].initial), self.comp_action.action_type.count())
+        self.assertEqual(len(form.fields["action_type_details"].initial), self.comp_action.action_type_details.count())
+        self.assertEqual(form.fields["amount"].initial, self.comp_action.amount)
+        self.assertEqual(form.fields["unit"].initial, self.comp_action.unit)
+        self.assertEqual(form.fields["comment"].initial, self.comp_action.comment)
+
+    def test_save(self):
+        amount = 25.4
+        unit = UnitChoices.cm
+        comment = generate_random_string(length=20, use_numbers=True, use_letters_lc=True, use_letters_uc=True)
+
+        data = {
+            "action_type": [self.action_dummy_code.id],
+            "action_type_details": [],
+            "amount": amount,
+            "unit": unit,
+            "comment": comment,
+        }
+
+        form = EditCompensationActionModalForm(data, request=self.request, instance=self.compensation, action=self.comp_action)
+
+        self.assertTrue(form.is_valid())
+        action = form.save()
+
+        self.assertEqual(action.action_type.count(), len(data["action_type"]))
+        self.assertEqual(action.action_type_details.count(), 0)
+        self.assertEqual(float(action.amount), amount)
+        self.assertEqual(action.unit, unit)
+        self.assertEqual(action.comment, comment)
+
+        last_log = self.compensation.log.first()
+        self.assertEqual(last_log.action, UserAction.EDITED)
+        self.assertEqual(last_log.user, self.superuser)
+        self.assertEqual(last_log.comment, COMPENSATION_ACTION_EDITED)
+        self.assertIn(action, self.compensation.actions.all())
+        self.assertEqual(self.compensation.actions.count(), 1)
+
+
+class RemoveCompensationActionModalFormTestCase(EditCompensationActionModalFormTestCase):
+    def setUp(self) -> None:
+        super().setUp()
+        
+    def test_init(self):
+        self.assertIn(self.comp_action, self.compensation.actions.all())
+        form = RemoveCompensationActionModalForm(request=self.request, instance=self.compensation, action=self.comp_action)
+        self.assertEqual(form.action, self.comp_action)
+        
+    def test_save(self):
+        data = {
+            "confirm": True,
+        }
+        form = RemoveCompensationActionModalForm(
+            data, 
+            request=self.request,
+            instance=self.compensation,
+            action=self.comp_action
+        )
+        self.assertTrue(form.is_valid())
+        self.assertIn(self.comp_action, self.compensation.actions.all())
+
+        form.save()
+
+        last_log = self.compensation.log.first()
+        self.assertEqual(last_log.action, UserAction.EDITED)
+        self.assertEqual(last_log.user, self.superuser)
+        self.assertEqual(last_log.comment, COMPENSATION_ACTION_REMOVED)
+
+        self.assertNotIn(self.comp_action, self.compensation.actions.all())
+        try:
+            self.comp_action.refresh_from_db()
+            self.fail(msg="This action should not be fetchable anymore")
+        except ObjectDoesNotExist:
+            pass
+
+
+class NewCompensationStateModalFormTestCase(BaseTestCase):
+    def setUp(self) -> None:
+        super().setUp()
+        self.request = RequestFactory().request()
+        self.request.user = self.superuser
+
+        self.comp_biotope_code = self.create_dummy_codes().first()
+        self.biotope_codelist = KonovaCodeList.objects.get_or_create(
+            id=CODELIST_BIOTOPES_ID
+        )[0]
+        self.biotope_codelist.codes.add(self.comp_biotope_code)
+
+    def test_init(self):
+        form = NewCompensationStateModalForm(request=self.request, instance=self.compensation)
+
+        self.assertEqual(form.form_title, str(_("New state")))
+        self.assertEqual(form.form_caption, str(_("Insert data for the new state")))
+        self.assertEqual(len(form.fields["biotope_type"].choices), 1)
+
+    def test_save(self):
+        test_surface = 123.45
+        data = {
+            "biotope_type": self.comp_biotope_code.id,
+            "biotope_extra": [],
+            "surface": test_surface,
+        }
+        self.assertEqual(self.compensation.before_states.count(), 0)
+        self.assertEqual(self.compensation.after_states.count(), 0)
+
+        form = NewCompensationStateModalForm(data, request=self.request, instance=self.compensation)
+
+        self.assertTrue(form.is_valid(), msg=form.errors)
+
+        is_before_state = True
+        state = form.save(is_before_state)
+
+        self.assertEqual(self.compensation.before_states.count(), 1)
+        self.assertEqual(self.compensation.after_states.count(), 0)
+        self.assertIn(state, self.compensation.before_states.all())
+        self.assertEqual(state.biotope_type, self.comp_biotope_code)
+        self.assertEqual(state.biotope_type_details.count(), 0)
+        self.assertEqual(float(state.surface), test_surface)
+
+        last_log = self.compensation.log.first()
+        self.assertEqual(last_log.user, self.superuser)
+        self.assertEqual(last_log.action, UserAction.EDITED)
+        self.assertEqual(last_log.comment, ADDED_COMPENSATION_STATE)
+
+        is_before_state = False
+        state = form.save(is_before_state)
+
+        self.assertEqual(self.compensation.before_states.count(), 1)
+        self.assertEqual(self.compensation.after_states.count(), 1)
+        self.assertIn(state, self.compensation.after_states.all())
+        self.assertEqual(state.biotope_type, self.comp_biotope_code)
+        self.assertEqual(state.biotope_type_details.count(), 0)
+        self.assertEqual(float(state.surface), test_surface)
+
+        last_log = self.compensation.log.first()
+        self.assertEqual(last_log.user, self.superuser)
+        self.assertEqual(last_log.action, UserAction.EDITED)
+        self.assertEqual(last_log.comment, ADDED_COMPENSATION_STATE)
+
+
+class EditCompensationStateModalFormTestCase(NewCompensationStateModalFormTestCase):
+    def setUp(self) -> None:
+        super().setUp()
+        self.comp_state.biotope_type = self.comp_biotope_code
+        self.comp_state.save()
+
+        self.compensation.after_states.add(self.comp_state)
+
+    def test_init(self):
+        form = EditCompensationStateModalForm(request=self.request, instance=self.compensation, state=self.comp_state)
+
+        self.assertEqual(form.state, self.comp_state)
+        self.assertEqual(form.form_title, str(_("Edit state")))
+        self.assertEqual(form.fields["biotope_type"].initial, self.comp_state.biotope_type.id)
+        self.assertTrue(
+            form.fields["biotope_extra"].initial.difference(
+                self.comp_state.biotope_type_details.all()
+            ).count() == 0
+        )
+        self.assertEqual(form.fields["surface"].initial, self.comp_state.surface)
+
+    def test_save(self):
+        test_surface = 987.65
+        test_code = self.create_dummy_codes().exclude(
+            id=self.comp_biotope_code.id
+        ).first()
+        self.biotope_codelist.codes.add(test_code)
+
+        self.assertEqual(self.compensation.after_states.count(), 1)
+        self.assertEqual(self.compensation.before_states.count(), 0)
+
+        data = {
+            "biotope_type": test_code.id,
+            "biotope_extra": [],
+            "surface": test_surface,
+        }
+        form = EditCompensationStateModalForm(
+            data,
+            request=self.request,
+            instance=self.compensation,
+            state=self.comp_state
+        )
+        self.assertTrue(form.is_valid(), msg=form.errors)
+
+        is_before_state = False
+        state = form.save(is_before_state=is_before_state)
+        self.assertEqual(state.biotope_type, test_code)
+        self.assertEqual(state.biotope_type_details.count(), 0)
+        self.assertEqual(float(state.surface), test_surface)
+
+        last_log = self.compensation.log.first()
+        self.assertEqual(last_log.action, UserAction.EDITED)
+        self.assertEqual(last_log.user, self.superuser)
+        self.assertEqual(last_log.comment, COMPENSATION_STATE_EDITED)
+
+
+class RemoveCompensationStateModalFormTestCase(EditCompensationStateModalFormTestCase):
+    def setUp(self) -> None:
+        super().setUp()
+
+    def test_init(self):
+        form = RemoveCompensationStateModalForm(request=self.request, instance=self.compensation, state=self.comp_state)
+
+        self.assertEqual(form.state, self.comp_state)
+
+    def test_save(self):
+        data = {
+            "confirm": True
+        }
+        form = RemoveCompensationStateModalForm(
+            data,
+            request=self.request,
+            instance=self.compensation,
+            state=self.comp_state
+        )
+        self.assertTrue(form.is_valid(), msg=form.errors)
+
+        self.assertIn(self.comp_state, self.compensation.after_states.all())
+        self.assertNotIn(self.comp_state, self.compensation.before_states.all())
+
+        form.save()
+
+        self.assertEqual(self.compensation.after_states.count(), 0)
+        self.assertEqual(self.compensation.before_states.count(), 0)
+        try:
+            self.comp_state.refresh_from_db()
+            self.fail("Entry should not existing anymore")
+        except ObjectDoesNotExist:
+            pass
+
+        last_log = self.compensation.log.first()
+        self.assertEqual(last_log.user, self.superuser)
+        self.assertEqual(last_log.action, UserAction.EDITED)
+        self.assertEqual(last_log.comment, COMPENSATION_STATE_REMOVED)
+

compensation/tests/compensation/unit/test_models.py

@@ -0,0 +1,201 @@
+"""
+Author: Michel Peltriaux
+Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
+Contact: ksp-servicestelle@sgdnord.rlp.de
+Created on: 30.08.23
+
+"""
+from django.core.exceptions import ObjectDoesNotExist
+from django.test import RequestFactory
+from django.utils.timezone import now
+
+from compensation.forms.modals.deadline import NewDeadlineModalForm
+from compensation.models import CompensationDocument
+from konova.forms.modals import RemoveDeadlineModalForm
+from konova.models import DeadlineType
+from konova.tests.test_views import BaseTestCase
+from konova.utils.message_templates import DEADLINE_REMOVED, DOCUMENT_REMOVED_TEMPLATE, COMPENSATION_REMOVED_TEMPLATE, \
+    DEADLINE_ADDED
+from user.models import UserAction, Team
+
+
+class AbstractCompensationModelTestCase(BaseTestCase):
+    def setUp(self) -> None:
+        super().setUp()
+        self.request = RequestFactory().request()
+        self.request.user = self.superuser
+
+    def test_remove_deadline(self):
+        self.compensation.deadlines.add(self.finished_deadline)
+
+        data = {
+            "confirm": True
+        }
+
+        form = RemoveDeadlineModalForm(
+            data,
+            request=self.request,
+            instance=self.compensation,
+            deadline=self.finished_deadline,
+        )
+        self.assertTrue(form.is_valid(), msg=form.errors)
+        self.assertIn(self.finished_deadline, self.compensation.deadlines.all())
+        form.save()
+
+        last_log = self.compensation.log.first()
+        self.assertEqual(last_log.user, self.request.user)
+        self.assertEqual(last_log.action, UserAction.EDITED)
+        self.assertEqual(last_log.comment, DEADLINE_REMOVED)
+
+        self.assertNotIn(self.finished_deadline, self.compensation.deadlines.all())
+        try:
+            self.finished_deadline.refresh_from_db()
+            self.fail("Deadline should not exist anymore after removing from abstract compensation")
+        except ObjectDoesNotExist:
+            pass
+
+    def test_add_deadline(self):
+        request = RequestFactory().request()
+        request.user = self.superuser
+
+        data = {
+            "type": DeadlineType.MAINTAIN,
+            "date": now().date(),
+            "comment": "TestDeadline"
+        }
+        form = NewDeadlineModalForm(
+            data,
+            request=self.request,
+            instance=self.compensation,
+        )
+        self.assertTrue(form.is_valid(), msg=form.errors)
+        deadline = self.compensation.add_deadline(form)
+        self.assertEqual(deadline.date, data["date"])
+        self.assertEqual(deadline.type, data["type"])
+        self.assertEqual(deadline.comment, data["comment"])
+        self.assertEqual(deadline.created.action, UserAction.CREATED)
+        self.assertEqual(deadline.created.user, self.superuser)
+        self.assertEqual(deadline.created.comment, None)
+        self.assertIn(deadline, self.compensation.deadlines.all())
+
+        last_log = self.compensation.log.first()
+        self.assertEqual(last_log.action, UserAction.EDITED)
+        self.assertEqual(last_log.user, self.superuser)
+        self.assertEqual(last_log.comment, DEADLINE_ADDED)
+
+
+class CompensationTestCase(BaseTestCase):
+    def setUp(self) -> None:
+        super().setUp()
+
+    def test_str(self):
+        self.assertEqual(str(self.compensation), self.compensation.identifier)
+
+    def test_save(self):
+        old_identifier = self.compensation.identifier
+        self.compensation.identifier = None
+        self.compensation.save()
+        self.assertIsNotNone(self.compensation.identifier)
+        self.assertNotEqual(old_identifier, self.compensation.identifier)
+
+    def test_share_with_user(self):
+        self.assertNotIn(self.user, self.compensation.shared_users)
+        self.compensation.share_with_user(self.user)
+        self.assertIn(self.user, self.compensation.shared_users)
+
+    def test_share_with_user_list(self):
+        user_list = [
+            self.user
+        ]
+        self.assertNotIn(self.user, self.compensation.shared_users)
+        self.compensation.share_with_user_list(user_list)
+        self.assertIn(self.user, self.compensation.shared_users)
+        user_list = [
+            self.superuser
+        ]
+        self.assertNotIn(self.superuser, self.compensation.shared_users)
+        self.compensation.share_with_user_list(user_list)
+        self.assertIn(self.superuser, self.compensation.shared_users)
+        self.assertNotIn(self.user, self.compensation.shared_users)
+
+    def test_share_with_team(self):
+        self.assertNotIn(self.team, self.compensation.shared_teams)
+        self.compensation.share_with_team(self.team)
+        self.assertIn(self.team, self.compensation.shared_teams)
+
+    def test_share_with_team_list(self):
+        self.compensation.share_with_team(self.team)
+        self.assertIn(self.team, self.compensation.shared_teams)
+        other_team = Team.objects.create(
+            name="NewTeam"
+        )
+        team_list = [
+            other_team
+        ]
+        self.compensation.share_with_team_list(team_list)
+        self.assertIn(other_team, self.compensation.shared_teams)
+        self.assertNotIn(self.team, self.compensation.shared_teams)
+
+    def test_shared_users(self):
+        intervention = self.compensation.intervention
+        diff = self.compensation.shared_users.difference(intervention.shared_users)
+        self.assertEqual(diff.count(), 0)
+
+        self.compensation.share_with_user(self.superuser)
+        diff = self.compensation.shared_users.difference(intervention.shared_users)
+        self.assertEqual(diff.count(), 0)
+
+    def test_shared_teams(self):
+        intervention = self.compensation.intervention
+        diff = self.compensation.shared_users.difference(intervention.shared_users)
+        self.assertEqual(diff.count(), 0)
+
+        self.compensation.share_with_user(self.superuser)
+        diff = self.compensation.shared_users.difference(intervention.shared_users)
+        self.assertEqual(diff.count(), 0)
+
+    def test_get_documents(self):
+        doc = self.create_dummy_document(CompensationDocument, self.compensation)
+        docs = self.compensation.get_documents()
+        self.assertIn(doc, docs)
+
+    def test_mark_as_deleted(self):
+        self.assertIsNone(self.compensation.deleted)
+        self.compensation.mark_as_deleted(self.superuser, send_mail=False)
+
+        comp_deleted = self.compensation.deleted
+        self.assertIsNotNone(comp_deleted)
+        self.assertEqual(comp_deleted.action, UserAction.DELETED)
+        self.assertEqual(comp_deleted.user, self.superuser)
+        self.assertEqual(comp_deleted.comment, None)
+
+        intervention_last_log = self.compensation.intervention.log.first()
+        self.assertEqual(intervention_last_log.action, UserAction.EDITED)
+        self.assertEqual(intervention_last_log.user, self.superuser)
+        self.assertEqual(
+            intervention_last_log.comment,
+            COMPENSATION_REMOVED_TEMPLATE.format(
+                self.compensation.identifier
+            )
+        )
+
+
+class CompensationDocumentTestCase(BaseTestCase):
+    def setUp(self) -> None:
+        super().setUp()
+        self.doc = self.create_dummy_document(CompensationDocument, self.compensation)
+
+    def test_delete(self):
+        doc_title = self.doc.title
+        self.assertIn(self.doc, self.compensation.get_documents())
+        self.doc.delete(self.superuser)
+        self.assertNotIn(self.doc, self.compensation.get_documents())
+        try:
+            self.doc.refresh_from_db()
+            self.fail("Document should not be fetchable anymore")
+        except ObjectDoesNotExist:
+            pass
+        last_log = self.compensation.log.first()
+        self.assertEqual(last_log.user, self.superuser)
+        self.assertEqual(last_log.action, UserAction.EDITED)
+        self.assertEqual(last_log.comment, DOCUMENT_REMOVED_TEMPLATE.format(doc_title))

compensation/tests/ecoaccount/test_workflow.py

@@ -47,7 +47,7 @@ class EcoAccountWorkflowTestCase(BaseWorkflowTestCase):
             "identifier": test_id,
             "title": test_title,
             "geom": geom_json,
-            "deductable_surface": test_deductable_surface,
+            "surface": test_deductable_surface,
             "conservation_office": test_conservation_office.id
         }
         self.client_user.post(new_url, post_data)
@@ -61,8 +61,11 @@ class EcoAccountWorkflowTestCase(BaseWorkflowTestCase):
 
         self.assertEqual(acc.identifier, test_id)
         self.assertEqual(acc.title, test_title)
+        self.assertEqual(acc.deductable_surface, test_deductable_surface)
+        self.assertEqual(acc.deductable_rest, test_deductable_surface)
         self.assert_equal_geometries(acc.geometry.geom, test_geom)
         self.assertEqual(acc.log.count(), 1)
+        self.assertEqual(acc.created, acc.modified)
 
         # Expect logs to be set
         self.assertEqual(acc.log.count(), 1)
@@ -79,12 +82,13 @@ class EcoAccountWorkflowTestCase(BaseWorkflowTestCase):
         url = reverse("compensation:acc:edit", args=(self.eco_account.id,))
         pre_edit_log_count = self.eco_account.log.count()
 
+        old_identifier = self.eco_account.identifier
         new_title = self.create_dummy_string()
         new_identifier = self.create_dummy_string()
         new_comment = self.create_dummy_string()
         new_geometry = MultiPolygon(srid=4326)  # Create an empty geometry
         test_conservation_office = self.get_conservation_office_code()
-        test_deductable_surface = 10005
+        test_deductable_surface = self.eco_account.deductable_surface + 100
 
         check_on_elements = {
             self.eco_account.title: new_title,
@@ -103,19 +107,23 @@ class EcoAccountWorkflowTestCase(BaseWorkflowTestCase):
             "surface": test_deductable_surface,
             "conservation_office": test_conservation_office.id
         }
-        self.client_user.post(url, post_data)
+        response = self.client_user.post(url, post_data)
+        self.assertEqual(response.status_code, 302, msg=f"{response.content.decode('utf-8')}")
         self.eco_account.refresh_from_db()
 
+        deductions_surface = self.eco_account.get_deductions_surface()
+
         check_on_elements = {
             self.eco_account.title: new_title,
-            self.eco_account.identifier: new_identifier,
             self.eco_account.deductable_surface: test_deductable_surface,
+            self.eco_account.deductable_rest: test_deductable_surface - deductions_surface,
             self.eco_account.comment: new_comment,
         }
 
         for k, v in check_on_elements.items():
             self.assertEqual(k, v)
 
+        self.assertEqual(self.eco_account.identifier, old_identifier)
         self.assert_equal_geometries(self.eco_account.geometry.geom, new_geometry)
 
         # Expect logs to be set
@@ -185,7 +193,7 @@ class EcoAccountWorkflowTestCase(BaseWorkflowTestCase):
 
         # Prepare data for deduction creation
         deduct_url = reverse("compensation:acc:new-deduction", args=(self.eco_account.id,))
-        test_surface = 10.00
+        test_surface = 10.50
         post_data = {
             "surface": test_surface,
             "account": self.eco_account.id,
@@ -194,17 +202,17 @@ class EcoAccountWorkflowTestCase(BaseWorkflowTestCase):
         # Perform request --> expect to fail
         self.client_user.post(deduct_url, post_data)
 
-        # Expect that no deduction has been created
+        # Expect that no deduction has been created since the eco account is not recorded, yet
         self.assertEqual(0, self.eco_account.deductions.count())
         self.assertEqual(0, self.intervention.deductions.count())
         self.assertEqual(pre_deduction_acc_log_count, 0)
         self.assertEqual(pre_deduction_int_log_count, 0)
 
         # Now mock the eco account as it would be recorded (with invalid data)
-        # Make sure the deductible surface is high enough for the request
+        # Make sure the deductible surface is valid for the request
         self.eco_account.set_recorded(self.superuser)
         self.eco_account.refresh_from_db()
-        self.eco_account.deductable_surface = test_surface + 1.00
+        self.eco_account.deductable_surface = test_surface + 1.0
         self.eco_account.save()
         self.assertIsNotNone(self.eco_account.recorded)
         self.assertGreater(self.eco_account.deductable_surface, test_surface)
@@ -216,10 +224,14 @@ class EcoAccountWorkflowTestCase(BaseWorkflowTestCase):
         self.client_user.post(deduct_url, post_data)
 
         # Expect that the deduction has been created
+        self.eco_account.refresh_from_db()
         self.assertEqual(1, self.eco_account.deductions.count())
         self.assertEqual(1, self.intervention.deductions.count())
-        deduction = self.eco_account.deductions.first()
+        deduction = self.eco_account.deductions.get(
+            surface=test_surface
+        )
         self.assertEqual(deduction.surface, test_surface)
+        self.assertEqual(self.eco_account.deductable_rest, self.eco_account.deductable_surface - deduction.surface)
         self.assertEqual(deduction.account, self.eco_account)
         self.assertEqual(deduction.intervention, self.intervention)
 
@@ -230,7 +242,7 @@ class EcoAccountWorkflowTestCase(BaseWorkflowTestCase):
         self.assertTrue(self.intervention.log.first().action == UserAction.EDITED)
 
     def test_edit_deduction(self):
-        test_surface = self.eco_account.get_available_rest()[0]
+        test_surface = self.eco_account.deductable_rest
         self.eco_account.set_recorded(self.superuser)
         self.intervention.share_with_user(self.superuser)
         self.eco_account.refresh_from_db()
@@ -239,7 +251,7 @@ class EcoAccountWorkflowTestCase(BaseWorkflowTestCase):
         deduction = EcoAccountDeduction.objects.create(
             intervention=self.intervention,
             account=self.eco_account,
-            surface=0
+            surface=1.10
         )
         self.assertEqual(1, self.intervention.deductions.count())
         self.assertEqual(1, self.eco_account.deductions.count())
@@ -262,6 +274,7 @@ class EcoAccountWorkflowTestCase(BaseWorkflowTestCase):
         self.eco_account.refresh_from_db()
         deduction.refresh_from_db()
 
+        self.assertEqual(self.eco_account.deductable_rest, self.eco_account.deductable_surface - deduction.surface)
         self.assertEqual(num_deductions_intervention, self.intervention.deductions.count())
         self.assertEqual(num_deductions_account, self.eco_account.deductions.count())
         self.assertEqual(deduction.surface, test_surface)
@@ -275,6 +288,7 @@ class EcoAccountWorkflowTestCase(BaseWorkflowTestCase):
     def test_remove_deduction(self):
         intervention = self.deduction.intervention
         account = self.deduction.account
+        deducted_surface = self.deduction.surface
 
         # Prepare url and form data to be posted
         new_url = reverse("compensation:acc:remove-deduction", args=(account.id, self.deduction.id))
@@ -287,6 +301,7 @@ class EcoAccountWorkflowTestCase(BaseWorkflowTestCase):
 
         pre_edit_intervention_log_count = intervention.log.count()
         pre_edit_account_log_count = account.log.count()
+        pre_edit_account_rest = account.deductable_rest
         num_deductions_intervention = intervention.deductions.count()
         num_deductions_account = account.deductions.count()
 
@@ -297,6 +312,7 @@ class EcoAccountWorkflowTestCase(BaseWorkflowTestCase):
 
         self.assertEqual(num_deductions_intervention - 1, intervention.deductions.count())
         self.assertEqual(num_deductions_account - 1, account.deductions.count())
+        self.assertEqual(account.deductable_rest, pre_edit_account_rest + deducted_surface)
 
         # Expect logs to be set
         self.assertEqual(pre_edit_intervention_log_count + 1, intervention.log.count())

compensation/tests/ecoaccount/unit/__init__.py

@@ -0,0 +1,7 @@
+"""
+Author: Michel Peltriaux
+Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
+Contact: ksp-servicestelle@sgdnord.rlp.de
+Created on: 30.08.23
+
+"""

compensation/tests/ecoaccount/unit/test_models.py

@@ -0,0 +1,128 @@
+"""
+Author: Michel Peltriaux
+Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
+Contact: ksp-servicestelle@sgdnord.rlp.de
+Created on: 30.08.23
+
+"""
+from django.core.exceptions import ObjectDoesNotExist
+from django.urls import reverse
+
+from compensation.models import EcoAccountDocument
+from konova.tests.test_views import BaseTestCase
+from konova.utils.message_templates import DOCUMENT_REMOVED_TEMPLATE, DEDUCTION_REMOVED
+from user.models import UserAction
+
+
+class EcoAccountTestCase(BaseTestCase):
+
+    def setUp(self) -> None:
+        super().setUp()
+
+    def test_str(self):
+        self.assertEqual(str(self.eco_account), f"{self.eco_account.identifier} ({self.eco_account.title})")
+
+    def test_save(self):
+        old_id = self.eco_account.identifier
+        self.assertIsNotNone(self.eco_account.identifier)
+        self.eco_account.identifier = None
+        self.eco_account.save()
+        self.assertIsNotNone(self.eco_account.identifier)
+        self.assertNotEqual(old_id, self.eco_account.identifier)
+
+    def test_property_deductions_surface_sum(self):
+        self.assertEqual(
+            self.eco_account.deductions_surface_sum,
+            self.eco_account.get_deductions_surface()
+        )
+
+    def test_get_documents(self):
+        docs = self.eco_account.get_documents()
+        self.assertEqual(docs.count(), 0)
+        doc = self.create_dummy_document(EcoAccountDocument, self.eco_account)
+        self.assertIn(doc, self.eco_account.get_documents())
+
+    def test_get_share_link(self):
+        self.assertEqual(
+            self.eco_account.get_share_link(),
+            reverse(
+                "compensation:acc:share-token",
+                args=(self.eco_account.id, self.eco_account.access_token)
+            )
+        )
+
+    def test_get_deductable_rest_relative(self):
+        self.assertEqual(self.eco_account.deductions.count(), 0)
+        self.eco_account.deductable_surface = 5.0
+        self.eco_account.save()
+        self.eco_account.update_deductable_rest()
+
+        self.assertEqual(self.eco_account.get_deductable_rest_relative(), 100)
+        self.eco_account.deductable_surface = None
+        self.eco_account.save()
+        self.assertEqual(self.eco_account.get_deductable_rest_relative(), 0)
+
+
+class EcoAccountDocumentTestCase(BaseTestCase):
+    def setUp(self) -> None:
+        super().setUp()
+
+    def test_delete(self):
+        doc = self.create_dummy_document(
+            EcoAccountDocument,
+            self.eco_account
+        )
+        doc_title = doc.title
+        docs = self.eco_account.get_documents()
+        self.assertIn(doc, docs)
+
+        doc.delete(user=self.superuser)
+        last_log = self.eco_account.log.first()
+        self.assertEqual(last_log.user, self.superuser)
+        self.assertEqual(last_log.action, UserAction.EDITED)
+        self.assertEqual(last_log.comment, DOCUMENT_REMOVED_TEMPLATE.format(
+            doc_title
+        ))
+        try:
+            doc.refresh_from_db()
+            self.fail("Document should not have been fetchable")
+        except ObjectDoesNotExist:
+            pass
+
+
+class EcoAccountDeductionTestCase(BaseTestCase):
+    def setUp(self) -> None:
+        super().setUp()
+
+    def test_str(self):
+        self.assertEqual(str(self.deduction), f"{self.deduction.surface} of {self.deduction.account}")
+
+    def test_delete(self):
+        self.deduction.account = self.eco_account
+        self.deduction.intervention = self.intervention
+        self.deduction.save()
+
+        self.eco_account.update_deductable_rest()
+        old_deductable_rest = self.eco_account.deductable_rest
+        deduction_surface = self.deduction.surface
+
+        self.deduction.delete(self.superuser)
+
+        last_log_intervention = self.intervention.log.first()
+        last_log_account = self.eco_account.log.first()
+        logs = [
+            last_log_intervention,
+            last_log_account,
+        ]
+        for log in logs:
+            self.assertEqual(log.action, UserAction.EDITED)
+            self.assertEqual(log.user, self.superuser)
+            self.assertEqual(log.comment, DEDUCTION_REMOVED)
+
+        self.assertLess(old_deductable_rest, self.eco_account.deductable_rest)
+        self.assertEqual(old_deductable_rest + deduction_surface, self.eco_account.deductable_rest)
+        try:
+            self.deduction.refresh_from_db()
+            self.fail("Deduction still fetchable after deleting")
+        except ObjectDoesNotExist:
+            pass

compensation/utils/quality.py

@@ -30,6 +30,7 @@ class CompensationQualityChecker(AbstractQualityChecker):
         """
         after_states = self.obj.get_surface_after_states()
         before_states = self.obj.get_surface_before_states()
+
         if after_states != before_states:
             self.messages.append(
                 _("States unequal")
@@ -90,10 +91,11 @@ class EcoAccountQualityChecker(CompensationQualityChecker):
         Returns:
 
         """
-        surface = self.obj.deductable_surface
+        surface = self.obj.deductable_surface or 0
-        if surface is None or surface == 0:
+        is_surface_invalid = surface == 0
+        if is_surface_invalid:
             self._add_missing_attr_name(_("Available Surface"))
-        after_state_surface = self.obj.get_state_after_surface_sum()
+        after_state_surface = self.obj.get_surface_after_states()
         if surface > after_state_surface:
             self.messages.append(
                 _("Deductable surface can not be larger than state surface")

compensation/views/compensation/compensation.py

@@ -19,15 +19,15 @@ from compensation.models import Compensation
 from compensation.tables.compensation import CompensationTable
 from intervention.models import Intervention
 from konova.contexts import BaseContext
-from konova.decorators import shared_access_required, default_group_required, any_group_check, login_required_modal
+from konova.decorators import shared_access_required, default_group_required, any_group_check, login_required_modal, \
+    uuid_required
 from konova.forms import SimpleGeomForm
 from konova.forms.modals import RemoveModalForm
 from konova.settings import DEFAULT_GROUP, ZB_GROUP, ETS_GROUP
 from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.message_templates import COMPENSATION_REMOVED_TEMPLATE, DATA_CHECKED_PREVIOUSLY_TEMPLATE, \
-    RECORDED_BLOCKS_EDIT, CHECKED_RECORDED_RESET, FORM_INVALID, PARAMS_INVALID, IDENTIFIER_REPLACED, \
+    RECORDED_BLOCKS_EDIT, CHECK_STATE_RESET, FORM_INVALID, PARAMS_INVALID, IDENTIFIER_REPLACED, \
-    COMPENSATION_ADDED_TEMPLATE
+    COMPENSATION_ADDED_TEMPLATE, DO_NOT_FORGET_TO_SHARE, GEOMETRY_SIMPLIFIED
-from konova.utils.user_checks import in_group
 
 
 @login_required
@@ -46,6 +46,8 @@ def index_view(request: HttpRequest):
     compensations = Compensation.objects.filter(
         deleted=None,  # only show those which are not deleted individually
         intervention__deleted=None,  # and don't show the ones whose intervention has been deleted
+    ).order_by(
+        "-modified__timestamp"
     )
     table = CompensationTable(
         request=request,
@@ -101,6 +103,11 @@ def new_view(request: HttpRequest, intervention_id: str = None):
                     )
                 )
             messages.success(request, COMPENSATION_ADDED_TEMPLATE.format(comp.identifier))
+            if geom_form.geometry_simplified:
+                messages.info(
+                    request,
+                    GEOMETRY_SIMPLIFIED
+                )
             return redirect("compensation:detail", id=comp.id)
         else:
             messages.error(request, FORM_INVALID, extra_tags="danger",)
@@ -163,16 +170,20 @@ def edit_view(request: HttpRequest, id: str):
     geom_form = SimpleGeomForm(request.POST or None, read_only=False, instance=comp)
     if request.method == "POST":
         if data_form.is_valid() and geom_form.is_valid():
-            # Preserve state of intervention recorded/checked to determine whether the user must be informed or not
+            # Preserve state of intervention checked to determine whether the user must be informed or not
-            # about a change of the recorded/checked state
+            # about a change of the check state
-            intervention_recorded = comp.intervention.recorded is not None
+            intervention_is_checked = comp.intervention.checked is not None
-            intervention_checked = comp.intervention.checked is not None
 
             # The data form takes the geom form for processing, as well as the performing user
             comp = data_form.save(request.user, geom_form)
-            if intervention_recorded or intervention_checked:
+            if intervention_is_checked:
-                messages.info(request, CHECKED_RECORDED_RESET)
+                messages.info(request, CHECK_STATE_RESET)
             messages.success(request, _("Compensation {} edited").format(comp.identifier))
+            if geom_form.geometry_simplified:
+                messages.info(
+                    request,
+                    GEOMETRY_SIMPLIFIED
+                )
             return redirect("compensation:detail", id=comp.id)
         else:
             messages.error(request, FORM_INVALID, extra_tags="danger",)
@@ -190,6 +201,7 @@ def edit_view(request: HttpRequest, id: str):
 
 @login_required
 @any_group_check
+@uuid_required
 def detail_view(request: HttpRequest, id: str):
     """ Renders a detail view for a compensation
 
@@ -201,7 +213,16 @@ def detail_view(request: HttpRequest, id: str):
 
     """
     template = "compensation/detail/compensation/view.html"
-    comp = get_object_or_404(Compensation, id=id)
+    comp = get_object_or_404(
+        Compensation.objects.select_related(
+            "modified",
+            "created",
+            "geometry"
+        ),
+        id=id,
+        deleted=None,
+        intervention__deleted=None,
+    )
     geom_form = SimpleGeomForm(instance=comp)
     parcels = comp.get_underlying_parcels()
     _user = request.user
@@ -214,8 +235,8 @@ def detail_view(request: HttpRequest, id: str):
 
     # Precalculate logical errors between before- and after-states
     # Sum() returns None in case of no states, so we catch that and replace it with 0 for easier handling
-    sum_before_states = before_states.aggregate(Sum("surface"))["surface__sum"] or 0
+    sum_before_states = comp.get_surface_before_states()
-    sum_after_states = after_states.aggregate(Sum("surface"))["surface__sum"] or 0
+    sum_after_states = comp.get_surface_after_states()
     diff_states = abs(sum_before_states - sum_after_states)
 
     request = comp.set_status_messages(request)
@@ -225,6 +246,13 @@ def detail_view(request: HttpRequest, id: str):
     if last_checked:
         last_checked_tooltip = DATA_CHECKED_PREVIOUSLY_TEMPLATE.format(last_checked.get_timestamp_str_formatted(), last_checked.user)
 
+    requesting_user_is_only_shared_user = comp.is_only_shared_with(_user)
+    if requesting_user_is_only_shared_user:
+        messages.info(
+            request,
+            DO_NOT_FORGET_TO_SHARE
+        )
+
     context = {
         "obj": comp,
         "last_checked": last_checked,
@@ -238,9 +266,9 @@ def detail_view(request: HttpRequest, id: str):
         "sum_before_states": sum_before_states,
         "sum_after_states": sum_after_states,
         "diff_states": diff_states,
-        "is_default_member": in_group(_user, DEFAULT_GROUP),
+        "is_default_member": _user.in_group(DEFAULT_GROUP),
-        "is_zb_member": in_group(_user, ZB_GROUP),
+        "is_zb_member": _user.in_group(ZB_GROUP),
-        "is_ets_member": in_group(_user, ETS_GROUP),
+        "is_ets_member": _user.in_group(ETS_GROUP),
         "LANIS_LINK": comp.get_LANIS_link(),
         TAB_TITLE_IDENTIFIER: f"{comp.identifier} - {comp.title}",
         "has_finished_deadlines": comp.get_finished_deadlines().exists(),

compensation/views/compensation/report.py

@@ -73,6 +73,7 @@ def report_view(request: HttpRequest, id: str):
         "geom_form": geom_form,
         "parcels": parcels,
         "actions": actions,
+        "tables_scrollable": False,
         TAB_TITLE_IDENTIFIER: tab_title,
     }
     context = BaseContext(request, context).context

compensation/views/eco_account/eco_account.py

@@ -13,18 +13,17 @@ from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
-from compensation.forms.eco_account import EditEcoAccountForm, NewEcoAccountForm
+from compensation.forms.eco_account import EditEcoAccountForm, NewEcoAccountForm, RemoveEcoAccountModalForm
 from compensation.models import EcoAccount
 from compensation.tables.eco_account import EcoAccountTable
 from konova.contexts import BaseContext
-from konova.decorators import shared_access_required, default_group_required, any_group_check, login_required_modal
+from konova.decorators import shared_access_required, default_group_required, any_group_check, login_required_modal, \
+    uuid_required
 from konova.forms import SimpleGeomForm
-from konova.forms.modals import RemoveModalForm
 from konova.settings import ETS_GROUP, DEFAULT_GROUP, ZB_GROUP
 from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.message_templates import CANCEL_ACC_RECORDED_OR_DEDUCTED, RECORDED_BLOCKS_EDIT, FORM_INVALID, \
-    IDENTIFIER_REPLACED
+    IDENTIFIER_REPLACED, DO_NOT_FORGET_TO_SHARE, GEOMETRY_SIMPLIFIED
-from konova.utils.user_checks import in_group
 
 
 @login_required
@@ -42,6 +41,8 @@ def index_view(request: HttpRequest):
     template = "generic_index.html"
     eco_accounts = EcoAccount.objects.filter(
         deleted=None,
+    ).order_by(
+        "-modified__timestamp"
     )
     table = EcoAccountTable(
         request=request,
@@ -83,6 +84,11 @@ def new_view(request: HttpRequest):
                     )
                 )
             messages.success(request, _("Eco-Account {} added").format(acc.identifier))
+            if geom_form.geometry_simplified:
+                messages.info(
+                    request,
+                    GEOMETRY_SIMPLIFIED
+                )
             return redirect("compensation:acc:detail", id=acc.id)
         else:
             messages.error(request, FORM_INVALID, extra_tags="danger",)
@@ -144,10 +150,17 @@ def edit_view(request: HttpRequest, id: str):
     data_form = EditEcoAccountForm(request.POST or None, instance=acc)
     geom_form = SimpleGeomForm(request.POST or None, read_only=False, instance=acc)
     if request.method == "POST":
-        if data_form.is_valid() and geom_form.is_valid():
+        data_form_valid = data_form.is_valid()
+        geom_form_valid = geom_form.is_valid()
+        if data_form_valid and geom_form_valid:
             # The data form takes the geom form for processing, as well as the performing user
             acc = data_form.save(request.user, geom_form)
             messages.success(request, _("Eco-Account {} edited").format(acc.identifier))
+            if geom_form.geometry_simplified:
+                messages.info(
+                    request,
+                    GEOMETRY_SIMPLIFIED
+                )
             return redirect("compensation:acc:detail", id=acc.id)
         else:
             messages.error(request, FORM_INVALID, extra_tags="danger",)
@@ -165,6 +178,7 @@ def edit_view(request: HttpRequest, id: str):
 
 @login_required
 @any_group_check
+@uuid_required
 def detail_view(request: HttpRequest, id: str):
     """ Renders a detail view for a compensation
 
@@ -183,7 +197,8 @@ def detail_view(request: HttpRequest, id: str):
             'geometry',
             'responsible',
         ),
-        id=id
+        id=id,
+        deleted=None,
     )
     geom_form = SimpleGeomForm(instance=acc)
     parcels = acc.get_underlying_parcels()
@@ -196,11 +211,12 @@ def detail_view(request: HttpRequest, id: str):
 
     # Precalculate logical errors between before- and after-states
     # Sum() returns None in case of no states, so we catch that and replace it with 0 for easier handling
-    sum_before_states = before_states.aggregate(Sum("surface"))["surface__sum"] or 0
+    sum_before_states = acc.get_surface_before_states()
-    sum_after_states = after_states.aggregate(Sum("surface"))["surface__sum"] or 0
+    sum_after_states = acc.get_surface_after_states()
     diff_states = abs(sum_before_states - sum_after_states)
     # Calculate rest of available surface for deductions
-    available_total, available_relative = acc.get_available_rest()
+    available_total = acc.deductable_rest
+    available_relative = acc.get_deductable_rest_relative()
 
     # Prefetch related data to decrease the amount of db connections
     deductions = acc.deductions.filter(
@@ -210,6 +226,13 @@ def detail_view(request: HttpRequest, id: str):
 
     request = acc.set_status_messages(request)
 
+    requesting_user_is_only_shared_user = acc.is_only_shared_with(_user)
+    if requesting_user_is_only_shared_user:
+        messages.info(
+            request,
+            DO_NOT_FORGET_TO_SHARE
+        )
+
     context = {
         "obj": acc,
         "geom_form": geom_form,
@@ -222,9 +245,9 @@ def detail_view(request: HttpRequest, id: str):
         "diff_states": diff_states,
         "available": available_relative,
         "available_total": available_total,
-        "is_default_member": in_group(_user, DEFAULT_GROUP),
+        "is_default_member": _user.in_group(DEFAULT_GROUP),
-        "is_zb_member": in_group(_user, ZB_GROUP),
+        "is_zb_member": _user.in_group(ZB_GROUP),
-        "is_ets_member": in_group(_user, ETS_GROUP),
+        "is_ets_member": _user.in_group(ETS_GROUP),
         "LANIS_LINK": acc.get_LANIS_link(),
         "deductions": deductions,
         "actions": actions,
@@ -255,11 +278,11 @@ def remove_view(request: HttpRequest, id: str):
     # default group user
     if acc.recorded is not None or acc.deductions.exists():
         user = request.user
-        if not in_group(user, ETS_GROUP):
+        if not user.in_group(ETS_GROUP):
             messages.info(request, CANCEL_ACC_RECORDED_OR_DEDUCTED)
             return redirect("compensation:acc:detail", id=id)
 
-    form = RemoveModalForm(request.POST or None, instance=acc, request=request)
+    form = RemoveEcoAccountModalForm(request.POST or None, instance=acc, request=request)
     return form.process_request(
         request=request,
         msg_success=_("Eco-account removed"),

compensation/views/eco_account/report.py

@@ -80,6 +80,7 @@ def report_view(request: HttpRequest, id: str):
         "parcels": parcels,
         "actions": actions,
         "deductions": deductions,
+        "tables_scrollable": False,
         TAB_TITLE_IDENTIFIER: tab_title,
     }
     context = BaseContext(request, context).context

ema/admin.py

@@ -6,12 +6,15 @@ from ema.models import Ema
 
 class EmaAdmin(AbstractCompensationAdmin):
     filter_horizontal = [
-        "users"
+        "users",
+        "teams",
     ]
 
     def get_fields(self, request, obj=None):
         return super().get_fields(request, obj) + [
-            "users"
+            "users",
+            "teams",
         ]
 
+
 admin.site.register(Ema, EmaAdmin)

ema/forms.py

@@ -64,8 +64,6 @@ class NewEmaForm(AbstractCompensationForm, CompensationResponsibleFormMixin, Pik
 
             # Create log entry
             action = UserActionLogEntry.get_created_action(user)
-            # Process the geometry form
-            geometry = geom_form.save(action)
 
             handler = Handler.objects.create(
                 type=handler_type,
@@ -78,22 +76,27 @@ class NewEmaForm(AbstractCompensationForm, CompensationResponsibleFormMixin, Pik
             )
 
             # Finally create main object
-            acc = Ema.objects.create(
+            ema = Ema.objects.create(
                 identifier=identifier,
                 title=title,
                 responsible=responsible,
                 created=action,
-                geometry=geometry,
+                modified=action,
                 comment=comment,
                 is_pik=is_pik,
             )
 
             # Add the creating user to the list of shared users
-            acc.share_with_user(user)
+            ema.share_with_user(user)
 
             # Add the log entry to the main objects log list
-            acc.log.add(action)
+            ema.log.add(action)
-        return acc
+
+        # Process the geometry form (NOT ATOMIC TRANSACTION DUE TO CELERY!)
+        geometry = geom_form.save(action)
+        ema.geometry = geometry
+        ema.save()
+        return ema
 
 
 class EditEmaForm(NewEmaForm):
@@ -130,7 +133,6 @@ class EditEmaForm(NewEmaForm):
     def save(self, user: User, geom_form: SimpleGeomForm):
         with transaction.atomic():
             # Fetch data from cleaned POST values
-            identifier = self.cleaned_data.get("identifier", None)
             title = self.cleaned_data.get("title", None)
             handler_type = self.cleaned_data.get("handler_type", None)
             handler_detail = self.cleaned_data.get("handler_detail", None)
@@ -141,8 +143,6 @@ class EditEmaForm(NewEmaForm):
 
             # Create log entry
             action = UserActionLogEntry.get_edited_action(user)
-            # Process the geometry form
-            geometry = geom_form.save(action)
 
             # Update responsible data
             self.instance.responsible.handler.type = handler_type
@@ -153,9 +153,7 @@ class EditEmaForm(NewEmaForm):
             self.instance.responsible.save()
 
             # Update main oject data
-            self.instance.identifier = identifier
             self.instance.title = title
-            self.instance.geometry = geometry
             self.instance.comment = comment
             self.instance.is_pik = is_pik
             self.instance.modified = action
@@ -163,6 +161,11 @@ class EditEmaForm(NewEmaForm):
 
             # Add the log entry to the main objects log list
             self.instance.log.add(action)
+
+        # Process the geometry form (NOT ATOMIC TRANSACTION DUE TO CELERY!)
+        geometry = geom_form.save(action)
+        self.instance.geometry = geometry
+        self.instance.save()
         return self.instance
 
 

ema/migrations/0008_auto_20221116_1322.py

@@ -0,0 +1,26 @@
+# Generated by Django 3.1.3 on 2022-11-16 12:22
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user', '0006_auto_20220815_0759'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('ema', '0007_auto_20220815_1030'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='ema',
+            name='teams',
+            field=models.ManyToManyField(blank=True, help_text='Teams having access (data shared with)', to='user.Team'),
+        ),
+        migrations.AlterField(
+            model_name='ema',
+            name='users',
+            field=models.ManyToManyField(blank=True, help_text='Users having access (data shared with)', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

ema/migrations/0009_alter_ema_after_states_alter_ema_before_states_and_more.py

@@ -0,0 +1,35 @@
+# Generated by Django 4.2.6 on 2023-11-30 11:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('compensation', '0015_alter_compensation_after_states_and_more'),
+        ('konova', '0014_resubmission'),
+        ('ema', '0008_auto_20221116_1322'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='ema',
+            name='after_states',
+            field=models.ManyToManyField(blank=True, help_text="Refers to 'Zielzustand Biotop'", related_name='+', to='compensation.compensationstate'),
+        ),
+        migrations.AlterField(
+            model_name='ema',
+            name='before_states',
+            field=models.ManyToManyField(blank=True, help_text="Refers to 'Ausgangszustand Biotop'", related_name='+', to='compensation.compensationstate'),
+        ),
+        migrations.AlterField(
+            model_name='ema',
+            name='deadlines',
+            field=models.ManyToManyField(blank=True, related_name='+', to='konova.deadline'),
+        ),
+        migrations.AlterField(
+            model_name='ema',
+            name='resubmissions',
+            field=models.ManyToManyField(blank=True, related_name='+', to='konova.resubmission'),
+        ),
+    ]

ema/models/ema.py

@@ -15,8 +15,11 @@ from django.urls import reverse
 
 from compensation.models import AbstractCompensation, PikMixin
 from ema.managers import EmaManager
+from ema.settings import EMA_IDENTIFIER_LENGTH, EMA_IDENTIFIER_TEMPLATE, EMA_LANIS_LAYER_NAME_RECORDED, \
+    EMA_LANIS_LAYER_NAME_UNRECORDED
 from ema.utils.quality import EmaQualityChecker
 from konova.models import AbstractDocument, generate_document_file_upload_path, RecordableObjectMixin, ShareableObjectMixin
+from konova.sub_settings.django_settings import BASE_URL
 from konova.utils.message_templates import DATA_UNSHARED_EXPLANATION, DOCUMENT_REMOVED_TEMPLATE
 
 
@@ -38,9 +41,18 @@ class Ema(AbstractCompensation, ShareableObjectMixin, RecordableObjectMixin, Pik
     """
     objects = EmaManager()
 
+    identifier_length = EMA_IDENTIFIER_LENGTH
+    identifier_template = EMA_IDENTIFIER_TEMPLATE
+
     def __str__(self):
         return "{}".format(self.identifier)
 
+    def get_detail_url(self):
+        return reverse("ema:detail", args=(self.id,))
+
+    def get_detail_url_absolute(self):
+        return BASE_URL + self.get_detail_url()
+
     def save(self, *args, **kwargs):
         if self.identifier is None or len(self.identifier) == 0:
             # Create new identifier
@@ -105,6 +117,20 @@ class Ema(AbstractCompensation, ShareableObjectMixin, RecordableObjectMixin, Pik
         """
         return reverse("ema:share-token", args=(self.id, self.access_token))
 
+    def get_lanis_layer_name(self):
+        """ Getter for specific LANIS/WFS object layer
+
+        Returns:
+
+        """
+        retval = None
+        if self.is_recorded:
+            retval = EMA_LANIS_LAYER_NAME_RECORDED
+        else:
+            retval = EMA_LANIS_LAYER_NAME_UNRECORDED
+
+        return retval
+
 
 class EmaDocument(AbstractDocument):
     """
@@ -122,7 +148,7 @@ class EmaDocument(AbstractDocument):
 
     def delete(self, user=None, *args, **kwargs):
         """
-        Custom delete functionality for EcoAccountDocuments.
+        Custom delete functionality for EmaDocuments.
         Removes the folder from the file system if there are no further documents for this entry.
 
         Args:
@@ -139,8 +165,11 @@ class EmaDocument(AbstractDocument):
             # The only file left for this EMA is the one which is currently processed and will be deleted
             # Make sure that the compensation folder itself is deleted as well, not only the file
             # Therefore take the folder path from the file path
-            folder_path = self.file.path.split("/")[:-1]
+            try:
-            folder_path = "/".join(folder_path)
+                folder_path = self.file.path.split("/")[:-1]
+                folder_path = "/".join(folder_path)
+            except ValueError:
+                folder_path = None
 
         if user:
             self.instance.mark_as_edited(user, edit_comment=DOCUMENT_REMOVED_TEMPLATE.format(self.title))

ema/settings.py

@@ -6,5 +6,7 @@ Created on: 19.08.21
 
 """
 
-EMA_ACCOUNT_IDENTIFIER_LENGTH = 6
+EMA_IDENTIFIER_LENGTH = 6
-EMA_ACCOUNT_IDENTIFIER_TEMPLATE = "EMA-{}"
+EMA_IDENTIFIER_TEMPLATE = "EMA-{}"
+EMA_LANIS_LAYER_NAME_RECORDED = "ema_recorded"
+EMA_LANIS_LAYER_NAME_UNRECORDED = "ema_unrecorded"

ema/tables.py

@@ -6,21 +6,18 @@ Created on: 19.08.21
 
 """
 from django.http import HttpRequest
-from django.template.loader import render_to_string
 from django.utils.html import format_html
-from django.utils.timezone import localtime
 from django.utils.translation import gettext_lazy as _
 from django.urls import reverse
 
 import django_tables2 as tables
 
-from konova.sub_settings.django_settings import DEFAULT_DATE_TIME_FORMAT
+from konova.utils.tables import BaseTable, TableRenderMixin, TableOrderMixin
-from konova.utils.tables import BaseTable, TableRenderMixin
 from ema.filters import EmaTableFilter
 from ema.models import Ema
 
 
-class EmaTable(BaseTable, TableRenderMixin):
+class EmaTable(BaseTable, TableRenderMixin, TableOrderMixin):
     """
     Since EMA and compensation are basically the same, we can reuse CompensationTableFilter and extend the EMA filter
     in the future by inheriting.
@@ -37,7 +34,7 @@ class EmaTable(BaseTable, TableRenderMixin):
     )
     d = tables.Column(
         verbose_name=_("Parcel gmrkng"),
-        orderable=True,
+        orderable=False,
         accessor="geometry",
     )
     r = tables.Column(
@@ -93,28 +90,6 @@ class EmaTable(BaseTable, TableRenderMixin):
         )
         return format_html(html)
 
-    def render_d(self, value, record: Ema):
-        """ Renders the parcel district column for a ema
-
-        Args:
-            value (str): The geometry
-            record (Ema): The ema record
-
-        Returns:
-
-        """
-        parcels = value.get_underlying_parcels().values_list(
-            "parcel_group__name",
-            flat=True
-        ).distinct()
-        html = render_to_string(
-            "table/gmrkng_col.html",
-            {
-                "entries": parcels
-            }
-        )
-        return html
-
     def render_r(self, value, record: Ema):
         """ Renders the registered column for a EMA
 
@@ -136,22 +111,3 @@ class EmaTable(BaseTable, TableRenderMixin):
             icn_filled=recorded,
         )
         return format_html(html)
-
-    def render_e(self, value, record: Ema):
-        """ Renders the editable column for a EMA
-
-        Args:
-            value (str): The identifier value
-            record (Ema): The EMA record
-
-        Returns:
-
-        """
-        html = ""
-        has_access = record.is_shared_with(self.user)
-
-        html += self.render_icn(
-            tooltip=_("Full access granted") if has_access else _("Access not granted"),
-            icn_class="fas fa-edit rlp-r-inv" if has_access else "far fa-edit",
-        )
-        return format_html(html)

ema/templates/ema/detail/includes/actions.html

@@ -20,7 +20,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -71,6 +71,10 @@
                     {% endif %}
                 </td>
             </tr>
+            {% empty %}
+            <div class="alert alert-danger mb-0">
+                {% trans 'Missing' %}
+            </div>
             {% endfor %}
             </tbody>
         </table>

ema/templates/ema/detail/includes/deadlines.html

@@ -25,7 +25,7 @@
         {% trans 'Missing finished deadline ' %}
     </div>
     {% endif %}
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
         <table class="table table-hover">
             <thead>
             <tr>

ema/templates/ema/detail/includes/documents.html

@@ -20,7 +20,7 @@
             </div>
         </div>
     </div>
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
         <table class="table table-hover">
             <thead>
             <tr>

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

@@ -25,7 +25,7 @@
         {% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m²
     </div>
     {% endif %}
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -66,6 +66,10 @@
                     {% endif %}
                 </td>
             </tr>
+            {% empty %}
+            <div class="alert alert-danger mb-0">
+                {% trans 'Missing' %}
+            </div>
             {% endfor %}
             </tbody>
         </table>

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

@@ -25,7 +25,7 @@
         {% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m²
     </div>
     {% endif %}
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
         <table class="table table-hover">
             <thead>
             <tr>
@@ -66,6 +66,10 @@
                     {% endif %}
                 </td>
             </tr>
+            {% empty %}
+            <div class="alert alert-danger mb-0">
+                {% trans 'Missing' %}
+            </div>
             {% endfor %}
             </tbody>
         </table>

ema/tests/test_workflow.py

@@ -62,6 +62,7 @@ class EmaWorkflowTestCase(BaseWorkflowTestCase):
         self.assertEqual(ema.title, test_title)
         self.assert_equal_geometries(ema.geometry.geom, test_geom)
         self.assertEqual(ema.log.count(), 1)
+        self.assertEqual(ema.created, ema.modified)
 
         # Expect logs to be set
         self.assertEqual(ema.log.count(), 1)
@@ -79,6 +80,7 @@ class EmaWorkflowTestCase(BaseWorkflowTestCase):
         self.ema = self.fill_out_ema(self.ema)
         pre_edit_log_count = self.ema.log.count()
 
+        old_identifier = self.ema.identifier
         new_title = self.create_dummy_string()
         new_identifier = self.create_dummy_string()
         new_comment = self.create_dummy_string()
@@ -105,13 +107,13 @@ class EmaWorkflowTestCase(BaseWorkflowTestCase):
 
         check_on_elements = {
             self.ema.title: new_title,
-            self.ema.identifier: new_identifier,
             self.ema.comment: new_comment,
         }
 
         for k, v in check_on_elements.items():
             self.assertEqual(k, v)
 
+        self.assertEqual(self.ema.identifier, old_identifier)
         self.assert_equal_geometries(self.ema.geometry.geom, new_geometry)
 
         # Expect logs to be set

ema/tests/unit/__init__.py

@@ -0,0 +1,7 @@
+"""
+Author: Michel Peltriaux
+Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
+Contact: ksp-servicestelle@sgdnord.rlp.de
+Created on: 24.08.23
+
+"""

ema/tests/unit/test_forms.py

@@ -0,0 +1,141 @@
+"""
+Author: Michel Peltriaux
+Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
+Contact: ksp-servicestelle@sgdnord.rlp.de
+Created on: 01.09.23
+
+"""
+import json
+
+from django.urls import reverse
+from django.utils.translation import gettext_lazy as _
+
+from ema.forms import NewEmaForm, EditEmaForm
+from konova.forms import SimpleGeomForm
+from konova.tests.test_views import BaseTestCase
+from konova.utils.generators import generate_random_string
+from user.models import UserAction
+
+
+class NewEmaFormTestCase(BaseTestCase):
+
+    def setUp(self) -> None:
+        super().setUp()
+
+    def test_init(self):
+        form = NewEmaForm()
+        self.assertEqual(form.form_title, str(_("New EMA")))
+        self.assertEqual(form.action_url, reverse("ema:new"))
+        self.assertEqual(form.cancel_redirect, reverse("ema:index"))
+        self.assertIsNotNone(form.fields["identifier"].initial)
+        self.assertEqual(form.fields["title"].widget.attrs["placeholder"], str(_("Compensation XY; Location ABC")))
+
+    def test_save(self):
+        cons_office_code = self.get_conservation_office_code()
+        data = {
+            "identifier": generate_random_string(length=20, use_numbers=True),
+            "title": generate_random_string(length=20, use_letters_lc=True),
+            "conservation_office": cons_office_code,
+            "conservation_file_number": generate_random_string(length=10, use_numbers=True),
+            "is_pik": True,
+            "comment": generate_random_string(length=20, use_numbers=True, use_letters_uc=True),
+        }
+        form = NewEmaForm(data)
+
+        test_geom = self.create_dummy_geometry()
+        geom_form_data = self.create_geojson(
+            test_geom
+        )
+        geom_form_data = json.loads(geom_form_data)
+        geom_form_data = {
+            "geom": json.dumps(geom_form_data)
+        }
+
+        geom_form = SimpleGeomForm(geom_form_data)
+        self.assertTrue(form.is_valid(), msg=form.errors)
+        self.assertTrue(geom_form.is_valid(), msg=form.errors)
+
+        obj = form.save(user=self.superuser, geom_form=geom_form)
+        self.assertEqual(obj.title, data["title"])
+        self.assertEqual(obj.is_pik, data["is_pik"])
+        self.assertIsNotNone(obj.responsible)
+        self.assertIsNotNone(obj.responsible.handler)
+        self.assertEqual(obj.responsible.conservation_office, data["conservation_office"])
+        self.assertEqual(obj.responsible.conservation_file_number, data["conservation_file_number"])
+        self.assertEqual(obj.identifier, data["identifier"])
+        self.assertEqual(obj.comment, data["comment"])
+
+        self.assertIn(self.superuser, obj.shared_users)
+
+        last_log = obj.log.first()
+        self.assertEqual(obj.created, obj.modified)
+        self.assertEqual(obj.created, last_log)
+        self.assertEqual(last_log.action, UserAction.CREATED)
+        self.assertEqual(last_log.user, self.superuser)
+        self.assertTrue(test_geom.equals_exact(obj.geometry.geom, 0.000001))
+
+
+class EditEmaFormTestCase(BaseTestCase):
+    def test_init(self):
+        form = EditEmaForm(instance=self.ema)
+        self.assertEqual(form.form_title, str(_("Edit EMA")))
+        self.assertEqual(form.action_url, reverse("ema:edit", args=(self.ema.id,)))
+        self.assertEqual(form.cancel_redirect, reverse("ema:detail", args=(self.ema.id,)))
+        self.assertEqual(form.fields["identifier"].widget.attrs["url"], reverse("ema:new-id"))
+        self.assertEqual(form.fields["title"].widget.attrs["placeholder"], str(_("Compensation XY; Location ABC")))
+
+        values = {
+            "identifier": self.ema.identifier,
+            "title": self.ema.title,
+            "comment": self.ema.comment,
+            "conservation_office": self.ema.responsible.conservation_office,
+            "conservation_file_number": self.ema.responsible.conservation_file_number,
+            "is_pik": self.ema.is_pik,
+            "handler_type": self.ema.responsible.handler.type,
+            "handler_detail": self.ema.responsible.handler.detail,
+        }
+        for k, v in values.items():
+            self.assertEqual(form.fields[k].initial, v)
+
+    def test_save(self):
+        cons_office_code = self.get_conservation_office_code()
+        data = {
+            "identifier": generate_random_string(length=20, use_numbers=True),
+            "title": generate_random_string(length=20, use_letters_lc=True),
+            "conservation_office": cons_office_code,
+            "conservation_file_number": generate_random_string(length=10, use_numbers=True),
+            "is_pik": not self.ema.is_pik,
+            "comment": generate_random_string(length=20, use_numbers=True, use_letters_uc=True),
+        }
+        form = EditEmaForm(data, instance=self.ema)
+        self.assertTrue(form.is_valid(), msg=form.errors)
+
+        test_geom = self.create_dummy_geometry()
+        geom_form_data = self.create_geojson(
+            test_geom
+        )
+        geom_form_data = json.loads(geom_form_data)
+        geom_form_data = {
+            "geom": json.dumps(geom_form_data)
+        }
+
+        geom_form = SimpleGeomForm(geom_form_data)
+        self.assertTrue(geom_form.is_valid())
+
+        obj = form.save(self.superuser, geom_form)
+        self.assertEqual(obj.id, self.ema.id)
+        self.assertEqual(obj.title, data["title"])
+        self.assertEqual(obj.is_pik, data["is_pik"])
+        self.assertIsNotNone(obj.responsible)
+        self.assertIsNotNone(obj.responsible.handler)
+        self.assertEqual(obj.responsible.conservation_office, data["conservation_office"])
+        self.assertEqual(obj.responsible.conservation_file_number, data["conservation_file_number"])
+        self.assertNotEqual(obj.identifier, data["identifier"], msg="Identifier editable via form!")
+        self.assertEqual(obj.comment, data["comment"])
+
+        last_log = obj.log.first()
+        self.assertEqual(obj.modified, last_log)
+        self.assertEqual(last_log.action, UserAction.EDITED)
+        self.assertEqual(last_log.user, self.superuser)
+        self.assertTrue(test_geom.equals_exact(obj.geometry.geom, 0.000001))
+

ema/tests/unit/test_models.py

@@ -0,0 +1,90 @@
+"""
+Author: Michel Peltriaux
+Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
+Contact: ksp-servicestelle@sgdnord.rlp.de
+Created on: 24.08.23
+
+"""
+from django.urls import reverse
+from django.utils.timezone import now
+
+from ema.models import Ema, EmaDocument
+from ema.settings import EMA_IDENTIFIER_TEMPLATE
+from konova.tests.test_views import BaseTestCase
+from konova.utils.message_templates import DOCUMENT_REMOVED_TEMPLATE
+from user.models import UserAction
+
+
+class EmaModelTestCase(BaseTestCase):
+    def setUp(self) -> None:
+        super().setUp()
+
+    def test_str(self):
+        self.assertEqual(str(self.ema), f"{self.ema.identifier}")
+
+    def test_save(self):
+        new_ema = Ema(
+            title="Test"
+        )
+        self.assertIsNone(new_ema.identifier)
+
+        new_ema.save()
+        new_ema.refresh_from_db()
+
+        self.assertIsNotNone(new_ema.identifier)
+        self.assertIn("EMA-", new_ema.identifier)
+
+    def test_is_ready_for_publish(self):
+        self.assertIsNone(self.ema.recorded)
+        self.assertFalse(self.ema.is_ready_for_publish())
+
+        self.ema.set_recorded(self.superuser)
+        self.ema.refresh_from_db()
+        self.assertIsNotNone(self.ema.recorded)
+        self.assertTrue(self.ema.is_ready_for_publish())
+
+    def test_get_share_link(self):
+        self.assertEqual(
+            self.ema.get_share_link(),
+            reverse("ema:share-token", args=(self.ema.id, self.ema.access_token))
+        )
+
+    def test_get_documents(self):
+        self.assertEqual(self.ema.get_documents().count(), 0)
+
+        doc = EmaDocument(
+            instance=self.ema,
+            date_of_creation=now().date(),
+            comment="Test",
+        )
+        doc.save()
+        docs = self.ema.get_documents()
+        self.assertEqual(docs.count(), 1)
+        self.assertEqual(docs.first(), doc)
+
+
+class EmaDocumentModelTestCase(BaseTestCase):
+    def setUp(self) -> None:
+        super().setUp()
+
+    def test_delete(self):
+        doc = EmaDocument.objects.create(
+            date_of_creation=now().date(),
+            instance=self.ema,
+            comment="TEST"
+        )
+        self.ema.refresh_from_db()
+        docs = self.ema.get_documents()
+        self.assertEqual(docs.count(), 1)
+        self.assertEqual(docs.first(), doc)
+
+        doc_title = doc.title
+        doc.delete(user=self.superuser)
+        last_log = self.ema.log.first()
+        self.assertEqual(last_log.action, UserAction.EDITED)
+        self.assertEqual(last_log.user, self.superuser)
+        self.assertEqual(last_log.comment, DOCUMENT_REMOVED_TEMPLATE.format(doc_title))
+
+        docs = self.ema.get_documents()
+        self.assertEqual(docs.count(), 0)
+

ema/views/ema.py

@@ -17,13 +17,14 @@ from ema.forms import NewEmaForm, EditEmaForm
 from ema.models import Ema
 from ema.tables import EmaTable
 from konova.contexts import BaseContext
-from konova.decorators import shared_access_required, conservation_office_group_required, login_required_modal
+from konova.decorators import shared_access_required, conservation_office_group_required, login_required_modal, \
+    uuid_required
 from konova.forms import SimpleGeomForm
 from konova.forms.modals import RemoveModalForm
 from konova.settings import DEFAULT_GROUP, ZB_GROUP, ETS_GROUP
 from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
-from konova.utils.message_templates import RECORDED_BLOCKS_EDIT, IDENTIFIER_REPLACED, FORM_INVALID
+from konova.utils.message_templates import RECORDED_BLOCKS_EDIT, IDENTIFIER_REPLACED, FORM_INVALID, \
-from konova.utils.user_checks import in_group
+    DO_NOT_FORGET_TO_SHARE, GEOMETRY_SIMPLIFIED
 
 
 @login_required
@@ -40,8 +41,9 @@ def index_view(request: HttpRequest):
     emas = Ema.objects.filter(
         deleted=None,
     ).order_by(
-        "-modified"
+        "-modified__timestamp"
     )
+
     table = EmaTable(
         request,
         queryset=emas
@@ -82,6 +84,12 @@ def new_view(request: HttpRequest):
                     )
                 )
             messages.success(request, _("EMA {} added").format(ema.identifier))
+            if geom_form.geometry_simplified:
+                messages.info(
+                    request,
+                    GEOMETRY_SIMPLIFIED
+                )
+
             return redirect("ema:detail", id=ema.id)
         else:
             messages.error(request, FORM_INVALID, extra_tags="danger",)
@@ -117,6 +125,7 @@ def new_id_view(request: HttpRequest):
 
 
 @login_required
+@uuid_required
 def detail_view(request: HttpRequest, id: str):
     """ Renders the detail view of an EMA
 
@@ -141,12 +150,19 @@ def detail_view(request: HttpRequest, id: str):
 
     # Precalculate logical errors between before- and after-states
     # Sum() returns None in case of no states, so we catch that and replace it with 0 for easier handling
-    sum_before_states = before_states.aggregate(Sum("surface"))["surface__sum"] or 0
+    sum_before_states = ema.get_surface_before_states()
-    sum_after_states = after_states.aggregate(Sum("surface"))["surface__sum"] or 0
+    sum_after_states = ema.get_surface_after_states()
     diff_states = abs(sum_before_states - sum_after_states)
 
     ema.set_status_messages(request)
 
+    requesting_user_is_only_shared_user = ema.is_only_shared_with(_user)
+    if requesting_user_is_only_shared_user:
+        messages.info(
+            request,
+            DO_NOT_FORGET_TO_SHARE
+        )
+
     context = {
         "obj": ema,
         "geom_form": geom_form,
@@ -157,9 +173,9 @@ def detail_view(request: HttpRequest, id: str):
         "sum_before_states": sum_before_states,
         "sum_after_states": sum_after_states,
         "diff_states": diff_states,
-        "is_default_member": in_group(_user, DEFAULT_GROUP),
+        "is_default_member": _user.in_group(DEFAULT_GROUP),
-        "is_zb_member": in_group(_user, ZB_GROUP),
+        "is_zb_member": _user.in_group(ZB_GROUP),
-        "is_ets_member": in_group(_user, ETS_GROUP),
+        "is_ets_member": _user.in_group(ETS_GROUP),
         "LANIS_LINK": ema.get_LANIS_link(),
         TAB_TITLE_IDENTIFIER: f"{ema.identifier} - {ema.title}",
         "has_finished_deadlines": ema.get_finished_deadlines().exists(),
@@ -199,6 +215,11 @@ def edit_view(request: HttpRequest, id: str):
             # The data form takes the geom form for processing, as well as the performing user
             ema = data_form.save(request.user, geom_form)
             messages.success(request, _("EMA {} edited").format(ema.identifier))
+            if geom_form.geometry_simplified:
+                messages.info(
+                    request,
+                    GEOMETRY_SIMPLIFIED
+                )
             return redirect("ema:detail", id=ema.id)
         else:
             messages.error(request, FORM_INVALID, extra_tags="danger",)

ema/views/report.py

@@ -73,6 +73,7 @@ def report_view(request:HttpRequest, id: str):
         "geom_form": geom_form,
         "parcels": parcels,
         "actions": actions,
+        "tables_scrollable": False,
         TAB_TITLE_IDENTIFIER: tab_title,
     }
     context = BaseContext(request, context).context

intervention/admin.py

@@ -14,7 +14,8 @@ class InterventionAdmin(BaseObjectAdmin):
     ]
 
     filter_horizontal = [
-        "users"
+        "users",
+        "teams",
     ]
 
     def get_fields(self, request, obj=None):
@@ -25,6 +26,7 @@ class InterventionAdmin(BaseObjectAdmin):
             "checked",
             "recorded",
             "users",
+            "teams",
             "geometry",
         ]
 

intervention/autocomplete/intervention.py

@@ -34,3 +34,9 @@ class InterventionAutocomplete(Select2QuerySetView):
                 Q(title__icontains=self.q)
             ).distinct()
         return qs
+
+    def get_result_label(self, result):
+        return str(result)
+
+    def get_selected_result_label(self, result):
+        return str(result)

intervention/forms/intervention.py

@@ -9,6 +9,7 @@ from dal import autocomplete
 from django import forms
 
 from konova.forms.base_form import BaseForm
+from konova.utils import validators
 from konova.utils.message_templates import EDITED_GENERAL_DATA
 from user.models import User
 from django.db import transaction
@@ -29,11 +30,12 @@ class NewInterventionForm(BaseForm):
         label=_("Identifier"),
         label_suffix="",
         max_length=255,
-        help_text=_("Generated automatically"),
+        help_text=_("Generated automatically - not editable"),
         widget=GenerateInput(
             attrs={
                 "class": "form-control",
                 "url": reverse_lazy("intervention:new-id"),
+                "readonly": True,
             }
         )
     )
@@ -174,6 +176,7 @@ class NewInterventionForm(BaseForm):
         label=_("Registration date"),
         label_suffix=_(""),
         required=False,
+        validators=[validators.reasonable_date],
         widget=forms.DateInput(
             attrs={
                 "type": "date",
@@ -186,6 +189,7 @@ class NewInterventionForm(BaseForm):
         label=_("Binding on"),
         label_suffix=_(""),
         required=False,
+        validators=[validators.reasonable_date],
         widget=forms.DateInput(
             attrs={
                 "type": "date",
@@ -263,9 +267,6 @@ class NewInterventionForm(BaseForm):
                 handler=handler,
             )
 
-            # Process the geometry form
-            geometry = geom_form.save(action)
-
             # Finally create main object, holding the other objects
             intervention = Intervention.objects.create(
                 identifier=identifier,
@@ -273,7 +274,7 @@ class NewInterventionForm(BaseForm):
                 responsible=responsibility_data,
                 legal=legal_data,
                 created=action,
-                geometry=geometry,
+                modified=action,
                 comment=comment,
             )
 
@@ -282,6 +283,12 @@ class NewInterventionForm(BaseForm):
 
             # Add the performing user as the first user having access to the data
             intervention.share_with_user(user)
+
+        # Process the geometry form (NOT ATOMIC TRANSACTION DUE TO CELERY!)
+        geometry = geom_form.save(action)
+        intervention.geometry = geometry
+        intervention.save()
+
         return intervention
 
 
@@ -338,7 +345,6 @@ class EditInterventionForm(NewInterventionForm):
 
         """
         with transaction.atomic():
-            identifier = self.cleaned_data.get("identifier", None)
             title = self.cleaned_data.get("title", None)
             process_type = self.cleaned_data.get("type", None)
             laws = self.cleaned_data.get("laws", None)
@@ -370,16 +376,18 @@ class EditInterventionForm(NewInterventionForm):
 
             user_action = self.instance.mark_as_edited(user, edit_comment=EDITED_GENERAL_DATA)
 
-            geometry = geom_form.save(user_action)
-            self.instance.geometry = geometry
-
             self.instance.log.add(user_action)
 
-            self.instance.identifier = identifier
             self.instance.title = title
             self.instance.comment = comment
             self.instance.modified = user_action
             self.instance.save()
 
+        # Process the geometry form (NOT ATOMIC TRANSACTION DUE TO CELERY!)
+        geometry = geom_form.save(user_action)
+        self.instance.geometry = geometry
+        self.instance.save()
+        self.instance.send_data_to_egon()
+
         return self.instance
 

intervention/forms/modals/check.py

@@ -33,7 +33,7 @@ class CheckModalForm(BaseModalForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.form_title = _("Run check")
-        self.form_caption = _("I, {} {}, confirm that all necessary control steps have been performed by myself.").format(self.user.first_name, self.user.last_name)
+        self.form_caption = _("The necessary control steps have been performed:").format(self.user.first_name, self.user.last_name)
         self.valid = False
 
     def _are_deductions_valid(self):
@@ -43,6 +43,7 @@ class CheckModalForm(BaseModalForm):
 
         """
         deductions = self.instance.deductions.all()
+        valid = True
         for deduction in deductions:
             checker = deduction.account.quality_check()
             for msg in checker.messages:
@@ -50,8 +51,8 @@ class CheckModalForm(BaseModalForm):
                     "checked_comps",
                     f"{deduction.account.identifier}: {msg}"
                 )
-            return checker.valid
+            valid &= checker.valid
-        return True
+        return valid
 
     def _are_comps_valid(self):
         """ Performs validity checks on all types of compensations
@@ -74,7 +75,8 @@ class CheckModalForm(BaseModalForm):
                     "checked_comps",
                     f"{comp.identifier}: {msg}"
                 )
-            comps_valid = checker.valid
+            if comps_valid and not checker.valid:
+                comps_valid = checker.valid
         deductions_valid = self._are_deductions_valid()
         return deductions_valid and comps_valid
 

intervention/forms/modals/deduction.py

@@ -163,6 +163,10 @@ class NewEcoAccountDeductionModalForm(BaseModalForm):
         self.cleaned_data["account"].mark_as_edited(self.user, edit_comment=DEDUCTION_ADDED)
         return deduction
 
+    def check_for_recorded_instance(self):
+        # Ignore super() implementation
+        return
+
 
 class EditEcoAccountDeductionModalForm(NewEcoAccountDeductionModalForm):
     deduction = None
@@ -231,6 +235,16 @@ class EditEcoAccountDeductionModalForm(NewEcoAccountDeductionModalForm):
         old_account.send_notification_mail_on_deduction_change(data_changes)
         return deduction
 
+    def check_for_recorded_instance(self):
+        """
+        Extension to super class base method
+
+        Returns:
+
+        """
+        if self.deduction.intervention.is_recorded:
+            self.block_form()
+
 
 class RemoveEcoAccountDeductionModalForm(RemoveModalForm):
     """ Removing modal form for EcoAccountDeduction
@@ -249,4 +263,8 @@ class RemoveEcoAccountDeductionModalForm(RemoveModalForm):
         with transaction.atomic():
             self.deduction.intervention.mark_as_edited(self.user, edit_comment=DEDUCTION_REMOVED)
             self.deduction.account.mark_as_edited(self.user, edit_comment=DEDUCTION_REMOVED)
-            self.deduction.delete()
+            self.deduction.delete()
+
+    def check_for_recorded_instance(self):
+        if self.deduction.intervention.is_recorded:
+            self.block_form()

intervention/forms/modals/document.py

@@ -10,4 +10,21 @@ from konova.forms.modals import NewDocumentModalForm
 
 
 class NewInterventionDocumentModalForm(NewDocumentModalForm):
-    document_model = InterventionDocument
+    document_model = InterventionDocument
+
+    def save(self, *args, **kwargs):
+        """ Extension of regular NewDocumentModalForm
+
+        Checks whether payments exist on the intervention and sends the data to EGON
+
+        Args:
+            *args ():
+            **kwargs ():
+
+        Returns:
+
+        """
+        doc = super().save(*args, **kwargs)
+        self.instance.send_data_to_egon()
+
+        return doc

intervention/forms/modals/revocation.py

@@ -11,6 +11,7 @@ from django.utils.translation import gettext_lazy as _
 
 from intervention.models import RevocationDocument
 from konova.forms.modals import BaseModalForm, RemoveModalForm
+from konova.utils import validators
 from konova.utils.message_templates import REVOCATION_ADDED, REVOCATION_EDITED
 
 
@@ -19,6 +20,7 @@ class NewRevocationModalForm(BaseModalForm):
         label=_("Date"),
         label_suffix=_(""),
         help_text=_("Date of revocation"),
+        validators=[validators.reasonable_date],
         widget=forms.DateInput(
             attrs={
                 "type": "date",

intervention/forms/modals/share.py

@@ -12,7 +12,6 @@ from django.utils.translation import gettext_lazy as _
 from intervention.inputs import TextToClipboardInput
 from konova.forms.modals import BaseModalForm
 from konova.utils.message_templates import ENTRY_REMOVE_MISSING_PERMISSION
-from konova.utils.user_checks import is_default_group_only
 from user.models import Team, User
 
 
@@ -80,7 +79,7 @@ class ShareModalForm(BaseModalForm):
         teams = self.cleaned_data.get("teams", Team.objects.none())
 
         _is_valid = True
-        if is_default_group_only(self.user):
+        if self.user.is_default_group_only():
             shared_users = self.instance.shared_users
             shared_teams = self.instance.shared_teams