Merge pull request '538_API_share_with_ids' (#539) from 538_API_share_with_ids into master

Reviewed-on: #539

analysis/urls.py

@@ -10,6 +10,6 @@ from analysis.views import *
 
 app_name = "analysis"
 urlpatterns = [
-    path("reports/", index_reports_view, name="reports"),
+    path("reports/", ReportIndexView.as_view(), name="reports"),
-    path("reports/<id>", detail_report_view, name="report-detail"),
+    path("reports/<id>", ReportDetailView.as_view(), name="report-detail"),
 ]

analysis/views.py

@@ -1,8 +1,12 @@
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
+from django.contrib.auth.mixins import LoginRequiredMixin
 from django.http import HttpRequest, HttpResponse
 from django.shortcuts import render, redirect, get_object_or_404
 from django.utils import timezone
+from django.utils.decorators import method_decorator
+from django.views import View
+from django.views.generic import DetailView
 
 from analysis.forms import TimespanReportForm
 from analysis.utils.excel.excel import TempExcelFile
@@ -42,10 +46,59 @@ def index_reports_view(request: HttpRequest):
     context = BaseContext(request, context).context
     return render(request, template, context)
 
+class ReportIndexView(LoginRequiredMixin, View):
+    @method_decorator(conservation_office_group_required)
+    def get(self, request: HttpRequest) -> HttpResponse:
 
-@login_required
+        """
-@conservation_office_group_required
+
-def detail_report_view(request: HttpRequest, id: str):
+        Args:
+            request (HttpRequest): The incoming request
+
+        Returns:
+
+        """
+        template = "analysis/reports/index.html"
+        form = TimespanReportForm(None)
+        context = {
+            "form": form
+        }
+        context = BaseContext(request, context).context
+        return render(request, template, context)
+
+    @method_decorator(conservation_office_group_required)
+    def post(self, request: HttpRequest) -> HttpResponse:
+
+        """
+
+        Args:
+            request (HttpRequest): The incoming request
+
+        Returns:
+
+        """
+        template = "analysis/reports/index.html"
+        form = TimespanReportForm(request.POST or None)
+        if form.is_valid():
+            redirect_url = form.save()
+            return redirect(redirect_url)
+        else:
+            messages.error(
+                request,
+                FORM_INVALID,
+                extra_tags="danger",
+            )
+        context = {
+            "form": form
+        }
+        context = BaseContext(request, context).context
+        return render(request, template, context)
+
+
+class ReportDetailView(LoginRequiredMixin, DetailView):
+
+    @method_decorator(conservation_office_group_required)
+    def get(self, request: HttpRequest, id: str):
         """ Renders the detailed report for a conservation office
 
         Args:
@@ -79,20 +132,26 @@ def detail_report_view(request: HttpRequest, id: str):
         report = TimespanReport(id, date_from, date_to)
 
         if format_param == "html":
+            return self.__handle_html_format(request, report, cons_office)
+        elif format_param == "excel":
+            return self.__handle_excel_format(report, cons_office, df, dt)
+        else:
+            raise NotImplementedError
+
+    def __handle_html_format(self, request, report: TimespanReport, office: KonovaCode):
         template = "analysis/reports/detail.html"
         context = {
-            "office": cons_office,
+            "office": office,
             "report": report,
         }
         context = BaseContext(request, context).context
         return render(request, template, context)
-    elif format_param == "excel":
+
+    def __handle_excel_format(self, report: TimespanReport, office: KonovaCode, df: str, dt: str):
         file = TempExcelFile(report.excel_template_path, report.excel_map)
         response = HttpResponse(
             content=file.stream,
             content_type="application/ms-excel",
         )
-        response['Content-Disposition'] = f'attachment; filename={cons_office.long_name}_{df}_{dt}.xlsx'
+        response['Content-Disposition'] = f'attachment; filename={office.long_name}_{df}_{dt}.xlsx'
         return response
-    else:
-        raise NotImplementedError

api/migrations/0004_externalidentifier.py

@@ -0,0 +1,23 @@
+# Generated by Django 6.0.5 on 2026-05-10 07:18
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0003_oauthtoken'),
+        ('user', '0010_user_sso_identifier'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ExternalIdentifier',
+            fields=[
+                ('external_id', models.CharField(db_comment='Identifier from a source system', max_length=255, primary_key=True, serialize=False)),
+                ('internal_id', models.UUIDField(db_comment='Identifier in konova')),
+                ('created', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='user.useractionlogentry')),
+            ],
+        ),
+    ]

api/models/__init__.py

@@ -6,3 +6,4 @@ Created on: 21.01.22
 
 """
 from .token import *
+from .external_identifier import *

api/models/external_identifier.py

@@ -0,0 +1,51 @@
+"""
+Author: Michel Peltriaux
+Created on: 10.05.26
+
+"""
+from django.db import models
+
+
+class ExternalIdentifier(models.Model):
+    """ Holds a lookup to match a given external identifier against the internal identifier in konova.
+
+    Relevant in cases of API transmitted entries, which are updates using external identifiers instead of
+    the internal ones directly.
+
+    """
+    external_id = models.CharField(
+        max_length=255,
+        primary_key=True,
+        db_comment="Identifier from a source system"
+    )
+    internal_id = models.UUIDField(
+        db_comment="Identifier in konova"
+    )
+    created = models.ForeignKey(
+        "user.UserActionLogEntry",
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
+        related_name='+'
+    )
+
+    def __str__(self):
+        return f"{self.external_id} -> {self.internal_id}"
+
+    @staticmethod
+    def resolve_external_identifier(external_identifier: str):
+        """ Returns a ExternalIdentifier object, if the given parameter could be resolved as an external identifier.
+
+        Args:
+            external_identifier (str): An external identifier.
+
+        Returns:
+            ExternalIdentifier | None
+        """
+        if external_identifier:
+            try:
+                obj = ExternalIdentifier.objects.get(external_id=external_identifier)
+                return obj
+            except ExternalIdentifier.DoesNotExist:
+                pass
+        return None

api/tests/v1/create/compensation_create_post_body.json

@@ -8,6 +8,7 @@
         "is_coherence_keeping": false,
         "is_pik": false,
         "intervention": "MUST_BE_SET_IN_TEST",
+        "external_identifier": "LOREMIPSUM-123",
         "before_states": [
         ],
         "after_states": [

api/tests/v1/create/ecoaccount_create_post_body.json

@@ -4,6 +4,7 @@
     ],
     "properties": {
         "title": "Test_ecoaccount",
+        "external_identifier": "LOREMIPSUM-1234",
         "deductable_surface": 10000.0,
         "is_pik": false,
         "responsible": {

api/tests/v1/create/ema_create_post_body.json

@@ -4,6 +4,7 @@
     ],
     "properties": {
         "title": "Test_ema",
+        "external_identifier": "LOREMIPSUM-1235",
         "is_pik": false,
         "responsible": {
             "conservation_office": null,

api/tests/v1/create/intervention_create_post_body.json

@@ -4,6 +4,7 @@
     ],
     "properties": {
         "title": "Test_intervention",
+        "external_identifier": "LOREMIPSUM-1236",
         "responsible": {
             "registration_office": null,
             "registration_file_number": null,

api/tests/v1/create/test_api_create.py

@@ -9,6 +9,7 @@ import json
 
 from django.urls import reverse
 
+from api.models import ExternalIdentifier
 from api.tests.v1.share.test_api_sharing import BaseAPIV1TestCase
 
 
@@ -42,7 +43,22 @@ class APIV1CreateTestCase(BaseAPIV1TestCase):
         response = self._run_create_request(url, post_body)
         self.assertEqual(response.status_code, 200, msg=response.content)
         content = json.loads(response.content)
-        self.assertIsNotNone(content.get("id", None), msg=response.content)
+        _id = content.get("id", None)
+        self.assertIsNotNone(_id, msg=response.content)
+        return _id
+
+    def _test_external_identifier_created(self, internal_id, external_id):
+        """ Tests whether an external identifier has been created
+
+        Args:
+            internal_id ():
+            external_id ():
+
+        Returns:
+
+        """
+        external_identifier = ExternalIdentifier.objects.get(internal_id=internal_id)
+        self.assertEqual(external_identifier.external_id, external_id)
 
     def test_create_intervention(self):
         """ Tests api creation
@@ -54,7 +70,8 @@ class APIV1CreateTestCase(BaseAPIV1TestCase):
         json_file_path = "api/tests/v1/create/intervention_create_post_body.json"
         with open(json_file_path) as json_file:
             post_body = json.load(fp=json_file)
-        self._test_create_object(url, post_body)
+        internal_id = self._test_create_object(url, post_body)
+        self._test_external_identifier_created(internal_id, post_body["properties"]["external_identifier"])
 
     def test_create_compensation(self):
         """ Tests api creation
@@ -71,13 +88,14 @@ class APIV1CreateTestCase(BaseAPIV1TestCase):
         # Expect this first request to fail, since user has no shared access on the intervention, we want to create
         # a compensation for
         response = self._run_create_request(url, post_body)
-        self.assertEqual(response.status_code, 500, msg=response.content)
+        self.assertEqual(response.status_code, 400, msg=response.content)
         content = json.loads(response.content)
         self.assertGreater(len(content.get("errors", [])), 0, msg=response.content)
 
         # Add the user to the shared users of the intervention and try again! Now everything should work as expected.
         self.intervention.users.add(self.superuser)
-        self._test_create_object(url, post_body)
+        internal_id = self._test_create_object(url, post_body)
+        self._test_external_identifier_created(internal_id, post_body["properties"]["external_identifier"])
 
     def test_create_eco_account(self):
         """ Tests api creation
@@ -89,7 +107,8 @@ class APIV1CreateTestCase(BaseAPIV1TestCase):
         json_file_path = "api/tests/v1/create/ecoaccount_create_post_body.json"
         with open(json_file_path) as json_file:
             post_body = json.load(fp=json_file)
-        self._test_create_object(url, post_body)
+        internal_id = self._test_create_object(url, post_body)
+        self._test_external_identifier_created(internal_id, post_body["properties"]["external_identifier"])
 
     def test_create_ema(self):
         """ Tests api creation
@@ -101,7 +120,8 @@ class APIV1CreateTestCase(BaseAPIV1TestCase):
         json_file_path = "api/tests/v1/create/ema_create_post_body.json"
         with open(json_file_path) as json_file:
             post_body = json.load(fp=json_file)
-        self._test_create_object(url, post_body)
+        internal_id = self._test_create_object(url, post_body)
+        self._test_external_identifier_created(internal_id, post_body["properties"]["external_identifier"])
 
     def test_create_deduction(self):
         """ Tests api creation

api/tests/v1/share/test_api_sharing.py

@@ -31,9 +31,10 @@ class APIV1SharingTestCase(BaseAPIV1TestCase):
     def setUpTestData(cls):
         super().setUpTestData()
 
-    def _run_share_request(self, url, user_list: list):
+    def _run_share_request(self, url, user_list: list, team_list: list):
         data = {
-            "users": user_list
+            "users": user_list,
+            "teams": team_list
         }
         data = json.dumps(data)
         response = self.client.put(
@@ -58,16 +59,22 @@ class APIV1SharingTestCase(BaseAPIV1TestCase):
             self.superuser.username,
             self.user.username,
         ]
+        team_list = [
+            str(self.team.id),
+        ]
 
-        response = self._run_share_request(url, user_list)
+        response = self._run_share_request(url, user_list, team_list)
 
         # Must fail, since performing user has no access on requested object
         self.assertEqual(response.status_code, 500)
         self.assertTrue(len(json.loads(response.content.decode("utf-8")).get("errors", [])) > 0)
 
-        # Add performing user to shared access users and rerun the request
+        # Add performing user to shared access users, switch from team id to team name and rerun the request
         obj.users.add(self.superuser)
-        response = self._run_share_request(url, user_list)
+        team_list = [
+            self.team.name
+        ]
+        response = self._run_share_request(url, user_list, team_list)
 
         shared_users = obj.shared_users
         self.assertEqual(response.status_code, 200)
@@ -84,14 +91,14 @@ class APIV1SharingTestCase(BaseAPIV1TestCase):
         share_url = reverse("api:v1:intervention-share", args=(self.intervention.id,))
         # Expect the first request to work properly
         self.intervention.users.add(self.superuser)
-        response = self._run_share_request(share_url, [self.superuser.username])
+        response = self._run_share_request(share_url, [self.superuser.username], [str(self.team.id)])
         self.assertEqual(response.status_code, 200)
 
         # Change the token
         self.header_data["HTTP_ksptoken"] = f"{self.superuser.api_token.token}__X"
 
         # Expect the request to fail now
-        response = self._run_share_request(share_url, [self.superuser.username])
+        response = self._run_share_request(share_url, [self.superuser.username], [])
         self.assertEqual(response.status_code, 403)
 
     def test_api_intervention_sharing(self):
@@ -144,11 +151,11 @@ class APIV1SharingTestCase(BaseAPIV1TestCase):
         self.assertEqual(self.intervention.users.count(), 1)
 
         # Try to add another user via API -> must work!
-        response = self._run_share_request(share_url, [self.superuser.username, self.user.username])
+        response = self._run_share_request(share_url, [self.superuser.username, self.user.username], [])
         self.assertEqual(response.status_code, 200)
         self.assertEqual(self.intervention.users.count(), 2)
 
         # Now try to remove the user again -> expect no changes at all to the shared user list
-        response = self._run_share_request(share_url, [self.superuser.username])
+        response = self._run_share_request(share_url, [self.superuser.username], [])
         self.assertEqual(response.status_code, 200)
         self.assertEqual(self.intervention.users.count(), 2)

api/tests/v1/update/compensation_update_put_body.json

@@ -44,6 +44,7 @@
         ],
     "properties": {
         "title": "TEST_compensation_CHANGED",
+        "external_identifier": "LOREMIPSUM-123_CHANGED",
         "is_cef": true,
         "is_coherence_keeping": true,
         "is_pik": true,

api/tests/v1/update/ecoaccount_update_put_body.json

@@ -44,6 +44,7 @@
         ],
     "properties": {
         "title": "TEST_account_CHANGED",
+        "external_identifier": "LOREMIPSUM-1234_CHANGED",
         "deductable_surface": "100000.0",
         "is_pik": true,
         "responsible": {

api/tests/v1/update/ema_update_put_body.json

@@ -44,6 +44,7 @@
         ],
     "properties": {
         "title": "TEST_EMA_CHANGED",
+        "external_identifier": "LOREMIPSUM-1235_CHANGED",
         "responsible": {
             "conservation_office": null,
             "conservation_file_number": "TEST_CHANGED",

api/tests/v1/update/intervention_update_put_body.json

@@ -44,6 +44,7 @@
         ],
     "properties": {
         "title": "Test_intervention_CHANGED",
+        "external_identifier": "LOREMIPSUM-1236_CHANGED",
         "responsible": {
             "registration_office": null,
             "registration_file_number": "CHANGED",

api/tests/v1/update/test_api_update.py

@@ -12,7 +12,7 @@ from django.contrib.gis import geos
 from django.urls import reverse
 
 from api.tests.v1.share.test_api_sharing import BaseAPIV1TestCase
-from konova.sub_settings.lanis_settings import DEFAULT_SRID_RLP
+from konova.models import Geometry
 
 
 class APIV1UpdateTestCase(BaseAPIV1TestCase):
@@ -64,7 +64,7 @@ class APIV1UpdateTestCase(BaseAPIV1TestCase):
 
         put_props = put_body["properties"]
         put_geom = geos.fromstr(json.dumps(put_body))
-        put_geom.transform(DEFAULT_SRID_RLP)
+        put_geom = Geometry.cast_to_rlp_srid(put_geom)
         self.assertEqual(put_geom, self.intervention.geometry.geom)
         self.assertEqual(put_props["title"], self.intervention.title)
         self.assertNotEqual(modified_on, self.intervention.modified)
@@ -94,7 +94,7 @@ class APIV1UpdateTestCase(BaseAPIV1TestCase):
 
         put_props = put_body["properties"]
         put_geom = geos.fromstr(json.dumps(put_body))
-        put_geom.transform(DEFAULT_SRID_RLP)
+        put_geom = Geometry.cast_to_rlp_srid(put_geom)
         self.assertEqual(put_geom, self.compensation.geometry.geom)
         self.assertEqual(put_props["title"], self.compensation.title)
         self.assertNotEqual(modified_on, self.compensation.modified)
@@ -124,7 +124,7 @@ class APIV1UpdateTestCase(BaseAPIV1TestCase):
 
         put_props = put_body["properties"]
         put_geom = geos.fromstr(json.dumps(put_body))
-        put_geom.transform(DEFAULT_SRID_RLP)
+        put_geom = Geometry.cast_to_rlp_srid(put_geom)
         self.assertEqual(put_geom, self.eco_account.geometry.geom)
         self.assertEqual(put_props["title"], self.eco_account.title)
         self.assertNotEqual(modified_on, self.eco_account.modified)
@@ -156,7 +156,7 @@ class APIV1UpdateTestCase(BaseAPIV1TestCase):
 
         put_props = put_body["properties"]
         put_geom = geos.fromstr(json.dumps(put_body))
-        put_geom.transform(DEFAULT_SRID_RLP)
+        put_geom = Geometry.cast_to_rlp_srid(put_geom)
         self.assertEqual(put_geom, self.ema.geometry.geom)
         self.assertEqual(put_props["title"], self.ema.title)
         self.assertNotEqual(modified_on, self.ema.modified)

api/urls/urls.py

@@ -7,11 +7,8 @@ Created on: 21.01.22
 """
 from django.urls import path, include
 
-from api.views.method_views import generate_new_token_view
-
 app_name = "api"
 
 urlpatterns = [
     path("v1/", include("api.urls.v1.urls", namespace="v1")),
-    path("token/generate", generate_new_token_view, name="generate-new-token"),
 ]

api/utils/serializer/serializer.py

@@ -10,10 +10,12 @@ from abc import abstractmethod
 
 from django.contrib.gis import geos
 from django.contrib.gis.geos import GEOSGeometry
+from django.core.exceptions import ObjectDoesNotExist
 from django.core.paginator import Paginator
 from django.db.models import Q
 
-from konova.sub_settings.lanis_settings import DEFAULT_SRID_RLP
+from api.models import ExternalIdentifier
+from konova.models import Geometry
 from konova.utils.message_templates import DATA_UNSHARED
 
 
@@ -76,6 +78,14 @@ class AbstractModelAPISerializer:
             del self.lookup["id"]
         else:
             # Return certain object
+            ## But first check, whether this is an external identifier ...
+            try:
+                ## If we can find this _id on our ExternalIdentifier model, we need to map it on the internal id
+                ext_id = ExternalIdentifier.objects.get(external_id=_id)
+                _id = ext_id.internal_id
+            except ObjectDoesNotExist:
+                # If we did not find it, we assume that this is already an internal id. (Or it does not exist at all)
+                pass
             self.lookup["id"] = _id
 
         self.shared_lookup = Q(
@@ -145,8 +155,8 @@ class AbstractModelAPISerializer:
         if isinstance(geojson, dict):
             geojson = json.dumps(geojson)
         geometry = geos.fromstr(geojson)
-        if geometry.srid != DEFAULT_SRID_RLP:
+        geometry = Geometry.cast_to_rlp_srid(geometry)
-            geometry.transform(DEFAULT_SRID_RLP)
+        geometry = Geometry.cast_to_multipolygon(geometry)
         return geometry
 
     def _get_obj_from_db(self, id, user):
@@ -161,6 +171,14 @@ class AbstractModelAPISerializer:
         Returns:
 
         """
+        # First if there is an external identifier linked to an internal one, so we can continue with the internal
+        try:
+            ext_id = ExternalIdentifier.objects.get(external_id=id)
+            id = ext_id.internal_id
+        except ObjectDoesNotExist:
+            # No external id found - let's hope the given id exists internally
+            pass
+
         obj = self.model.objects.get(
             id=id,
             deleted__isnull=True,

api/utils/serializer/v1/compensation.py

@@ -88,6 +88,11 @@ class CompensationAPISerializerV1(AbstractModelAPISerializerV1, AbstractCompensa
             # Nothing to do here
             return obj
 
+        # Transform a potential external identifier into an internal one
+        intervention_ext_id = self._get_external_identifier(intervention_id)
+        if intervention_ext_id:
+            intervention_id = intervention_ext_id.internal_id
+
         intervention = Intervention.objects.get(
             id=intervention_id,
         )
@@ -114,6 +119,10 @@ class CompensationAPISerializerV1(AbstractModelAPISerializerV1, AbstractCompensa
 
             # Fill in data to objects
             properties = json_model["properties"]
+
+            external_identifier = properties.get("external_identifier", None)
+            self._check_external_identifier_on_entry_creation(external_identifier)
+
             obj.identifier = obj.generate_new_identifier()
             obj.title = properties["title"]
             obj.is_cef = properties["is_cef"]
@@ -129,6 +138,7 @@ class CompensationAPISerializerV1(AbstractModelAPISerializerV1, AbstractCompensa
             obj = self._set_compensation_states(obj, properties["after_states"], obj.after_states)
             obj = self._set_deadlines(obj, properties["deadlines"])
 
+        self._set_external_identifier(obj.id, properties.get("external_identifier", None), obj.created)
         obj.log.add(obj.created)
 
         celery_update_parcels.delay(obj.geometry.id)
@@ -170,6 +180,7 @@ class CompensationAPISerializerV1(AbstractModelAPISerializerV1, AbstractCompensa
             obj = self._set_compensation_states(obj, properties["after_states"], obj.after_states)
             obj = self._set_deadlines(obj, properties["deadlines"])
 
+        self._set_external_identifier(obj.id, properties.get("external_identifier", None), update_action)
         obj.log.add(update_action)
 
         celery_update_parcels.delay(obj.geometry.id)

api/utils/serializer/v1/deduction.py

@@ -62,6 +62,14 @@ class DeductionAPISerializerV1(AbstractModelAPISerializerV1,
         if surface <= 0:
             raise ValueError("Surface must be > 0 m²")
 
+        # Check if external identifiers need to be mapped onto internal ones
+        acc_ext_id = self._get_external_identifier(acc_id)
+        intervention_ext_id = self._get_external_identifier(intervention_id)
+        if acc_ext_id:
+            acc_id = acc_ext_id.internal_id
+        if intervention_ext_id:
+            intervention_id = intervention_ext_id.internal_id
+
         acc = EcoAccount.objects.get(
             id=acc_id,
             deleted__isnull=True,

api/utils/serializer/v1/ecoaccount.py

@@ -121,7 +121,9 @@ class EcoAccountAPISerializerV1(AbstractModelAPISerializerV1,
             obj = self._initialize_objects(json_model, user)
 
             # Fill in data to objects
-            properties = json_model["properties"]
+            properties = json_model.get("properties", None)
+            if not properties:
+                raise AssertionError("No 'properties' found in payload!")
             obj.identifier = obj.generate_new_identifier()
             obj.title = properties["title"]
             obj.is_pik = properties.get("is_pik", False)
@@ -147,6 +149,7 @@ class EcoAccountAPISerializerV1(AbstractModelAPISerializerV1,
             obj = self._set_compensation_states(obj, properties["after_states"], obj.after_states)
             obj = self._set_deadlines(obj, properties["deadlines"])
 
+        self._set_external_identifier(obj.id, properties.get("external_identifier", None), obj.created)
         obj.log.add(obj.created)
         obj.users.add(user)
 
@@ -172,6 +175,10 @@ class EcoAccountAPISerializerV1(AbstractModelAPISerializerV1,
 
             # Fill in data to objects
             properties = json_model["properties"]
+
+            external_identifier = properties.get("external_identifier", None)
+            self._check_external_identifier_on_entry_creation(external_identifier)
+
             obj.title = properties["title"]
             obj.is_pik = properties.get("is_pik", False)
             obj.deductable_surface = float(properties["deductable_surface"])
@@ -192,6 +199,7 @@ class EcoAccountAPISerializerV1(AbstractModelAPISerializerV1,
             obj = self._set_compensation_states(obj, properties["after_states"], obj.after_states)
             obj = self._set_deadlines(obj, properties["deadlines"])
 
+        self._set_external_identifier(obj.id, external_identifier, update_action)
         obj.log.add(update_action)
 
         celery_update_parcels.delay(obj.geometry.id)

api/utils/serializer/v1/ema.py

@@ -104,6 +104,10 @@ class EmaAPISerializerV1(AbstractModelAPISerializerV1, AbstractCompensationAPISe
 
             # Fill in data to objects
             properties = json_model["properties"]
+
+            external_identifier = properties.get("external_identifier", None)
+            self._check_external_identifier_on_entry_creation(external_identifier)
+
             obj.identifier = obj.generate_new_identifier()
             obj.title = properties["title"]
             obj.is_pik = properties.get("is_pik", False)
@@ -119,6 +123,7 @@ class EmaAPISerializerV1(AbstractModelAPISerializerV1, AbstractCompensationAPISe
             obj = self._set_compensation_states(obj, properties["after_states"], obj.after_states)
             obj = self._set_deadlines(obj, properties["deadlines"])
 
+        self._set_external_identifier(obj.id, external_identifier, obj.created)
         obj.log.add(obj.created)
         obj.users.add(user)
 
@@ -161,6 +166,7 @@ class EmaAPISerializerV1(AbstractModelAPISerializerV1, AbstractCompensationAPISe
             obj = self._set_compensation_states(obj, properties["after_states"], obj.after_states)
             obj = self._set_deadlines(obj, properties["deadlines"])
 
+        self._set_external_identifier(obj.id, properties.get("external_identifier", None), update_action)
         obj.log.add(update_action)
 
         celery_update_parcels.delay(obj.geometry.id)

api/utils/serializer/v1/intervention.py

@@ -150,10 +150,14 @@ class InterventionAPISerializerV1(AbstractModelAPISerializerV1,
 
             # Fill in data to objects
             properties = json_model["properties"]
+
+            external_identifier = properties.get("external_identifier", None)
+            self._check_external_identifier_on_entry_creation(external_identifier)
+
             obj.identifier = obj.generate_new_identifier()
-            obj.title = properties["title"]
+            obj.title = properties.get("title", None)
-            self._set_responsibility(obj, properties["responsible"])
+            self._set_responsibility(obj, properties.get("responsible", None))
-            self._set_legal(obj, properties["legal"])
+            self._set_legal(obj, properties.get("legal", None))
 
             obj.responsible.handler.save()
             obj.responsible.save()
@@ -161,6 +165,7 @@ class InterventionAPISerializerV1(AbstractModelAPISerializerV1,
             obj.legal.save()
             obj.save()
 
+        self._set_external_identifier(obj.id, external_identifier, obj.created)
         obj.users.add(user)
         obj.log.add(obj.created)
 
@@ -186,7 +191,7 @@ class InterventionAPISerializerV1(AbstractModelAPISerializerV1,
 
             # Fill in data to objects
             properties = json_model["properties"]
-            obj.title = properties["title"]
+            obj.title = properties.get("title")
             self._set_responsibility(obj, properties.get("responsible", None))
             self._set_legal(obj, properties.get("legal", None))
             self._set_payments(obj, properties.get("payments", None))
@@ -200,6 +205,7 @@ class InterventionAPISerializerV1(AbstractModelAPISerializerV1,
             obj.save()
 
         obj.mark_as_edited(user, edit_comment="API update")
+        self._set_external_identifier(obj.id, properties.get("external_identifier", None), update_action)
         obj.send_data_to_egon()
 
         celery_update_parcels.delay(obj.geometry.id)

api/utils/serializer/v1/serializer.py

@@ -12,6 +12,7 @@ from django.contrib.gis.geos import MultiPolygon
 from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import QuerySet
 
+from api.models import ExternalIdentifier
 from api.utils.serializer.serializer import AbstractModelAPISerializer
 from codelist.models import KonovaCode
 from codelist.settings import CODELIST_COMPENSATION_ACTION_ID, CODELIST_BIOTOPES_ID, CODELIST_PROCESS_TYPE_ID, \
@@ -39,12 +40,20 @@ class AbstractModelAPISerializerV1(AbstractModelAPISerializer):
         else:
             geom = MultiPolygon().geojson
         geo_json = json.loads(geom)
+        ext_ids = list(
+            ExternalIdentifier.objects.filter(
+                internal_id=entry.id
+            ).values_list(
+                "external_id", flat=True
+            )
+        )
         self.properties_data = {
             "id": entry.id,
             "identifier": entry.identifier,
             "title": entry.title,
             "created_on": self._created_on_to_json(entry),
             "modified_on": self._modified_on_to_json(entry),
+            "external_identifiers": ext_ids,
         }
         self._extend_properties_data(entry)
         geo_json["properties"] = self.properties_data
@@ -137,6 +146,57 @@ class AbstractModelAPISerializerV1(AbstractModelAPISerializer):
         success = entry.deleted is not None
         return success
 
+    def _set_external_identifier(self, internal_identifier, external_identifier, log_entry):
+        """ If an external identifier was provided in the payload, we set it
+        in the database
+
+        Args:
+            internal_identifier (BaseObject): The already processed konova object (EIV, KOM, ...)
+            external_identifier (any): The external identifier taken from the payload
+
+        Returns:
+
+        """
+        if external_identifier is None:
+            return None
+
+        ext_id_obj = ExternalIdentifier.objects.get_or_create(
+            internal_id=internal_identifier,
+            external_id=external_identifier
+        )[0]
+        if not ext_id_obj.created:
+            ext_id_obj.created = log_entry
+            ext_id_obj.save()
+
+        return ext_id_obj
+
+    def _get_external_identifier(self, external_identifier):
+        """ Checks whether a linkage based on an external identifier already exists and returns it if so.
+
+        Args:
+            external_identifier (any): The external identifier according to payload
+
+        Returns:
+            ExternalIdentifier | None
+        """
+        return ExternalIdentifier.resolve_external_identifier(external_identifier)
+
+    def _check_external_identifier_on_entry_creation(self, external_identifier):
+        """ Special check for POST processing:
+        Checks whether an external identifier already exists on the database. This hints that
+        the entry already has been created in the past. Instead of POST, the PUT method shall be used
+        to avoid creating duplicates.
+
+        Args:
+            external_identifier (any): The external identifier according to payload
+
+        Returns:
+
+        """
+        persisted_external_identifier = self._get_external_identifier(external_identifier)
+        if persisted_external_identifier:
+            raise AssertionError(f"{external_identifier} has already been initially created! Use PUT for updates!")
+
 
 class DeductableAPISerializerV1Mixin:
     class Meta:

api/views/method_views.py

@@ -1,35 +0,0 @@
-"""
-Author: Michel Peltriaux
-Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
-Contact: michel.peltriaux@sgdnord.rlp.de
-Created on: 27.01.22
-
-"""
-from django.contrib.auth.decorators import login_required
-from django.http import HttpRequest, JsonResponse
-
-from api.models import APIUserToken
-
-
-@login_required
-def generate_new_token_view(request: HttpRequest):
-    """ Handles request for fetching
-
-    Args:
-        request (HttpRequest): The incoming request
-
-    Returns:
-
-    """
-
-    if request.method == "GET":
-        token = APIUserToken()
-        while APIUserToken.objects.filter(token=token.token).exists():
-            token = APIUserToken()
-        return JsonResponse(
-            data={
-                "gen_data": token.token
-            }
-        )
-    else:
-        raise NotImplementedError

api/views/v1/views.py

@@ -6,7 +6,9 @@ Created on: 21.01.22
 
 """
 import json
+from json import JSONDecodeError
 
+from django.core.exceptions import ObjectDoesNotExist
 from django.http import JsonResponse, HttpRequest
 
 from api.utils.serializer.v1.compensation import CompensationAPISerializerV1
@@ -66,8 +68,12 @@ class AbstractAPIViewV1(AbstractAPIView):
             body = request.body.decode("utf-8")
             body = json.loads(body)
             created_id = self.serializer.create_model_from_json(body, self.user)
-        except Exception as e:
+        except (JSONDecodeError,
-            return self._return_error_response(e, 500)
+                AssertionError,
+                ValueError,
+                PermissionError,
+                ObjectDoesNotExist) as e:
+            return self._return_error_response(e, 400)
         return JsonResponse({"id": created_id})
 
     def put(self, request: HttpRequest, id=None):

api/views/views.py

@@ -6,13 +6,14 @@ Created on: 21.01.22
 
 """
 import json
+import uuid
 
-from django.db.models import QuerySet
+from django.db.models import QuerySet, Q
 from django.http import JsonResponse, HttpRequest
 from django.views import View
 from django.views.decorators.csrf import csrf_exempt
 
-from api.models import APIUserToken
+from api.models import APIUserToken, ExternalIdentifier
 from api.settings import KSP_TOKEN_HEADER_IDENTIFIER, KSP_USER_HEADER_IDENTIFIER
 from compensation.models import EcoAccount
 from ema.models import Ema
@@ -81,9 +82,7 @@ class AbstractAPIView(View):
         Returns:
 
         """
-        content = [error.__str__()]
+        content = [f"{error.__class__.__name__}: {str(error)}"]
-        if hasattr(error, "messages"):
-            content = error.messages
         return JsonResponse(
             {
                 "errors": content
@@ -207,6 +206,10 @@ class AbstractModelShareAPIView(AbstractAPIView):
 
         """
         try:
+            external_identifier = ExternalIdentifier.resolve_external_identifier(id)
+            if external_identifier:
+                id = external_identifier.internal_id
+
             users = self._get_shared_users_of_object(id)
             teams = self._get_shared_teams_of_object(id)
         except Exception as e:
@@ -239,6 +242,9 @@ class AbstractModelShareAPIView(AbstractAPIView):
         """
 
         try:
+            external_identifier = ExternalIdentifier.resolve_external_identifier(id)
+            if external_identifier:
+                id = external_identifier.internal_id
             success = self._process_put_body(request.body, id)
         except Exception as e:
             return self._return_error_response(e)
@@ -311,22 +317,36 @@ class AbstractModelShareAPIView(AbstractAPIView):
             raise ValueError("Shared user list must not be empty!")
         new_teams = content.get("teams", [])
 
+        self.__process_user_sharing(new_users, obj)
+        self.__process_team_sharing(new_teams, obj)
+
+        return True
+
+    def __process_user_sharing(self, user_list: list, obj):
+        """ Processes API sharing for user payload
+
+        Args:
+            user_list (list): A list of users to share the obj with
+            obj (BaseObject): The shareable object
+
+        Returns:
+
+        """
         # Eliminate duplicates
-        new_users = list(dict.fromkeys(new_users))
+        new_users = list(dict.fromkeys(user_list))
-        new_teams = list(dict.fromkeys(new_teams))
 
         # Make sure each of these names exist as a user
         new_users_objs = []
         for user in new_users:
-            new_users_objs.append(User.objects.get(username=user))
+            try:
-
+                user_obj = User.objects.get(username=user)
-        # Make sure each of these names exist as a user
+            except User.DoesNotExist:
-        new_teams_objs = []
+                raise AssertionError(f"User with username {user} does not exist")
-        for team_name in new_teams:
+            new_users_objs.append(user_obj)
-            new_teams_objs.append(Team.objects.get(name=team_name))
 
         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!
+            # So we need to keep the ones that already have access from being removed!
             new_users_to_be_added = User.objects.filter(
                 username__in=new_users
             ).exclude(
@@ -334,17 +354,44 @@ class AbstractModelShareAPIView(AbstractAPIView):
             )
             new_users_objs = obj.shared_users.union(new_users_to_be_added)
 
-            new_teams_to_be_added = Team.objects.filter(
-                name__in=new_teams
-            ).exclude(
-                id__in=obj.shared_teams
-            )
-            new_teams_objs = obj.shared_teams.union(new_teams_to_be_added)
-
         obj.share_with_user_list(new_users_objs)
-        obj.share_with_team_list(new_teams_objs)
-        return True
 
+    def __process_team_sharing(self, team_list: list, obj):
+        """ Processes API sharing for team payload
+
+        Args:
+            team_list (list): A list of teams to share the obj with
+            obj (BaseObject): The shareable object
+
+        Returns:
+
+        """
+        # Eliminate duplicates
+        new_teams = list(dict.fromkeys(team_list))
+
+        # Resolve team names or ids into objects
+        new_team_ids = []
+        for team in new_teams:
+            try:
+                uuid.UUID(team)
+                try:
+                    new_team_ids.append(Team.objects.get(id=team).id)
+                except Team.DoesNotExist:
+                    raise AssertionError(f"Team with id {team} does not exist!")
+            except ValueError:
+                # entry is a name and not a uuid -> try to resolve as name!
+                try:
+                    new_team_ids.append(Team.objects.get(name=team).id)
+                except Team.DoesNotExist:
+                    raise AssertionError(f"Team with name {team} does not exist!")
+
+        new_team_objs = Team.objects.filter(id__in=new_team_ids)
+        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!
+            # So we need to keep the ones that already have access from being removed!
+            new_team_objs = obj.shared_teams.union(new_team_objs)
+
+        obj.share_with_team_list(new_team_objs)
 
 class InterventionAPIShareView(AbstractModelShareAPIView):
     model = Intervention

compensation/admin.py

@@ -45,6 +45,14 @@ class AbstractCompensationAdmin(BaseObjectAdmin):
         states = "\n".join(states)
         return states
 
+    def get_actions(self, request):
+        DELETE_ACTION_IDENTIFIER = "delete_selected"
+        actions = super().get_actions(request)
+
+        if DELETE_ACTION_IDENTIFIER in actions:
+            del actions[DELETE_ACTION_IDENTIFIER]
+
+        return actions
 
 class CompensationAdmin(AbstractCompensationAdmin):
     autocomplete_fields = [

compensation/forms/eco_account.py

@@ -15,6 +15,7 @@ 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.settings import ETS_GROUP
 from konova.utils import validators
 from user.models import User, UserActionLogEntry
 
@@ -246,4 +247,13 @@ class RemoveEcoAccountModalForm(RemoveModalForm):
                 "confirm",
                 _("The account can not be removed, since there are still deductions.")
             )
+
+            # If there are deductions but the performing user is not part of an ETS group, we assume this poor
+            # fella does not know what he/she does -> give a hint that they should contact someone in charge...
+            user_is_ets_user = self.user.in_group(ETS_GROUP)
+            if not user_is_ets_user:
+                self.add_error(
+                    "confirm",
+                    _("Please contact the responsible conservation office to find a solution!")
+                )
         return super_valid and not has_deductions

compensation/tables/compensation.py

@@ -124,7 +124,7 @@ class CompensationTable(BaseTable, TableRenderMixin, TableOrderMixin):
             html += self.render_previously_checked_star(
                 tooltip=tooltip,
             )
-        return format_html(html)
+        return format_html(html, None)
 
     def render_r(self, value, record: Compensation):
         """ Renders the registered column for a compensation
@@ -146,5 +146,5 @@ class CompensationTable(BaseTable, TableRenderMixin, TableOrderMixin):
             tooltip=tooltip,
             icn_filled=recorded,
         )
-        return format_html(html)
+        return format_html(html, None)
 

compensation/tables/eco_account.py

@@ -95,7 +95,7 @@ class EcoAccountTable(BaseTable, TableRenderMixin, TableOrderMixin):
             txt=value,
             new_tab=False,
         )
-        return format_html(html)
+        return format_html(html, None)
 
     def render_av(self, value, record: EcoAccount):
         """ Renders the available column for an eco account
@@ -113,7 +113,7 @@ class EcoAccountTable(BaseTable, TableRenderMixin, TableOrderMixin):
             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)
+        return format_html(html, None)
 
     def render_r(self, value, record: EcoAccount):
         """ Renders the recorded column for an eco account
@@ -135,4 +135,4 @@ class EcoAccountTable(BaseTable, TableRenderMixin, TableOrderMixin):
             tooltip=tooltip,
             icn_filled=checked,
         )
-        return format_html(html)
+        return format_html(html, None)

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

@@ -53,7 +53,7 @@
                 </td>
                 <td class="align-middle">
                     {% if deduction.intervention.recorded %}
-                        <em title="{% trans 'Recorded on' %} {{obj.recorded.timestamp}} {% trans 'by' %} {{obj.recorded.user}}" class='fas fa-bookmark registered-bookmark'></em>
+                        <em title="{% trans 'Recorded on' %} {{deduction.intervention.recorded.timestamp}} {% trans 'by' %} {{deduction.intervention.recorded.user}}" class='fas fa-bookmark registered-bookmark'></em>
                     {% else %}
                         <em title="{% trans 'Not recorded yet' %}" class='far fa-bookmark'></em>
                     {% endif %}

compensation/tests/compensation/test_workflow.py

@@ -54,7 +54,7 @@ class CompensationWorkflowTestCase(BaseWorkflowTestCase):
         post_data = {
             "identifier": test_id,
             "title": test_title,
-            "geom": geom_json,
+            "output": geom_json,
             "intervention": self.intervention.id,
         }
         pre_creation_intervention_log_count = self.intervention.log.count()
@@ -94,7 +94,7 @@ class CompensationWorkflowTestCase(BaseWorkflowTestCase):
         post_data = {
             "identifier": test_id,
             "title": test_title,
-            "geom": geom_json,
+            "output": geom_json,
         }
         pre_creation_intervention_log_count = self.intervention.log.count()
 
@@ -150,7 +150,7 @@ class CompensationWorkflowTestCase(BaseWorkflowTestCase):
             "title": new_title,
             "intervention": self.intervention.id,  # just keep the intervention as it is
             "comment": new_comment,
-            "geom": geojson,
+            "output": geojson,
         }
         self.client_user.post(url, post_data)
         self.compensation.refresh_from_db()

compensation/tests/ecoaccount/test_workflow.py

@@ -46,7 +46,7 @@ class EcoAccountWorkflowTestCase(BaseWorkflowTestCase):
         post_data = {
             "identifier": test_id,
             "title": test_title,
-            "geom": geom_json,
+            "output": geom_json,
             "surface": test_deductable_surface,
             "conservation_office": test_conservation_office.id
         }
@@ -86,7 +86,7 @@ class EcoAccountWorkflowTestCase(BaseWorkflowTestCase):
         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 = self.create_dummy_geometry()
         test_conservation_office = self.get_conservation_office_code()
         test_deductable_surface = self.eco_account.deductable_surface + 100
 
@@ -103,7 +103,7 @@ class EcoAccountWorkflowTestCase(BaseWorkflowTestCase):
             "identifier": new_identifier,
             "title": new_title,
             "comment": new_comment,
-            "geom": new_geometry.geojson,
+            "output": self.create_geojson(new_geometry),
             "surface": test_deductable_surface,
             "conservation_office": test_conservation_office.id
         }

compensation/urls/compensation.py

@@ -7,30 +7,32 @@ Created on: 24.08.21
 """
 from django.urls import path
 
+from compensation.views.compensation.detail import DetailCompensationView
 from compensation.views.compensation.document import EditCompensationDocumentView, NewCompensationDocumentView, \
     GetCompensationDocumentView, RemoveCompensationDocumentView
+from compensation.views.compensation.remove import RemoveCompensationView
 from compensation.views.compensation.resubmission import CompensationResubmissionView
-from compensation.views.compensation.report import report_view
+from compensation.views.compensation.report import CompensationPublicReportView
 from compensation.views.compensation.deadline import NewCompensationDeadlineView, EditCompensationDeadlineView, \
     RemoveCompensationDeadlineView
 from compensation.views.compensation.action import NewCompensationActionView, EditCompensationActionView, \
     RemoveCompensationActionView
 from compensation.views.compensation.state import NewCompensationStateView, EditCompensationStateView, \
     RemoveCompensationStateView
-from compensation.views.compensation.compensation import index_view, new_view, new_id_view, detail_view, edit_view, \
+from compensation.views.compensation.compensation import IndexCompensationView, CompensationIdentifierGeneratorView, \
-    remove_view
+    EditCompensationView, NewCompensationView
 from compensation.views.compensation.log import CompensationLogView
 
 urlpatterns = [
     # Main compensation
-    path("", index_view, name="index"),
+    path("", IndexCompensationView.as_view(), name="index"),
-    path('new/id', new_id_view, name='new-id'),
+    path('new/id', CompensationIdentifierGeneratorView.as_view(), name='new-id'),
-    path('new/<intervention_id>', new_view, name='new'),
+    path('new/<intervention_id>', NewCompensationView.as_view(), name='new'),
-    path('new', new_view, name='new'),
+    path('new', NewCompensationView.as_view(), name='new'),
-    path('<id>', detail_view, name='detail'),
+    path('<id>', DetailCompensationView.as_view(), name='detail'),
     path('<id>/log', CompensationLogView.as_view(), name='log'),
-    path('<id>/edit', edit_view, name='edit'),
+    path('<id>/edit', EditCompensationView.as_view(), name='edit'),
-    path('<id>/remove', remove_view, name='remove'),
+    path('<id>/remove', RemoveCompensationView.as_view(), name='remove'),
 
     path('<id>/state/new', NewCompensationStateView.as_view(), name='new-state'),
     path('<id>/state/<state_id>/edit', EditCompensationStateView.as_view(), name='state-edit'),
@@ -43,7 +45,7 @@ urlpatterns = [
     path('<id>/deadline/new', NewCompensationDeadlineView.as_view(), name="new-deadline"),
     path('<id>/deadline/<deadline_id>/edit', EditCompensationDeadlineView.as_view(), name='deadline-edit'),
     path('<id>/deadline/<deadline_id>/remove', RemoveCompensationDeadlineView.as_view(), name='deadline-remove'),
-    path('<id>/report', report_view, name='report'),
+    path('<id>/report', CompensationPublicReportView.as_view(), name='report'),
     path('<id>/resub', CompensationResubmissionView.as_view(), name='resubmission-create'),
 
     # Documents

compensation/urls/eco_account.py

@@ -8,11 +8,13 @@ Created on: 24.08.21
 from django.urls import path
 
 from compensation.autocomplete.eco_account import EcoAccountAutocomplete
-from compensation.views.eco_account.eco_account import index_view, new_view, new_id_view, edit_view, remove_view, \
+from compensation.views.eco_account.detail import DetailEcoAccountView
-    detail_view
+from compensation.views.eco_account.eco_account import IndexEcoAccountView, EcoAccountIdentifierGeneratorView, \
+    NewEcoAccountView, EditEcoAccountView
 from compensation.views.eco_account.log import EcoAccountLogView
 from compensation.views.eco_account.record import EcoAccountRecordView
-from compensation.views.eco_account.report import report_view
+from compensation.views.eco_account.remove import RemoveEcoAccountView
+from compensation.views.eco_account.report import EcoAccountPublicReportView
 from compensation.views.eco_account.resubmission import EcoAccountResubmissionView
 from compensation.views.eco_account.state import NewEcoAccountStateView, EditEcoAccountStateView, \
     RemoveEcoAccountStateView
@@ -28,15 +30,15 @@ from compensation.views.eco_account.deduction import NewEcoAccountDeductionView,
 
 app_name = "acc"
 urlpatterns = [
-    path("", index_view, name="index"),
+    path("", IndexEcoAccountView.as_view(), name="index"),
-    path('new/', new_view, name='new'),
+    path('new/', NewEcoAccountView.as_view(), name='new'),
-    path('new/id', new_id_view, name='new-id'),
+    path('new/id', EcoAccountIdentifierGeneratorView.as_view(), name='new-id'),
-    path('<id>', detail_view, name='detail'),
+    path('<id>', DetailEcoAccountView.as_view(), name='detail'),
     path('<id>/log', EcoAccountLogView.as_view(), name='log'),
     path('<id>/record', EcoAccountRecordView.as_view(), name='record'),
-    path('<id>/report', report_view, name='report'),
+    path('<id>/report', EcoAccountPublicReportView.as_view(), name='report'),
-    path('<id>/edit', edit_view, name='edit'),
+    path('<id>/edit', EditEcoAccountView.as_view(), name='edit'),
-    path('<id>/remove', remove_view, name='remove'),
+    path('<id>/remove', RemoveEcoAccountView.as_view(), name='remove'),
     path('<id>/resub', EcoAccountResubmissionView.as_view(), name='resubmission-create'),
 
     path('<id>/state/new', NewEcoAccountStateView.as_view(), name='new-state'),

compensation/urls/payment.py

@@ -10,7 +10,7 @@ from compensation.views.payment import *
 
 app_name = "pay"
 urlpatterns = [
-    path('<id>/new', new_payment_view, name='new'),
+    path('<id>/new', NewPaymentView.as_view(), name='new'),
-    path('<id>/remove/<payment_id>', payment_remove_view, name='remove'),
+    path('<id>/remove/<payment_id>', RemovePaymentView.as_view(), name='remove'),
-    path('<id>/edit/<payment_id>', payment_edit_view, name='edit'),
+    path('<id>/edit/<payment_id>', EditPaymentView.as_view(), name='edit'),
 ]

compensation/views/compensation/compensation.py

@@ -6,33 +6,29 @@ Created on: 19.08.22
 
 """
 from django.contrib import messages
-from django.contrib.auth.decorators import login_required
+from django.contrib.auth.mixins import LoginRequiredMixin
-from django.core.exceptions import ObjectDoesNotExist
+from django.http import HttpRequest, HttpResponse
-from django.db.models import Sum
-from django.http import HttpRequest, JsonResponse
 from django.shortcuts import get_object_or_404, render, redirect
-from django.urls import reverse
+from django.utils.decorators import method_decorator
 from django.utils.translation import gettext_lazy as _
+from django.views import View
 
 from compensation.forms.compensation import EditCompensationForm, NewCompensationForm
 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
-    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, \
+from konova.utils.message_templates import RECORDED_BLOCKS_EDIT, CHECK_STATE_RESET, FORM_INVALID, PARAMS_INVALID, \
-    RECORDED_BLOCKS_EDIT, CHECK_STATE_RESET, FORM_INVALID, PARAMS_INVALID, IDENTIFIER_REPLACED, \
+    IDENTIFIER_REPLACED, COMPENSATION_ADDED_TEMPLATE, GEOMETRY_SIMPLIFIED, GEOMETRIES_IGNORED_TEMPLATE
-    COMPENSATION_ADDED_TEMPLATE, DO_NOT_FORGET_TO_SHARE, GEOMETRY_SIMPLIFIED
+from konova.views.identifier import AbstractIdentifierGeneratorView
+from konova.views.index import AbstractIndexView
 
 
-@login_required
+class IndexCompensationView(AbstractIndexView):
-@any_group_check
+    def get(self, request, *args, **kwargs) -> HttpResponse:
-def index_view(request: HttpRequest):
         """
         Renders the index view for compensation
 
@@ -42,7 +38,6 @@ def index_view(request: HttpRequest):
         Returns:
             A rendered view
         """
-    template = "generic_index.html"
         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
@@ -58,13 +53,56 @@ def index_view(request: HttpRequest):
             TAB_TITLE_IDENTIFIER: _("Compensations - Overview"),
         }
         context = BaseContext(request, context).context
-    return render(request, template, context)
+        return render(request, self._TEMPLATE, context)
 
 
-@login_required
+class NewCompensationView(LoginRequiredMixin, View):
-@default_group_required
+    _TEMPLATE = "compensation/form/view.html"
-@shared_access_required(Intervention, "intervention_id")
+
-def new_view(request: HttpRequest, intervention_id: str = None):
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "intervention_id"))
+    def get(self, request: HttpRequest, intervention_id: str = None, *args, **kwargs) -> HttpResponse:
+        """
+        Renders a view for new compensation
+
+        A compensation creation may be called directly from the parent-intervention object. If so - we may take
+        the intervention's id and directly link the compensation to it.
+
+        Args:
+            request (HttpRequest): The incoming request
+            intervention_id (str): The intervention identifier
+
+        Returns:
+
+        """
+        if intervention_id:
+            # If the parent-intervention is recorded, we are not allowed to change anything on it's data.
+            # Not even adding new child elements like compensations!
+            intervention = get_object_or_404(Intervention, id=intervention_id)
+            recording_state_blocks_actions = intervention.is_recorded
+            if recording_state_blocks_actions:
+                messages.info(
+                    request,
+                    RECORDED_BLOCKS_EDIT
+                )
+                return redirect("intervention:detail", id=intervention_id)
+
+        data_form = NewCompensationForm(request.POST or None, intervention_id=intervention_id)
+        geom_form = SimpleGeomForm(request.POST or None, read_only=False)
+
+        context = {
+            "form": data_form,
+            "geom_form": geom_form,
+            TAB_TITLE_IDENTIFIER: _("New compensation"),
+        }
+        context = BaseContext(request, context).context
+
+        return render(request, self._TEMPLATE, context)
+
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "intervention_id"))
+    def post(self, request: HttpRequest, intervention_id: str = None, *args, **kwargs) -> HttpResponse:
+
         """
         Renders a view for a new compensation creation
 
@@ -74,14 +112,12 @@ def new_view(request: HttpRequest, intervention_id: str = None):
         Returns:
 
         """
-    template = "compensation/form/view.html"
+        if intervention_id:
-    if intervention_id is not None:
+            # If the parent-intervention is recorded, we are not allowed to change anything on it's data.
-        try:
+            # Not even adding new child elements like compensations!
-            intervention = Intervention.objects.get(id=intervention_id)
+            intervention = get_object_or_404(Intervention, id=intervention_id)
-        except ObjectDoesNotExist:
+            recording_state_blocks_actions = intervention.is_recorded
-            messages.error(request, PARAMS_INVALID)
+            if recording_state_blocks_actions:
-            return redirect("home")
-        if intervention.is_recorded:
                 messages.info(
                     request,
                     RECORDED_BLOCKS_EDIT
@@ -90,7 +126,7 @@ def new_view(request: HttpRequest, intervention_id: str = None):
 
         data_form = NewCompensationForm(request.POST or None, intervention_id=intervention_id)
         geom_form = SimpleGeomForm(request.POST or None, read_only=False)
-    if request.method == "POST":
+
         if data_form.is_valid() and geom_form.is_valid():
             generated_identifier = data_form.cleaned_data.get("identifier", None)
             comp = data_form.save(request.user, geom_form)
@@ -103,49 +139,42 @@ def new_view(request: HttpRequest, intervention_id: str = None):
                     )
                 )
             messages.success(request, COMPENSATION_ADDED_TEMPLATE.format(comp.identifier))
-            if geom_form.geometry_simplified:
+            if geom_form.has_geometry_simplified():
                 messages.info(
                     request,
                     GEOMETRY_SIMPLIFIED
                 )
+            num_ignored_geometries = geom_form.get_num_geometries_ignored()
+            if num_ignored_geometries > 0:
+                messages.info(
+                    request,
+                    GEOMETRIES_IGNORED_TEMPLATE.format(num_ignored_geometries)
+                )
             return redirect("compensation:detail", id=comp.id)
         else:
             messages.error(request, FORM_INVALID, extra_tags="danger", )
-    else:
+
-        # For clarification: nothing in this case
-        pass
         context = {
             "form": data_form,
             "geom_form": geom_form,
             TAB_TITLE_IDENTIFIER: _("New compensation"),
         }
         context = BaseContext(request, context).context
-    return render(request, template, context)
+
+        return render(request, self._TEMPLATE, context)
 
 
-@login_required
+class CompensationIdentifierGeneratorView(AbstractIdentifierGeneratorView):
-@default_group_required
+    _MODEL = Compensation
-def new_id_view(request: HttpRequest):
-    """ JSON endpoint
-
-    Provides fetching of free identifiers for e.g. AJAX calls
-
-    """
-    tmp = Compensation()
-    identifier = tmp.generate_new_identifier()
-    while Compensation.objects.filter(identifier=identifier).exists():
-        identifier = tmp.generate_new_identifier()
-    return JsonResponse(
-        data={
-            "gen_data": identifier
-        }
-    )
 
 
-@login_required
+class EditCompensationView(LoginRequiredMixin, View):
-@default_group_required
+    _TEMPLATE = "compensation/form/view.html"
-@shared_access_required(Compensation, "id")
+
-def edit_view(request: HttpRequest, id: str):
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Compensation, "id"))
+    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+
         """
         Renders a view for editing compensations
 
@@ -155,7 +184,6 @@ def edit_view(request: HttpRequest, id: str):
         Returns:
 
         """
-    template = "compensation/form/view.html"
         # Get object from db
         comp = get_object_or_404(Compensation, id=id)
         if comp.is_recorded:
@@ -168,134 +196,70 @@ def edit_view(request: HttpRequest, id: str):
         # Create forms, initialize with values from db/from POST request
         data_form = EditCompensationForm(request.POST or None, instance=comp)
         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 checked to determine whether the user must be informed or not
-            # about a change of the check state
-            intervention_is_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_is_checked:
-                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",)
-    else:
-        # For clarification: nothing in this case
-        pass
         context = {
             "form": data_form,
             "geom_form": geom_form,
             TAB_TITLE_IDENTIFIER: _("Edit {}").format(comp.identifier),
         }
         context = BaseContext(request, context).context
-    return render(request, template, context)
 
+        return render(request, self._TEMPLATE, context)
 
-@login_required
+    @method_decorator(default_group_required)
-@any_group_check
+    @method_decorator(shared_access_required(Compensation, "id"))
-@uuid_required
+    def post(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
-def detail_view(request: HttpRequest, id: str):
+
-    """ Renders a detail view for a compensation
+        """
+        Renders a view for editing compensations
 
         Args:
             request (HttpRequest): The incoming request
-        id (str): The compensation's id
 
         Returns:
 
         """
-    template = "compensation/detail/compensation/view.html"
+        # Get object from db
-    comp = get_object_or_404(
+        comp = get_object_or_404(Compensation, id=id)
-        Compensation.objects.select_related(
+        if comp.is_recorded:
-            "modified",
-            "created",
-            "geometry"
-        ),
-        id=id,
-        deleted=None,
-        intervention__deleted=None,
-    )
-    geom_form = SimpleGeomForm(instance=comp)
-    parcels = comp.get_underlying_parcels()
-    _user = request.user
-    is_data_shared = comp.intervention.is_shared_with(_user)
-
-    # Order states according to surface
-    before_states = comp.before_states.all().prefetch_related("biotope_type").order_by("-surface")
-    after_states = comp.after_states.all().prefetch_related("biotope_type").order_by("-surface")
-    actions = comp.actions.all().prefetch_related("action_type")
-
-    # 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 = comp.get_surface_before_states()
-    sum_after_states = comp.get_surface_after_states()
-    diff_states = abs(sum_before_states - sum_after_states)
-
-    request = comp.set_status_messages(request)
-
-    last_checked = comp.intervention.get_last_checked_action()
-    last_checked_tooltip = ""
-    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
+                RECORDED_BLOCKS_EDIT
             )
+            return redirect("compensation:detail", id=id)
+
+        # Create forms, initialize with values from db/from POST request
+        data_form = EditCompensationForm(request.POST or None, instance=comp)
+        geom_form = SimpleGeomForm(request.POST or None, read_only=False, instance=comp)
+        if data_form.is_valid() and geom_form.is_valid():
+            # Preserve state of intervention checked to determine whether the user must be informed or not
+            # about a change of the check state
+            intervention_is_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_is_checked:
+                messages.info(request, CHECK_STATE_RESET)
+            messages.success(request, _("Compensation {} edited").format(comp.identifier))
+            if geom_form.has_geometry_simplified():
+                messages.info(
+                    request,
+                    GEOMETRY_SIMPLIFIED
+                )
+            num_ignored_geometries = geom_form.get_num_geometries_ignored()
+            if num_ignored_geometries > 0:
+                messages.info(
+                    request,
+                    GEOMETRIES_IGNORED_TEMPLATE.format(num_ignored_geometries)
+                )
+            return redirect("compensation:detail", id=comp.id)
+        else:
+            messages.error(request, FORM_INVALID, extra_tags="danger", )
 
         context = {
-        "obj": comp,
+            "form": data_form,
-        "last_checked": last_checked,
-        "last_checked_tooltip": last_checked_tooltip,
             "geom_form": geom_form,
-        "parcels": parcels,
+            TAB_TITLE_IDENTIFIER: _("Edit {}").format(comp.identifier),
-        "is_entry_shared": is_data_shared,
-        "actions": actions,
-        "before_states": before_states,
-        "after_states": after_states,
-        "sum_before_states": sum_before_states,
-        "sum_after_states": sum_after_states,
-        "diff_states": diff_states,
-        "is_default_member": _user.in_group(DEFAULT_GROUP),
-        "is_zb_member": _user.in_group(ZB_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(),
         }
         context = BaseContext(request, context).context
-    return render(request, template, context)
-
-
-@login_required_modal
-@login_required
-@default_group_required
-@shared_access_required(Compensation, "id")
-def remove_view(request: HttpRequest, id: str):
-    """ Renders a modal view for removing the compensation
-
-    Args:
-        request (HttpRequest): The incoming request
-        id (str): The compensation's id
-
-    Returns:
-
-    """
-    comp = get_object_or_404(Compensation, id=id)
-    form = RemoveModalForm(request.POST or None, instance=comp, request=request)
-    return form.process_request(
-        request=request,
-        msg_success=COMPENSATION_REMOVED_TEMPLATE.format(comp.identifier),
-        redirect_url=reverse("compensation:index"),
-    )
 
+        return render(request, self._TEMPLATE, context)

compensation/views/compensation/detail.py

@@ -0,0 +1,97 @@
+"""
+Author: Michel Peltriaux
+Created on: 14.12.25
+
+"""
+from django.contrib import messages
+from django.http import HttpRequest, HttpResponse
+from django.shortcuts import render, get_object_or_404
+
+from compensation.models import Compensation
+from konova.contexts import BaseContext
+from konova.forms import SimpleGeomForm
+from konova.settings import ETS_GROUP, ZB_GROUP, DEFAULT_GROUP
+from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
+from konova.utils.message_templates import DO_NOT_FORGET_TO_SHARE, DATA_CHECKED_PREVIOUSLY_TEMPLATE
+from konova.views.detail import AbstractDetailView
+
+
+class DetailCompensationView(AbstractDetailView):
+    _TEMPLATE = "compensation/detail/compensation/view.html"
+
+    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+
+        """ Renders a detail view for a compensation
+
+        Args:
+            request (HttpRequest): The incoming request
+            id (str): The compensation's id
+
+        Returns:
+
+        """
+        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
+        is_data_shared = comp.intervention.is_shared_with(_user)
+
+        # Order states according to surface
+        before_states = comp.before_states.all().prefetch_related("biotope_type").order_by("-surface")
+        after_states = comp.after_states.all().prefetch_related("biotope_type").order_by("-surface")
+        actions = comp.actions.all().prefetch_related("action_type")
+
+        # 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 = comp.get_surface_before_states()
+        sum_after_states = comp.get_surface_after_states()
+        diff_states = abs(sum_before_states - sum_after_states)
+
+        request = comp.set_status_messages(request)
+
+        last_checked = comp.intervention.get_last_checked_action()
+        last_checked_tooltip = ""
+        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,
+            "last_checked_tooltip": last_checked_tooltip,
+            "geom_form": geom_form,
+            "parcels": parcels,
+            "is_entry_shared": is_data_shared,
+            "actions": actions,
+            "before_states": before_states,
+            "after_states": after_states,
+            "sum_before_states": sum_before_states,
+            "sum_after_states": sum_after_states,
+            "diff_states": diff_states,
+            "is_default_member": _user.in_group(DEFAULT_GROUP),
+            "is_zb_member": _user.in_group(ZB_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(),
+        }
+        context = BaseContext(request, context).context
+        return render(request, self._TEMPLATE, context)

compensation/views/compensation/remove.py

@@ -0,0 +1,20 @@
+"""
+Author: Michel Peltriaux
+Created on: 14.12.25
+
+"""
+from django.http import HttpRequest, HttpResponse
+from django.utils.decorators import method_decorator
+
+from compensation.models import Compensation
+from konova.decorators import shared_access_required
+from konova.views.remove import AbstractRemoveView
+
+
+class RemoveCompensationView(AbstractRemoveView):
+    _MODEL = Compensation
+    _REDIRECT_URL = "compensation:index"
+
+    @method_decorator(shared_access_required(Compensation, "id"))
+    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
+        return super().get(request, *args, **kwargs)

compensation/views/compensation/report.py

@@ -5,20 +5,23 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.http import HttpRequest
+from django.http import HttpRequest, HttpResponse
 from django.shortcuts import get_object_or_404, render
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
 from compensation.models import Compensation
 from konova.contexts import BaseContext
-from konova.decorators import uuid_required
 from konova.forms import SimpleGeomForm
 from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
-from konova.utils.generators import generate_qr_code
+from konova.utils.qrcode import QrCode
+from konova.views.report import AbstractPublicReportView
 
-@uuid_required
+
-def report_view(request: HttpRequest, id: str):
+class CompensationPublicReportView(AbstractPublicReportView):
+    _TEMPLATE = "compensation/report/compensation/report.html"
+
+    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
         """ Renders the public report view
 
         Args:
@@ -28,10 +31,7 @@ def report_view(request: HttpRequest, id: str):
         Returns:
 
         """
-    # Reuse the compensation report template since compensations are structurally identical
-    template = "compensation/report/compensation/report.html"
         comp = get_object_or_404(Compensation, id=id)
-
         tab_title = _("Report {}").format(comp.identifier)
         # If intervention is not recorded (yet or currently) we need to render another template without any data
         if not comp.is_ready_for_publish():
@@ -48,10 +48,14 @@ def report_view(request: HttpRequest, id: str):
         )
         parcels = comp.get_underlying_parcels()
 
-    qrcode_url = request.build_absolute_uri(reverse("compensation:report", args=(id,)))
+        qrcode = QrCode(
-    qrcode_img = generate_qr_code(qrcode_url, 10)
+            content=request.build_absolute_uri(reverse("compensation:report", args=(id,))),
-    qrcode_lanis_url = comp.get_LANIS_link()
+            size=10
-    qrcode_img_lanis = generate_qr_code(qrcode_lanis_url, 7)
+        )
+        qrcode_lanis = QrCode(
+            content=comp.get_LANIS_link(),
+            size=7
+        )
 
         # Order states by surface
         before_states = comp.before_states.all().order_by("-surface").prefetch_related("biotope_type")
@@ -61,12 +65,12 @@ def report_view(request: HttpRequest, id: str):
         context = {
             "obj": comp,
             "qrcode": {
-            "img": qrcode_img,
+                "img": qrcode.get_img(),
-            "url": qrcode_url,
+                "url": qrcode.get_content(),
             },
             "qrcode_lanis": {
-            "img": qrcode_img_lanis,
+                "img": qrcode_lanis.get_img(),
-            "url": qrcode_lanis_url,
+                "url": qrcode_lanis.get_content(),
             },
             "is_entry_shared": False,  # disables action buttons during rendering
             "before_states": before_states,
@@ -78,4 +82,4 @@ def report_view(request: HttpRequest, id: str):
             TAB_TITLE_IDENTIFIER: tab_title,
         }
         context = BaseContext(request, context).context
-    return render(request, template, context)
+        return render(request, self._TEMPLATE, context)

compensation/views/eco_account/detail.py

@@ -0,0 +1,97 @@
+"""
+Author: Michel Peltriaux
+Created on: 14.12.25
+
+"""
+from django.contrib import messages
+from django.http import HttpRequest, HttpResponse
+from django.shortcuts import render, get_object_or_404
+
+from compensation.models import EcoAccount
+from konova.contexts import BaseContext
+from konova.forms import SimpleGeomForm
+from konova.settings import ETS_GROUP, ZB_GROUP, DEFAULT_GROUP
+from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
+from konova.utils.message_templates import DO_NOT_FORGET_TO_SHARE
+from konova.views.detail import AbstractDetailView
+
+
+class DetailEcoAccountView(AbstractDetailView):
+    _TEMPLATE = "compensation/detail/eco_account/view.html"
+
+    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+        """ Renders a detail view for a compensation
+
+        Args:
+            request (HttpRequest): The incoming request
+            id (str): The compensation's id
+
+        Returns:
+
+        """
+        acc = get_object_or_404(
+            EcoAccount.objects.prefetch_related(
+                "deadlines",
+            ).select_related(
+                'geometry',
+                'responsible',
+            ),
+            id=id,
+            deleted=None,
+        )
+        geom_form = SimpleGeomForm(instance=acc)
+        parcels = acc.get_underlying_parcels()
+        _user = request.user
+        is_data_shared = acc.is_shared_with(_user)
+
+        # Order states according to surface
+        before_states = acc.before_states.order_by("-surface")
+        after_states = acc.after_states.order_by("-surface")
+
+        # 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 = acc.get_surface_before_states()
+        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 = acc.deductable_rest
+        available_relative = acc.get_deductable_rest_relative()
+
+        # Prefetch related data to decrease the amount of db connections
+        deductions = acc.deductions.filter(
+            intervention__deleted=None,
+        )
+        actions = acc.actions.all()
+
+        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,
+            "parcels": parcels,
+            "is_entry_shared": is_data_shared,
+            "before_states": before_states,
+            "after_states": after_states,
+            "sum_before_states": sum_before_states,
+            "sum_after_states": sum_after_states,
+            "diff_states": diff_states,
+            "available": available_relative,
+            "available_total": available_total,
+            "is_default_member": _user.in_group(DEFAULT_GROUP),
+            "is_zb_member": _user.in_group(ZB_GROUP),
+            "is_ets_member": _user.in_group(ETS_GROUP),
+            "LANIS_LINK": acc.get_LANIS_link(),
+            "deductions": deductions,
+            "actions": actions,
+            TAB_TITLE_IDENTIFIER: f"{acc.identifier} - {acc.title}",
+            "has_finished_deadlines": acc.get_finished_deadlines().exists(),
+        }
+        context = BaseContext(request, context).context
+        return render(request, self._TEMPLATE, context)

compensation/views/eco_account/eco_account.py

@@ -6,29 +6,28 @@ Created on: 19.08.22
 
 """
 from django.contrib import messages
-from django.contrib.auth.decorators import login_required
+from django.contrib.auth.mixins import LoginRequiredMixin
-from django.db.models import Sum
+from django.http import HttpRequest, HttpResponse
-from django.http import HttpRequest, JsonResponse
 from django.shortcuts import get_object_or_404, redirect, render
-from django.urls import reverse
+from django.utils.decorators import method_decorator
 from django.utils.translation import gettext_lazy as _
+from django.views import View
 
-from compensation.forms.eco_account import EditEcoAccountForm, NewEcoAccountForm, RemoveEcoAccountModalForm
+from compensation.forms.eco_account import EditEcoAccountForm, NewEcoAccountForm
 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
-    uuid_required
 from konova.forms import SimpleGeomForm
-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, \
+from konova.utils.message_templates import RECORDED_BLOCKS_EDIT, FORM_INVALID, \
-    IDENTIFIER_REPLACED, DO_NOT_FORGET_TO_SHARE, GEOMETRY_SIMPLIFIED
+    IDENTIFIER_REPLACED, GEOMETRY_SIMPLIFIED, GEOMETRIES_IGNORED_TEMPLATE
+from konova.views.identifier import AbstractIdentifierGeneratorView
+from konova.views.index import AbstractIndexView
 
 
-@login_required
+class IndexEcoAccountView(AbstractIndexView):
-@any_group_check
+    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
-def index_view(request: HttpRequest):
         """
         Renders the index view for eco accounts
 
@@ -38,7 +37,6 @@ def index_view(request: HttpRequest):
         Returns:
             A rendered view
         """
-    template = "generic_index.html"
         eco_accounts = EcoAccount.objects.filter(
             deleted=None,
         ).order_by(
@@ -53,12 +51,38 @@ def index_view(request: HttpRequest):
             TAB_TITLE_IDENTIFIER: _("Eco-account - Overview"),
         }
         context = BaseContext(request, context).context
-    return render(request, template, context)
+        return render(request, self._TEMPLATE, context)
 
 
-@login_required
+class NewEcoAccountView(LoginRequiredMixin, View):
-@default_group_required
+    _TEMPLATE = "compensation/form/view.html"
-def new_view(request: HttpRequest):
+
+    @method_decorator(default_group_required)
+    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
+        """
+        Renders a view for a new eco account creation
+
+        Args:
+            request (HttpRequest): The incoming request
+
+        Returns:
+
+        """
+        data_form = NewEcoAccountForm(request.POST or None)
+        geom_form = SimpleGeomForm(request.POST or None, read_only=False)
+
+        context = {
+            "form": data_form,
+            "geom_form": geom_form,
+            TAB_TITLE_IDENTIFIER: _("New Eco-Account"),
+        }
+        context = BaseContext(request, context).context
+
+        return render(request, self._TEMPLATE, context)
+
+    @method_decorator(default_group_required)
+    def post(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
+
         """
         Renders a view for a new eco account creation
 
@@ -68,10 +92,8 @@ def new_view(request: HttpRequest):
         Returns:
 
         """
-    template = "compensation/form/view.html"
         data_form = NewEcoAccountForm(request.POST or None)
         geom_form = SimpleGeomForm(request.POST or None, read_only=False)
-    if request.method == "POST":
         if data_form.is_valid() and geom_form.is_valid():
             generated_identifier = data_form.cleaned_data.get("identifier", None)
             acc = data_form.save(request.user, geom_form)
@@ -84,49 +106,41 @@ def new_view(request: HttpRequest):
                     )
                 )
             messages.success(request, _("Eco-Account {} added").format(acc.identifier))
-            if geom_form.geometry_simplified:
+            if geom_form.has_geometry_simplified():
                 messages.info(
                     request,
                     GEOMETRY_SIMPLIFIED
                 )
+            num_ignored_geometries = geom_form.get_num_geometries_ignored()
+            if num_ignored_geometries > 0:
+                messages.info(
+                    request,
+                    GEOMETRIES_IGNORED_TEMPLATE.format(num_ignored_geometries)
+                )
             return redirect("compensation:acc:detail", id=acc.id)
         else:
             messages.error(request, FORM_INVALID, extra_tags="danger", )
-    else:
+
-        # For clarification: nothing in this case
-        pass
         context = {
             "form": data_form,
             "geom_form": geom_form,
             TAB_TITLE_IDENTIFIER: _("New Eco-Account"),
         }
         context = BaseContext(request, context).context
-    return render(request, template, context)
+
+        return render(request, self._TEMPLATE, context)
+
+class EcoAccountIdentifierGeneratorView(AbstractIdentifierGeneratorView):
+    _MODEL = EcoAccount
 
 
-@login_required
+class EditEcoAccountView(LoginRequiredMixin, View):
-@default_group_required
+    _TEMPLATE = "compensation/form/view.html"
-def new_id_view(request: HttpRequest):
-    """ JSON endpoint
 
-    Provides fetching of free identifiers for e.g. AJAX calls
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(EcoAccount, "id"))
+    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
 
-    """
-    tmp = EcoAccount()
-    identifier = tmp.generate_new_identifier()
-    while EcoAccount.objects.filter(identifier=identifier).exists():
-        identifier = tmp.generate_new_identifier()
-    return JsonResponse(
-        data={
-            "gen_data": identifier
-        }
-    )
-
-
-@login_required
-@default_group_required
-@shared_access_required(EcoAccount, "id")
-def edit_view(request: HttpRequest, id: str):
         """
         Renders a view for editing compensations
 
@@ -136,7 +150,6 @@ def edit_view(request: HttpRequest, id: str):
         Returns:
 
         """
-    template = "compensation/form/view.html"
         # Get object from db
         acc = get_object_or_404(EcoAccount, id=id)
         if acc.is_recorded:
@@ -149,143 +162,67 @@ def edit_view(request: HttpRequest, id: str):
         # Create forms, initialize with values from db/from POST request
         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":
+
-        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",)
-    else:
-        # For clarification: nothing in this case
-        pass
         context = {
             "form": data_form,
             "geom_form": geom_form,
             TAB_TITLE_IDENTIFIER: _("Edit {}").format(acc.identifier),
         }
         context = BaseContext(request, context).context
-    return render(request, template, context)
+        return render(request, self._TEMPLATE, context)
 
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(EcoAccount, "id"))
+    def post(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
 
-@login_required
+        """
-@any_group_check
+        Renders a view for editing compensations
-@uuid_required
-def detail_view(request: HttpRequest, id: str):
-    """ Renders a detail view for a compensation
 
         Args:
             request (HttpRequest): The incoming request
-        id (str): The compensation's id
 
         Returns:
 
         """
-    template = "compensation/detail/eco_account/view.html"
+        # Get object from db
-    acc = get_object_or_404(
+        acc = get_object_or_404(EcoAccount, id=id)
-        EcoAccount.objects.prefetch_related(
+        if acc.is_recorded:
-            "deadlines",
-        ).select_related(
-            'geometry',
-            'responsible',
-        ),
-        id=id,
-        deleted=None,
-    )
-    geom_form = SimpleGeomForm(instance=acc)
-    parcels = acc.get_underlying_parcels()
-    _user = request.user
-    is_data_shared = acc.is_shared_with(_user)
-
-    # Order states according to surface
-    before_states = acc.before_states.order_by("-surface")
-    after_states = acc.after_states.order_by("-surface")
-
-    # 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 = acc.get_surface_before_states()
-    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 = acc.deductable_rest
-    available_relative = acc.get_deductable_rest_relative()
-
-    # Prefetch related data to decrease the amount of db connections
-    deductions = acc.deductions.filter(
-        intervention__deleted=None,
-    )
-    actions = acc.actions.all()
-
-    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
+                RECORDED_BLOCKS_EDIT
             )
-
-    context = {
-        "obj": acc,
-        "geom_form": geom_form,
-        "parcels": parcels,
-        "is_entry_shared": is_data_shared,
-        "before_states": before_states,
-        "after_states": after_states,
-        "sum_before_states": sum_before_states,
-        "sum_after_states": sum_after_states,
-        "diff_states": diff_states,
-        "available": available_relative,
-        "available_total": available_total,
-        "is_default_member": _user.in_group(DEFAULT_GROUP),
-        "is_zb_member": _user.in_group(ZB_GROUP),
-        "is_ets_member": _user.in_group(ETS_GROUP),
-        "LANIS_LINK": acc.get_LANIS_link(),
-        "deductions": deductions,
-        "actions": actions,
-        TAB_TITLE_IDENTIFIER: f"{acc.identifier} - {acc.title}",
-        "has_finished_deadlines": acc.get_finished_deadlines().exists(),
-    }
-    context = BaseContext(request, context).context
-    return render(request, template, context)
-
-
-@login_required_modal
-@login_required
-@default_group_required
-@shared_access_required(EcoAccount, "id")
-def remove_view(request: HttpRequest, id: str):
-    """ Renders a modal view for removing the eco account
-
-    Args:
-        request (HttpRequest): The incoming request
-        id (str): The account's id
-
-    Returns:
-
-    """
-    acc = get_object_or_404(EcoAccount, id=id)
-
-    # If the eco account has already been recorded OR there are already deductions, it can not be deleted by a regular
-    # default group user
-    if acc.recorded is not None or acc.deductions.exists():
-        user = request.user
-        if not user.in_group(ETS_GROUP):
-            messages.info(request, CANCEL_ACC_RECORDED_OR_DEDUCTED)
             return redirect("compensation:acc:detail", id=id)
 
-    form = RemoveEcoAccountModalForm(request.POST or None, instance=acc, request=request)
+        # Create forms, initialize with values from db/from POST request
-    return form.process_request(
+        data_form = EditEcoAccountForm(request.POST or None, instance=acc)
-        request=request,
+        geom_form = SimpleGeomForm(request.POST or None, read_only=False, instance=acc)
-        msg_success=_("Eco-account removed"),
-        redirect_url=reverse("compensation:acc:index"),
-    )
 
+        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.has_geometry_simplified():
+                messages.info(
+                    request,
+                    GEOMETRY_SIMPLIFIED
+                )
+            num_ignored_geometries = geom_form.get_num_geometries_ignored()
+            if num_ignored_geometries > 0:
+                messages.info(
+                    request,
+                    GEOMETRIES_IGNORED_TEMPLATE.format(num_ignored_geometries)
+                )
+            return redirect("compensation:acc:detail", id=acc.id)
+        else:
+            messages.error(request, FORM_INVALID, extra_tags="danger", )
+
+        context = {
+            "form": data_form,
+            "geom_form": geom_form,
+            TAB_TITLE_IDENTIFIER: _("Edit {}").format(acc.identifier),
+        }
+        context = BaseContext(request, context).context
+
+        return render(request, self._TEMPLATE, context)

compensation/views/eco_account/remove.py

@@ -0,0 +1,22 @@
+"""
+Author: Michel Peltriaux
+Created on: 14.12.25
+
+"""
+from django.http import HttpRequest, HttpResponse
+from django.utils.decorators import method_decorator
+
+from compensation.forms.eco_account import RemoveEcoAccountModalForm
+from compensation.models import EcoAccount
+from konova.decorators import shared_access_required
+from konova.views.remove import AbstractRemoveView
+
+
+class RemoveEcoAccountView(AbstractRemoveView):
+    _MODEL = EcoAccount
+    _REDIRECT_URL = "compensation:acc:index"
+    _FORM = RemoveEcoAccountModalForm
+
+    @method_decorator(shared_access_required(EcoAccount, "id"))
+    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
+        return super().get(request, *args, **kwargs)

compensation/views/eco_account/report.py

@@ -5,21 +5,23 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.http import HttpRequest
+from django.http import HttpRequest, HttpResponse
 from django.shortcuts import get_object_or_404, render
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
 from compensation.models import EcoAccount
 from konova.contexts import BaseContext
-from konova.decorators import uuid_required
 from konova.forms import SimpleGeomForm
 from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
-from konova.utils.generators import generate_qr_code
+from konova.utils.qrcode import QrCode
+from konova.views.report import AbstractPublicReportView
 
 
-@uuid_required
+class EcoAccountPublicReportView(AbstractPublicReportView):
-def report_view(request: HttpRequest, id: str):
+    _TEMPLATE = "compensation/report/eco_account/report.html"
+
+    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
         """ Renders the public report view
 
         Args:
@@ -29,10 +31,7 @@ def report_view(request: HttpRequest, id: str):
         Returns:
 
         """
-    # Reuse the compensation report template since EcoAccounts are structurally identical
-    template = "compensation/report/eco_account/report.html"
         acc = get_object_or_404(EcoAccount, id=id)
-
         tab_title = _("Report {}").format(acc.identifier)
         # If intervention is not recorded (yet or currently) we need to render another template without any data
         if not acc.is_ready_for_publish():
@@ -49,10 +48,14 @@ def report_view(request: HttpRequest, id: str):
         )
         parcels = acc.get_underlying_parcels()
 
-    qrcode_url = request.build_absolute_uri(reverse("compensation:acc:report", args=(id,)))
+        qrcode = QrCode(
-    qrcode_img = generate_qr_code(qrcode_url, 10)
+            content=request.build_absolute_uri(reverse("compensation:acc:report", args=(id,))),
-    qrcode_lanis_url = acc.get_LANIS_link()
+            size=10
-    qrcode_img_lanis = generate_qr_code(qrcode_lanis_url, 7)
+        )
+        qrcode_lanis = QrCode(
+            content=acc.get_LANIS_link(),
+            size=7
+        )
 
         # Order states by surface
         before_states = acc.before_states.all().order_by("-surface").select_related("biotope_type__parent")
@@ -68,12 +71,12 @@ def report_view(request: HttpRequest, id: str):
         context = {
             "obj": acc,
             "qrcode": {
-            "img": qrcode_img,
+                "img": qrcode.get_img(),
-            "url": qrcode_url,
+                "url": qrcode.get_content(),
             },
             "qrcode_lanis": {
-            "img": qrcode_img_lanis,
+                "img": qrcode_lanis.get_img(),
-            "url": qrcode_lanis_url,
+                "url": qrcode_lanis.get_content(),
             },
             "is_entry_shared": False,  # disables action buttons during rendering
             "before_states": before_states,
@@ -86,4 +89,4 @@ def report_view(request: HttpRequest, id: str):
             TAB_TITLE_IDENTIFIER: tab_title,
         }
         context = BaseContext(request, context).context
-    return render(request, template, context)
+        return render(request, self._TEMPLATE, context)

compensation/views/payment.py

@@ -5,10 +5,12 @@ Contact: michel.peltriaux@sgdnord.rlp.de
 Created on: 09.08.21
 
 """
+from django.contrib.auth.mixins import LoginRequiredMixin
 from django.urls import reverse
-from django.contrib.auth.decorators import login_required
 from django.http import HttpRequest
 from django.shortcuts import get_object_or_404
+from django.utils.decorators import method_decorator
+from django.views import View
 
 from compensation.forms.modals.payment import NewPaymentForm, RemovePaymentModalForm, EditPaymentModalForm
 from compensation.models import Payment
@@ -17,10 +19,9 @@ from konova.decorators import default_group_required, shared_access_required
 from konova.utils.message_templates import PAYMENT_ADDED, PAYMENT_REMOVED, PAYMENT_EDITED
 
 
-@login_required
+class NewPaymentView(LoginRequiredMixin, View):
-@default_group_required
+
-@shared_access_required(Intervention, "id")
+    def __process_request(self, request: HttpRequest, id: str):
-def new_payment_view(request: HttpRequest, id: str):
         """ Renders a modal view for adding new payments
 
         Args:
@@ -38,11 +39,20 @@ def new_payment_view(request: HttpRequest, id: str):
             redirect_url=reverse("intervention:detail", args=(id,)) + "#related_data"
         )
 
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def get(self, request: HttpRequest, id: str):
+        return self.__process_request(request, id=id)
 
-@login_required
+    @method_decorator(default_group_required)
-@default_group_required
+    @method_decorator(shared_access_required(Intervention, "id"))
-@shared_access_required(Intervention, "id")
+    def post(self, request: HttpRequest, id: str):
-def payment_remove_view(request: HttpRequest, id: str, payment_id: str):
+        return self.__process_request(request, id=id)
+
+
+class RemovePaymentView(LoginRequiredMixin, View):
+
+    def __process_request(self, request: HttpRequest, id: str, payment_id: str):
         """ Renders a modal view for removing payments
 
         Args:
@@ -62,11 +72,19 @@ def payment_remove_view(request: HttpRequest, id: str, payment_id: str):
             redirect_url=reverse("intervention:detail", args=(payment.intervention_id,)) + "#related_data"
         )
 
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def get(self, request: HttpRequest, id: str, payment_id: str):
+        return self.__process_request(request, id=id, payment_id=payment_id)
 
-@login_required
+    @method_decorator(default_group_required)
-@default_group_required
+    @method_decorator(shared_access_required(Intervention, "id"))
-@shared_access_required(Intervention, "id")
+    def post(self, request: HttpRequest, id: str, payment_id: str):
-def payment_edit_view(request: HttpRequest, id: str, payment_id: str):
+        return self.__process_request(request, id=id, payment_id=payment_id)
+
+
+class EditPaymentView(LoginRequiredMixin, View):
+    def __process_request(self, request: HttpRequest, id: str, payment_id: str):
         """ Renders a modal view for editing payments
 
         Args:
@@ -86,3 +104,12 @@ def payment_edit_view(request: HttpRequest, id: str, payment_id: str):
             redirect_url=reverse("intervention:detail", args=(payment.intervention_id,)) + "#related_data"
         )
 
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def get(self, request: HttpRequest, id: str, payment_id: str):
+        return self.__process_request(request, id=id, payment_id=payment_id)
+
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def post(self, request: HttpRequest, id: str, payment_id: str):
+        return self.__process_request(request, id=id, payment_id=payment_id)

ema/tables.py

@@ -88,7 +88,7 @@ class EmaTable(BaseTable, TableRenderMixin, TableOrderMixin):
             txt=value,
             new_tab=False,
         )
-        return format_html(html)
+        return format_html(html, None)
 
     def render_r(self, value, record: Ema):
         """ Renders the registered column for a EMA
@@ -110,4 +110,4 @@ class EmaTable(BaseTable, TableRenderMixin, TableOrderMixin):
             tooltip=tooltip,
             icn_filled=recorded,
         )
-        return format_html(html)
+        return format_html(html, None)

ema/templates/ema/detail/includes/controls.html

@@ -15,10 +15,10 @@
         <button class="btn btn-default btn-modal mr-2" title="{% trans 'Resubmission' %}" data-form-url="{% url 'ema:resubmission-create' obj.id %}">
             {% fa5_icon 'bell' %}
         </button>
+        {% if is_ets_member %}
             <button class="btn btn-default btn-modal mr-2" title="{% trans 'Share' %}" data-form-url="{% url 'ema:share-form' obj.id %}">
                 {% fa5_icon 'share-alt' %}
             </button>
-        {% if is_ets_member %}
             {% if obj.recorded %}
                 <button class="btn btn-default btn-modal mr-2" title="{% trans 'Unrecord' %}" data-form-url="{% url 'ema:record' obj.id %}">
                     {% fa5_icon 'bookmark' 'far' %}
@@ -28,16 +28,18 @@
                     {% fa5_icon 'bookmark' %}
                 </button>
             {% endif %}
-        {% endif %}
-        {% if is_default_member %}
             <a href="{% url 'ema:edit' obj.id %}" class="mr-2">
                 <button class="btn btn-default" title="{% trans 'Edit' %}">
                     {% fa5_icon 'edit' %}
                 </button>
             </a>
+        {% endif %}
+        {% if is_default_member %}
             <button class="btn btn-default btn-modal mr-2" data-form-url="{% url 'ema:log' obj.id %}" title="{% trans 'Show log' %}">
                 {% fa5_icon 'history' %}
             </button>
+        {% endif %}
+        {% if is_ets_member %}
             <button class="btn btn-default btn-modal" data-form-url="{% url 'ema:remove' obj.id %}" title="{% trans 'Delete' %}">
                 {% fa5_icon 'trash' %}
             </button>

ema/tests/test_views.py

@@ -118,6 +118,7 @@ class EmaViewTestCase(CompensationViewTestCase):
             self.index_url,
             self.detail_url,
             self.report_url,
+            self.log_url,
         ]
         fail_urls = [
             self.new_url,
@@ -133,7 +134,6 @@ class EmaViewTestCase(CompensationViewTestCase):
             self.action_remove_url,
             self.action_new_url,
             self.new_doc_url,
-            self.log_url,
             self.remove_url,
         ]
         self.assert_url_fail(client, fail_urls)

ema/tests/test_workflow.py

@@ -46,7 +46,7 @@ class EmaWorkflowTestCase(BaseWorkflowTestCase):
         post_data = {
             "identifier": test_id,
             "title": test_title,
-            "geom": geom_json,
+            "output": geom_json,
             "conservation_office": test_conservation_office.id
         }
         self.client_user.post(new_url, post_data)
@@ -84,7 +84,7 @@ class EmaWorkflowTestCase(BaseWorkflowTestCase):
         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 = self.create_dummy_geometry()  # Create an empty geometry
         test_conservation_office = self.get_conservation_office_code()
 
         check_on_elements = {
@@ -99,7 +99,7 @@ class EmaWorkflowTestCase(BaseWorkflowTestCase):
             "identifier": new_identifier,
             "title": new_title,
             "comment": new_comment,
-            "geom": new_geometry.geojson,
+            "output": self.create_geojson(new_geometry),
             "conservation_office": test_conservation_office.id
         }
         self.client_user.post(url, post_data)

ema/tests/unit/test_forms.py

@@ -48,7 +48,7 @@ class NewEmaFormTestCase(BaseTestCase):
         )
         geom_form_data = json.loads(geom_form_data)
         geom_form_data = {
-            "geom": json.dumps(geom_form_data)
+            "output": json.dumps(geom_form_data)
         }
 
         geom_form = SimpleGeomForm(geom_form_data)
@@ -116,7 +116,7 @@ class EditEmaFormTestCase(BaseTestCase):
         )
         geom_form_data = json.loads(geom_form_data)
         geom_form_data = {
-            "geom": json.dumps(geom_form_data)
+            "output": json.dumps(geom_form_data)
         }
 
         geom_form = SimpleGeomForm(geom_form_data)

ema/urls.py

@@ -9,26 +9,28 @@ from django.urls import path
 
 from ema.views.action import NewEmaActionView, EditEmaActionView, RemoveEmaActionView
 from ema.views.deadline import NewEmaDeadlineView, EditEmaDeadlineView, RemoveEmaDeadlineView
+from ema.views.detail import DetailEmaView
 from ema.views.document import NewEmaDocumentView, EditEmaDocumentView, RemoveEmaDocumentView, GetEmaDocumentView
-from ema.views.ema import index_view, new_view, new_id_view, detail_view, edit_view, remove_view
+from ema.views.ema import IndexEmaView, EmaIdentifierGeneratorView, EditEmaView, NewEmaView
 from ema.views.log import EmaLogView
 from ema.views.record import EmaRecordView
-from ema.views.report import report_view
+from ema.views.remove import RemoveEmaView
+from ema.views.report import EmaPublicReportView
 from ema.views.resubmission import EmaResubmissionView
 from ema.views.share import EmaShareFormView, EmaShareByTokenView
 from ema.views.state import NewEmaStateView, EditEmaStateView, RemoveEmaStateView
 
 app_name = "ema"
 urlpatterns = [
-    path("", index_view, name="index"),
+    path("", IndexEmaView.as_view(), name="index"),
-    path("new/", new_view, name="new"),
+    path("new/", NewEmaView.as_view(), name="new"),
-    path("new/id", new_id_view, name="new-id"),
+    path("new/id", EmaIdentifierGeneratorView.as_view(), name="new-id"),
-    path("<id>", detail_view, name="detail"),
+    path("<id>", DetailEmaView.as_view(), name="detail"),
     path('<id>/log', EmaLogView.as_view(), name='log'),
-    path('<id>/edit', edit_view, name='edit'),
+    path('<id>/edit', EditEmaView.as_view(), name='edit'),
-    path('<id>/remove', remove_view, name='remove'),
+    path('<id>/remove', RemoveEmaView.as_view(), name='remove'),
     path('<id>/record', EmaRecordView.as_view(), name='record'),
-    path('<id>/report', report_view, name='report'),
+    path('<id>/report', EmaPublicReportView.as_view(), name='report'),
     path('<id>/resub', EmaResubmissionView.as_view(), name='resubmission-create'),
 
     path('<id>/state/new', NewEmaStateView.as_view(), name='new-state'),

ema/views/detail.py

@@ -0,0 +1,76 @@
+"""
+Author: Michel Peltriaux
+Created on: 14.12.25
+
+"""
+from django.contrib import messages
+from django.http import HttpResponse, HttpRequest
+from django.shortcuts import get_object_or_404, render
+
+from ema.models import Ema
+from konova.contexts import BaseContext
+from konova.forms import SimpleGeomForm
+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 DO_NOT_FORGET_TO_SHARE
+from konova.views.detail import AbstractDetailView
+
+
+class DetailEmaView(AbstractDetailView):
+    _TEMPLATE = "ema/detail/view.html"
+
+    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+        """ Renders the detail view of an EMA
+
+        Args:
+            request (HttpRequest): The incoming request
+            id (str): The EMA id
+
+        Returns:
+
+        """
+        ema = get_object_or_404(Ema, id=id, deleted=None)
+
+        geom_form = SimpleGeomForm(instance=ema)
+        parcels = ema.get_underlying_parcels()
+        _user = request.user
+        is_entry_shared = ema.is_shared_with(_user)
+
+        # Order states according to surface
+        before_states = ema.before_states.all().order_by("-surface")
+        after_states = ema.after_states.all().order_by("-surface")
+
+        # 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 = ema.get_surface_before_states()
+        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,
+            "parcels": parcels,
+            "is_entry_shared": is_entry_shared,
+            "before_states": before_states,
+            "after_states": after_states,
+            "sum_before_states": sum_before_states,
+            "sum_after_states": sum_after_states,
+            "diff_states": diff_states,
+            "is_default_member": _user.in_group(DEFAULT_GROUP),
+            "is_zb_member": _user.in_group(ZB_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(),
+        }
+        context = BaseContext(request, context).context
+        return render(request, self._TEMPLATE, context)

ema/views/ema.py

@@ -7,28 +7,28 @@ Created on: 19.08.22
 """
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
-from django.db.models import Sum
+from django.contrib.auth.mixins import LoginRequiredMixin
-from django.http import HttpRequest, JsonResponse
+from django.http import HttpRequest, HttpResponse
 from django.shortcuts import get_object_or_404, redirect, render
-from django.urls import reverse
+from django.utils.decorators import method_decorator
 from django.utils.translation import gettext_lazy as _
+from django.views.generic.base import View
 
 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
-    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, \
-    DO_NOT_FORGET_TO_SHARE, GEOMETRY_SIMPLIFIED
+    GEOMETRY_SIMPLIFIED, GEOMETRIES_IGNORED_TEMPLATE
+from konova.views.identifier import AbstractIdentifierGeneratorView
+from konova.views.index import AbstractIndexView
 
 
-@login_required
+class IndexEmaView(AbstractIndexView):
-def index_view(request: HttpRequest):
+    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
         """ Renders the index view for EMAs
 
         Args:
@@ -37,7 +37,6 @@ def index_view(request: HttpRequest):
         Returns:
 
         """
-    template = "generic_index.html"
         emas = Ema.objects.filter(
             deleted=None,
         ).order_by(
@@ -53,25 +52,51 @@ def index_view(request: HttpRequest):
             TAB_TITLE_IDENTIFIER: _("EMAs - Overview"),
         }
         context = BaseContext(request, context).context
-    return render(request, template, context)
+        return render(request, self._TEMPLATE, context)
 
+class NewEmaView(LoginRequiredMixin, View):
+    _TEMPLATE = "ema/form/view.html"
 
-@login_required
+    @method_decorator(conservation_office_group_required)
-@conservation_office_group_required
+    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
-def new_view(request: HttpRequest):
+        """ GET endpoint
-    """
+
-    Renders a view for a new eco account creation
+        Renders form for new EMA
 
         Args:
             request (HttpRequest): The incoming request
+            *args ():
+            **kwargs ():
+
+        Returns:
+
+        """
+        data_form = NewEmaForm(request.POST or None)
+        geom_form = SimpleGeomForm(request.POST or None, read_only=False)
+        context = {
+            "form": data_form,
+            "geom_form": geom_form,
+            TAB_TITLE_IDENTIFIER: _("New EMA"),
+        }
+        context = BaseContext(request, context).context
+        return render(request, self._TEMPLATE, context)
+
+    @method_decorator(conservation_office_group_required)
+    def post(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
+        """ POST endpoint
+
+        Processes submitted form
+
+        Args:
+            request (HttpRequest): The incoming request
+            *args ():
+            **kwargs ():
 
         Returns:
 
         """
-    template = "ema/form/view.html"
         data_form = NewEmaForm(request.POST or None)
         geom_form = SimpleGeomForm(request.POST or None, read_only=False)
-    if request.method == "POST":
         if data_form.is_valid() and geom_form.is_valid():
             generated_identifier = data_form.cleaned_data.get("identifier", None)
             ema = data_form.save(request.user, geom_form)
@@ -84,120 +109,90 @@ def new_view(request: HttpRequest):
                     )
                 )
             messages.success(request, _("EMA {} added").format(ema.identifier))
-            if geom_form.geometry_simplified:
+            if geom_form.has_geometry_simplified():
                 messages.info(
                     request,
                     GEOMETRY_SIMPLIFIED
                 )
-
+            num_ignored_geometries = geom_form.get_num_geometries_ignored()
+            if num_ignored_geometries > 0:
+                messages.info(
+                    request,
+                    GEOMETRIES_IGNORED_TEMPLATE.format(num_ignored_geometries)
+                )
             return redirect("ema:detail", id=ema.id)
         else:
             messages.error(request, FORM_INVALID, extra_tags="danger",)
-    else:
-        # For clarification: nothing in this case
-        pass
         context = {
             "form": data_form,
             "geom_form": geom_form,
             TAB_TITLE_IDENTIFIER: _("New EMA"),
         }
         context = BaseContext(request, context).context
-    return render(request, template, context)
+        return render(request, self._TEMPLATE, context)
 
+class EmaIdentifierGeneratorView(AbstractIdentifierGeneratorView):
+    _MODEL = Ema
 
-@login_required
+    @method_decorator(conservation_office_group_required)
-@conservation_office_group_required
+    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
-def new_id_view(request: HttpRequest):
+        return super().get(request, *args, **kwargs)
-    """ JSON endpoint
 
-    Provides fetching of free identifiers for e.g. AJAX calls
+class EditEmaView(LoginRequiredMixin, View):
+    _TEMPLATE = "compensation/form/view.html"
 
-    """
+    @method_decorator(conservation_office_group_required)
-    tmp = Ema()
+    @method_decorator(shared_access_required(Ema, "id"))
-    identifier = tmp.generate_new_identifier()
+    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
-    while Ema.objects.filter(identifier=identifier).exists():
+        """ GET endpoint
-        identifier = tmp.generate_new_identifier()
-    return JsonResponse(
-        data={
-            "gen_data": identifier
-        }
-    )
 
-
+        Renders form
-@login_required
-@uuid_required
-def detail_view(request: HttpRequest, id: str):
-    """ Renders the detail view of an EMA
 
         Args:
             request (HttpRequest): The incoming request
-        id (str): The EMA id
+            id (str): The ema identifier
+            *args ():
+            **kwargs ():
 
         Returns:
 
         """
-    template = "ema/detail/view.html"
+        # Get object from db
-    ema = get_object_or_404(Ema, id=id, deleted=None)
+        ema = get_object_or_404(Ema, id=id)
-
+        if ema.is_recorded:
-    geom_form = SimpleGeomForm(instance=ema)
-    parcels = ema.get_underlying_parcels()
-    _user = request.user
-    is_entry_shared = ema.is_shared_with(_user)
-
-    # Order states according to surface
-    before_states = ema.before_states.all().order_by("-surface")
-    after_states = ema.after_states.all().order_by("-surface")
-
-    # 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 = ema.get_surface_before_states()
-    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
+                RECORDED_BLOCKS_EDIT
             )
+            return redirect("ema:detail", id=id)
 
+        # Create forms, initialize with values from db/from POST request
+        data_form = EditEmaForm(instance=ema)
+        geom_form = SimpleGeomForm(read_only=False, instance=ema)
         context = {
-        "obj": ema,
+            "form": data_form,
             "geom_form": geom_form,
-        "parcels": parcels,
+            TAB_TITLE_IDENTIFIER: _("Edit {}").format(ema.identifier),
-        "is_entry_shared": is_entry_shared,
-        "before_states": before_states,
-        "after_states": after_states,
-        "sum_before_states": sum_before_states,
-        "sum_after_states": sum_after_states,
-        "diff_states": diff_states,
-        "is_default_member": _user.in_group(DEFAULT_GROUP),
-        "is_zb_member": _user.in_group(ZB_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(),
         }
         context = BaseContext(request, context).context
-    return render(request, template, context)
+        return render(request, self._TEMPLATE, context)
 
+    @method_decorator(conservation_office_group_required)
+    @method_decorator(shared_access_required(Ema, "id"))
+    def post(self, request: HttpRequest, id:str, *args, **kwargs) -> HttpResponse:
+        """ POST endpoint
 
-@login_required
+        Process submitted forms
-@conservation_office_group_required
-@shared_access_required(Ema, "id")
-def edit_view(request: HttpRequest, id: str):
-    """
-    Renders a view for editing compensations
 
         Args:
             request (HttpRequest): The incoming request
+            id (str): The id of the ema
+            *args ():
+            **kwargs ():
 
         Returns:
 
         """
-    template = "compensation/form/view.html"
         # Get object from db
         ema = get_object_or_404(Ema, id=id)
         if ema.is_recorded:
@@ -210,50 +205,28 @@ def edit_view(request: HttpRequest, id: str):
         # Create forms, initialize with values from db/from POST request
         data_form = EditEmaForm(request.POST or None, instance=ema)
         geom_form = SimpleGeomForm(request.POST or None, read_only=False, instance=ema)
-    if request.method == "POST":
         if data_form.is_valid() and geom_form.is_valid():
             # 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:
+            if geom_form.has_geometry_simplified():
                 messages.info(
                     request,
                     GEOMETRY_SIMPLIFIED
                 )
+            num_ignored_geometries = geom_form.get_num_geometries_ignored()
+            if num_ignored_geometries > 0:
+                messages.info(
+                    request,
+                    GEOMETRIES_IGNORED_TEMPLATE.format(num_ignored_geometries)
+                )
             return redirect("ema:detail", id=ema.id)
         else:
             messages.error(request, FORM_INVALID, extra_tags="danger", )
-    else:
-        # For clarification: nothing in this case
-        pass
         context = {
             "form": data_form,
             "geom_form": geom_form,
             TAB_TITLE_IDENTIFIER: _("Edit {}").format(ema.identifier),
         }
         context = BaseContext(request, context).context
-    return render(request, template, context)
+        return render(request, self._TEMPLATE, context)
-
-
-@login_required_modal
-@login_required
-@conservation_office_group_required
-@shared_access_required(Ema, "id")
-def remove_view(request: HttpRequest, id: str):
-    """ Renders a modal view for removing the EMA
-
-    Args:
-        request (HttpRequest): The incoming request
-        id (str): The EMA's id
-
-    Returns:
-
-    """
-    ema = get_object_or_404(Ema, id=id)
-    form = RemoveModalForm(request.POST or None, instance=ema, request=request)
-    return form.process_request(
-        request=request,
-        msg_success=_("EMA removed"),
-        redirect_url=reverse("ema:index"),
-    )
-

ema/views/log.py

@@ -18,7 +18,6 @@ class EmaLogView(AbstractLogView):
 
     @method_decorator(login_required_modal)
     @method_decorator(login_required)
-    @method_decorator(conservation_office_group_required)
     @method_decorator(shared_access_required(Ema, "id"))
     def dispatch(self, request, *args, **kwargs):
         return super().dispatch(request, *args, **kwargs)

ema/views/remove.py

@@ -0,0 +1,21 @@
+"""
+Author: Michel Peltriaux
+Created on: 14.12.25
+
+"""
+from django.http import HttpRequest, HttpResponse
+from django.utils.decorators import method_decorator
+
+from ema.models import Ema
+from konova.decorators import shared_access_required, conservation_office_group_required
+from konova.views.remove import AbstractRemoveView
+
+
+class RemoveEmaView(AbstractRemoveView):
+    _MODEL = Ema
+    _REDIRECT_URL = "ema:index"
+
+    @method_decorator(conservation_office_group_required)
+    @method_decorator(shared_access_required(Ema, "id"))
+    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
+        return super().get(request, *args, **kwargs)

ema/views/report.py

@@ -5,20 +5,23 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.http import HttpRequest
+from django.http import HttpRequest, HttpResponse
 from django.shortcuts import get_object_or_404, render
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
 from ema.models import Ema
 from konova.contexts import BaseContext
-from konova.decorators import uuid_required
 from konova.forms import SimpleGeomForm
 from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
-from konova.utils.generators import generate_qr_code
+from konova.utils.qrcode import QrCode
+from konova.views.report import AbstractPublicReportView
 
-@uuid_required
+
-def report_view(request:HttpRequest, id: str):
+class EmaPublicReportView(AbstractPublicReportView):
+    _TEMPLATE = "ema/report/report.html"
+
+    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
         """ Renders the public report view
 
         Args:
@@ -28,10 +31,7 @@ def report_view(request:HttpRequest, id: str):
         Returns:
 
         """
-    # Reuse the compensation report template since EMAs are structurally identical
-    template = "ema/report/report.html"
         ema = get_object_or_404(Ema, id=id)
-
         tab_title = _("Report {}").format(ema.identifier)
         # If intervention is not recorded (yet or currently) we need to render another template without any data
         if not ema.is_ready_for_publish():
@@ -48,10 +48,14 @@ def report_view(request:HttpRequest, id: str):
         )
         parcels = ema.get_underlying_parcels()
 
-    qrcode_url = request.build_absolute_uri(reverse("ema:report", args=(id,)))
+        qrcode = QrCode(
-    qrcode_img = generate_qr_code(qrcode_url, 10)
+            content=request.build_absolute_uri(reverse("ema:report", args=(id,))),
-    qrcode_lanis_url = ema.get_LANIS_link()
+            size=10
-    qrcode_img_lanis = generate_qr_code(qrcode_lanis_url, 7)
+        )
+        qrcode_lanis = QrCode(
+            content=ema.get_LANIS_link(),
+            size=7
+        )
 
         # Order states by surface
         before_states = ema.before_states.all().order_by("-surface").prefetch_related("biotope_type")
@@ -61,12 +65,12 @@ def report_view(request:HttpRequest, id: str):
         context = {
             "obj": ema,
             "qrcode": {
-            "img": qrcode_img,
+                "img": qrcode.get_img(),
-            "url": qrcode_url
+                "url": qrcode.get_content(),
             },
             "qrcode_lanis": {
-            "img": qrcode_img_lanis,
+                "img": qrcode_lanis.get_img(),
-            "url": qrcode_lanis_url
+                "url": qrcode_lanis.get_content(),
             },
             "is_entry_shared": False,  # disables action buttons during rendering
             "before_states": before_states,
@@ -78,4 +82,4 @@ def report_view(request:HttpRequest, id: str):
             TAB_TITLE_IDENTIFIER: tab_title,
         }
         context = BaseContext(request, context).context
-    return render(request, template, context)
+        return render(request, self._TEMPLATE, context)

intervention/admin.py

@@ -37,6 +37,14 @@ class InterventionAdmin(BaseObjectAdmin):
             "geometry",
         ]
 
+    def get_actions(self, request):
+        DELETE_ACTION_IDENTIFIER = "delete_selected"
+        actions = super().get_actions(request)
+
+        if DELETE_ACTION_IDENTIFIER in actions:
+            del actions[DELETE_ACTION_IDENTIFIER]
+
+        return actions
 
 class InterventionDocumentAdmin(AbstractDocumentAdmin):
     pass

intervention/tables.py

@@ -127,7 +127,7 @@ class InterventionTable(BaseTable, TableRenderMixin, TableOrderMixin):
             html += self.render_previously_checked_star(
                 tooltip=tooltip,
             )
-        return format_html(html)
+        return format_html(html, None)
 
     def render_r(self, value, record: Intervention):
         """ Renders the recorded column for an intervention
@@ -149,5 +149,5 @@ class InterventionTable(BaseTable, TableRenderMixin, TableOrderMixin):
             tooltip=tooltip,
             icn_filled=checked,
         )
-        return format_html(html)
+        return format_html(html, None)
 

intervention/tests/test_workflow.py

@@ -60,7 +60,7 @@ class InterventionWorkflowTestCase(BaseWorkflowTestCase):
         post_data = {
             "identifier": test_id,
             "title": test_title,
-            "geom": geom_json,
+            "output": geom_json,
         }
         response = self.client_user.post(
             new_url,

intervention/tests/unit/test_forms.py

@@ -62,7 +62,7 @@ class NewInterventionFormTestCase(BaseTestCase):
         )
         geom_form_data = json.loads(geom_form_data)
         geom_form_data = {
-            "geom": json.dumps(geom_form_data)
+            "output": json.dumps(geom_form_data)
         }
         geom_form = SimpleGeomForm(geom_form_data)
 
@@ -104,7 +104,7 @@ class EditInterventionFormTestCase(NewInterventionFormTestCase):
         )
         geom_form_data = json.loads(geom_form_data)
         geom_form_data = {
-            "geom": json.dumps(geom_form_data)
+            "output": json.dumps(geom_form_data)
         }
 
         geom_form = SimpleGeomForm(geom_form_data)
@@ -124,7 +124,7 @@ class EditInterventionFormTestCase(NewInterventionFormTestCase):
         self.assertIsNotNone(obj.responsible.handler)
         self.assertEqual(obj.title, data["title"])
         self.assertEqual(obj.comment, data["comment"])
-        self.assertTrue(test_geom.equals_exact(obj.geometry.geom, 0.000001))
+        self.assert_equal_geometries(test_geom, obj.geometry.geom)
 
         self.assertEqual(obj.legal.binding_date, today)
         self.assertEqual(obj.legal.registration_date, today)

intervention/urls.py

@@ -8,39 +8,42 @@ Created on: 30.11.20
 from django.urls import path
 
 from intervention.autocomplete.intervention import InterventionAutocomplete
-from intervention.views.check import check_view
+from intervention.views.check import InterventionCheckView
-from intervention.views.compensation import remove_compensation_view
+from intervention.views.compensation import RemoveCompensationFromInterventionView
 from intervention.views.deduction import NewInterventionDeductionView, EditInterventionDeductionView, \
     RemoveInterventionDeductionView
 from intervention.views.document import NewInterventionDocumentView, GetInterventionDocumentView, \
     RemoveInterventionDocumentView, EditInterventionDocumentView
-from intervention.views.intervention import index_view, new_view, new_id_view, detail_view, edit_view, remove_view
+from intervention.views.intervention import IndexInterventionView, InterventionIdentifierGeneratorView, \
+    NewInterventionView, EditInterventionView
+from intervention.views.remove import RemoveInterventionView
+from intervention.views.detail import DetailInterventionView
 from intervention.views.log import InterventionLogView
 from intervention.views.record import InterventionRecordView
-from intervention.views.report import report_view
+from intervention.views.report import InterventionPublicReportView
 from intervention.views.resubmission import InterventionResubmissionView
-from intervention.views.revocation import new_revocation_view, edit_revocation_view, remove_revocation_view, \
+from intervention.views.revocation import NewInterventionRevocationView, GetInterventionRevocationView, \
-    get_revocation_view
+    EditInterventionRevocationView, RemoveInterventionRevocationView
 from intervention.views.share import InterventionShareFormView, InterventionShareByTokenView
 
 app_name = "intervention"
 urlpatterns = [
-    path("", index_view, name="index"),
+    path("", IndexInterventionView.as_view(), name="index"),
-    path('new/', new_view, name='new'),
+    path('new/', NewInterventionView.as_view(), name='new'),
-    path('new/id', new_id_view, name='new-id'),
+    path('new/id', InterventionIdentifierGeneratorView.as_view(), name='new-id'),
-    path('<id>', detail_view, name='detail'),
+    path('<id>', DetailInterventionView.as_view(), name='detail'),
     path('<id>/log', InterventionLogView.as_view(), name='log'),
-    path('<id>/edit', edit_view, name='edit'),
+    path('<id>/edit', EditInterventionView.as_view(), name='edit'),
-    path('<id>/remove', remove_view, name='remove'),
+    path('<id>/remove', RemoveInterventionView.as_view(), name='remove'),
     path('<id>/share/<token>', InterventionShareByTokenView.as_view(), name='share-token'),
     path('<id>/share', InterventionShareFormView.as_view(), name='share-form'),
-    path('<id>/check', check_view, name='check'),
+    path('<id>/check', InterventionCheckView.as_view(), name='check'),
     path('<id>/record', InterventionRecordView.as_view(), name='record'),
-    path('<id>/report', report_view, name='report'),
+    path('<id>/report', InterventionPublicReportView.as_view(), name='report'),
     path('<id>/resub', InterventionResubmissionView.as_view(), name='resubmission-create'),
 
     # Compensations
-    path('<id>/compensation/<comp_id>/remove', remove_compensation_view, name='remove-compensation'),
+    path('<id>/compensation/<comp_id>/remove', RemoveCompensationFromInterventionView.as_view(), name='remove-compensation'),
 
     # Documents
     path('<id>/document/new/', NewInterventionDocumentView.as_view(), name='new-doc'),
@@ -54,10 +57,10 @@ urlpatterns = [
     path('<id>/deduction/<deduction_id>/remove', RemoveInterventionDeductionView.as_view(), name='remove-deduction'),
 
     # Revocation routes
-    path('<id>/revocation/new', new_revocation_view, name='new-revocation'),
+    path('<id>/revocation/new', NewInterventionRevocationView.as_view(), name='new-revocation'),
-    path('<id>/revocation/<revocation_id>/edit', edit_revocation_view, name='edit-revocation'),
+    path('<id>/revocation/<revocation_id>/edit', EditInterventionRevocationView.as_view(), name='edit-revocation'),
-    path('<id>/revocation/<revocation_id>/remove', remove_revocation_view, name='remove-revocation'),
+    path('<id>/revocation/<revocation_id>/remove', RemoveInterventionRevocationView.as_view(), name='remove-revocation'),
-    path('revocation/<doc_id>', get_revocation_view, name='get-doc-revocation'),
+    path('revocation/<doc_id>', GetInterventionRevocationView.as_view(), name='get-doc-revocation'),
 
     # Autocomplete
     path("atcmplt/interventions", InterventionAutocomplete.as_view(), name="autocomplete"),

intervention/views/check.py

@@ -5,21 +5,21 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib.auth.decorators import login_required
+from django.contrib.auth.mixins import LoginRequiredMixin
-from django.http import HttpRequest
+from django.http import HttpRequest, HttpResponse
 from django.shortcuts import get_object_or_404
+from django.utils.decorators import method_decorator
 from django.utils.translation import gettext_lazy as _
+from django.views import View
 
 from intervention.forms.modals.check import CheckModalForm
 from intervention.models import Intervention
 from konova.decorators import registration_office_group_required, shared_access_required
 from konova.utils.message_templates import INTERVENTION_INVALID
 
+class InterventionCheckView(LoginRequiredMixin, View):
 
-@login_required
+    def __process_request(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
-@registration_office_group_required
-@shared_access_required(Intervention, "id")
-def check_view(request: HttpRequest, id: str):
         """ Renders check form for an intervention
 
         Args:
@@ -37,3 +37,12 @@ def check_view(request: HttpRequest, id: str):
             msg_error=INTERVENTION_INVALID
         )
 
+    @method_decorator(registration_office_group_required)
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+        return self.__process_request(request, id, *args, **kwargs)
+
+    @method_decorator(registration_office_group_required)
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def post(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+        return self.__process_request(request, id, *args, **kwargs)

intervention/views/compensation.py

@@ -5,22 +5,23 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib.auth.decorators import login_required
+from django.contrib.auth.mixins import LoginRequiredMixin
 from django.core.exceptions import ObjectDoesNotExist
-from django.http import HttpRequest, Http404
+from django.http import HttpRequest, Http404, HttpResponse
 from django.shortcuts import get_object_or_404
 from django.urls import reverse
+from django.utils.decorators import method_decorator
+from django.views import View
 
 from intervention.models import Intervention
-from konova.decorators import shared_access_required, login_required_modal
+from konova.decorators import shared_access_required
 from konova.forms.modals import RemoveModalForm
 from konova.utils.message_templates import COMPENSATION_REMOVED_TEMPLATE
 
 
-@login_required_modal
+class RemoveCompensationFromInterventionView(LoginRequiredMixin, View):
-@login_required
+
-@shared_access_required(Intervention, "id")
+    def __process_request(self, request: HttpRequest, id: str, comp_id: str, *args, **kwargs) -> HttpResponse:
-def remove_compensation_view(request: HttpRequest, id: str, comp_id: str):
         """ Renders a modal view for removing the compensation
 
         Args:
@@ -44,3 +45,10 @@ def remove_compensation_view(request: HttpRequest, id: str, comp_id: str):
             redirect_url=reverse("intervention:detail", args=(id,)) + "#related_data",
         )
 
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def get(self, request, id: str, comp_id: str, *args, **kwargs) -> HttpResponse:
+        return self.__process_request(request, id, comp_id, *args, **kwargs)
+
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def post(self, request, id: str, comp_id: str, *args, **kwargs) -> HttpResponse:
+        return self.__process_request(request, id, comp_id, *args, **kwargs)

intervention/views/detail.py

@@ -0,0 +1,79 @@
+"""
+Author: Michel Peltriaux
+Created on: 14.12.25
+
+"""
+from django.contrib import messages
+from django.http import HttpResponse
+from django.shortcuts import get_object_or_404, render
+
+from intervention.models import Intervention
+from konova.contexts import BaseContext
+from konova.forms import SimpleGeomForm
+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 DATA_CHECKED_PREVIOUSLY_TEMPLATE, DO_NOT_FORGET_TO_SHARE
+from konova.views.detail import AbstractDetailView
+
+
+class DetailInterventionView(AbstractDetailView):
+    _TEMPLATE = "intervention/detail/view.html"
+
+    def get(self, request, id: str, *args, **kwargs) -> HttpResponse:
+        # Fetch data, filter out deleted related data
+        intervention = get_object_or_404(
+            Intervention.objects.select_related(
+                "geometry",
+                "legal",
+                "responsible",
+            ).prefetch_related(
+                "legal__revocations",
+            ),
+            id=id,
+            deleted=None
+        )
+        compensations = intervention.compensations.filter(
+            deleted=None,
+        )
+        _user = request.user
+        is_data_shared = intervention.is_shared_with(user=_user)
+
+        geom_form = SimpleGeomForm(
+            instance=intervention,
+        )
+        last_checked = intervention.get_last_checked_action()
+        last_checked_tooltip = ""
+        if last_checked:
+            last_checked_tooltip = DATA_CHECKED_PREVIOUSLY_TEMPLATE.format(
+                last_checked.get_timestamp_str_formatted(),
+                last_checked.user
+            )
+
+        has_payment_without_document = intervention.payments.exists() and not intervention.get_documents()[1].exists()
+
+        requesting_user_is_only_shared_user = intervention.is_only_shared_with(_user)
+        if requesting_user_is_only_shared_user:
+            messages.info(
+                request,
+                DO_NOT_FORGET_TO_SHARE
+            )
+
+        context = {
+            "obj": intervention,
+            "last_checked": last_checked,
+            "last_checked_tooltip": last_checked_tooltip,
+            "compensations": compensations,
+            "is_entry_shared": is_data_shared,
+            "geom_form": geom_form,
+            "is_default_member": _user.in_group(DEFAULT_GROUP),
+            "is_zb_member": _user.in_group(ZB_GROUP),
+            "is_ets_member": _user.in_group(ETS_GROUP),
+            "LANIS_LINK": intervention.get_LANIS_link(),
+            "has_payment_without_document": has_payment_without_document,
+            TAB_TITLE_IDENTIFIER: f"{intervention.identifier} - {intervention.title}",
+        }
+
+        request = intervention.set_status_messages(request)
+
+        context = BaseContext(request, context).context
+        return render(request, self._TEMPLATE, context)

intervention/views/intervention.py

@@ -7,28 +7,29 @@ Created on: 19.08.22
 """
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
-from django.http import JsonResponse, HttpRequest
+from django.contrib.auth.mixins import LoginRequiredMixin
+from django.http import HttpRequest, HttpResponse
 from django.shortcuts import get_object_or_404, render, redirect
-from django.urls import reverse
+from django.utils.decorators import method_decorator
 from django.utils.translation import gettext_lazy as _
+from django.views import View
 
 from intervention.forms.intervention import EditInterventionForm, NewInterventionForm
 from intervention.models import Intervention
 from intervention.tables import InterventionTable
 from konova.contexts import BaseContext
-from konova.decorators import default_group_required, shared_access_required, any_group_check, login_required_modal, \
+from konova.decorators import default_group_required, shared_access_required
-    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 DATA_CHECKED_PREVIOUSLY_TEMPLATE, RECORDED_BLOCKS_EDIT, \
+from konova.utils.message_templates import RECORDED_BLOCKS_EDIT, \
-    CHECK_STATE_RESET, FORM_INVALID, IDENTIFIER_REPLACED, DO_NOT_FORGET_TO_SHARE, GEOMETRY_SIMPLIFIED
+    CHECK_STATE_RESET, FORM_INVALID, IDENTIFIER_REPLACED, GEOMETRY_SIMPLIFIED, \
+    GEOMETRIES_IGNORED_TEMPLATE
+from konova.views.identifier import AbstractIdentifierGeneratorView
+from konova.views.index import AbstractIndexView
 
 
-@login_required
+class IndexInterventionView(AbstractIndexView):
-@any_group_check
+    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
-def index_view(request: HttpRequest):
         """
         Renders the index view for Interventions
 
@@ -38,8 +39,6 @@ def index_view(request: HttpRequest):
         Returns:
             A rendered view
         """
-    template = "generic_index.html"
-
         # Filtering by user access is performed in table filter inside InterventionTableFilter class
         interventions = Intervention.objects.filter(
             deleted=None,  # not deleted
@@ -57,12 +56,37 @@ def index_view(request: HttpRequest):
             TAB_TITLE_IDENTIFIER: _("Interventions - Overview"),
         }
         context = BaseContext(request, context).context
-    return render(request, template, context)
+        return render(request, self._TEMPLATE, context)
 
 
-@login_required
+class NewInterventionView(LoginRequiredMixin, View):
-@default_group_required
+    _TEMPLATE = "intervention/form/view.html"
-def new_view(request: HttpRequest):
+
+    @method_decorator(default_group_required)
+    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
+
+        """
+        Renders a view for a new intervention creation
+
+        Args:
+            request (HttpRequest): The incoming request
+
+        Returns:
+
+        """
+        data_form = NewInterventionForm()
+        geom_form = SimpleGeomForm(read_only=False)
+        context = {
+            "form": data_form,
+            "geom_form": geom_form,
+            TAB_TITLE_IDENTIFIER: _("New intervention"),
+        }
+        context = BaseContext(request, context).context
+        return render(request, self._TEMPLATE, context)
+
+    @method_decorator(default_group_required)
+    def post(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
+
         """
         Renders a view for a new intervention creation
 
@@ -72,10 +96,9 @@ def new_view(request: HttpRequest):
         Returns:
 
         """
-    template = "intervention/form/view.html"
         data_form = NewInterventionForm(request.POST or None)
         geom_form = SimpleGeomForm(request.POST or None, read_only=False)
-    if request.method == "POST":
+
         if data_form.is_valid() and geom_form.is_valid():
             generated_identifier = data_form.cleaned_data.get("identifier", None)
             intervention = data_form.save(request.user, geom_form)
@@ -87,134 +110,88 @@ def new_view(request: HttpRequest):
                         intervention.identifier
                     )
                 )
+
             messages.success(request, _("Intervention {} added").format(intervention.identifier))
-            if geom_form.geometry_simplified:
+            if geom_form.has_geometry_simplified():
                 messages.info(
                     request,
                     GEOMETRY_SIMPLIFIED
                 )
+
+            num_ignored_geometries = geom_form.get_num_geometries_ignored()
+            if num_ignored_geometries > 0:
+                messages.info(
+                    request,
+                    GEOMETRIES_IGNORED_TEMPLATE.format(num_ignored_geometries)
+                )
             return redirect("intervention:detail", id=intervention.id)
+
         else:
             messages.error(request, FORM_INVALID, extra_tags="danger", )
-    else:
-        # For clarification: nothing in this case
-        pass
         context = {
             "form": data_form,
             "geom_form": geom_form,
             TAB_TITLE_IDENTIFIER: _("New intervention"),
         }
         context = BaseContext(request, context).context
-    return render(request, template, context)
+        return render(request, self._TEMPLATE, context)
 
 
-@login_required
+class InterventionIdentifierGeneratorView(AbstractIdentifierGeneratorView):
-@default_group_required
+    _MODEL = Intervention
-def new_id_view(request: HttpRequest):
-    """ JSON endpoint
-
-    Provides fetching of free identifiers for e.g. AJAX calls
-
-    """
-    tmp_intervention = Intervention()
-    identifier = tmp_intervention.generate_new_identifier()
-    while Intervention.objects.filter(identifier=identifier).exists():
-        identifier = tmp_intervention.generate_new_identifier()
-    return JsonResponse(
-        data={
-            "gen_data": identifier
-        }
-    )
 
 
-@login_required
+class EditInterventionView(LoginRequiredMixin, View):
-@any_group_check
+    _TEMPLATE = "intervention/form/view.html"
-@uuid_required
-def detail_view(request: HttpRequest, id: str):
-    """ Renders a detail view for viewing an intervention's data
 
-    Args:
+    @method_decorator(default_group_required)
-        request (HttpRequest): The incoming request
+    @method_decorator(shared_access_required(Intervention, "id"))
-        id (str): The intervention's id
+    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
-
-    Returns:
-
-    """
-    template = "intervention/detail/view.html"
-
-    # Fetch data, filter out deleted related data
-    intervention = get_object_or_404(
-        Intervention.objects.select_related(
-            "geometry",
-            "legal",
-            "responsible",
-        ).prefetch_related(
-            "legal__revocations",
-        ),
-        id=id,
-        deleted=None
-    )
-    compensations = intervention.compensations.filter(
-        deleted=None,
-    )
-    _user = request.user
-    is_data_shared = intervention.is_shared_with(user=_user)
-
-    geom_form = SimpleGeomForm(
-        instance=intervention,
-    )
-    last_checked = intervention.get_last_checked_action()
-    last_checked_tooltip = ""
-    if last_checked:
-        last_checked_tooltip = DATA_CHECKED_PREVIOUSLY_TEMPLATE.format(
-            last_checked.get_timestamp_str_formatted(),
-            last_checked.user
-        )
-
-    has_payment_without_document = intervention.payments.exists() and not intervention.get_documents()[1].exists()
-
-    requesting_user_is_only_shared_user = intervention.is_only_shared_with(_user)
-    if requesting_user_is_only_shared_user:
-        messages.info(
-            request,
-            DO_NOT_FORGET_TO_SHARE
-        )
-
-    context = {
-        "obj": intervention,
-        "last_checked": last_checked,
-        "last_checked_tooltip": last_checked_tooltip,
-        "compensations": compensations,
-        "is_entry_shared": is_data_shared,
-        "geom_form": geom_form,
-        "is_default_member": _user.in_group(DEFAULT_GROUP),
-        "is_zb_member": _user.in_group(ZB_GROUP),
-        "is_ets_member": _user.in_group(ETS_GROUP),
-        "LANIS_LINK": intervention.get_LANIS_link(),
-        "has_payment_without_document": has_payment_without_document,
-        TAB_TITLE_IDENTIFIER: f"{intervention.identifier} - {intervention.title}",
-    }
-
-    request = intervention.set_status_messages(request)
-
-    context = BaseContext(request, context).context
-    return render(request, template, context)
-
-
-@login_required
-@default_group_required
-@shared_access_required(Intervention, "id")
-def edit_view(request: HttpRequest, id: str):
         """
         Renders a view for editing interventions
 
         Args:
             request (HttpRequest): The incoming request
+            id (str): The intervention identifier
 
         Returns:
-
+            HttpResponse: The rendered view
+        """
+
+        # Get object from db
+        intervention = get_object_or_404(Intervention, id=id)
+        if intervention.is_recorded:
+            messages.info(
+                request,
+                RECORDED_BLOCKS_EDIT
+            )
+            return redirect("intervention:detail", id=id)
+
+        # Create forms, initialize with values from db/from POST request
+        data_form = EditInterventionForm(request.POST or None, instance=intervention)
+        geom_form = SimpleGeomForm(request.POST or None, read_only=False, instance=intervention)
+        context = {
+            "form": data_form,
+            "geom_form": geom_form,
+            TAB_TITLE_IDENTIFIER: _("Edit {}").format(intervention.identifier),
+        }
+        context = BaseContext(request, context).context
+        return render(request, self._TEMPLATE, context)
+
+
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def post(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+        """
+        Process saved form content
+
+        Args:
+            request (HttpRequest): The incoming request
+            id (str): The intervention id
+
+        Returns:
+            HttpResponse:
         """
-    template = "intervention/form/view.html"
         # Get object from db
         intervention = get_object_or_404(Intervention, id=id)
         if intervention.is_recorded:
@@ -227,7 +204,6 @@ def edit_view(request: HttpRequest, id: str):
         # Create forms, initialize with values from db/from POST request
         data_form = EditInterventionForm(request.POST or None, instance=intervention)
         geom_form = SimpleGeomForm(request.POST or None, read_only=False, instance=intervention)
-    if request.method == "POST":
         if data_form.is_valid() and geom_form.is_valid():
             # The data form takes the geom form for processing, as well as the performing user
             # Save the current state of recorded|checked to inform the user in case of a status reset due to editing
@@ -236,45 +212,22 @@ def edit_view(request: HttpRequest, id: str):
             messages.success(request, _("Intervention {} edited").format(intervention.identifier))
             if intervention_is_checked:
                 messages.info(request, CHECK_STATE_RESET)
-            if geom_form.geometry_simplified:
+            if geom_form.has_geometry_simplified():
                 messages.info(
                     request,
                     GEOMETRY_SIMPLIFIED
                 )
+            num_ignored_geometries = geom_form.get_num_geometries_ignored()
+            if num_ignored_geometries > 0:
+                messages.info(
+                    request,
+                    GEOMETRIES_IGNORED_TEMPLATE.format(num_ignored_geometries)
+                )
             return redirect("intervention:detail", id=intervention.id)
-        else:
-            messages.error(request, FORM_INVALID, extra_tags="danger",)
-    else:
-        # For clarification: nothing in this case
-        pass
         context = {
             "form": data_form,
             "geom_form": geom_form,
             TAB_TITLE_IDENTIFIER: _("Edit {}").format(intervention.identifier),
         }
         context = BaseContext(request, context).context
-    return render(request, template, context)
+        return render(request, self._TEMPLATE, context)
-
-
-@login_required_modal
-@login_required
-@default_group_required
-@shared_access_required(Intervention, "id")
-def remove_view(request: HttpRequest, id: str):
-    """ Renders a remove view for this intervention
-
-    Args:
-        request (HttpRequest): The incoming request
-        id (str): The uuid id as string
-
-    Returns:
-
-    """
-    obj = Intervention.objects.get(id=id)
-    identifier = obj.identifier
-    form = RemoveModalForm(request.POST or None, instance=obj, request=request)
-    return form.process_request(
-        request,
-        _("{} removed").format(identifier),
-        redirect_url=reverse("intervention:index")
-    )

intervention/views/remove.py

@@ -0,0 +1,20 @@
+"""
+Author: Michel Peltriaux
+Created on: 14.12.25
+
+"""
+from django.http import HttpRequest, HttpResponse
+from django.utils.decorators import method_decorator
+
+from intervention.models import Intervention
+from konova.decorators import shared_access_required
+from konova.views.remove import AbstractRemoveView
+
+
+class RemoveInterventionView(AbstractRemoveView):
+    _MODEL = Intervention
+    _REDIRECT_URL = "intervention:index"
+
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
+        return super().get(request, *args, **kwargs)

intervention/views/report.py

@@ -5,21 +5,23 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.http import HttpRequest
+from django.http import HttpRequest, HttpResponse
 from django.shortcuts import get_object_or_404, render
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
 from intervention.models import Intervention
 from konova.contexts import BaseContext
-from konova.decorators import uuid_required
 from konova.forms import SimpleGeomForm
 from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
-from konova.utils.generators import generate_qr_code
+from konova.utils.qrcode import QrCode
+from konova.views.report import AbstractPublicReportView
 
 
-@uuid_required
+class InterventionPublicReportView(AbstractPublicReportView):
-def report_view(request: HttpRequest, id: str):
+    _TEMPLATE = "intervention/report/report.html"
+
+    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
         """ Renders the public report view
 
         Args:
@@ -29,7 +31,6 @@ def report_view(request: HttpRequest, id: str):
         Returns:
 
         """
-    template = "intervention/report/report.html"
         intervention = get_object_or_404(Intervention, id=id)
 
         tab_title = _("Report {}").format(intervention.identifier)
@@ -51,21 +52,26 @@ def report_view(request: HttpRequest, id: str):
         distinct_deductions = intervention.deductions.all().distinct(
             "account"
         )
-    qrcode_url = request.build_absolute_uri(reverse("intervention:report", args=(id,)))
+
-    qrcode_img = generate_qr_code(qrcode_url, 10)
+        qrcode = QrCode(
-    qrcode_lanis_url = intervention.get_LANIS_link()
+            content=request.build_absolute_uri(reverse("intervention:report", args=(id,))),
-    qrcode_img_lanis = generate_qr_code(qrcode_lanis_url, 7)
+            size=10
+        )
+        qrcode_lanis = QrCode(
+            content=intervention.get_LANIS_link(),
+            size=7
+        )
 
         context = {
             "obj": intervention,
             "deductions": distinct_deductions,
             "qrcode": {
-            "img": qrcode_img,
+                "img": qrcode.get_img(),
-            "url": qrcode_url,
+                "url": qrcode.get_content(),
             },
             "qrcode_lanis": {
-            "img": qrcode_img_lanis,
+                "img": qrcode_lanis.get_img(),
-            "url": qrcode_lanis_url,
+                "url": qrcode_lanis.get_content(),
             },
             "geom_form": geom_form,
             "parcels": parcels,
@@ -73,4 +79,4 @@ def report_view(request: HttpRequest, id: str):
             TAB_TITLE_IDENTIFIER: tab_title,
         }
         context = BaseContext(request, context).context
-    return render(request, template, context)
+        return render(request, self._TEMPLATE, context)

intervention/views/revocation.py

@@ -6,10 +6,12 @@ Created on: 19.08.22
 
 """
 from django.contrib import messages
-from django.contrib.auth.decorators import login_required
+from django.contrib.auth.mixins import LoginRequiredMixin
-from django.http import HttpRequest
+from django.http import HttpRequest, HttpResponse
 from django.shortcuts import get_object_or_404, redirect
 from django.urls import reverse
+from django.utils.decorators import method_decorator
+from django.views import View
 
 from intervention.forms.modals.revocation import NewRevocationModalForm, EditRevocationModalForm, \
     RemoveRevocationModalForm
@@ -19,10 +21,8 @@ from konova.utils.documents import get_document
 from konova.utils.message_templates import REVOCATION_ADDED, DATA_UNSHARED, REVOCATION_EDITED, REVOCATION_REMOVED
 
 
-@login_required
+class NewInterventionRevocationView(LoginRequiredMixin, View):
-@default_group_required
+    def __process_request(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
-@shared_access_required(Intervention, "id")
-def new_revocation_view(request: HttpRequest, id: str):
         """ Renders sharing form for an intervention
 
         Args:
@@ -33,17 +33,28 @@ def new_revocation_view(request: HttpRequest, id: str):
 
         """
         intervention = get_object_or_404(Intervention, id=id)
-    form = NewRevocationModalForm(request.POST or None, request.FILES or None, instance=intervention, request=request)
+        form = NewRevocationModalForm(request.POST or None, request.FILES or None, instance=intervention,
+                                      request=request)
         return form.process_request(
             request,
             msg_success=REVOCATION_ADDED,
             redirect_url=reverse("intervention:detail", args=(id,)) + "#related_data"
         )
 
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+        return self.__process_request(request, id, *args, **kwargs)
 
-@login_required
+    @method_decorator(default_group_required)
-@default_group_required
+    @method_decorator(shared_access_required(Intervention, "id"))
-def get_revocation_view(request: HttpRequest, doc_id: str):
+    def post(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+        return self.__process_request(request, id, *args, **kwargs)
+
+
+class GetInterventionRevocationView(LoginRequiredMixin, View):
+    @method_decorator(default_group_required)
+    def get(self, request: HttpRequest, doc_id: str, *args, **kwargs) -> HttpResponse:
         """ Returns the revocation document as downloadable file
 
         Wraps the generic document fetcher function from konova.utils.
@@ -66,10 +77,8 @@ def get_revocation_view(request: HttpRequest, doc_id: str):
         return get_document(doc)
 
 
-@login_required
+class EditInterventionRevocationView(LoginRequiredMixin, View):
-@default_group_required
+    def __process_request(self, request: HttpRequest, id: str, revocation_id: str, *args, **kwargs) -> HttpResponse:
-@shared_access_required(Intervention, "id")
-def edit_revocation_view(request: HttpRequest, id: str, revocation_id: str):
         """ Renders a edit view for a revocation
 
         Args:
@@ -83,19 +92,27 @@ def edit_revocation_view(request: HttpRequest, id: str, revocation_id: str):
         intervention = get_object_or_404(Intervention, id=id)
         revocation = get_object_or_404(Revocation, id=revocation_id)
 
-    form = EditRevocationModalForm(request.POST or None, request.FILES or None, instance=intervention, revocation=revocation, request=request)
+        form = EditRevocationModalForm(request.POST or None, request.FILES or None, instance=intervention,
+                                       revocation=revocation, request=request)
         return form.process_request(
             request,
             REVOCATION_EDITED,
             redirect_url=reverse("intervention:detail", args=(intervention.id,)) + "#related_data"
         )
 
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def get(self, request: HttpRequest, id: str, revocation_id: str, *args, **kwargs) -> HttpResponse:
+        return self.__process_request(request, id, revocation_id, *args, **kwargs)
 
-@login_required_modal
+    @method_decorator(default_group_required)
-@login_required
+    @method_decorator(shared_access_required(Intervention, "id"))
-@default_group_required
+    def post(self, request: HttpRequest, id: str, revocation_id: str, *args, **kwargs) -> HttpResponse:
-@shared_access_required(Intervention, "id")
+        return self.__process_request(request, id, revocation_id, *args, **kwargs)
-def remove_revocation_view(request: HttpRequest, id: str, revocation_id: str):
+
+
+class RemoveInterventionRevocationView(LoginRequiredMixin, View):
+    def __process_request(self, request, id: str, revocation_id: str, *args, **kwargs) -> HttpResponse:
         """ Renders a remove view for a revocation
 
         Args:
@@ -109,10 +126,20 @@ def remove_revocation_view(request: HttpRequest, id: str, revocation_id: str):
         intervention = get_object_or_404(Intervention, id=id)
         revocation = get_object_or_404(Revocation, id=revocation_id)
 
-    form = RemoveRevocationModalForm(request.POST or None, instance=intervention, revocation=revocation, request=request)
+        form = RemoveRevocationModalForm(request.POST or None, instance=intervention, revocation=revocation,
+                                         request=request)
         return form.process_request(
             request,
             REVOCATION_REMOVED,
             redirect_url=reverse("intervention:detail", args=(intervention.id,)) + "#related_data"
         )
 
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def get(self, request: HttpRequest, id: str, revocation_id: str, *args, **kwargs) -> HttpResponse:
+        return self.__process_request(request, id, revocation_id, *args, **kwargs)
+
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def post(self, request, id: str, revocation_id: str, *args, **kwargs) -> HttpResponse:
+        return self.__process_request(request, id, revocation_id, *args, **kwargs)

konova/forms/geometry_form.py

@@ -25,15 +25,17 @@ class SimpleGeomForm(BaseForm):
     """ A geometry form for rendering geometry read-only using a widget
 
     """
-    read_only = True
+    read_only: bool = True
-    geometry_simplified = False
+    _geometry_simplified: bool = False
-    geom = JSONField(
+    output = JSONField(
         label=_("Geometry"),
         help_text=_(""),
         label_suffix="",
         required=False,
         disabled=False,
     )
+    _num_geometries_ignored: int = 0
+    empty = False
 
     def __init__(self, *args, **kwargs):
         self.read_only = kwargs.pop("read_only", True)
@@ -48,33 +50,33 @@ class SimpleGeomForm(BaseForm):
                 raise AttributeError
 
             geojson = self.instance.geometry.as_feature_collection(srid=DEFAULT_SRID_RLP)
+            geojson = self._set_geojson_properties(geojson, title=self.instance.identifier or None)
             geom = json.dumps(geojson)
         except AttributeError:
             # If no geometry exists for this form, we simply set the value to None and zoom to the maximum level
-            geom = ""
+            geom = json.dumps({})
             self.empty = True
 
-        self.initialize_form_field("geom", geom)
+        self.initialize_form_field("output", geom)
 
     def is_valid(self):
         super().is_valid()
         is_valid = True
 
-        # Get geojson from form
+        # Make sure invalid geometry is properly rendered again to the user
-        geom = self.data["geom"]
+        # Therefore: write submitted data back into form field
-        if geom is None or len(geom) == 0:
+        # (does not matter whether we know if it is valid or invalid)
-            # empty geometry is a valid geometry
+        submitted_data = self.data["output"]
-            self.cleaned_data["geom"] = MultiPolygon(srid=DEFAULT_SRID_RLP).ewkt
+        submitted_data = json.loads(submitted_data)
-            return is_valid
+        submitted_data = self._set_geojson_properties(submitted_data)
+        self.initialize_form_field("output", json.dumps(submitted_data))
+
+        # Get geojson from form for validity checking
+        geom = self.data.get("output", json.dumps({}))
         geom = json.loads(geom)
 
-        # Write submitted data back into form field to make sure invalid geometry
+        # Initialize features list with empty MultiPolygon, so that an empty input will result in a
-        # will be rendered again on failed submit
+        # proper empty MultiPolygon object
-        self.initialize_form_field("geom", self.data["geom"])
-
-        # Read geojson into gdal geometry
-        # HINT: This can be simplified if the geojson format holds data in epsg:4326 (GDAL provides direct creation for
-        # this case)
         features = []
         features_json = geom.get("features", [])
         accepted_ogr_types = [
@@ -83,47 +85,64 @@ class SimpleGeomForm(BaseForm):
             "MultiPolygon",
             "MultiPolygon25D",
         ]
+        # Check validity for each feature of the geometry
         for feature in features_json:
             feature_geom = feature.get("geometry", feature)
             if feature_geom is None:
                 # Fallback for rare cases where a feature does not contain any geometry
                 continue
 
+            # Try to create a geometry object from the single feature
             feature_geom = json.dumps(feature_geom)
             g = gdal.OGRGeometry(feature_geom, srs=DEFAULT_SRID_RLP)
 
-            flatten_geometry = g.coord_dim > 2
+            geometry_has_unwanted_dimensions = g.coord_dim > 2
-            if flatten_geometry:
+            if geometry_has_unwanted_dimensions:
                 g = self.__flatten_geom_to_2D(g)
 
-            if g.geom_type not in accepted_ogr_types:
+            geometry_type_is_accepted = g.geom_type not in accepted_ogr_types
-                self.add_error("geom", _("Only surfaces allowed. Points or lines must be buffered."))
+            if geometry_type_is_accepted:
+                self.add_error("output", _("Only surfaces allowed. Points or lines must be buffered."))
                 is_valid &= False
                 return is_valid
 
-            is_valid &= self.__is_area_valid(g)
+            is_area_valid = self.__is_area_valid(g)
+            if not is_area_valid:
+                # Geometries with an invalid size will not be saved to the db
+                # We assume these are malicious snippets which are not supposed to be in the geometry in the first place
+                self._num_geometries_ignored += 1
+                continue
 
-            polygon = Polygon.from_ewkt(g.ewkt)
+            # Whatever this geometry object is -> try to create a Polygon from it
-            is_valid &= polygon.valid
+            # The resulting polygon object automatically detects whether a valid polygon has been created or not
-            if not polygon.valid:
+            g = Polygon.from_ewkt(g.ewkt)
-                self.add_error("geom", polygon.valid_reason)
+            is_valid &= g.valid
+            if not g.valid:
+                self.add_error("output", g.valid_reason)
                 return is_valid
 
-            features.append(polygon)
+            # If the resulting polygon is just a single polygon, we add it to the list of properly casted features
+            if isinstance(g, Polygon):
+                features.append(g)
+            elif isinstance(g, MultiPolygon):
+                # The resulting polygon could be of type MultiPolygon (due to multiple surfaces)
+                # If so, we extract all polygons from the MultiPolygon and extend the casted features list
+                features.extend(list(g))
 
-        # Unionize all geometry features into one new MultiPolygon
+        # Unionize all polygon features into one new MultiPolygon
+        if features:
+            form_geom = MultiPolygon(*features, srid=DEFAULT_SRID_RLP).unary_union
+        else:
+            # If no features have been processed, this indicates an empty geometry - so we store an empty geometry
             form_geom = MultiPolygon(srid=DEFAULT_SRID_RLP)
-        for feature in features:
-            form_geom = form_geom.union(feature)
 
         # Make sure to convert into a MultiPolygon. Relevant if a single Polygon is provided.
-        if form_geom.geom_type != "MultiPolygon":
+        form_geom = Geometry.cast_to_multipolygon(form_geom)
-            form_geom = MultiPolygon(form_geom, srid=DEFAULT_SRID_RLP)
 
-        # Write unioned Multipolygon into cleaned data
+        # Write unionized Multipolygon back into cleaned data
         if self.cleaned_data is None:
             self.cleaned_data = {}
-        self.cleaned_data["geom"] = form_geom.ewkt
+        self.cleaned_data["output"] = form_geom.ewkt
 
         return is_valid
 
@@ -133,7 +152,7 @@ class SimpleGeomForm(BaseForm):
         Returns:
 
         """
-        geom = self.cleaned_data.get("geom")
+        geom = self.cleaned_data.get("output")
         g = gdal.OGRGeometry(geom, srs=DEFAULT_SRID_RLP)
         num_vertices = g.num_coords
 
@@ -146,15 +165,6 @@ class SimpleGeomForm(BaseForm):
 
         """
         is_area_valid = geom.area > 1  # > 1m² (SRID:25832)
-
-        if not is_area_valid:
-            self.add_error(
-                "geom",
-                _("Geometry must be greater than 1m². Currently is {}m²").format(
-                    float(geom.area)
-                )
-            )
-
         return is_area_valid
 
     def __simplify_geometry(self, geom, max_vert: int):
@@ -192,14 +202,14 @@ class SimpleGeomForm(BaseForm):
             if self.instance is None or self.instance.geometry is None:
                 raise LookupError
             geometry = self.instance.geometry
-            geometry.geom = self.cleaned_data.get("geom", MultiPolygon(srid=DEFAULT_SRID_RLP))
+            geometry.geom = self.cleaned_data.get("output", MultiPolygon(srid=DEFAULT_SRID_RLP))
             geometry.modified = action
 
             geometry.save()
         except LookupError:
             # No geometry or linked instance holding a geometry exist --> create a new one!
             geometry = Geometry.objects.create(
-                geom=self.cleaned_data.get("geom", MultiPolygon(srid=DEFAULT_SRID_RLP)),
+                geom=self.cleaned_data.get("output", MultiPolygon(srid=DEFAULT_SRID_RLP)),
                 created=action,
             )
 
@@ -207,13 +217,29 @@ class SimpleGeomForm(BaseForm):
         if not is_vertices_num_valid:
             geometry.geom = self.__simplify_geometry(geometry.geom, max_vert=GEOM_MAX_VERTICES)
             geometry.save()
-            self.geometry_simplified = True
+            self._geometry_simplified = True
 
         # Start parcel update and geometry conflict checking procedure in a background process
         celery_update_parcels.delay(geometry.id)
         celery_check_for_geometry_conflicts.delay(geometry.id)
         return geometry
 
+    def get_num_geometries_ignored(self):
+        """ Returns the number of geometries which had to be ignored for various reasons
+
+        Returns:
+
+        """
+        return self._num_geometries_ignored
+
+    def has_geometry_simplified(self):
+        """ Returns whether the geometry has been simplified or not.
+
+        Returns:
+
+        """
+        return self._geometry_simplified
+
     def __flatten_geom_to_2D(self, geom):
         """
         Enforces a given OGRGeometry from higher dimensions into 2D
@@ -223,3 +249,22 @@ class SimpleGeomForm(BaseForm):
         g_wkt = wkt_w.write(geom.geos).decode("utf-8")
         geom = gdal.OGRGeometry(g_wkt)
         return geom
+
+    def _set_geojson_properties(self, geojson: dict, title: str = None):
+        """ Toggles the editable property of the geojson for proper handling in map client
+
+        Args:
+            geojson (dict): The GeoJson
+            title (str): An alternative title for the geometry
+
+        Returns:
+            geojson (dict): The altered GeoJson
+        """
+        features = geojson.get("features", [])
+        for feature in features:
+            if not feature.get("properties", None):
+                feature["properties"] = {}
+            feature["properties"]["editable"] = not self.read_only
+            if title:
+                feature["properties"]["title"] = title
+        return geojson

konova/models/geometry.py

@@ -10,7 +10,9 @@ import json
 from django.contrib.gis.db.models import MultiPolygonField
 from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned
 from django.db import models, transaction
+from django.db.models import Q
 from django.utils import timezone
+from django.contrib.gis.geos import MultiPolygon
 
 from konova.models import BaseResource, UuidModel
 from konova.sub_settings.lanis_settings import DEFAULT_SRID_RLP
@@ -101,24 +103,41 @@ class Geometry(BaseResource):
         resolved_conflicts = all_conflicted_by_conflicts.exclude(id__in=still_conflicting_conflicts)
         resolved_conflicts.delete()
 
-    def get_data_objects(self):
+    def get_data_objects(self, limit_to_attrs: list = None):
         """ Getter for all objects which are related to this geometry
 
+        Using the limit_to_attrs we can limit the amount of returned data directly onto the data object attributes
+        we want to have. Reduces memory consumption and runtime.
+
         Returns:
             objs (list): The list of objects
         """
         objs = []
-        sets = [
+
+        # Some related data sets can be processed rather easily
+        regular_sets = [
             self.intervention_set,
-            self.compensation_set,
             self.ema_set,
             self.ecoaccount_set,
         ]
-        for _set in sets:
+        for _set in regular_sets:
             set_objs = _set.filter(
                 deleted=None
             )
+            if limit_to_attrs:
+                objs += set_objs.values_list(*limit_to_attrs, flat=True)
+            else:
                 objs += set_objs
+
+        # ... but we need a special treatment for compensations, since they can be deleted directly OR inherit their
+        # de-facto-deleted status from their deleted parent intervention
+        comp_objs = self.compensation_set.filter(
+            Q(deleted=None) & Q(intervention__deleted=None)
+        )
+        if limit_to_attrs:
+            objs += comp_objs.values_list(*limit_to_attrs, flat=True)
+        else:
+            objs += comp_objs
         return objs
 
     def get_data_object(self):
@@ -342,6 +361,7 @@ class Geometry(BaseResource):
                 {
                     "type": "Feature",
                     "geometry": json.loads(p.json),
+                    "properties": {},
                  }
                 for p in polygons
             ]
@@ -383,6 +403,39 @@ class Geometry(BaseResource):
 
         return complexity_factor
 
+    @staticmethod
+    def cast_to_multipolygon(input_geom):
+        """ If input_geom is not a MultiPolygon, cast to MultiPolygon
+
+        Args:
+            input_geom ():
+
+        Returns:
+            output_geom
+        """
+        output_geom = input_geom
+        if not isinstance(input_geom, MultiPolygon):
+            try:
+                output_geom = MultiPolygon(input_geom, srid=DEFAULT_SRID_RLP)
+            except TypeError as e:
+                raise AssertionError(f"Only (Multi)Polygon allowed! Could not convert {input_geom.geom_type} to MultiPolygon")
+        return output_geom
+
+    @staticmethod
+    def cast_to_rlp_srid(input_geom):
+        """ If input_geom is not of RLP SRID (25832), cast to RLP SRID
+
+        Args:
+            input_geom ():
+
+        Returns:
+            output_geom
+        """
+        output_geom = input_geom
+        if output_geom.srid != DEFAULT_SRID_RLP:
+            output_geom.transform(DEFAULT_SRID_RLP)
+        return output_geom
+
 
 class GeometryConflict(UuidModel):
     """

konova/models/object.py

@@ -677,19 +677,23 @@ class GeoReferencedMixin(models.Model):
             return request
 
         instance_objs = []
-        conflicts = self.geometry.conflicts_geometries.all()
+        needed_data_object_attrs = [
+            "identifier"
+        ]
+        conflicts = self.geometry.conflicts_geometries.iterator()
 
         for conflict in conflicts:
-            instance_objs += conflict.affected_geometry.get_data_objects()
+            # Only check the affected geometry of this conflict, since we know the conflicting geometry is self.geometry
+            instance_objs += conflict.affected_geometry.get_data_objects(needed_data_object_attrs)
 
-        conflicts = self.geometry.conflicted_by_geometries.all()
+        conflicts = self.geometry.conflicted_by_geometries.iterator()
         for conflict in conflicts:
-            instance_objs += conflict.conflicting_geometry.get_data_objects()
+            # Only check the conflicting geometry of this conflict, since we know the affected geometry is self.geometry
+            instance_objs += conflict.conflicting_geometry.get_data_objects(needed_data_object_attrs)
 
         add_message = len(instance_objs) > 0
         if add_message:
-            instance_identifiers = [x.identifier for x in instance_objs]
+            instance_identifiers = ", ".join(instance_objs)
-            instance_identifiers = ", ".join(instance_identifiers)
             message_str = GEOMETRY_CONFLICT_WITH_TEMPLATE.format(instance_identifiers)
             messages.info(request, message_str)
         return request

konova/static/css/konova.css

@@ -279,3 +279,17 @@ Similar to bootstraps 'shadow-lg'
 .alert{
     margin-bottom: 0 !important;
 }
+
+/*
+Overwrites netgis.css attributes
+ */
+.netgis-gradient-a{
+    /*
+    Overwrites gradient used on default css of netgis map client
+     */
+    background: var(--rlp-red) !important;
+}
+
+.netgis-menu{
+    z-index: 1 !important;
+}

konova/sub_settings/context_settings.py

@@ -11,4 +11,4 @@ BASE_TITLE = "KSP - Kompensationsverzeichnis Service Portal"
 BASE_FRONTEND_TITLE = "Kompensationsverzeichnis Service Portal"
 TAB_TITLE_IDENTIFIER = "tab_title"
 HELP_LINK = "https://dienste.naturschutz.rlp.de/doku/doku.php?id=ksp2:start"
-IMPRESSUM_LINK = "https://naturschutz.rlp.de/index.php?q=impressum"
+IMPRESSUM_LINK = "https://naturschutz.rlp.de/ueber-uns/impressum"

konova/sub_settings/django_settings.py

@@ -188,7 +188,6 @@ STATIC_ROOT = os.path.join(BASE_DIR, "static")
 STATICFILES_DIRS = [
     os.path.join(BASE_DIR, 'konova/static'),
     os.path.join(BASE_DIR, 'templates/map/client'),         # NETGIS map client files
-    os.path.join(BASE_DIR, 'templates/map/client/libs'),    # NETGIS map client files
 ]
 
 # EMAIL (see https://docs.djangoproject.com/en/dev/topics/email/)

konova/tests/test_geometries.py

@@ -124,6 +124,7 @@ class GeometryTestCase(BaseTestCase):
                 {
                     "type": "Feature",
                     "geometry": json.loads(p.json),
+                    "properties": {}
                 }
                 for p in polygons
             ]

konova/tests/test_views.py

@@ -491,7 +491,10 @@ class BaseTestCase(TestCase):
             # transformation from one coordinate system into the other, which is valid
             geom1.transform(geom2.srid)
             geom2.transform(geom1.srid)
-        self.assertTrue(geom1.equals_exact(geom2, tolerance) or geom2.equals_exact(geom1, tolerance))
+        self.assertTrue(
+            geom1.equals_exact(geom2, tolerance=tolerance),
+            msg=f"Difference is {abs(geom1.area - geom2.area)} with {geom1.area} and {geom2.area} in a tolerance of {tolerance}"
+        )
 
 
 class BaseViewTestCase(BaseTestCase):

konova/utils/exception_reporter.py

@@ -5,6 +5,9 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 11.12.23
 
 """
+import json
+from json import JSONDecodeError
+
 from django.views.debug import ExceptionReporter
 
 
@@ -30,7 +33,7 @@ class KonovaExceptionReporter(ExceptionReporter):
         """
         whitelist = [
             "is_email",
-            "unicdoe_hint",
+            "unicode_hint",
             "frames",
             "request",
             "user_str",
@@ -39,6 +42,8 @@ class KonovaExceptionReporter(ExceptionReporter):
             "raising_view_name",
             "exception_type",
             "exception_value",
+            "filtered_GET_items",
+            "filtered_POST_items",
         ]
         clean_data = dict()
         for entry in whitelist:
@@ -56,7 +61,28 @@ class KonovaExceptionReporter(ExceptionReporter):
         """
         tb_data = super().get_traceback_data()
 
+        return_data = tb_data
         if self.is_email:
-            tb_data = self._filter_traceback_data(tb_data)
+            filtered_data = dict()
+            filtered_data.update(self._filter_traceback_data(tb_data))
+            filtered_data.update(self._filter_POST_body(tb_data))
+            return_data = filtered_data
+        return return_data
 
-        return tb_data
+    def _filter_POST_body(self, tb_data: dict):
+        """ Filters POST body from traceback data
+
+        """
+        post_data = tb_data.get("request", None)
+        if post_data:
+            post_data = post_data.body
+            try:
+                post_data = json.loads(post_data)
+            except JSONDecodeError:
+                pass
+        post_data = {
+            "filtered_POST_items": [
+                ("body", post_data),
+            ]
+        }
+        return post_data

konova/utils/generators.py

@@ -42,23 +42,24 @@ def generate_random_string(length: int, use_numbers: bool = False, use_letters_l
     ret_val = "".join(random.choice(elements) for i in range(length))
     return ret_val
 
+class IdentifierGenerator:
+    _MODEL = None
 
-def generate_qr_code(content: str, size: int = 20) -> str:
+    def __init__(self, model):
-    """ Generates a qr code from given content
+        from konova.models import BaseObject
+        if not issubclass(model, BaseObject):
+            raise AssertionError("Model must be a subclass of BaseObject!")
 
-    Args:
+        self._MODEL = model
-        content (str): The content for the qr code
+
-        size (int): The image size
+    def generate_id(self) -> str:
+        """ Generates a unique identifier
 
         Returns:
-        qrcode_svg (str): The qr code as svg
+
         """
-    qrcode_factory = qrcode.image.svg.SvgImage
+        unpersisted_object = self._MODEL()
-    qrcode_img = qrcode.make(
+        identifier = unpersisted_object.generate_new_identifier()
-        content,
+        while self._MODEL.objects.filter(identifier=identifier).exists():
-        image_factory=qrcode_factory,
+            identifier = unpersisted_object.generate_new_identifier()
-        box_size=size
+        return identifier
-    )
-    stream = BytesIO()
-    qrcode_img.save(stream)
-    return stream.getvalue().decode()

konova/utils/mailer.py

@@ -5,7 +5,7 @@ Contact: michel.peltriaux@sgdnord.rlp.de
 Created on: 09.11.20
 
 """
-from django.core.mail import send_mail
+from django.core.mail import send_mail, EmailMultiAlternatives
 from django.template.loader import render_to_string
 from django.utils.translation import gettext_lazy as _
 
@@ -45,6 +45,19 @@ class Mailer:
             auth_password=self.auth_password
         )
 
+    def send_via_bcc(self, recipient_list: list, subject: str, msg: str):
+        """
+        Sends a mail with subject and message where recipients will be masked via bcc
+        """
+        email_obj = EmailMultiAlternatives(
+            subject,
+            msg,
+            self.from_mail,
+            bcc=recipient_list,
+        )
+        email_obj.attach_alternative(msg, "text/html")
+        return email_obj.send(fail_silently=self.fail_silently)
+
     def send_mail_shared_access_removed(self, obj, user, municipals_names):
         """ Send a mail if user has no access to the object anymore
 
@@ -115,7 +128,7 @@ class Mailer:
         }
         msg = render_to_string("email/sharing/shared_access_given_team.html", context)
         user_mail_address = users_to_notify.values_list("email", flat=True)
-        self.send(
+        self.send_via_bcc(
             user_mail_address,
             _("{} - Shared access given").format(obj.identifier),
             msg
@@ -141,7 +154,7 @@ class Mailer:
         }
         msg = render_to_string("email/sharing/shared_access_removed_team.html", context)
         user_mail_address = users_to_notify.values_list("email", flat=True)
-        self.send(
+        self.send_via_bcc(
             user_mail_address,
             _("{} - Shared access removed").format(obj.identifier),
             msg
@@ -167,7 +180,7 @@ class Mailer:
         }
         msg = render_to_string("email/recording/shared_data_unrecorded_team.html", context)
         user_mail_address = users_to_notify.values_list("email", flat=True)
-        self.send(
+        self.send_via_bcc(
             user_mail_address,
             _("{} - Shared data unrecorded").format(obj.identifier),
             msg
@@ -193,7 +206,7 @@ class Mailer:
         }
         msg = render_to_string("email/recording/shared_data_recorded_team.html", context)
         user_mail_address = users_to_notify.values_list("email", flat=True)
-        self.send(
+        self.send_via_bcc(
             user_mail_address,
             _("{} - Shared data recorded").format(obj.identifier),
             msg
@@ -219,7 +232,7 @@ class Mailer:
         }
         msg = render_to_string("email/checking/shared_data_checked_team.html", context)
         user_mail_address = users_to_notify.values_list("email", flat=True)
-        self.send(
+        self.send_via_bcc(
             user_mail_address,
             _("{} - Shared data checked").format(obj.identifier),
             msg
@@ -244,7 +257,7 @@ class Mailer:
         }
         msg = render_to_string("email/other/deduction_changed_team.html", context)
         user_mail_address = users_to_notify.values_list("email", flat=True)
-        self.send(
+        self.send_via_bcc(
             user_mail_address,
             _("{} - Deduction changed").format(obj.identifier),
             msg
@@ -270,7 +283,7 @@ class Mailer:
         }
         msg = render_to_string("email/deleting/shared_data_deleted_team.html", context)
         user_mail_address = users_to_notify.values_list("email", flat=True)
-        self.send(
+        self.send_via_bcc(
             user_mail_address,
             _("{} - Shared data deleted").format(obj.identifier),
             msg

konova/utils/message_templates.py

@@ -83,6 +83,7 @@ EDITED_GENERAL_DATA = _("Edited general data")
 # Geometry
 GEOMETRY_CONFLICT_WITH_TEMPLATE = _("Geometry conflict detected with {}")
 GEOMETRY_SIMPLIFIED = _("The geometry contained more than {} vertices. It had to be simplified to match the allowed limit of {} vertices.").format(GEOM_MAX_VERTICES, GEOM_MAX_VERTICES)
+GEOMETRIES_IGNORED_TEMPLATE = _("The geometry contained {} parts which have been detected as invalid (e.g. too small to be valid). These parts have been removed. Please check the stored geometry.")
 
 # INTERVENTION
 INTERVENTION_HAS_REVOCATIONS_TEMPLATE = _("This intervention has {} revocations")

konova/utils/qrcode.py

@@ -0,0 +1,49 @@
+"""
+Author: Michel Peltriaux
+Created on: 14.12.25
+
+"""
+from io import BytesIO
+
+import qrcode
+import qrcode.image.svg as svg
+
+
+class QrCode:
+    """ A wrapping class for creating a qr code with content
+
+    """
+    _content = None
+    _img = None
+
+    def __init__(self, content: str, size: int):
+        self._content = content
+        self._img = self._generate_qr_code(content, size)
+
+    def _generate_qr_code(self, content: str, size: int = 20) -> str:
+        """ Generates a qr code from given content
+
+        Args:
+            content (str): The content for the qr code
+            size (int): The image size
+
+        Returns:
+            qrcode_svg (str): The qr code as svg
+        """
+        qr = qrcode.QRCode(
+            image_factory=qrcode.image.svg.SvgPathImage,
+            box_size=size
+        )
+        qr.add_data(content)
+        qr.make(
+            fit=True
+        )
+
+        img = qr.make_image()
+        return img.to_string(encoding="unicode")
+
+    def get_img(self):
+        return self._img
+
+    def get_content(self):
+        return self._content

konova/utils/tables.py

@@ -178,7 +178,9 @@ class TableRenderMixin:
         if len(value) > max_length:
             value = f"{value[:max_length]}..."
         value = format_html(
-            f'<div title="{value_orig}">{value}</div>'
+            '<div title="{}">{}</div>',
+            value_orig,
+            value
         )
         return value
 
@@ -222,7 +224,7 @@ class TableRenderMixin:
             tooltip=_("Full access granted") if is_entry_shared else _("Access not granted"),
             icn_class="fas fa-edit rlp-r-inv" if is_entry_shared else "far fa-edit",
         )
-        return format_html(html)
+        return format_html(html, None)
 
 
 class TableOrderMixin:

konova/views/detail.py

@@ -0,0 +1,25 @@
+"""
+Author: Michel Peltriaux
+Created on: 14.12.25
+
+"""
+from abc import ABC
+
+from django.contrib.auth.mixins import LoginRequiredMixin
+from django.http import HttpRequest, HttpResponse
+from django.utils.decorators import method_decorator
+from django.views import View
+
+from konova.decorators import uuid_required, any_group_check
+
+
+class AbstractDetailView(LoginRequiredMixin, View, ABC):
+    _TEMPLATE = None
+
+    @method_decorator(uuid_required)
+    def dispatch(self, request, *args, **kwargs):
+        return super().dispatch(request, *args, **kwargs)
+
+    @method_decorator(any_group_check)
+    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+        raise NotImplementedError()

konova/views/home.py

@@ -53,6 +53,7 @@ class HomeView(LoginRequiredMixin, View):
         # Repeat for other objects
         comps = Compensation.objects.filter(
             deleted=None,
+            intervention__deleted=None,
         )
         user_comps = comps.filter(
             Q(intervention__users__in=[user]) | Q(intervention__teams__in=user_teams)

konova/views/identifier.py

@@ -0,0 +1,28 @@
+"""
+Author: Michel Peltriaux
+Created on: 14.12.25
+
+"""
+from abc import ABC
+
+from django.contrib.auth.mixins import LoginRequiredMixin
+from django.http import HttpRequest, JsonResponse
+from django.utils.decorators import method_decorator
+from django.views import View
+
+from konova.decorators import default_group_required
+from konova.utils.generators import IdentifierGenerator
+
+
+class AbstractIdentifierGeneratorView(LoginRequiredMixin, View, ABC):
+    _MODEL = None
+
+    @method_decorator(default_group_required)
+    def get(self, request: HttpRequest, *args, **kwargs):
+        generator = IdentifierGenerator(model=self._MODEL)
+        identifier = generator.generate_id()
+        return JsonResponse(
+            data={
+                "gen_data": identifier
+            }
+        )

konova/views/index.py

@@ -0,0 +1,21 @@
+"""
+Author: Michel Peltriaux
+Created on: 14.12.25
+
+"""
+from abc import ABC
+
+from django.contrib.auth.mixins import LoginRequiredMixin
+from django.http import HttpRequest, HttpResponse
+from django.utils.decorators import method_decorator
+from django.views import View
+
+from konova.decorators import any_group_check
+
+
+class AbstractIndexView(LoginRequiredMixin, View, ABC):
+    _TEMPLATE = "generic_index.html"
+
+    @method_decorator(any_group_check)
+    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
+        raise NotImplementedError()

konova/views/map_proxy.py

@@ -11,11 +11,10 @@ from json import JSONDecodeError
 import requests
 import urllib3.util
 from django.contrib.auth.decorators import login_required
-from django.http import JsonResponse, HttpRequest
+from django.http import JsonResponse, HttpRequest, HttpResponse
 from django.utils.decorators import method_decorator
 from django.utils.http import urlencode
 from django.views import View
-from django.utils.translation import gettext_lazy as _
 
 from requests.auth import HTTPDigestAuth
 
@@ -60,7 +59,10 @@ class BaseClientProxyView(View):
         )
         content = response.content
         if isinstance(content, bytes):
+            try:
                 content = content.decode("utf-8")
+            except UnicodeDecodeError:
+                content = f"Can not decode content of {url}"
         return content, response.status_code
 
 
@@ -74,24 +76,7 @@ class ClientProxyParcelSearch(BaseClientProxyView):
             raise PermissionError(f"Proxied url '{url}' is not allowed!")
 
         content, response_code = self.perform_url_call(url)
-        try:
+        return HttpResponse(content)
-            body = json.loads(content)
-        except JSONDecodeError as e:
-            body = {
-                "totalResultsCount": -1,
-                "geonames": [
-                    {
-                        "title": _("The external service is currently unavailable.<br>Please try again in a few moments...")
-                    }
-                ]
-            }
-
-        if response_code != 200:
-            return JsonResponse({
-                "status_code": response_code,
-                "content": body,
-            })
-        return JsonResponse(body)
 
 
 class ClientProxyParcelWFS(BaseClientProxyView):

konova/views/remove.py

@@ -0,0 +1,64 @@
+"""
+Author: Michel Peltriaux
+Created on: 14.12.25
+
+"""
+from abc import ABC
+
+from django.contrib.auth.mixins import LoginRequiredMixin
+from django.http import HttpRequest, HttpResponse
+from django.urls import reverse
+from django.utils.decorators import method_decorator
+from django.views import View
+from django.utils.translation import gettext_lazy as _
+
+from konova.decorators import default_group_required
+from konova.forms.modals import RemoveModalForm
+
+
+class AbstractRemoveView(LoginRequiredMixin, View, ABC):
+    _MODEL = None
+    _REDIRECT_URL = None
+    _FORM = RemoveModalForm
+
+    def dispatch(self, request, *args, **kwargs):
+        return super().dispatch(request, *args, **kwargs)
+
+    @method_decorator(default_group_required)
+    def __process_request(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+        obj = self._MODEL.objects.get(id=id)
+        identifier = obj.identifier
+        form = self._FORM(request.POST or None, instance=obj, request=request)
+        return form.process_request(
+            request,
+            _("{} removed").format(identifier),
+            redirect_url=reverse(self._REDIRECT_URL)
+        )
+
+    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+        """ GET endpoint for removing via modal form
+
+        Due to the legacy logic of the form (which processes get and post requests directly), we simply need to pipe
+        the request from GET and POST endpoints directly into the same method.
+
+        Args:
+            request (HttpRequest): The incoming request
+            id (str): The uuid id as string
+
+        Returns:
+        """
+        return self.__process_request(request, id, *args, **kwargs)
+
+    def post(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+        """  POST endpoint for removing via modal form
+
+        Due to the legacy logic of the form (which processes get and post requests directly), we simply need to pipe
+        the request from GET and POST endpoints directly into the same method.
+
+        Args:
+            request (HttpRequest): The incoming request
+            id (str): The uuid id as string
+
+        Returns:
+        """
+        return self.__process_request(request, id, *args, **kwargs)

konova/views/report.py

@@ -0,0 +1,24 @@
+"""
+Author: Michel Peltriaux
+Created on: 14.12.25
+
+"""
+from abc import abstractmethod, ABC
+
+from django.http import HttpRequest, HttpResponse
+from django.utils.decorators import method_decorator
+from django.views import View
+
+from konova.decorators import uuid_required
+
+
+class AbstractPublicReportView(View, ABC):
+    _TEMPLATE = None
+
+    @method_decorator(uuid_required)
+    def dispatch(self, request, *args, **kwargs):
+        return super().dispatch(request, *args, **kwargs)
+
+    @abstractmethod
+    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+        raise NotImplementedError()

locale/de/LC_MESSAGES/django.po

@@ -45,7 +45,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-05-12 14:22+0200\n"
+"POT-Creation-Date: 2025-12-14 17:23+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -448,7 +448,7 @@ msgid "Select the intervention for which this compensation compensates"
 msgstr "Wählen Sie den Eingriff, für den diese Kompensation bestimmt ist"
 
 #: compensation/forms/compensation.py:114
-#: compensation/views/compensation/compensation.py:120
+#: compensation/views/compensation/compensation.py:121
 msgid "New compensation"
 msgstr "Neue Kompensation"
 
@@ -456,38 +456,38 @@ msgstr "Neue Kompensation"
 msgid "Edit compensation"
 msgstr "Bearbeite Kompensation"
 
-#: compensation/forms/eco_account.py:31 compensation/utils/quality.py:97
+#: compensation/forms/eco_account.py:32 compensation/utils/quality.py:97
 msgid "Available Surface"
 msgstr "Verfügbare Fläche"
 
-#: compensation/forms/eco_account.py:34
+#: compensation/forms/eco_account.py:35
 msgid "The amount that can be used for deductions"
 msgstr "Die für Abbuchungen zur Verfügung stehende Menge"
 
-#: compensation/forms/eco_account.py:43
+#: compensation/forms/eco_account.py:44
 #: compensation/templates/compensation/detail/eco_account/view.html:67
 #: compensation/utils/quality.py:84
 msgid "Agreement date"
 msgstr "Vereinbarungsdatum"
 
-#: compensation/forms/eco_account.py:45
+#: compensation/forms/eco_account.py:46
 msgid "When did the parties agree on this?"
 msgstr "Wann wurde dieses Ökokonto offiziell vereinbart?"
 
-#: compensation/forms/eco_account.py:72
+#: compensation/forms/eco_account.py:73
-#: compensation/views/eco_account/eco_account.py:101
+#: compensation/views/eco_account/eco_account.py:105
 msgid "New Eco-Account"
 msgstr "Neues Ökokonto"
 
-#: compensation/forms/eco_account.py:81
+#: compensation/forms/eco_account.py:82
 msgid "Eco-Account XY; Location ABC"
 msgstr "Ökokonto XY; Flur ABC"
 
-#: compensation/forms/eco_account.py:147
+#: compensation/forms/eco_account.py:148
 msgid "Edit Eco-Account"
 msgstr "Ökokonto bearbeiten"
 
-#: compensation/forms/eco_account.py:183
+#: compensation/forms/eco_account.py:184
 msgid ""
 "{}m² have been deducted from this eco account so far. The given value of {} "
 "would be too low."
@@ -495,12 +495,16 @@ msgstr ""
 "{}n² wurden bereits von diesem Ökokonto abgebucht. Der eingegebene Wert von "
 "{} wäre daher zu klein."
 
-#: compensation/forms/eco_account.py:247
+#: compensation/forms/eco_account.py:248
 msgid "The account can not be removed, since there are still deductions."
 msgstr ""
 "Das Ökokonto kann nicht entfernt werden, da hierzu noch Abbuchungen "
 "vorliegen."
 
+#: compensation/forms/eco_account.py:257
+msgid "Please contact the responsible conservation office to find a solution!"
+msgstr "Kontaktieren Sie die zuständige Naturschutzbehörde um eine Lösung zu finden!"
+
 #: compensation/forms/mixins.py:37
 #: compensation/templates/compensation/detail/eco_account/view.html:63
 #: compensation/templates/compensation/report/eco_account/report.html:20
@@ -1288,44 +1292,40 @@ msgstr ""
 msgid "Responsible data"
 msgstr "Daten zu den verantwortlichen Stellen"
 
-#: compensation/views/compensation/compensation.py:58
+#: compensation/views/compensation/compensation.py:52
 msgid "Compensations - Overview"
 msgstr "Kompensationen - Übersicht"
 
-#: compensation/views/compensation/compensation.py:181
+#: compensation/views/compensation/compensation.py:167
 #: konova/utils/message_templates.py:40
 msgid "Compensation {} edited"
 msgstr "Kompensation {} bearbeitet"
 
-#: compensation/views/compensation/compensation.py:196
+#: compensation/views/compensation/compensation.py:190
-#: compensation/views/eco_account/eco_account.py:173 ema/views/ema.py:232
+#: compensation/views/eco_account/eco_account.py:168 ema/views/ema.py:173
-#: intervention/views/intervention.py:253
+#: intervention/views/intervention.py:175
 msgid "Edit {}"
 msgstr "Bearbeite {}"
 
 #: compensation/views/compensation/report.py:35
 #: compensation/views/eco_account/report.py:35 ema/views/report.py:35
-#: intervention/views/report.py:35
+#: intervention/views/report.py:36
 msgid "Report {}"
 msgstr "Bericht {}"
 
-#: compensation/views/eco_account/eco_account.py:53
+#: compensation/views/eco_account/eco_account.py:49
 msgid "Eco-account - Overview"
 msgstr "Ökokonten - Übersicht"
 
-#: compensation/views/eco_account/eco_account.py:86
+#: compensation/views/eco_account/eco_account.py:82
 msgid "Eco-Account {} added"
 msgstr "Ökokonto {} hinzugefügt"
 
-#: compensation/views/eco_account/eco_account.py:158
+#: compensation/views/eco_account/eco_account.py:145
 msgid "Eco-Account {} edited"
 msgstr "Ökokonto {} bearbeitet"
 
-#: compensation/views/eco_account/eco_account.py:288
+#: ema/forms.py:42 ema/tests/unit/test_forms.py:27 ema/views/ema.py:107
-msgid "Eco-account removed"
-msgstr "Ökokonto entfernt"
-
-#: ema/forms.py:42 ema/tests/unit/test_forms.py:27 ema/views/ema.py:102
 msgid "New EMA"
 msgstr "Neue EMA hinzufügen"
 
@@ -1353,22 +1353,18 @@ msgstr ""
 msgid "Payment funded compensation"
 msgstr "Ersatzzahlungsmaßnahme"
 
-#: ema/views/ema.py:53
+#: ema/views/ema.py:52
 msgid "EMAs - Overview"
 msgstr "EMAs - Übersicht"
 
-#: ema/views/ema.py:86
+#: ema/views/ema.py:85
 msgid "EMA {} added"
 msgstr "EMA {} hinzugefügt"
 
-#: ema/views/ema.py:217
+#: ema/views/ema.py:150
 msgid "EMA {} edited"
 msgstr "EMA {} bearbeitet"
 
-#: ema/views/ema.py:256
-msgid "EMA removed"
-msgstr "EMA entfernt"
-
 #: intervention/forms/intervention.py:49
 msgid "Construction XY; Location ABC"
 msgstr "Bauvorhaben XY; Flur ABC"
@@ -1429,7 +1425,7 @@ msgstr "Datum Bestandskraft bzw. Rechtskraft"
 
 #: intervention/forms/intervention.py:216
 #: intervention/tests/unit/test_forms.py:36
-#: intervention/views/intervention.py:105
+#: intervention/views/intervention.py:109
 msgid "New intervention"
 msgstr "Neuer Eingriff"
 
@@ -1665,22 +1661,18 @@ msgstr ""
 msgid "Check performed"
 msgstr "Prüfung durchgeführt"
 
-#: intervention/views/intervention.py:57
+#: intervention/views/intervention.py:53
 msgid "Interventions - Overview"
 msgstr "Eingriffe - Übersicht"
 
-#: intervention/views/intervention.py:90
+#: intervention/views/intervention.py:86
 msgid "Intervention {} added"
 msgstr "Eingriff {} hinzugefügt"
 
-#: intervention/views/intervention.py:236
+#: intervention/views/intervention.py:150
 msgid "Intervention {} edited"
 msgstr "Eingriff {} bearbeitet"
 
-#: intervention/views/intervention.py:278
-msgid "{} removed"
-msgstr "{} entfernt"
-
 #: konova/decorators.py:32
 msgid "You need to be staff to perform this action!"
 msgstr "Hierfür müssen Sie Mitarbeiter sein!"
@@ -1810,15 +1802,11 @@ msgstr "Nicht editierbar"
 msgid "Geometry"
 msgstr "Geometrie"
 
-#: konova/forms/geometry_form.py:100
+#: konova/forms/geometry_form.py:105
 msgid "Only surfaces allowed. Points or lines must be buffered."
 msgstr ""
 "Nur Flächen erlaubt. Punkte oder Linien müssen zu Flächen gepuffert werden."
 
-#: konova/forms/geometry_form.py:153
-msgid "Geometry must be greater than 1m². Currently is {}m²"
-msgstr "Geometrie muss größer als 1m² sein. Aktueller Flächeninhalt: {}m²"
-
 #: konova/forms/modals/document_form.py:37
 msgid "When has this file been created? Important for photos."
 msgstr "Wann wurde diese Datei erstellt oder das Foto aufgenommen?"
@@ -2266,24 +2254,34 @@ msgstr ""
 "Die Geometrie enthielt mehr als {} Eckpunkte. Sie musste vereinfacht werden "
 "um die Obergrenze von {} erlaubten Eckpunkten einzuhalten."
 
-#: konova/utils/message_templates.py:88
+#: konova/utils/message_templates.py:86
+msgid ""
+"The geometry contained {} parts which have been detected as invalid (e.g. "
+"too small to be valid). These parts have been removed. Please check the "
+"stored geometry."
+msgstr ""
+"Die Geometrie enthielt {} invalide Bestandteile (z.B. unaussagekräftige "
+"Kleinstflächen).Diese Bestandteile wurden automatisch entfernt. Bitte "
+"überprüfen Sie die angepasste Geometrie."
+
+#: konova/utils/message_templates.py:89
 msgid "This intervention has {} revocations"
 msgstr "Dem Eingriff liegen {} Widersprüche vor"
 
-#: konova/utils/message_templates.py:91
+#: konova/utils/message_templates.py:92
 msgid "Checked on {} by {}"
 msgstr "Am {} von {} geprüft worden"
 
-#: konova/utils/message_templates.py:92
+#: konova/utils/message_templates.py:93
 msgid "Data has changed since last check on {} by {}"
 msgstr ""
 "Daten wurden nach der letzten Prüfung geändert. Letzte Prüfung am {} durch {}"
 
-#: konova/utils/message_templates.py:93
+#: konova/utils/message_templates.py:94
 msgid "Current data not checked yet"
 msgstr "Momentane Daten noch nicht geprüft"
 
-#: konova/utils/message_templates.py:96
+#: konova/utils/message_templates.py:97
 msgid "New token generated. Administrators need to validate."
 msgstr "Neuer Token generiert. Administratoren sind informiert."
 
@@ -2313,14 +2311,6 @@ msgstr "Home"
 msgid "Log"
 msgstr "Log"
 
-#: konova/views/map_proxy.py:84
-msgid ""
-"The external service is currently unavailable.<br>Please try again in a few "
-"moments..."
-msgstr ""
-"Der externe Dienst ist zur Zeit nicht erreichbar.<br>Versuchen Sie es in ein "
-"paar Sekunden nochmal."
-
 #: konova/views/record.py:30
 msgid "{} unrecorded"
 msgstr "{} entzeichnet"
@@ -2333,6 +2323,10 @@ msgstr "{} verzeichnet"
 msgid "Errors found:"
 msgstr "Fehler gefunden:"
 
+#: konova/views/remove.py:35
+msgid "{} removed"
+msgstr "{} entfernt"
+
 #: konova/views/resubmission.py:39
 msgid "Resubmission set"
 msgstr "Wiedervorlage gesetzt"
@@ -2377,17 +2371,19 @@ msgstr "Alle"
 msgid "News"
 msgstr "Neuigkeiten"
 
-#: templates/400.html:7
+#: templates/400.html:12
 msgid "Request was invalid"
 msgstr "Anfrage fehlerhaft"
 
-#: templates/400.html:10
+#: templates/400.html:17
 msgid "There seems to be a problem with the link you opened."
 msgstr "Es scheint ein Problem mit dem Link zu geben, den Sie geöffnet haben."
 
-#: templates/400.html:11
+#: templates/400.html:18
 msgid "Make sure the URL is valid (no whitespaces, properly copied, ...)."
-msgstr "Stellen Sie sicher, dass die URL gültig ist (keine Leerzeichen, fehlerfrei kopiert, ...)."
+msgstr ""
+"Stellen Sie sicher, dass die URL gültig ist (keine Leerzeichen, fehlerfrei "
+"kopiert, ...)."
 
 #: templates/404.html:7
 msgid "Not found"
@@ -2401,11 +2397,11 @@ msgstr "Die angeforderten Daten existieren nicht."
 msgid "Make sure the URL is valid (no whitespaces, ...)."
 msgstr "Stellen Sie sicher, dass die URL gültig ist (keine Leerzeichen, ...)."
 
-#: templates/500.html:7
+#: templates/500.html:12
 msgid "Server Error"
 msgstr ""
 
-#: templates/500.html:10
+#: templates/500.html:17
 msgid "Something happened. Admins have been informed. We are working on it!"
 msgstr ""
 "Irgendetwas ist passiert. Die Administratoren wurden informiert. Wir "

requirements.txt

@@ -1,63 +1,65 @@
 amqp==5.3.1
-asgiref==3.8.1
+asgiref==3.11.1
 async-timeout==5.0.1
-beautifulsoup4==4.13.0b2
+beautifulsoup4==4.14.3
-billiard==4.2.1
+billiard==4.2.4
 cached-property==2.0.1
-celery==5.4.0
+celery==5.6.3
-certifi==2024.12.14
+certifi==2026.4.22
-cffi==1.17.1
+cffi==2.0.0
-chardet==5.2.0
+chardet==7.4.3
-charset-normalizer==3.4.0
+charset-normalizer==3.4.7
-click==8.1.8
+click==8.3.3
 click-didyoumean==0.3.1
-click-plugins==1.1.1
+click-plugins==1.1.1.2
 click-repl==0.3.0
-coverage==7.6.9
+coverage==7.13.5
-cryptography==44.0.0
+cryptography==48.0.0
-Deprecated==1.2.15
+Deprecated==1.3.1
-Django==5.1.4
+Django==6.0.5
-django-autocomplete-light==3.11.0
+django-autocomplete-light==4.0.0
 django-bootstrap-modal-forms==3.0.5
-django-bootstrap4==24.4
+django-bootstrap4==26.1
-django-environ==0.11.2
+django-environ==0.13.0
-django-filter==24.3
+django-filter==25.2
 django-fontawesome-5==1.0.18
-django-oauth-toolkit==3.0.1
+django-oauth-toolkit==3.2.0
-django-tables2==2.7.1
+django-tables2==3.0.0
 et_xmlfile==2.0.0
-gunicorn==23.0.0
+gunicorn==26.0.0
-idna==3.10
+idna==3.13
-importlib_metadata==8.5.0
+importlib_metadata==9.0.0
-jwcrypto==1.5.6
+itsdangerous==2.2.0
-kombu==5.4.0rc1
+jwcrypto==1.5.7
-oauthlib==3.2.2
+kombu==5.6.2
+oauthlib==3.3.1
 openpyxl==3.2.0b1
-packaging==24.2
+packaging==26.2
-pika==1.3.2
+pika==1.4.0
-pillow==11.0.0
+pillow==12.2.0
-prompt_toolkit==3.0.48
+prompt_toolkit==3.0.52
-psycopg==3.2.3
+psycopg==3.3.4
-psycopg-binary==3.2.3
+psycopg-binary==3.3.4
-pycparser==2.22
+pycparser==3.0
-pyparsing==3.2.0
+pyparsing==3.3.2
 pypng==0.20220715.0
-pyproj==3.7.0
+pyproj==3.7.2
 python-dateutil==2.9.0.post0
-pytz==2024.2
+pytz==2026.2
-PyYAML==6.0.2
+PyYAML==6.0.3
-qrcode==7.3.1
+qrcode==8.2
-redis==5.1.0b6
+redis==7.4.0
-requests==2.32.3
+requests==2.33.1
-six==1.16.0
+six==1.17.0
-soupsieve==2.5
+soupsieve==2.8.3
-sqlparse==0.5.1
+sqlparse==0.5.5
-typing_extensions==4.12.2
+typing_extensions==4.15.0
-tzdata==2024.2
+tzdata==2026.2
-urllib3==2.3.0
+tzlocal==5.3.1
+urllib3==2.7.0
 vine==5.1.0
-wcwidth==0.2.13
+wcwidth==0.7.0
 webservices==0.7
-wrapt==1.16.0
+wrapt==2.1.2
-xmltodict==0.14.2
+xmltodict==1.0.4
-zipp==3.21.0
+zipp==3.23.1

templates/400.html

@@ -5,7 +5,7 @@
     <div class="jumbotron">
         <div class="row">
             <div class="col-auto">
-                <img src="{% static 'images/error_imgs/croc_technician_400.png' %}" style="max-width: 150px">
+                <img src="{% static 'images/error_imgs/croc_technician_400_sm.png' %}" style="max-width: 150px">
             </div>
             <div class="col-sm-12 col-md-9 col-lg-9 col-xl-10">
                 <h1 class="display-4">{% fa5_icon 'question-circle' %}400</h1>

templates/500.html

@@ -5,7 +5,7 @@
     <div class="jumbotron">
         <div class="row">
             <div class="col-auto">
-                <img src="{% static 'images/error_imgs/croc_technician_500.png' %}" style="max-width: 150px">
+                <img src="{% static 'images/error_imgs/croc_technician_500_sm.png' %}" style="max-width: 150px">
             </div>
             <div class="col-sm-12 col-md-9 col-lg-9 col-xl-10">
                 <h1 class="display-4">{% fa5_icon 'fire-alt' %} 500</h1>

templates/generic_index.html

@@ -70,7 +70,7 @@
                         </div>
                         <div class="dropdown-menu dropdown-menu-right">
                             {% for rpp_option in table.results_per_page_choices %}
-                                <a class="dropdown-item {% if table.results_per_page_chosen == rpp_option %}selected{% endif %}" href="{% querystring table.results_per_page_parameter=rpp_option %}">
+                                <a class="dropdown-item {% if table.results_per_page_chosen == rpp_option %}selected{% endif %}" href="{% querystring %}&{{ table.results_per_page_parameter}}={{rpp_option }}">
                                     {{ rpp_option }}
                                 </a>
                             {% endfor %}

templates/map/client/config.json

@@ -1,172 +1,305 @@
 {
-	"layers":
+	"modules":
+	{
+		"menu": true,
+		"layertree": true,
+		"map": true,
+		"controls": true,
+		"attribution": true,
+		"info": true,
+		"searchplace": true,
+		"searchparcel": true,
+		"toolbox": true,
+		"import": true,
+		"export": true
+	},
+	"menu":
+	{
+		"header": "",
+		"items":
 		[
-		{ "folder": 5, "type": "WMS", "title": "KOM", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=kom_recorded&", "name": "kom_recorded" },
+			{ "id": "searchplace", "title": "<i class='fas fa-search'></i><span>Suche</span>" },
-		{ "folder": 5, "type": "WMS", "title": "KOM - In Bearbeitung", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=kom_unrecorded&", "name": "kom_unrecorded" },
+			{ "id": "searchparcel", "title": "<i class='fas fa-vector-square'></i><span>Flurstücke</span>" },
-		{ "folder": 5, "type": "WMS", "title": "KOM - Unvollständige Altfälle", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=kom_unrecorded_old_entries&", "name": "kom_unrecorded_old_entries" },
+			{ "id": "toolbox", "title": "<i class='fas fa-tools'></i><span>Werkzeuge</span>" },
-
+			{ "id": "layertree", "title": "<i class='fas fa-layer-group'></i><span>Inhalte</span>" }
-		{ "folder": 6, "type": "WMS", "title": "EIV", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=eiv_recorded&", "name": "eiv_recorded" },
+		]
-		{ "folder": 6, "type": "WMS", "title": "EIV - In Bearbeitung", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=eiv_unrecorded&", "name": "eiv_unrecorded" },
+	},
-		{ "folder": 6, "type": "WMS", "title": "EIV - Unvollständige Altfälle", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=eiv_unrecorded_old_entries&", "name": "eiv_unrecorded_old_entries" },
-
-		{ "folder": 7, "type": "WMS", "title": "OEK", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=oek_recorded&", "name": "oek_recorded" },
-		{ "folder": 7, "type": "WMS", "title": "OEK - In Bearbeitung", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=oek_unrecorded&", "name": "oek_unrecorded" },
-
-		{ "folder": 8, "type": "WMS", "title": "EMA", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=ema_recorded&", "name": "ema_recorded" },
-		{ "folder": 8, "type": "WMS", "title": "EMA - In Bearbeitung", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=ema_unrecorded&", "name": "ema_unrecorded" },
-
-		{ "folder": 9, "type": "WMS", "title": "MAE", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=mae&", "name": "mae" },
-
-		{ "folder": 10, "type": "WMS", "title": "Naturschutzgebiete", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=naturschutzgebiet&", "name": "naturschutzgebiet" },
-		{ "folder": 10, "type": "WMS", "title": "Naturparkzonen", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=naturparkzonen&", "name": "naturparkzonen" },
-		{ "folder": 10, "type": "WMS", "title": "Landschaftsschutzgebiete", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=landschaftsschutzgebiet&", "name": "landschaftsschutzgebiet" },
-		{ "folder": 10, "type": "WMS", "title": "Vogelschutzgebiete", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=vogelschutzgebiet&", "name": "vogelschutzgebiet" },
-		{ "folder": 10, "type": "WMS", "title": "FFH Gebiete", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=ffh&", "name": "ffh" },
-
-		{ "folder": 11, "type": "WMS", "title": "Nationalpark Zonen", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=nationalpark_zonen&", "name": "nationalpark_zonen" },
-		{ "folder": 11, "type": "WMS", "title": "Nationalpark Grenzen", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=nationalpark_grenze&", "name": "nationalpark_grenze" },
-
-		{ "folder": 12, "type": "WMS", "title": "Naturräume Grenzen", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=natraum_lkompvo_grenzen&", "name": "natraum_lkompvo_grenzen" },
-		{ "folder": 12, "type": "WMS", "title": "Naturräume Flächen", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=natraum_lkompvo&", "name": "natraum_lkompvo" },
-
-		{ "folder": 1, "type": "WMS", "title": "Lagebezeichnungen", "url": "https://geo5.service24.rlp.de/wms/liegenschaften_rp.fcgi?", "name": "Lagebezeichnungen" },
-		{ "folder": 1, "type": "WMS", "title": "Flurstücke (WMS)", "url": "https://geo5.service24.rlp.de/wms/liegenschaften_rp.fcgi?", "name": "Flurstueck", "active":  true},
-		{ "folder": 1, "type": "WFS", "title": "Flurstücke (WFS; ab hoher Zoomstufe)", "url": "/client/proxy/wfs?", "name": "ave:Flurstueck", "minZoom": 17},
-		{ "folder": 1, "type": "WMS", "title": "Gebäude / Bauwerke", "url": "https://geo5.service24.rlp.de/wms/liegenschaften_rp.fcgi?", "name": "GebaeudeBauwerke" },
-		{ "folder": 1, "type": "WMS", "title": "Nutzung", "url": "https://geo5.service24.rlp.de/wms/liegenschaften_rp.fcgi?", "name": "Nutzung" },
-
-		{ "folder": 2, "type": "WMS", "title": "Landkreise", "url": "http://geo5.service24.rlp.de/wms/verwaltungsgrenzen_rp.fcgi?", "name": "Landkreise" },
-		{ "folder": 2, "type": "WMS", "title": "Verbandsgemeinden", "url": "http://geo5.service24.rlp.de/wms/verwaltungsgrenzen_rp.fcgi?", "name": "Verbandsgemeinden" },
-		{ "folder": 2, "type": "WMS", "title": "Gemeinden", "url": "http://geo5.service24.rlp.de/wms/verwaltungsgrenzen_rp.fcgi?", "name": "Gemeinden" },
-
-		{ "folder": 15, "type": "WMS", "order": -1, "title": "farbig", "attribution": "LVermGeo", "url": "https://maps.service24.rlp.de/gisserver/services/RP/RP_WebAtlasRP/MapServer/WmsServer?", "name": "RP_WebAtlasRP", "active": true},
-		{ "folder": 15, "type": "WMS", "title": "grau", "attribution": "LVermGeo", "url": "https://maps.service24.rlp.de/gisserver/services/RP/RP_ETRS_Gt/MapServer/WmsServer?", "name": "0", "active": false },
-		{ "folder": 0, "type": "WMS", "title": "Luftbilder", "attribution": "LVermGeo", "url": "https://geo4.service24.rlp.de/wms/rp_dop20.fcgi?", "name": "rp_dop20", "active": false },
-		{ "folder": 14, "type": "WMS", "title": "farbig", "attribution": "BKG", "url": "https://sgx.geodatenzentrum.de/wms_basemapde?", "name": "de_basemapde_web_raster_farbe", "active": false },
-		{ "folder": 14, "type": "WMS", "title": "grau", "attribution": "BKG", "url": "https://sgx.geodatenzentrum.de/wms_basemapde?", "name": "de_basemapde_web_raster_grau", "active": false },
-		{ "folder": 13, "type": "WMS", "title": "farbig", "attribution": "LVermGeo", "url": "https://geo4.service24.rlp.de/wms/dtk5_rp.fcgi?", "name": "rp_dtk5", "active": false },
-		{ "folder": 13, "type": "WMS", "title": "grau", "attribution": "LVermGeo", "url": "https://geo4.service24.rlp.de/wms/dtk5_rp.fcgi?", "name": "rp_dtk5_grau", "active": false }
-	],
-	"folders":
-	[
-		{ "title": "Hintergrund", "parent": -1 },
-		{ "title": "ALKIS Liegenschaften", "parent": -1 },
-		{ "title": "Verwaltungsgrenzen", "parent": -1 },
-		{ "title": "Geofachdaten", "parent": -1 },
-		{ "title": "Kompensationsverzeichnis", "parent": 3 },
-		{ "title": "Kompensationen", "parent": 4 },
-		{ "title": "Eingriffe", "parent": 4 },
-		{ "title": "Ökokonten", "parent": 4 },
-		{ "title": "EMA", "parent": 4 },
-		{ "title": "MAE", "parent": 4 },
-		{ "title": "Schutzgebiete", "parent": 3 },
-		{ "title": "Nationalparke", "parent": 10 },
-		{ "title": "Naturräume", "parent": 10 },
-		{ "title": "Topographisch (DTK5)", "parent": 0 },
-		{ "title": "BaseMap", "parent": 0 },
-		{ "title": "Webatlas", "parent": 0 }
-	],
 	"projections":
 	[
 		[ "EPSG:25832", "+proj=utm +zone=32 +ellps=GRS80 +units=m +no_defs" ]
 	],
-	
 	"map":
 	{
 		"projection": "EPSG:25832",
-		"center": [ 385000, 5543000 ],
+		"center_lonlat": [ 7.0, 50.0 ],
-		"minZoom": 5,
-		"maxZoom": 22,
 		"zoom": 9,
-		"attribution": "LANIS RLP",
+		"min_zoom": 5,
-		"scalebar": true
+		"max_zoom": 24,
+		"scalebar": true,
+		"move_tolerance": 5
 	},
+	"folders":
+	[
+		{ "id": "bg", "title": "Hintergrund", "parent": null , "radio":  true},
+		{ "id": "alkis", "parent": null, "title": "ALKIS Liegenschaften" },
+		{ "id": "verwaltung", "parent": null, "title": "Verwaltungsgrenzen" },
+		{ "id": "fachdaten", "parent": null, "title": "Geofachdaten" },
+		{ "id": "ksp", "parent": "fachdaten", "title": "Kompensationsverzeichnis"},
+		{ "id": "schutzgebiet", "parent": "fachdaten", "title": "Schutzgebiete"},
+		{ "id": "nationalpark", "parent": "schutzgebiet", "title": "Nationalparke"},
+		{ "id": "naturraum", "parent": "schutzgebiet", "title": "Naturräume" },
+		{ "id": "kom", "parent": "ksp", "title": "Kompensationen" },
+		{ "id": "eiv", "parent": "ksp", "title": "Eingriffe" },
+		{ "id": "oek", "parent": "ksp", "title": "Ökokonten" },
+		{ "id": "ema", "parent": "ksp", "title": "EMA" },
+		{ "id": "mae", "parent": "ksp", "title": "MAE" }
+	],
+	"layers":
+	[
+		{ "id": "webatlas_farbe", "folder": "bg", "type": "WMS", "order": -1, "title": "WebatlasRP farbig", "attribution": "LVermGeo", "url": "https://maps.service24.rlp.de/gisserver/services/RP/RP_WebAtlasRP/MapServer/WmsServer?", "name": "RP_WebAtlasRP", "active": true},
+		{ "id": "webatlas_grau", "folder": "bg", "type": "WMS", "order": -1, "title": "WebatlasRP grau", "attribution": "LVermGeo", "url": "https://maps.service24.rlp.de/gisserver/services/RP/RP_ETRS_Gt/MapServer/WmsServer?", "name": "0", "active": false },
+		{ "id": "luftbilder", "folder": "bg", "type": "WMS", "order": -1, "title": "Luftbilder", "attribution": "LVermGeo", "url": "https://geo4.service24.rlp.de/wms/rp_dop20.fcgi?", "name": "rp_dop20", "active": false },
+		{ "id": "basemap_farbe", "folder": "bg", "type": "WMS", "order": -1, "title": "BasemapDE farbig", "attribution": "BKG", "url": "https://sgx.geodatenzentrum.de/wms_basemapde?", "name": "de_basemapde_web_raster_farbe", "active": false },
+		{ "id": "basemap_grau", "folder": "bg", "type": "WMS", "order": -1, "title": "BasemapDE grau", "attribution": "BKG", "url": "https://sgx.geodatenzentrum.de/wms_basemapde?", "name": "de_basemapde_web_raster_grau", "active": false },
+		{ "id": "dtk_farbe", "folder": "bg", "type": "WMS", "order": -1, "title": "DTK5 farbig", "attribution": "LVermGeo", "url": "https://geo4.service24.rlp.de/wms/dtk5_rp.fcgi?", "name": "rp_dtk5", "active": false },
+		{ "id": "dtk_grau", "folder": "bg", "type": "WMS", "order": -1, "title": "DTK5 grau", "attribution": "LVermGeo", "url": "https://geo4.service24.rlp.de/wms/dtk5_rp.fcgi?", "name": "rp_dtk5_grau", "active": false },
 
-	"output":
+		{ "id": "kom", "folder": "kom", "type": "WMS", "title": "KOM", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=kom_recorded&", "name": "kom_recorded" },
+		{ "id": "kom_rec", "folder": "kom", "type": "WMS", "title": "KOM - In Bearbeitung", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=kom_unrecorded&", "name": "kom_unrecorded" },
+		{ "id": "kom_rec_unfinished", "folder": "kom", "type": "WMS", "title": "KOM - Unvollständige Altfälle", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=kom_unrecorded_old_entries&", "name": "kom_unrecorded_old_entries" },
+
+		{ "id": "eiv", "folder": "eiv", "type": "WMS", "title": "EIV", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=eiv_recorded&", "name": "eiv_recorded" },
+		{ "id": "eiv_rec", "folder": "eiv", "type": "WMS", "title": "EIV - In Bearbeitung", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=eiv_unrecorded&", "name": "eiv_unrecorded" },
+		{ "id": "eiv_rec_unfinished", "folder": "eiv", "type": "WMS", "title": "EIV - Unvollständige Altfälle", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=eiv_unrecorded_old_entries&", "name": "eiv_unrecorded_old_entries" },
+
+		{ "id": "oek", "folder": "oek", "type": "WMS", "title": "OEK", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=oek_recorded&", "name": "oek_recorded" },
+		{ "id": "oek_rec", "folder": "oek", "type": "WMS", "title": "OEK - In Bearbeitung", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=oek_unrecorded&", "name": "oek_unrecorded" },
+
+		{ "id": "ema", "folder": "ema", "type": "WMS", "title": "EMA", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=ema_recorded&", "name": "ema_recorded" },
+		{ "id": "ema_rec", "folder": "ema", "type": "WMS", "title": "EMA - In Bearbeitung", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=ema_unrecorded&", "name": "ema_unrecorded" },
+
+		{ "id": "mae", "folder": "mae", "type": "WMS", "title": "MAE", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=mae&", "name": "mae" },
+
+		{ "id": "nsg", "folder": "schutzgebiet", "type": "WMS", "title": "Naturschutzgebiete", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=naturschutzgebiet&", "name": "naturschutzgebiet" },
+		{ "id": "npz", "folder": "schutzgebiet", "type": "WMS", "title": "Naturparkzonen", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=naturparkzonen&", "name": "naturparkzonen" },
+		{ "id": "lsg", "folder": "schutzgebiet", "type": "WMS", "title": "Landschaftsschutzgebiete", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=landschaftsschutzgebiet&", "name": "landschaftsschutzgebiet" },
+		{ "id": "vsg", "folder": "schutzgebiet", "type": "WMS", "title": "Vogelschutzgebiete", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=vogelschutzgebiet&", "name": "vogelschutzgebiet" },
+		{ "id": "ffh", "folder": "schutzgebiet", "type": "WMS", "title": "FFH Gebiete", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=ffh&", "name": "ffh" },
+
+		{"id": "ntpz", "folder": "nationalpark", "type": "WMS", "title": "Nationalpark Zonen", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=nationalpark_zonen&", "name": "nationalpark_zonen" },
+		{"id": "ntpg", "folder": "nationalpark", "type": "WMS", "title": "Nationalpark Grenzen", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=nationalpark_grenze&", "name": "nationalpark_grenze" },
+
+		{ "id": "natraum_g", "folder": "naturraum", "type": "WMS", "title": "Naturräume Grenzen", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=natraum_lkompvo_grenzen&", "name": "natraum_lkompvo_grenzen" },
+		{ "id": "natraum_f", "folder": "naturraum", "type": "WMS", "title": "Naturräume Flächen", "url": "https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_ogc/wms_getmap.php?mapfile=natraum_lkompvo&", "name": "natraum_lkompvo" },
+
+		{ "id": "lagebezeichnung", "folder": "alkis", "type": "WMS", "title": "Lagebezeichnungen", "url": "https://geo5.service24.rlp.de/wms/liegenschaften_rp.fcgi?", "name": "Lagebezeichnungen" },
+		{ "id": "flurstueck_wms", "folder": "alkis", "type": "WMS", "title": "Flurstücke (WMS)", "url": "https://geo5.service24.rlp.de/wms/liegenschaften_rp.fcgi?", "name": "Flurstueck", "active":  true},
+		{ "id": "flurstueck_wfs", "folder": "alkis", "type": "WFS", "title": "Flurstücke (WFS; ab hoher Zoomstufe)", "url": "/client/proxy/wfs?", "name": "ave:Flurstueck", "minZoom": 17},
+		{ "id": "gebaeude", "folder": "alkis", "type": "WMS", "title": "Gebäude / Bauwerke", "url": "https://geo5.service24.rlp.de/wms/liegenschaften_rp.fcgi?", "name": "GebaeudeBauwerke" },
+		{ "id": "nutzung", "folder": "alkis", "type": "WMS", "title": "Nutzung", "url": "https://geo5.service24.rlp.de/wms/liegenschaften_rp.fcgi?", "name": "Nutzung" },
+
+		{ "id": "lk", "folder": "verwaltung", "type": "WMS", "title": "Landkreise", "url": "https://geo5.service24.rlp.de/wms/verwaltungsgrenzen_rp.fcgi?", "name": "Landkreise" },
+		{ "id": "vg", "folder": "verwaltung", "type": "WMS", "title": "Verbandsgemeinden", "url": "https://geo5.service24.rlp.de/wms/verwaltungsgrenzen_rp.fcgi?", "name": "Verbandsgemeinden" },
+		{ "id": "gmd", "folder": "verwaltung", "type": "WMS", "title": "Gemeinden", "url": "https://geo5.service24.rlp.de/wms/verwaltungsgrenzen_rp.fcgi?", "name": "Gemeinden" }
+	],
+	"layertree":
 	{
-		"id": "netgis-storage"
+		"open": false,
+		"title": "Inhalte",
+		"buttons":
+		[
+			{ "id": "import_layer", "title": "<i class='netgis-icon fas fa-plus' style='font-size: 1em;'></i><span>Hinzufügen...</span>" }
+		]
 	},
-	
+	"controls":
-	"search":
 	{
-		"url": "/client/proxy?https://www.geoportal.rlp.de/mapbender/geoportal/gaz_geom_mobile.php?outputFormat=json&resultTarget=web&searchEPSG={epsg}&maxResults=5&maxRows=5&featureClass=P&style=full&searchText={q}&name_startsWith={q}"
+		"buttons":
+		[
+			{ "id": "zoom_in", "icon": "<i class='fas fa-plus'></i>", "title": "Zoom +" },
+			{ "id": "zoom_out", "icon": "<i class='fas fa-minus'></i>", "title": "Zoom -" },
+			{ "id": "zoom_home", "icon": "<i class='fas fa-home'></i>", "title": "Anfangsausdehung" }
+		]
 	},
-
+	"searchplace":
-	"searchParcel":
 	{
-		"nameURL": "/client/proxy?https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_alkis/gem_search.php?placename={q}",
+		"title": "Adresse...",
-		"parcelURL": "/client/proxy?https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_alkis/flur_search.php?gmk_gmn={district}&fln={field}&fsn_zae={parcelA}&fsn_nen={parcelB}&export=json",
+		"url": "/client/proxy?https://www.geoportal.rlp.de/mapbender/geoportal/gaz_geom_mobile.php?outputFormat=json&resultTarget=web&searchEPSG={epsg}&maxResults=5&maxRows=5&featureClass=P&style=full&searchText={query}&name_startsWith={query}",
+		"zoom": 17,
+		"marker_color": "darkgray",
+		"marker_title": "Such-Ergebnis"
+	},
+	"searchparcel":
+	{
+		"open": false,
+		"name_url": "/client/proxy?https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_alkis/gem_search.php?placename={q}",
+		"parcel_url": "/client/proxy?https://geodaten.naturschutz.rlp.de/kartendienste_naturschutz/mod_alkis/flur_search.php?gmk_gmn={district}&fln={field}&fsn_zae={parcelA}&fsn_nen={parcelB}&export=json",
 		"districts_service":
 		{
 			"type": "WFS",
-			"url": "http://geo5.service24.rlp.de/wfs/verwaltungsgrenzen_rp.fcgi?",
+			"url": "https://geo5.service24.rlp.de/wfs/verwaltungsgrenzen_rp.fcgi?",
 			"name": "vermkv:gemarkungen_rlp",
-			"order": 10,
+			"format": "application/json; subtype=geojson",
-			"minZoom": 11,
+			"min_zoom": 12
-			"maxZoom": 17
 		},
 		"fields_service":
 		{
-			"url": "http://geo5.service24.rlp.de/wfs/verwaltungsgrenzen_rp.fcgi?",
+			"url": "https://geo5.service24.rlp.de/wfs/verwaltungsgrenzen_rp.fcgi?",
 			"name": "vermkv:fluren_rlp",
 			"filter_property": "gmkgnr"
 		}
 	},
+	"toolbox":
+	{
+		"open": false,
+		"items":
+		[
+			{ "id": "view", "title": "<i class='netgis-icon netgis-text-a fas fa-hand-paper'></i><span>Betrachten</span>" },
+			{ "id": "zoom_box", "title": "<i class='netgis-icon netgis-text-a fas fa-expand'></i><span>Zoom-Rechteck</span>" },
+			{ "id": "view_prev", "title": "<i class='netgis-icon netgis-text-a fas fa-step-backward'></i><span>Vorherige Ansicht</span>" },
+			{ "id": "view_next", "title": "<i class='netgis-icon netgis-text-a fas fa-step-forward'></i><span>Nächste Ansicht</span>" },
+			{ "id": "measure_line", "title": "<i class='netgis-icon netgis-text-a fas fa-ruler'></i><span>Strecke messen</span>" },
+			{ "id": "measure_area", "title": "<i class='netgis-icon netgis-text-a fas fa-ruler-combined'></i><span>Fläche messen</span>" },
+			{ "id": "measure_clear", "title": "<i class='netgis-icon netgis-text-a fas fa-trash-alt'></i><span>Messung löschen</span>" },
+			{ "id": "draw_points", "title": "<i class='netgis-icon netgis-text-a fas fa-map-marker-alt'></i><span>Punkte zeichnen</span>" },
+			{ "id": "draw_lines", "title": "<i class='netgis-icon netgis-text-a fas fa-minus'></i><span>Linien zeichnen</span>" },
+			{ "id": "draw_polygons", "title": "<i class='netgis-icon netgis-text-a fas fa-vector-square'></i><span>Polygone zeichnen</span>" },
+			{ "id": "modify_features", "title": "<i class='netgis-icon netgis-text-a fas fa-arrows-alt'></i><span>Verschieben</span>" },
+			{ "id": "delete_features", "title": "<i class='netgis-icon netgis-text-a fas fa-eraser'></i><span>Löschen</span>" },
+			{ "id": "buffer_features", "title": "<i class='netgis-icon netgis-text-a far fa-dot-circle'></i><span>Puffern</span>" },
+			{ "id": "cut_features", "title": "<i class='netgis-icon netgis-text-a fas fa-cut'></i><span>Ausschneiden</span>" },
+			{ "id": "import_layer", "title": "<i class='netgis-icon netgis-text-a fas fa-upload'></i><span>Importieren</span>" },
+			{ "id": "export", "title": "<i class='netgis-icon netgis-text-a fas fa-save'></i><span>Exportieren</span>" }
+		],
+		"options":
+		{
+			"buffer_features":
+			{
+				"title": "Puffern",
+				"items":
+				[
+					{ "id": "buffer_radius", "type": "integer", "title": "Radius (Meter)" },
+					{ "id": "buffer_segments", "type": "integer", "title": "Segmente" },
+					{ "id": "buffer_submit", "type": "button", "title": "<i class='netgis-icon netgis-text-a fas fa-arrow-circle-right'></i><span>Akzeptieren</span>" }
+				]
+			}
+		}
+	},
 	"import":
 	{
-		"geopackageLibURL": "/static/libs/geopackage/4.2.3/"
+		"title": "Ebene hinzufügen",
+		"preview": true,
+		"editable": true,
+		"wms_options": [ "https://sgx.geodatenzentrum.de/wms_topplus_open" ],
+		"wfs_options": [ "http://213.139.159.34:80/geoserver/uesg/wfs" ],
+		"wfs_proxy": "/client/proxy?",
+		"geopackage_lib": "/static/libs/geopackage/4.2.3/"
 	},
 	"export":
 	{
+		"title": "Exportieren",
 		"logo": "/static/assets/logo.png",
-		"gifWebWorker": "/static/libs/gifjs/0.2.0/gif.worker.js",
+		"gif_worker": "/static/libs/gifjs/0.2.0/gif.worker.js",
-		"defaultFilename": "Export",
+		"default_filename": "Export",
-		"defaultMargin": 10
+		"default_margin": 10
+	},
+	"measure":
+	{
+		"line_color": "rgba( 255, 0, 0, 1.0 )",
+		"line_width": 3.0,
+		"line_dash": [ 5, 10 ],
+		"area_fill": "rgba( 255, 0, 0, 0.3 )",
+		"point_radius": 4.0,
+		"point_fill": "rgba( 255, 255, 255, 1.0 )",
+		"point_stroke": "rgba( 0, 0, 0, 1.0 )",
+		"text_color": "#871d33",
+		"text_back": "rgba( 255, 255, 255, 0.7 )"
 	},
 	"tools":
 	{
+		"editable": true,
+		"interactive_render": true,
 		"buffer":
 		{
-			"defaultRadius": 5,
+			"default_radius": 5,
-			"defaultSegments": 2
+			"default_segments": 3
-		}
+		},
+		"snapping":
+		{
+			"show": true,
+			"active": true,
+			"tolerance": 35
+		},
+		"bounds_message": "Ausserhalb des erlaubten Bereichs!",
+		"show_bounds": true
+	},
+	"output":
+	{
+		"id": "netgis-storage"
+	},
+	"attribution":
+	{
+		"prefix": "LANIS"
 	},
 	"styles":
 	{
-		"editLayer":
+		"draw":
 		{
-			"fill": "rgba( 255, 0, 0, 0.2 )",
+			"fill": "rgba( 135, 29, 51, 0.5 )",
-			"stroke": "#ff0000",
+			"stroke": "#871d33",
-			"strokeWidth": 3,
+			"width": 3,
-			"pointRadius": 6
+			"radius": 6,
+			"viewport_labels": true
+		},
+		"non_edit":
+		{
+			"fill": "rgba( 135, 29, 51, 0.5 )",
+			"stroke": "#871d33",
+			"width": 3,
+			"radius": 6,
+			"viewport_labels": true
 		},
 		"select":
 		{
 			"fill": "rgba( 0, 127, 255, 0.5 )",
 			"stroke": "#007fff",
-			"strokeWidth": 3,
+			"width": 3,
-			"pointRadius": 6
+			"radius": 6
 		},
 		"sketch":
 		{
-			"fill": "rgba( 0, 127, 255, 0.2 )",
+			"fill": "rgba( 29, 135, 113, 0.5 )",
-			"stroke": "#0080ff",
+			"stroke": "#1D8771",
-			"strokeWidth": 3,
+			"width": 3,
-			"pointRadius": 6
+			"radius": 6
+		},
+		"error":
+		{
+			"fill": "rgba( 255, 0, 0, 0.5 )",
+			"stroke": "#ff0000",
+			"width": 3,
+			"radius": 6
+		},
+		"bounds":
+		{
+			"fill": "rgba( 0, 0, 0, 0.0 )",
+			"stroke": "#000000",
+			"width": 3,
+			"radius": 6
 		},
 		"modify":
 		{
-			"fill": "rgba( 0, 127, 255, 0.5 )",
+			"fill": "rgba( 29, 135, 113, 0.5 )",
-			"stroke": "#0080ff",
+			"stroke": "#1D8771",
-			"strokeWidth": 3,
+			"width": 3,
-			"pointRadius": 6
+			"radius": 6
 		},
 		"parcel":
 		{
-			"fill": "rgba( 127, 255, 255, 0.5 )",
+			"fill": "rgba( 127, 0, 0, 0.2 )",
-			"stroke": "#7fffff",
+			"stroke": "rgba( 127, 0, 0, 1.0 )",
-			"strokeWidth": 3
+			"width": 2.5
 		},
+
 		"import":
 		{
 			"fill": "rgba( 0, 127, 255, 0.2 )",