Merge pull request '535_Support_foreign_key_lookup_on_API_requests' (#536) from 535_Support_foreign_key_lookup_on_API_requests into master

Reviewed-on: #536

.env.sample

@@ -24,6 +24,7 @@ DEFAULT_FROM_EMAIL=service@ksp.de
 
 # Proxy
 PROXY=CHANGE_ME
+MAP_PROXY_HOST_WHITELIST=CHANGE_ME_1,CHANGE_ME_2
 GEOPORTAL_RLP_USER=CHANGE_ME
 GEOPORTAL_RLP_PASSWORD=CHANGE_ME
 
@@ -37,6 +38,7 @@ SSO_SERVER_BASE_URL=https://login.naturschutz.rlp.de
 OAUTH_CODE_VERIFIER=CHANGE_ME
 OAUTH_CLIENT_ID=CHANGE_ME
 OAUTH_CLIENT_SECRET=CHANGE_ME
+PROPAGATION_SECRET=CHANGE_ME
 
 # RabbitMQ
 ## For connections to EGON

analysis/urls.py

@@ -10,6 +10,6 @@ from analysis.views import *
 
 app_name = "analysis"
 urlpatterns = [
-    path("reports/", index_reports_view, name="reports"),
-    path("reports/<id>", detail_report_view, name="report-detail"),
+    path("reports/", ReportIndexView.as_view(), name="reports"),
+    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,57 +46,112 @@ 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):
-    """ Renders the detailed report for a conservation office
+        """
 
-    Args:
-        request (HttpRequest): The incoming request
-        id (str): The conservation_office KonovaCode id
+        Args:
+            request (HttpRequest): The incoming request
 
-    Returns:
+        Returns:
 
-    """
-    # Try to resolve the requested office id
-    cons_office = get_object_or_404(
-        KonovaCode,
-        id=id
-    )
-    # Try to resolve the date parameters into Date objects -> redirect if this fails
-    try:
-        df = request.GET.get("df", None)
-        dt = request.GET.get("dt", None)
-        date_from = timezone.make_aware(timezone.datetime.fromisoformat(df))
-        date_to = timezone.make_aware(timezone.datetime.fromisoformat(dt))
-    except ValueError:
-        messages.error(
-            request,
-            PARAMS_INVALID,
-            extra_tags="danger",
+        """
+        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:
+            request (HttpRequest): The incoming request
+            id (str): The conservation_office KonovaCode id
+
+        Returns:
+
+        """
+        # Try to resolve the requested office id
+        cons_office = get_object_or_404(
+            KonovaCode,
+            id=id
         )
-        return redirect("analysis:reports")
+        # Try to resolve the date parameters into Date objects -> redirect if this fails
+        try:
+            df = request.GET.get("df", None)
+            dt = request.GET.get("dt", None)
+            date_from = timezone.make_aware(timezone.datetime.fromisoformat(df))
+            date_to = timezone.make_aware(timezone.datetime.fromisoformat(dt))
+        except ValueError:
+            messages.error(
+                request,
+                PARAMS_INVALID,
+                extra_tags="danger",
+            )
+            return redirect("analysis:reports")
 
-    # Check whether the html default rendering is requested or an alternative
-    format_param = request.GET.get("format", "html")
-    report = TimespanReport(id, date_from, date_to)
+        # Check whether the html default rendering is requested or an alternative
+        format_param = request.GET.get("format", "html")
+        report = TimespanReport(id, date_from, date_to)
 
-    if format_param == "html":
+        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

@@ -5,4 +5,5 @@ Contact: michel.peltriaux@sgdnord.rlp.de
 Created on: 21.01.22
 
 """
-from .token import *
+from .token import *
+from .external_identifier import *

api/models/external_identifier.py

@@ -0,0 +1,33 @@
+"""
+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}"

api/models/token.py

@@ -51,7 +51,7 @@ class APIUserToken(models.Model):
             if token_obj.valid_until is not None and token_obj.valid_until < _today:
                 raise PermissionError("Token validity expired")
         except ObjectDoesNotExist:
-            raise PermissionError("Credentials invalid")
+            raise PermissionError("Token unknown")
         return token_obj.user
 
 
@@ -155,3 +155,25 @@ class OAuthToken(UuidModel):
 
         return user
 
+    def revoke(self) -> int:
+        """ Revokes the OAuth2 token of the user
+
+        (/o/revoke_token/ indeed removes the corresponding access token on provider side and invalidates the
+        submitted refresh token in one step)
+
+        Returns:
+            revocation_status_code (int): HTTP status code for revocation of refresh_token
+        """
+        revoke_url = f"{SSO_SERVER_BASE}o/revoke_token/"
+        token = self.refresh_token
+        revocation_status_code = requests.post(
+                revoke_url,
+                data={
+                    'token': token,
+                    'token_type_hint': "refresh_token",
+                },
+                auth=(OAUTH_CLIENT_ID, OAUTH_CLIENT_SECRET),
+            ).status_code
+
+        return revocation_status_code
+

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/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.transform(DEFAULT_SRID_RLP)
+        geometry = Geometry.cast_to_rlp_srid(geometry)
+        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"]
-            self._set_responsibility(obj, properties["responsible"])
-            self._set_legal(obj, properties["legal"])
+            obj.title = properties.get("title", None)
+            self._set_responsibility(obj, properties.get("responsible", None))
+            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,63 @@ 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
+        """
+        if external_identifier:
+            try:
+                obj = ExternalIdentifier.objects.get(external_id=external_identifier)
+                return obj
+            except ObjectDoesNotExist:
+                pass
+        return None
+
+    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:
-            return self._return_error_response(e, 500)
+        except (JSONDecodeError,
+                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

@@ -50,14 +50,19 @@ class AbstractAPIView(View):
     def dispatch(self, request, *args, **kwargs):
         try:
             # Fetch the proper user from the given request header token
-            ksp_token = request.headers.get(KSP_TOKEN_HEADER_IDENTIFIER, None)
+            token = request.headers.get(KSP_TOKEN_HEADER_IDENTIFIER, None)
             ksp_user = request.headers.get(KSP_USER_HEADER_IDENTIFIER, None)
-            token_user = APIUserToken.get_user_from_token(ksp_token)
 
-            if ksp_user != token_user.username:
+            if not token and not ksp_user:
+                bearer_token = request.headers.get("authorization", None)
+                if not bearer_token:
+                    raise PermissionError("No token provided")
+                token = bearer_token.split(" ")[1]
+
+            token_user = APIUserToken.get_user_from_token(token)
+            if ksp_user and ksp_user != token_user.username:
                 raise PermissionError(f"Invalid token for {ksp_user}")
-            else:
-                self.user = token_user
+            self.user = token_user
 
             request.user = self.user
             if not self.user.is_default_user():
@@ -76,9 +81,7 @@ class AbstractAPIView(View):
         Returns:
 
         """
-        content = [error.__str__()]
-        if hasattr(error, "messages"):
-            content = error.messages
+        content = [f"{error.__class__.__name__}: {str(error)}"]
         return JsonResponse(
             {
                 "errors": content

codelist/management/commands/update_codelist.py

@@ -82,8 +82,8 @@ class Command(BaseKonovaCommand):
                 atom_id = element.find("atomid").text
                 selectable = element.find("selectable").text.lower()
                 selectable = bool_map.get(selectable, False)
-                short_name = element.find("shortname").text
-                long_name = element.find("longname").text
+                short_name = element.find("shortname").text or ""
+                long_name = element.find("longname").text or ""
                 is_archived = bool_map.get((element.find("archive").text.lower()), False)
 
                 code = KonovaCode.objects.get_or_create(

codelist/migrations/0002_migrate_975_to_288.py

@@ -1,5 +1,6 @@
 # Generated by Django 5.0.7 on 2024-08-06 13:40
 
+from django.core.exceptions import ObjectDoesNotExist
 from django.db import migrations
 from django.db.models import Q
 
@@ -10,9 +11,12 @@ def migrate_975_to_288(apps, schema_editor):
     KonovaCodeList = apps.get_model('codelist', 'KonovaCodeList')
     CompensationState = apps.get_model('compensation', 'CompensationState')
 
-    list_288 = KonovaCodeList.objects.get(
-        id=CODELIST_BIOTOPES_EXTRA_CODES_FULL_ID
-    ).codes.all()
+    try:
+        list_288 = KonovaCodeList.objects.get(
+            id=CODELIST_BIOTOPES_EXTRA_CODES_FULL_ID
+        ).codes.all()
+    except ObjectDoesNotExist:
+        raise AssertionError("KonovaCodeList 288 does not exist. Did you run 'update_codelist' before migrating?")
 
     states_with_extra_code = CompensationState.objects.filter(
         ~Q(biotope_type_details=None)
@@ -42,8 +46,15 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('codelist', '0001_initial'),
+        ('compensation', '0003_auto_20220202_0846'),
     ]
 
-    operations = [
-        migrations.RunPython(migrate_975_to_288)
-    ]
+    # If migration of codelist is not necessary, this variable can shut down the logic whilst not disturbing the
+    # migration history
+    EXECUTE_CODELIST_MIGRATION = True
+
+    operations = []
+
+    if EXECUTE_CODELIST_MIGRATION:
+        operations.append(migrations.RunPython(migrate_975_to_288))
+

codelist/migrations/0003_alter_konovacode_long_name_and_more.py

@@ -0,0 +1,25 @@
+# Generated by Django 5.0.8 on 2024-08-26 16:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('codelist', '0002_migrate_975_to_288'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='konovacode',
+            name='long_name',
+            field=models.CharField(blank=True, default="", max_length=1000),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='konovacode',
+            name='short_name',
+            field=models.CharField(blank=True, default="", help_text='Short version of long name', max_length=500),
+            preserve_default=False,
+        ),
+    ]

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/migrations/0016_alter_compensationstate_biotope_type_details.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.0.8 on 2024-08-26 16:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('codelist', '0003_alter_konovacode_long_name_and_more'),
+        ('compensation', '0015_alter_compensation_after_states_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='compensationstate',
+            name='biotope_type_details',
+            field=models.ManyToManyField(blank=True, limit_choices_to={'code_lists__in': [288], 'is_archived': False, 'is_selectable': True}, related_name='+', to='codelist.konovacode'),
+        ),
+    ]

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/compensation/includes/actions.html

@@ -11,7 +11,7 @@
             </div>
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:new-action' obj.id %}" title="{% trans 'Add new action' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'seedling' %}
@@ -34,7 +34,7 @@
                 <th scope="col">
                     {% trans 'Comment' %}
                 </th>
-                {% if is_default_member and has_access %}
+                {% if is_default_member and is_entry_shared %}
                 <th class="w-10" scope="col">
                     <span class="float-right">
                         {% trans 'Action' %}
@@ -64,7 +64,7 @@
                     </div>
                 </td>
                 <td class="align-middle float-right">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button data-form-url="{% url 'compensation:action-edit' obj.id action.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit action' %}">
                         {% fa5_icon 'edit' %}
                     </button>

compensation/templates/compensation/detail/compensation/includes/controls.html

@@ -11,7 +11,7 @@
             {% fa5_icon 'file-alt' %}
         </button>
     </a>
-    {% if has_access %}
+    {% if is_entry_shared %}
         <button class="btn btn-default btn-modal mr-2" title="{% trans 'Resubmission' %}" data-form-url="{% url 'compensation:resubmission-create' obj.id %}">
             {% fa5_icon 'bell' %}
         </button>

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

@@ -10,7 +10,7 @@
             </div>
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:new-deadline' obj.id %}" title="{% trans 'Add new deadline' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'calendar-check' %}
@@ -38,7 +38,7 @@
                 <th scope="col">
                     {% trans 'Comment' %}
                 </th>
-                {% if is_default_member and has_access %}
+                {% if is_default_member and is_entry_shared %}
                     <th class="w-10" scope="col">
                         <span class="float-right">
                             {% trans 'Action' %}
@@ -60,7 +60,7 @@
                     </div>
                 </td>
                 <td class="align-middle float-right">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button data-form-url="{% url 'compensation:deadline-edit' obj.id deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit deadline' %}">
                         {% fa5_icon 'edit' %}
                     </button>

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

@@ -10,7 +10,7 @@
             </div>
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:new-doc' obj.id %}" title="{% trans 'Add new document' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'file' %}
@@ -33,7 +33,7 @@
                 <th scope="col">
                     {% trans 'Comment' %}
                 </th>
-                {% if is_default_member and has_access %}
+                {% if is_default_member and is_entry_shared %}
                     <th class="w-10" scope="col">
                         <span class="float-right">
                             {% trans 'Action' %}
@@ -59,7 +59,7 @@
                     </div>
                 </td>
                 <td class="align-middle float-right">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button data-form-url="{% url 'compensation:edit-doc' obj.id doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit document' %}">
                         {% fa5_icon 'edit' %}
                     </button>

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

@@ -10,7 +10,7 @@
             </div>
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:new-state' obj.id %}" title="{% trans 'Add new state after' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'layer-group' %}
@@ -35,7 +35,7 @@
                 <th scope="col">
                     {% trans 'Surface' %}
                 </th>
-                {% if is_default_member and has_access %}
+                {% if is_default_member and is_entry_shared %}
                 <th class="w-10" scope="col">
                     <span class="float-right">
                         {% trans 'Action' %}
@@ -58,7 +58,7 @@
                 </td>
                 <td>{{ state.surface|floatformat:2 }} m²</td>
                 <td class="align-middle float-right">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button data-form-url="{% url 'compensation:state-edit' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit state' %}">
                         {% fa5_icon 'edit' %}
                     </button>

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

@@ -10,7 +10,7 @@
             </div>
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:new-state' obj.id %}?before=true" title="{% trans 'Add new state before' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'layer-group' %}
@@ -35,7 +35,7 @@
                 <th scope="col">
                     {% trans 'Surface' %}
                 </th>
-                {% if is_default_member and has_access %}
+                {% if is_default_member and is_entry_shared %}
                 <th class="w-10" scope="col">
                     <span class="float-right">
                         {% trans 'Action' %}
@@ -58,7 +58,7 @@
                 </td>
                 <td>{{ state.surface|floatformat:2 }} m²</td>
                 <td class="align-middle float-right">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button data-form-url="{% url 'compensation:state-edit' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit state' %}">
                         {% fa5_icon 'edit' %}
                     </button>

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

@@ -123,7 +123,7 @@
                                 {% include 'user/includes/team_data_modal_button.html' %}
                             {% endfor %}
                             <hr>
-                            {% if has_access %}
+                            {% if is_entry_shared %}
                                 {% for user in obj.intervention.shared_users %}
                                     {% include 'user/includes/contact_modal_button.html' %}
                                 {% endfor %}

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

@@ -10,7 +10,7 @@
             </div>
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc:new-action' obj.id %}" title="{% trans 'Add new action' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'seedling' %}
@@ -33,7 +33,7 @@
                 <th scope="col">
                     {% trans 'Comment' %}
                 </th>
-                {% if is_default_member and has_access %}
+                {% if is_default_member and is_entry_shared %}
                     <th class="w-10" scope="col">
                         <span class="float-right">
                             {% trans 'Action' %}
@@ -63,7 +63,7 @@
                     </div>
                 </td>
                 <td class="align-middle float-right">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button data-form-url="{% url 'compensation:acc:action-edit' obj.id action.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit action' %}">
                         {% fa5_icon 'edit' %}
                     </button>

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

@@ -11,7 +11,7 @@
             {% fa5_icon 'file-alt' %}
         </button>
     </a>
-    {% if has_access %}
+    {% if is_entry_shared %}
         <button class="btn btn-default btn-modal mr-2" title="{% trans 'Resubmission' %}" data-form-url="{% url 'compensation:acc:resubmission-create' obj.id %}">
             {% fa5_icon 'bell' %}
         </button>

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

@@ -10,7 +10,7 @@
             </div>
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc:new-deadline' obj.id %}" title="{% trans 'Add new deadline' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'calendar-check' %}
@@ -58,7 +58,7 @@
                     </div>
                 </td>
                 <td class="align-middle float-right">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button data-form-url="{% url 'compensation:acc:deadline-edit' obj.id deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit deadline' %}">
                         {% fa5_icon 'edit' %}
                     </button>

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 %}
@@ -61,7 +61,7 @@
                 <td class="align-middle">{{ deduction.surface|floatformat:2|intcomma }} m²</td>
                 <td class="align-middle">{{ deduction.created.timestamp|default_if_none:""|naturalday}}</td>
                 <td class="align-middle float-right">
-                    {% if is_default_member and has_access or is_default_member and user in deduction.intervention.shared_users  %}
+                    {% if is_default_member and is_entry_shared or is_default_member and user in deduction.intervention.shared_users  %}
                     <button data-form-url="{% url 'compensation:acc:edit-deduction' deduction.account.id deduction.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit Deduction' %}">
                         {% fa5_icon 'edit' %}
                     </button>

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

@@ -10,7 +10,7 @@
             </div>
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc:new-doc' obj.id %}" title="{% trans 'Add new document' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'file' %}
@@ -57,7 +57,7 @@
                     </div>
                 </td>
                 <td class="align-middle float-right">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button data-form-url="{% url 'compensation:acc:edit-doc' obj.id doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit document' %}">
                         {% fa5_icon 'edit' %}
                     </button>

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

@@ -10,7 +10,7 @@
             </div>
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc:new-state' obj.id %}" title="{% trans 'Add new state after' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'layer-group' %}
@@ -35,7 +35,7 @@
                 <th scope="col">
                     {% trans 'Surface' %}
                 </th>
-                {% if is_default_member and has_access %}
+                {% if is_default_member and is_entry_shared %}
                 <th class="w-10" scope="col">
                     <span class="float-right">
                         {% trans 'Action' %}
@@ -58,7 +58,7 @@
                 </td>
                 <td>{{ state.surface|floatformat:2 }} m²</td>
                 <td class="align-middle float-right">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button data-form-url="{% url 'compensation:acc:state-edit' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit state' %}">
                         {% fa5_icon 'edit' %}
                     </button>

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

@@ -10,7 +10,7 @@
             </div>
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc:new-state' obj.id %}?before=true" title="{% trans 'Add new state before' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'layer-group' %}
@@ -35,7 +35,7 @@
                 <th scope="col">
                     {% trans 'Surface' %}
                 </th>
-                {% if is_default_member and has_access %}
+                {% if is_default_member and is_entry_shared %}
                 <th class="w-10" scope="col">
                     <span class="float-right">
                         {% trans 'Action' %}
@@ -58,7 +58,7 @@
                 </td>
                 <td>{{ state.surface|floatformat:2 }} m²</td>
                 <td class="align-middle float-right">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button data-form-url="{% url 'compensation:acc:state-edit' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit state' %}">
                         {% fa5_icon 'edit' %}
                     </button>

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

@@ -101,7 +101,7 @@
                                 {% include 'user/includes/team_data_modal_button.html' %}
                             {% endfor %}
                             <hr>
-                            {% if has_access %}
+                            {% if is_entry_shared %}
                                 {% for user in obj.users.all %}
                                     {% include 'user/includes/contact_modal_button.html' %}
                                 {% endfor %}

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, \
-    remove_view
+from compensation.views.compensation.compensation import IndexCompensationView, CompensationIdentifierGeneratorView, \
+    EditCompensationView, NewCompensationView
 from compensation.views.compensation.log import CompensationLogView
 
 urlpatterns = [
     # Main compensation
-    path("", index_view, name="index"),
-    path('new/id', new_id_view, name='new-id'),
-    path('new/<intervention_id>', new_view, name='new'),
-    path('new', new_view, name='new'),
-    path('<id>', detail_view, name='detail'),
+    path("", IndexCompensationView.as_view(), name="index"),
+    path('new/id', CompensationIdentifierGeneratorView.as_view(), name='new-id'),
+    path('new/<intervention_id>', NewCompensationView.as_view(), name='new'),
+    path('new', NewCompensationView.as_view(), name='new'),
+    path('<id>', DetailCompensationView.as_view(), name='detail'),
     path('<id>/log', CompensationLogView.as_view(), name='log'),
-    path('<id>/edit', edit_view, name='edit'),
-    path('<id>/remove', remove_view, name='remove'),
+    path('<id>/edit', EditCompensationView.as_view(), name='edit'),
+    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, \
-    detail_view
+from compensation.views.eco_account.detail import DetailEcoAccountView
+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('new/', new_view, name='new'),
-    path('new/id', new_id_view, name='new-id'),
-    path('<id>', detail_view, name='detail'),
+    path("", IndexEcoAccountView.as_view(), name="index"),
+    path('new/', NewEcoAccountView.as_view(), name='new'),
+    path('new/id', EcoAccountIdentifierGeneratorView.as_view(), name='new-id'),
+    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>/edit', edit_view, name='edit'),
-    path('<id>/remove', remove_view, name='remove'),
+    path('<id>/report', EcoAccountPublicReportView.as_view(), name='report'),
+    path('<id>/edit', EditEcoAccountView.as_view(), name='edit'),
+    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>/remove/<payment_id>', payment_remove_view, name='remove'),
-    path('<id>/edit/<payment_id>', payment_edit_view, name='edit'),
+    path('<id>/new', NewPaymentView.as_view(), name='new'),
+    path('<id>/remove/<payment_id>', RemovePaymentView.as_view(), name='remove'),
+    path('<id>/edit/<payment_id>', EditPaymentView.as_view(), name='edit'),
 ]

compensation/views/compensation/compensation.py

@@ -6,91 +6,127 @@ Created on: 19.08.22
 
 """
 from django.contrib import messages
-from django.contrib.auth.decorators import login_required
-from django.core.exceptions import ObjectDoesNotExist
-from django.db.models import Sum
-from django.http import HttpRequest, JsonResponse
+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 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, \
-    uuid_required
+from konova.decorators import shared_access_required, default_group_required
 from konova.forms import SimpleGeomForm
-from konova.forms.modals import RemoveModalForm
-from konova.settings import DEFAULT_GROUP, ZB_GROUP, ETS_GROUP
 from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
-from konova.utils.message_templates import COMPENSATION_REMOVED_TEMPLATE, DATA_CHECKED_PREVIOUSLY_TEMPLATE, \
-    RECORDED_BLOCKS_EDIT, CHECK_STATE_RESET, FORM_INVALID, PARAMS_INVALID, IDENTIFIER_REPLACED, \
-    COMPENSATION_ADDED_TEMPLATE, DO_NOT_FORGET_TO_SHARE, GEOMETRY_SIMPLIFIED
+from konova.utils.message_templates import RECORDED_BLOCKS_EDIT, CHECK_STATE_RESET, FORM_INVALID, PARAMS_INVALID, \
+    IDENTIFIER_REPLACED, COMPENSATION_ADDED_TEMPLATE, GEOMETRY_SIMPLIFIED, GEOMETRIES_IGNORED_TEMPLATE
+from konova.views.identifier import AbstractIdentifierGeneratorView
+from konova.views.index import AbstractIndexView
 
 
-@login_required
-@any_group_check
-def index_view(request: HttpRequest):
-    """
-    Renders the index view for compensation
+class IndexCompensationView(AbstractIndexView):
+    def get(self, request, *args, **kwargs) -> HttpResponse:
+        """
+        Renders the index view for compensation
 
-    Args:
-        request (HttpRequest): The incoming request
+        Args:
+            request (HttpRequest): The incoming request
 
-    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
-    ).order_by(
-        "-modified__timestamp"
-    )
-    table = CompensationTable(
-        request=request,
-        queryset=compensations
-    )
-    context = {
-        "table": table,
-        TAB_TITLE_IDENTIFIER: _("Compensations - Overview"),
-    }
-    context = BaseContext(request, context).context
-    return render(request, template, context)
+        Returns:
+            A rendered view
+        """
+        compensations = Compensation.objects.filter(
+            deleted=None,  # only show those which are not deleted individually
+            intervention__deleted=None,  # and don't show the ones whose intervention has been deleted
+        ).order_by(
+            "-modified__timestamp"
+        )
+        table = CompensationTable(
+            request=request,
+            queryset=compensations
+        )
+        context = {
+            "table": table,
+            TAB_TITLE_IDENTIFIER: _("Compensations - Overview"),
+        }
+        context = BaseContext(request, context).context
+        return render(request, self._TEMPLATE, context)
 
 
-@login_required
-@default_group_required
-@shared_access_required(Intervention, "intervention_id")
-def new_view(request: HttpRequest, intervention_id: str = None):
-    """
-    Renders a view for a new compensation creation
+class NewCompensationView(LoginRequiredMixin, View):
+    _TEMPLATE = "compensation/form/view.html"
 
-    Args:
-        request (HttpRequest): The incoming request
+    @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
 
-    Returns:
+        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.
 
-    """
-    template = "compensation/form/view.html"
-    if intervention_id is not None:
-        try:
-            intervention = Intervention.objects.get(id=intervention_id)
-        except ObjectDoesNotExist:
-            messages.error(request, PARAMS_INVALID)
-            return redirect("home")
-        if intervention.is_recorded:
-            messages.info(
-                request,
-                RECORDED_BLOCKS_EDIT
-            )
-            return redirect("intervention:detail", id=intervention_id)
+        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
+
+        Args:
+            request (HttpRequest): The incoming request
+
+        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)
 
-    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,199 +139,127 @@ 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)
+            messages.error(request, FORM_INVALID, extra_tags="danger", )
 
-
-@login_required
-@default_group_required
-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
+        context = {
+            "form": data_form,
+            "geom_form": geom_form,
+            TAB_TITLE_IDENTIFIER: _("New compensation"),
         }
-    )
+        context = BaseContext(request, context).context
+
+        return render(request, self._TEMPLATE, context)
 
 
-@login_required
-@default_group_required
-@shared_access_required(Compensation, "id")
-def edit_view(request: HttpRequest, id: str):
-    """
-    Renders a view for editing compensations
+class CompensationIdentifierGeneratorView(AbstractIdentifierGeneratorView):
+    _MODEL = Compensation
 
-    Args:
-        request (HttpRequest): The incoming request
 
-    Returns:
+class EditCompensationView(LoginRequiredMixin, View):
+    _TEMPLATE = "compensation/form/view.html"
 
-    """
-    template = "compensation/form/view.html"
-    # Get object from db
-    comp = get_object_or_404(Compensation, id=id)
-    if comp.is_recorded:
-        messages.info(
-            request,
-            RECORDED_BLOCKS_EDIT
-        )
-        return redirect("compensation:detail", id=id)
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Compensation, "id"))
+    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
 
-    # 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":
+        """
+        Renders a view for editing compensations
+
+        Args:
+            request (HttpRequest): The incoming request
+
+        Returns:
+
+        """
+        # Get object from db
+        comp = get_object_or_404(Compensation, id=id)
+        if comp.is_recorded:
+            messages.info(
+                request,
+                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)
+
+        context = {
+            "form": data_form,
+            "geom_form": geom_form,
+            TAB_TITLE_IDENTIFIER: _("Edit {}").format(comp.identifier),
+        }
+        context = BaseContext(request, context).context
+
+        return render(request, self._TEMPLATE, context)
+
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Compensation, "id"))
+    def post(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+
+        """
+        Renders a view for editing compensations
+
+        Args:
+            request (HttpRequest): The incoming request
+
+        Returns:
+
+        """
+        # Get object from db
+        comp = get_object_or_404(Compensation, id=id)
+        if comp.is_recorded:
+            messages.info(
+                request,
+                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.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: _("Edit {}").format(comp.identifier),
-    }
-    context = BaseContext(request, context).context
-    return render(request, template, context)
+            messages.error(request, FORM_INVALID, extra_tags="danger", )
 
+        context = {
+            "form": data_form,
+            "geom_form": geom_form,
+            TAB_TITLE_IDENTIFIER: _("Edit {}").format(comp.identifier),
+        }
+        context = BaseContext(request, context).context
 
-@login_required
-@any_group_check
-@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/compensation/view.html"
-    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,
-        "has_access": 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,7 +5,7 @@ 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 _
@@ -14,67 +14,72 @@ from compensation.models import Compensation
 from konova.contexts import BaseContext
 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
 
 
-def report_view(request: HttpRequest, id: str):
-    """ Renders the public report view
+class CompensationPublicReportView(AbstractPublicReportView):
+    _TEMPLATE = "compensation/report/compensation/report.html"
 
-    Args:
-        request (HttpRequest): The incoming request
-        id (str): The id of the intervention
+    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+        """ Renders the public report view
 
-    Returns:
+        Args:
+            request (HttpRequest): The incoming request
+            id (str): The id of the intervention
 
-    """
-    # Reuse the compensation report template since compensations are structurally identical
-    template = "compensation/report/compensation/report.html"
-    comp = get_object_or_404(Compensation, id=id)
+        Returns:
+
+        """
+        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():
+            template = "report/unavailable.html"
+            context = {
+                TAB_TITLE_IDENTIFIER: tab_title,
+            }
+            context = BaseContext(request, context).context
+            return render(request, template, context)
+
+        # Prepare data for map viewer
+        geom_form = SimpleGeomForm(
+            instance=comp
+        )
+        parcels = comp.get_underlying_parcels()
+
+        qrcode = QrCode(
+            content=request.build_absolute_uri(reverse("compensation:report", args=(id,))),
+            size=10
+        )
+        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")
+        after_states = comp.after_states.all().order_by("-surface").prefetch_related("biotope_type")
+        actions = comp.actions.all().prefetch_related("action_type")
 
-    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():
-        template = "report/unavailable.html"
         context = {
+            "obj": comp,
+            "qrcode": {
+                "img": qrcode.get_img(),
+                "url": qrcode.get_content(),
+            },
+            "qrcode_lanis": {
+                "img": qrcode_lanis.get_img(),
+                "url": qrcode_lanis.get_content(),
+            },
+            "is_entry_shared": False,  # disables action buttons during rendering
+            "before_states": before_states,
+            "after_states": after_states,
+            "geom_form": geom_form,
+            "parcels": parcels,
+            "actions": actions,
+            "tables_scrollable": False,
             TAB_TITLE_IDENTIFIER: tab_title,
         }
         context = BaseContext(request, context).context
-        return render(request, template, context)
-
-    # Prepare data for map viewer
-    geom_form = SimpleGeomForm(
-        instance=comp
-    )
-    parcels = comp.get_underlying_parcels()
-
-    qrcode_url = request.build_absolute_uri(reverse("compensation:report", args=(id,)))
-    qrcode_img = generate_qr_code(qrcode_url, 10)
-    qrcode_lanis_url = comp.get_LANIS_link()
-    qrcode_img_lanis = generate_qr_code(qrcode_lanis_url, 7)
-
-    # Order states by surface
-    before_states = comp.before_states.all().order_by("-surface").prefetch_related("biotope_type")
-    after_states = comp.after_states.all().order_by("-surface").prefetch_related("biotope_type")
-    actions = comp.actions.all().prefetch_related("action_type")
-
-    context = {
-        "obj": comp,
-        "qrcode": {
-            "img": qrcode_img,
-            "url": qrcode_url,
-        },
-        "qrcode_lanis": {
-            "img": qrcode_img_lanis,
-            "url": qrcode_lanis_url,
-        },
-        "has_access": False,  # disables action buttons during rendering
-        "before_states": before_states,
-        "after_states": after_states,
-        "geom_form": geom_form,
-        "parcels": parcels,
-        "actions": actions,
-        "tables_scrollable": False,
-        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,72 +6,94 @@ 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.http import HttpRequest, JsonResponse
+from django.contrib.auth.mixins import LoginRequiredMixin
+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 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, \
-    uuid_required
+from konova.decorators import shared_access_required, default_group_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, \
-    IDENTIFIER_REPLACED, DO_NOT_FORGET_TO_SHARE, GEOMETRY_SIMPLIFIED
+from konova.utils.message_templates import RECORDED_BLOCKS_EDIT, FORM_INVALID, \
+    IDENTIFIER_REPLACED, GEOMETRY_SIMPLIFIED, GEOMETRIES_IGNORED_TEMPLATE
+from konova.views.identifier import AbstractIdentifierGeneratorView
+from konova.views.index import AbstractIndexView
 
 
-@login_required
-@any_group_check
-def index_view(request: HttpRequest):
-    """
-    Renders the index view for eco accounts
+class IndexEcoAccountView(AbstractIndexView):
+    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
+        """
+        Renders the index view for eco accounts
 
-    Args:
-        request (HttpRequest): The incoming request
+        Args:
+            request (HttpRequest): The incoming request
 
-    Returns:
-        A rendered view
-    """
-    template = "generic_index.html"
-    eco_accounts = EcoAccount.objects.filter(
-        deleted=None,
-    ).order_by(
-        "-modified__timestamp"
-    )
-    table = EcoAccountTable(
-        request=request,
-        queryset=eco_accounts
-    )
-    context = {
-        "table": table,
-        TAB_TITLE_IDENTIFIER: _("Eco-account - Overview"),
-    }
-    context = BaseContext(request, context).context
-    return render(request, template, context)
+        Returns:
+            A rendered view
+        """
+        eco_accounts = EcoAccount.objects.filter(
+            deleted=None,
+        ).order_by(
+            "-modified__timestamp"
+        )
+        table = EcoAccountTable(
+            request=request,
+            queryset=eco_accounts
+        )
+        context = {
+            "table": table,
+            TAB_TITLE_IDENTIFIER: _("Eco-account - Overview"),
+        }
+        context = BaseContext(request, context).context
+        return render(request, self._TEMPLATE, context)
 
 
-@login_required
-@default_group_required
-def new_view(request: HttpRequest):
-    """
-    Renders a view for a new eco account creation
+class NewEcoAccountView(LoginRequiredMixin, View):
+    _TEMPLATE = "compensation/form/view.html"
 
-    Args:
-        request (HttpRequest): The incoming request
+    @method_decorator(default_group_required)
+    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
+        """
+        Renders a view for a new eco account creation
 
-    Returns:
+        Args:
+            request (HttpRequest): The incoming request
 
-    """
-    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":
+        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
+
+        Args:
+            request (HttpRequest): The incoming request
+
+        Returns:
+
+        """
+        data_form = NewEcoAccountForm(request.POST or None)
+        geom_form = SimpleGeomForm(request.POST or None, read_only=False)
         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,208 +106,123 @@ 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)
+            messages.error(request, FORM_INVALID, extra_tags="danger", )
 
-
-@login_required
-@default_group_required
-def new_id_view(request: HttpRequest):
-    """ JSON endpoint
-
-    Provides fetching of free identifiers for e.g. AJAX calls
-
-    """
-    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
+        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)
+
+class EcoAccountIdentifierGeneratorView(AbstractIdentifierGeneratorView):
+    _MODEL = EcoAccount
 
 
-@login_required
-@default_group_required
-@shared_access_required(EcoAccount, "id")
-def edit_view(request: HttpRequest, id: str):
-    """
-    Renders a view for editing compensations
+class EditEcoAccountView(LoginRequiredMixin, View):
+    _TEMPLATE = "compensation/form/view.html"
 
-    Args:
-        request (HttpRequest): The incoming request
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(EcoAccount, "id"))
+    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
 
-    Returns:
+        """
+        Renders a view for editing compensations
 
-    """
-    template = "compensation/form/view.html"
-    # Get object from db
-    acc = get_object_or_404(EcoAccount, id=id)
-    if acc.is_recorded:
-        messages.info(
-            request,
-            RECORDED_BLOCKS_EDIT
-        )
-        return redirect("compensation:acc:detail", id=id)
+        Args:
+            request (HttpRequest): The incoming request
+
+        Returns:
+
+        """
+        # Get object from db
+        acc = get_object_or_404(EcoAccount, id=id)
+        if acc.is_recorded:
+            messages.info(
+                request,
+                RECORDED_BLOCKS_EDIT
+            )
+            return redirect("compensation:acc:detail", id=id)
+
+        # 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)
+
+        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)
+
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(EcoAccount, "id"))
+    def post(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+
+        """
+        Renders a view for editing compensations
+
+        Args:
+            request (HttpRequest): The incoming request
+
+        Returns:
+
+        """
+        # Get object from db
+        acc = get_object_or_404(EcoAccount, id=id)
+        if acc.is_recorded:
+            messages.info(
+                request,
+                RECORDED_BLOCKS_EDIT
+            )
+            return redirect("compensation:acc:detail", id=id)
+
+        # 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)
 
-    # 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:
+            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: _("Edit {}").format(acc.identifier),
-    }
-    context = BaseContext(request, context).context
-    return render(request, template, context)
+            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
 
-@login_required
-@any_group_check
-@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"
-    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,
-        "has_access": 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)
-    return form.process_request(
-        request=request,
-        msg_success=_("Eco-account removed"),
-        redirect_url=reverse("compensation:acc:index"),
-    )
-
+        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,7 +5,7 @@ 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 _
@@ -14,74 +14,79 @@ from compensation.models import EcoAccount
 from konova.contexts import BaseContext
 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
 
 
-def report_view(request: HttpRequest, id: str):
-    """ Renders the public report view
+class EcoAccountPublicReportView(AbstractPublicReportView):
+    _TEMPLATE = "compensation/report/eco_account/report.html"
 
-    Args:
-        request (HttpRequest): The incoming request
-        id (str): The id of the intervention
+    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+        """ Renders the public report view
 
-    Returns:
+        Args:
+            request (HttpRequest): The incoming request
+            id (str): The id of the intervention
 
-    """
-    # 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)
+        Returns:
+
+        """
+        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():
+            template = "report/unavailable.html"
+            context = {
+                TAB_TITLE_IDENTIFIER: tab_title,
+            }
+            context = BaseContext(request, context).context
+            return render(request, template, context)
+
+        # Prepare data for map viewer
+        geom_form = SimpleGeomForm(
+            instance=acc
+        )
+        parcels = acc.get_underlying_parcels()
+
+        qrcode = QrCode(
+            content=request.build_absolute_uri(reverse("compensation:acc:report", args=(id,))),
+            size=10
+        )
+        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")
+        after_states = acc.after_states.all().order_by("-surface").select_related("biotope_type__parent")
+        actions = acc.actions.all().prefetch_related("action_type__parent")
+
+        # Reduce amount of db fetched data to the bare minimum we need in the template (deduction's intervention id and identifier)
+        deductions = acc.deductions.all() \
+            .distinct("intervention") \
+            .select_related("intervention") \
+            .values_list("intervention__id", "intervention__identifier", "intervention__title", named=True)
 
-    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():
-        template = "report/unavailable.html"
         context = {
+            "obj": acc,
+            "qrcode": {
+                "img": qrcode.get_img(),
+                "url": qrcode.get_content(),
+            },
+            "qrcode_lanis": {
+                "img": qrcode_lanis.get_img(),
+                "url": qrcode_lanis.get_content(),
+            },
+            "is_entry_shared": False,  # disables action buttons during rendering
+            "before_states": before_states,
+            "after_states": after_states,
+            "geom_form": geom_form,
+            "parcels": parcels,
+            "actions": actions,
+            "deductions": deductions,
+            "tables_scrollable": False,
             TAB_TITLE_IDENTIFIER: tab_title,
         }
         context = BaseContext(request, context).context
-        return render(request, template, context)
-
-    # Prepare data for map viewer
-    geom_form = SimpleGeomForm(
-        instance=acc
-    )
-    parcels = acc.get_underlying_parcels()
-
-    qrcode_url = request.build_absolute_uri(reverse("compensation:acc:report", args=(id,)))
-    qrcode_img = generate_qr_code(qrcode_url, 10)
-    qrcode_lanis_url = acc.get_LANIS_link()
-    qrcode_img_lanis = generate_qr_code(qrcode_lanis_url, 7)
-
-    # Order states by surface
-    before_states = acc.before_states.all().order_by("-surface").select_related("biotope_type__parent")
-    after_states = acc.after_states.all().order_by("-surface").select_related("biotope_type__parent")
-    actions = acc.actions.all().prefetch_related("action_type__parent")
-
-    # Reduce amount of db fetched data to the bare minimum we need in the template (deduction's intervention id and identifier)
-    deductions = acc.deductions.all()\
-        .distinct("intervention")\
-        .select_related("intervention")\
-        .values_list("intervention__id", "intervention__identifier", "intervention__title", named=True)
-
-    context = {
-        "obj": acc,
-        "qrcode": {
-            "img": qrcode_img,
-            "url": qrcode_url,
-        },
-        "qrcode_lanis": {
-            "img": qrcode_img_lanis,
-            "url": qrcode_lanis_url,
-        },
-        "has_access": False,  # disables action buttons during rendering
-        "before_states": before_states,
-        "after_states": after_states,
-        "geom_form": geom_form,
-        "parcels": parcels,
-        "actions": actions,
-        "deductions": deductions,
-        "tables_scrollable": False,
-        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,72 +19,97 @@ from konova.decorators import default_group_required, shared_access_required
 from konova.utils.message_templates import PAYMENT_ADDED, PAYMENT_REMOVED, PAYMENT_EDITED
 
 
-@login_required
-@default_group_required
-@shared_access_required(Intervention, "id")
-def new_payment_view(request: HttpRequest, id: str):
-    """ Renders a modal view for adding new payments
+class NewPaymentView(LoginRequiredMixin, View):
 
-    Args:
-        request (HttpRequest): The incoming request
-        id (str): The intervention's id for which a new payment shall be added
+    def __process_request(self, request: HttpRequest, id: str):
+        """ Renders a modal view for adding new payments
 
-    Returns:
+        Args:
+            request (HttpRequest): The incoming request
+            id (str): The intervention's id for which a new payment shall be added
 
-    """
-    intervention = get_object_or_404(Intervention, id=id)
-    form = NewPaymentForm(request.POST or None, instance=intervention, request=request)
-    return form.process_request(
-        request,
-        msg_success=PAYMENT_ADDED,
-        redirect_url=reverse("intervention:detail", args=(id,)) + "#related_data"
-    )
+        Returns:
+
+        """
+        intervention = get_object_or_404(Intervention, id=id)
+        form = NewPaymentForm(request.POST or None, instance=intervention, request=request)
+        return form.process_request(
+            request,
+            msg_success=PAYMENT_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):
+        return self.__process_request(request, id=id)
+
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def post(self, request: HttpRequest, id: str):
+        return self.__process_request(request, id=id)
 
 
-@login_required
-@default_group_required
-@shared_access_required(Intervention, "id")
-def payment_remove_view(request: HttpRequest, id: str, payment_id: str):
-    """ Renders a modal view for removing payments
+class RemovePaymentView(LoginRequiredMixin, View):
 
-    Args:
-        request (HttpRequest): The incoming request
-        id (str): The intervention's id
-        payment_id (str): The payment's id
+    def __process_request(self, request: HttpRequest, id: str, payment_id: str):
+        """ Renders a modal view for removing payments
 
-    Returns:
+        Args:
+            request (HttpRequest): The incoming request
+            id (str): The intervention's id
+            payment_id (str): The payment's id
 
-    """
-    intervention = get_object_or_404(Intervention, id=id)
-    payment = get_object_or_404(Payment, id=payment_id)
-    form = RemovePaymentModalForm(request.POST or None, instance=intervention, payment=payment, request=request)
-    return form.process_request(
-        request=request,
-        msg_success=PAYMENT_REMOVED,
-        redirect_url=reverse("intervention:detail", args=(payment.intervention_id,)) + "#related_data"
-    )
+        Returns:
+
+        """
+        intervention = get_object_or_404(Intervention, id=id)
+        payment = get_object_or_404(Payment, id=payment_id)
+        form = RemovePaymentModalForm(request.POST or None, instance=intervention, payment=payment, request=request)
+        return form.process_request(
+            request=request,
+            msg_success=PAYMENT_REMOVED,
+            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)
 
 
-@login_required
-@default_group_required
-@shared_access_required(Intervention, "id")
-def payment_edit_view(request: HttpRequest, id: str, payment_id: str):
-    """ Renders a modal view for editing payments
+class EditPaymentView(LoginRequiredMixin, View):
+    def __process_request(self, request: HttpRequest, id: str, payment_id: str):
+        """ Renders a modal view for editing payments
 
-    Args:
-        request (HttpRequest): The incoming request
-        id (str): The intervention's id
-        payment_id (str): The payment's id
+        Args:
+            request (HttpRequest): The incoming request
+            id (str): The intervention's id
+            payment_id (str): The payment's id
 
-    Returns:
+        Returns:
 
-    """
-    intervention = get_object_or_404(Intervention, id=id)
-    payment = get_object_or_404(Payment, id=payment_id)
-    form = EditPaymentModalForm(request.POST or None, instance=intervention, payment=payment, request=request)
-    return form.process_request(
-        request=request,
-        msg_success=PAYMENT_EDITED,
-        redirect_url=reverse("intervention:detail", args=(payment.intervention_id,)) + "#related_data"
-    )
+        """
+        intervention = get_object_or_404(Intervention, id=id)
+        payment = get_object_or_404(Payment, id=payment_id)
+        form = EditPaymentModalForm(request.POST or None, instance=intervention, payment=payment, request=request)
+        return form.process_request(
+            request=request,
+            msg_success=PAYMENT_EDITED,
+            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/actions.html

@@ -10,7 +10,7 @@
             </div>
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'ema:new-action' obj.id %}" title="{% trans 'Add new action' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'seedling' %}
@@ -61,7 +61,7 @@
                     </div>
                 </td>
                 <td class="align-middle float-right">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button data-form-url="{% url 'ema:action-edit' obj.id action.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit action' %}">
                         {% fa5_icon 'edit' %}
                     </button>

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

@@ -11,14 +11,14 @@
             {% fa5_icon 'file-alt' %}
         </button>
     </a>
-    {% if has_access %}
+    {% if is_entry_shared %}
         <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>
-        <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 %}
+            <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 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,19 +28,21 @@
                     {% fa5_icon 'bookmark' %}
                 </button>
             {% endif %}
+            <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 %}
-        <a href="{% url 'ema:edit' obj.id %}" class="mr-2">
-            <button class="btn btn-default" title="{% trans 'Edit' %}">
-                {% fa5_icon 'edit' %}
+            <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>
-        </a>
-        <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>
-        <button class="btn btn-default btn-modal" data-form-url="{% url 'ema:remove' obj.id %}" title="{% trans 'Delete' %}">
-            {% fa5_icon 'trash' %}
-        </button>
         {% endif %}
     {% endif %}
 </div>

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

@@ -10,7 +10,7 @@
             </div>
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'ema:new-deadline' obj.id %}" title="{% trans 'Add new deadline' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'calendar-check' %}
@@ -58,7 +58,7 @@
                     </div>
                 </td>
                 <td class="align-middle float-right">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button data-form-url="{% url 'ema:deadline-edit' obj.id deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit deadline' %}">
                         {% fa5_icon 'edit' %}
                     </button>

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

@@ -10,7 +10,7 @@
             </div>
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'ema:new-doc' obj.id %}" title="{% trans 'Add new document' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'file' %}
@@ -57,7 +57,7 @@
                     </div>
                 </td>
                 <td class="align-middle float-right">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button data-form-url="{% url 'ema:edit-doc' obj.id doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit document' %}">
                         {% fa5_icon 'edit' %}
                     </button>

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

@@ -10,7 +10,7 @@
             </div>
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'ema:new-state' obj.id %}" title="{% trans 'Add new state after' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'layer-group' %}
@@ -56,7 +56,7 @@
                 </td>
                 <td>{{ state.surface|floatformat:2 }} m²</td>
                 <td class="align-middle float-right">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button data-form-url="{% url 'ema:state-edit' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit state' %}">
                         {% fa5_icon 'edit' %}
                     </button>

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

@@ -10,7 +10,7 @@
             </div>
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'ema:new-state' obj.id %}?before=true" title="{% trans 'Add new state before' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'layer-group' %}
@@ -56,7 +56,7 @@
                 </td>
                 <td>{{ state.surface|floatformat:2 }} m²</td>
                 <td class="align-middle float-right">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button data-form-url="{% url 'ema:state-edit' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit state' %}">
                         {% fa5_icon 'edit' %}
                     </button>

ema/templates/ema/detail/view.html

@@ -87,7 +87,7 @@
                                 {% include 'user/includes/team_data_modal_button.html' %}
                             {% endfor %}
                             <hr>
-                            {% if has_access %}
+                            {% if is_entry_shared %}
                                 {% for user in obj.users.all %}
                                     {% include 'user/includes/contact_modal_button.html' %}
                                 {% endfor %}

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("new/", new_view, name="new"),
-    path("new/id", new_id_view, name="new-id"),
-    path("<id>", detail_view, name="detail"),
+    path("", IndexEmaView.as_view(), name="index"),
+    path("new/", NewEmaView.as_view(), name="new"),
+    path("new/id", EmaIdentifierGeneratorView.as_view(), name="new-id"),
+    path("<id>", DetailEmaView.as_view(), name="detail"),
     path('<id>/log', EmaLogView.as_view(), name='log'),
-    path('<id>/edit', edit_view, name='edit'),
-    path('<id>/remove', remove_view, name='remove'),
+    path('<id>/edit', EditEmaView.as_view(), name='edit'),
+    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,71 +7,96 @@ 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.http import HttpRequest, JsonResponse
+from django.contrib.auth.mixins import LoginRequiredMixin
+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, \
-    uuid_required
+from konova.decorators import shared_access_required, conservation_office_group_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
-def index_view(request: HttpRequest):
-    """ Renders the index view for EMAs
+class IndexEmaView(AbstractIndexView):
+    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
+        """ Renders the index view for EMAs
 
-    Args:
-        request (HttpRequest): The incoming request
+        Args:
+            request (HttpRequest): The incoming request
 
-    Returns:
+        Returns:
 
-    """
-    template = "generic_index.html"
-    emas = Ema.objects.filter(
-        deleted=None,
-    ).order_by(
-        "-modified__timestamp"
-    )
+        """
+        emas = Ema.objects.filter(
+            deleted=None,
+        ).order_by(
+            "-modified__timestamp"
+        )
 
-    table = EmaTable(
-        request,
-        queryset=emas
-    )
-    context = {
-        "table": table,
-        TAB_TITLE_IDENTIFIER: _("EMAs - Overview"),
-    }
-    context = BaseContext(request, context).context
-    return render(request, template, context)
+        table = EmaTable(
+            request,
+            queryset=emas
+        )
+        context = {
+            "table": table,
+            TAB_TITLE_IDENTIFIER: _("EMAs - Overview"),
+        }
+        context = BaseContext(request, context).context
+        return render(request, self._TEMPLATE, context)
 
+class NewEmaView(LoginRequiredMixin, View):
+    _TEMPLATE = "ema/form/view.html"
 
-@login_required
-@conservation_office_group_required
-def new_view(request: HttpRequest):
-    """
-    Renders a view for a new eco account creation
+    @method_decorator(conservation_office_group_required)
+    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
+        """ GET endpoint
 
-    Args:
-        request (HttpRequest): The incoming request
+        Renders form for new EMA
 
-    Returns:
+        Args:
+            request (HttpRequest): The incoming request
+            *args ():
+            **kwargs ():
 
-    """
-    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":
+        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:
+
+        """
+        data_form = NewEmaForm(request.POST or None)
+        geom_form = SimpleGeomForm(request.POST or None, read_only=False)
         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,176 +109,124 @@ 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)
-
-
-@login_required
-@conservation_office_group_required
-def new_id_view(request: HttpRequest):
-    """ JSON endpoint
-
-    Provides fetching of free identifiers for e.g. AJAX calls
-
-    """
-    tmp = Ema()
-    identifier = tmp.generate_new_identifier()
-    while Ema.objects.filter(identifier=identifier).exists():
-        identifier = tmp.generate_new_identifier()
-    return JsonResponse(
-        data={
-            "gen_data": identifier
+        context = {
+            "form": data_form,
+            "geom_form": geom_form,
+            TAB_TITLE_IDENTIFIER: _("New EMA"),
         }
-    )
+        context = BaseContext(request, context).context
+        return render(request, self._TEMPLATE, context)
 
+class EmaIdentifierGeneratorView(AbstractIdentifierGeneratorView):
+    _MODEL = Ema
 
-@login_required
-@uuid_required
-def detail_view(request: HttpRequest, id: str):
-    """ Renders the detail view of an EMA
+    @method_decorator(conservation_office_group_required)
+    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
+        return super().get(request, *args, **kwargs)
 
-    Args:
-        request (HttpRequest): The incoming request
-        id (str): The EMA id
+class EditEmaView(LoginRequiredMixin, View):
+    _TEMPLATE = "compensation/form/view.html"
 
-    Returns:
+    @method_decorator(conservation_office_group_required)
+    @method_decorator(shared_access_required(Ema, "id"))
+    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+        """ GET endpoint
 
-    """
-    template = "ema/detail/view.html"
-    ema = get_object_or_404(Ema, id=id, deleted=None)
+        Renders form
 
-    geom_form = SimpleGeomForm(instance=ema)
-    parcels = ema.get_underlying_parcels()
-    _user = request.user
-    is_data_shared = ema.is_shared_with(_user)
+        Args:
+            request (HttpRequest): The incoming request
+            id (str): The ema identifier
+            *args ():
+            **kwargs ():
 
-    # Order states according to surface
-    before_states = ema.before_states.all().order_by("-surface")
-    after_states = ema.after_states.all().order_by("-surface")
+        Returns:
 
-    # 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)
+        """
+        # Get object from db
+        ema = get_object_or_404(Ema, id=id)
+        if ema.is_recorded:
+            messages.info(
+                request,
+                RECORDED_BLOCKS_EDIT
+            )
+            return redirect("ema:detail", id=id)
 
-    ema.set_status_messages(request)
+        # Create forms, initialize with values from db/from POST request
+        data_form = EditEmaForm(instance=ema)
+        geom_form = SimpleGeomForm(read_only=False, instance=ema)
+        context = {
+            "form": data_form,
+            "geom_form": geom_form,
+            TAB_TITLE_IDENTIFIER: _("Edit {}").format(ema.identifier),
+        }
+        context = BaseContext(request, context).context
+        return render(request, self._TEMPLATE, context)
 
-    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
-        )
+    @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
 
-    context = {
-        "obj": ema,
-        "geom_form": geom_form,
-        "parcels": parcels,
-        "has_access": 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,
-        "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)
+        Process submitted forms
 
+        Args:
+            request (HttpRequest): The incoming request
+            id (str): The id of the ema
+            *args ():
+            **kwargs ():
 
-@login_required
-@conservation_office_group_required
-@shared_access_required(Ema, "id")
-def edit_view(request: HttpRequest, id: str):
-    """
-    Renders a view for editing compensations
+        Returns:
 
-    Args:
-        request (HttpRequest): The incoming request
+        """
+        # Get object from db
+        ema = get_object_or_404(Ema, id=id)
+        if ema.is_recorded:
+            messages.info(
+                request,
+                RECORDED_BLOCKS_EDIT
+            )
+            return redirect("ema:detail", id=id)
 
-    Returns:
-
-    """
-    template = "compensation/form/view.html"
-    # Get object from db
-    ema = get_object_or_404(Ema, id=id)
-    if ema.is_recorded:
-        messages.info(
-            request,
-            RECORDED_BLOCKS_EDIT
-        )
-        return redirect("ema:detail", id=id)
-
-    # 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":
+        # 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 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)
-
-
-@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"),
-    )
-
+            messages.error(request, FORM_INVALID, extra_tags="danger", )
+        context = {
+            "form": data_form,
+            "geom_form": geom_form,
+            TAB_TITLE_IDENTIFIER: _("Edit {}").format(ema.identifier),
+        }
+        context = BaseContext(request, context).context
+        return render(request, self._TEMPLATE, context)

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,7 +5,7 @@ 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 _
@@ -14,67 +14,72 @@ from ema.models import Ema
 from konova.contexts import BaseContext
 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
 
 
-def report_view(request:HttpRequest, id: str):
-    """ Renders the public report view
+class EmaPublicReportView(AbstractPublicReportView):
+    _TEMPLATE = "ema/report/report.html"
 
-    Args:
-        request (HttpRequest): The incoming request
-        id (str): The id of the intervention
+    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+        """ Renders the public report view
 
-    Returns:
+        Args:
+            request (HttpRequest): The incoming request
+            id (str): The id of the intervention
 
-    """
-    # Reuse the compensation report template since EMAs are structurally identical
-    template = "ema/report/report.html"
-    ema = get_object_or_404(Ema, id=id)
+        Returns:
+
+        """
+        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():
+            template = "report/unavailable.html"
+            context = {
+                TAB_TITLE_IDENTIFIER: tab_title,
+            }
+            context = BaseContext(request, context).context
+            return render(request, template, context)
+
+        # Prepare data for map viewer
+        geom_form = SimpleGeomForm(
+            instance=ema,
+        )
+        parcels = ema.get_underlying_parcels()
+
+        qrcode = QrCode(
+            content=request.build_absolute_uri(reverse("ema:report", args=(id,))),
+            size=10
+        )
+        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")
+        after_states = ema.after_states.all().order_by("-surface").prefetch_related("biotope_type")
+        actions = ema.actions.all().prefetch_related("action_type")
 
-    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():
-        template = "report/unavailable.html"
         context = {
+            "obj": ema,
+            "qrcode": {
+                "img": qrcode.get_img(),
+                "url": qrcode.get_content(),
+            },
+            "qrcode_lanis": {
+                "img": qrcode_lanis.get_img(),
+                "url": qrcode_lanis.get_content(),
+            },
+            "is_entry_shared": False,  # disables action buttons during rendering
+            "before_states": before_states,
+            "after_states": after_states,
+            "geom_form": geom_form,
+            "parcels": parcels,
+            "actions": actions,
+            "tables_scrollable": False,
             TAB_TITLE_IDENTIFIER: tab_title,
         }
         context = BaseContext(request, context).context
-        return render(request, template, context)
-
-    # Prepare data for map viewer
-    geom_form = SimpleGeomForm(
-        instance=ema,
-    )
-    parcels = ema.get_underlying_parcels()
-
-    qrcode_url = request.build_absolute_uri(reverse("ema:report", args=(id,)))
-    qrcode_img = generate_qr_code(qrcode_url, 10)
-    qrcode_lanis_url = ema.get_LANIS_link()
-    qrcode_img_lanis = generate_qr_code(qrcode_lanis_url, 7)
-
-    # Order states by surface
-    before_states = ema.before_states.all().order_by("-surface").prefetch_related("biotope_type")
-    after_states = ema.after_states.all().order_by("-surface").prefetch_related("biotope_type")
-    actions = ema.actions.all().prefetch_related("action_type")
-
-    context = {
-        "obj": ema,
-        "qrcode": {
-            "img": qrcode_img,
-            "url": qrcode_url
-        },
-        "qrcode_lanis": {
-            "img": qrcode_img_lanis,
-            "url": qrcode_lanis_url
-        },
-        "has_access": False,  # disables action buttons during rendering
-        "before_states": before_states,
-        "after_states": after_states,
-        "geom_form": geom_form,
-        "parcels": parcels,
-        "actions": actions,
-        "tables_scrollable": False,
-        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/templates/intervention/detail/includes/compensations.html

@@ -10,7 +10,7 @@
             </div>
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <a href="{% url 'compensation:new' obj.id %}" title="{% trans 'Add new compensation' %}">
                         <button class="btn btn-outline-default">
                             {% fa5_icon 'plus' %}
@@ -32,7 +32,7 @@
                 <th scope="col">
                     {% trans 'Title' %}
                 </th>
-                {% if is_default_member and has_access %}
+                {% if is_default_member and is_entry_shared %}
                     <th class="w-10" scope="col">
                         <span class="float-right">
                             {% trans 'Action' %}
@@ -51,7 +51,7 @@
                 </td>
                 <td class="align-middle">{{ comp.title }}</td>
                 <td>
-                {% if is_default_member and has_access %}
+                {% if is_default_member and is_entry_shared %}
                     <button data-form-url="{% url 'intervention:remove-compensation' obj.id comp.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove compensation' %}">
                         {% fa5_icon 'trash' %}
                     </button>

intervention/templates/intervention/detail/includes/controls.html

@@ -11,7 +11,7 @@
             {% fa5_icon 'file-alt' %}
         </button>
     </a>
-    {% if has_access %}
+    {% if is_entry_shared %}
         <button class="btn btn-default btn-modal mr-2" title="{% trans 'Resubmission' %}" data-form-url="{% url 'intervention:resubmission-create' obj.id %}">
             {% fa5_icon 'bell' %}
         </button>

intervention/templates/intervention/detail/includes/deductions.html

@@ -10,7 +10,7 @@
             </div>
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'intervention:new-deduction' obj.id %}" title="{% trans 'Add new deduction' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'tree' %}
@@ -33,7 +33,7 @@
                 <th scope="col">
                     {% trans 'Created' %}
                 </th>
-                {% if is_default_member and has_access %}
+                {% if is_default_member and is_entry_shared %}
                     <th class="w-10" scope="col">
                         <span class="float-right">
                             {% trans 'Action' %}
@@ -56,7 +56,7 @@
                 <td class="align-middle">{{ deduction.surface|floatformat:2|intcomma }} m²</td>
                 <td class="align-middle">{{ deduction.created.timestamp|default_if_none:""|naturalday}}</td>
                 <td class="align-middle float-right">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button data-form-url="{% url 'intervention:edit-deduction' obj.id deduction.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit Deduction' %}">
                         {% fa5_icon 'edit' %}
                     </button>

intervention/templates/intervention/detail/includes/documents.html

@@ -10,7 +10,7 @@
             </div>
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'intervention:new-doc' obj.id %}" title="{% trans 'Add new document' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'file' %}
@@ -38,7 +38,7 @@
                 <th scope="col">
                     {% trans 'Comment' %}
                 </th>
-                {% if is_default_member and has_access %}
+                {% if is_default_member and is_entry_shared %}
                     <th class="w-10" scope="col">
                         <span class="float-right">
                             {% trans 'Action' %}
@@ -66,7 +66,7 @@
                     </div>
                 </td>
                 <td class="align-middle float-right">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button data-form-url="{% url 'intervention:edit-doc' obj.id doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit document' %}">
                         {% fa5_icon 'edit' %}
                     </button>

intervention/templates/intervention/detail/includes/payments.html

@@ -10,7 +10,7 @@
             </div>
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:pay:new' obj.id %}" title="{% trans 'Add new payment' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'money-bill-wave' %}
@@ -33,7 +33,7 @@
                 <th class="w-50" scope="col">
                     {% trans 'Comment' %}
                 </th>
-                {% if is_default_member and has_access %}
+                {% if is_default_member and is_entry_shared %}
                     <th class="w-10" scope="col">
                         <span class="float-right">
                             {% trans 'Action' %}
@@ -46,16 +46,24 @@
             {% for pay in obj.payments.all %}
             <tr>
                 <td class="align-middle">
-                    {{ pay.amount|floatformat:2 }} €
+                    {% if is_entry_shared %}
+                        {{ pay.amount|floatformat:2 }} €
+                    {% else %}
+                        ***
+                    {% endif %}
                 </td>
                 <td class="align-middle">{{ pay.due_on|default_if_none:"---" }}</td>
                 <td class="align-middle">
                     <div class="scroll-150">
-                        {{ pay.comment }}
+                        {% if is_entry_shared %}
+                            {{ pay.comment }}
+                        {% else %}
+                            {% trans 'This data is not shared with you' %}
+                        {% endif %}
                     </div>
                 </td>
                 <td class="align-middle float-right">
-                    {% if is_default_member and has_access  %}
+                    {% if is_default_member and is_entry_shared  %}
                     <button data-form-url="{% url 'compensation:pay:edit' obj.id pay.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit payment' %}">
                         {% fa5_icon 'edit' %}
                     </button>

intervention/templates/intervention/detail/includes/revocation.html

@@ -13,7 +13,7 @@
                     {% comment %}
                         Only show add-button if no revocation exists, yet.
                     {% endcomment %}
-                    {% if is_default_member and has_access and not obj.legal.revocation %}
+                    {% if is_default_member and is_entry_shared and not obj.legal.revocation %}
                     <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'intervention:new-revocation' obj.id %}" title="{% trans 'Add revocation' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'ban' %}
@@ -36,7 +36,7 @@
                 <th scope="col">
                     {% trans 'Comment' %}
                 </th>
-                {% if is_default_member and has_access %}
+                {% if is_default_member and is_entry_shared %}
                     <th class="w-10" scope="col">
                         <span class="float-right">
                             {% trans 'Action' %}
@@ -64,7 +64,7 @@
                         </div>
                     </td>
                     <td class="align-middle float-right">
-                        {% if is_default_member and has_access  %}
+                        {% if is_default_member and is_entry_shared  %}
                         <button data-form-url="{% url 'intervention:edit-revocation' obj.id rev.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit revocation' %}">
                             {% fa5_icon 'edit' %}
                         </button>

intervention/templates/intervention/detail/view.html

@@ -129,7 +129,7 @@
                                 {% include 'user/includes/team_data_modal_button.html' %}
                             {% endfor %}
                             <hr>
-                            {% if has_access %}
+                            {% if is_entry_shared %}
                                 {% for user in obj.users.all %}
                                     {% include 'user/includes/contact_modal_button.html' %}
                                 {% endfor %}

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.compensation import remove_compensation_view
+from intervention.views.check import InterventionCheckView
+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, \
-    get_revocation_view
+from intervention.views.revocation import NewInterventionRevocationView, GetInterventionRevocationView, \
+    EditInterventionRevocationView, RemoveInterventionRevocationView
 from intervention.views.share import InterventionShareFormView, InterventionShareByTokenView
 
 app_name = "intervention"
 urlpatterns = [
-    path("", index_view, name="index"),
-    path('new/', new_view, name='new'),
-    path('new/id', new_id_view, name='new-id'),
-    path('<id>', detail_view, name='detail'),
+    path("", IndexInterventionView.as_view(), name="index"),
+    path('new/', NewInterventionView.as_view(), name='new'),
+    path('new/id', InterventionIdentifierGeneratorView.as_view(), name='new-id'),
+    path('<id>', DetailInterventionView.as_view(), name='detail'),
     path('<id>/log', InterventionLogView.as_view(), name='log'),
-    path('<id>/edit', edit_view, name='edit'),
-    path('<id>/remove', remove_view, name='remove'),
+    path('<id>/edit', EditInterventionView.as_view(), name='edit'),
+    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/<revocation_id>/edit', edit_revocation_view, name='edit-revocation'),
-    path('<id>/revocation/<revocation_id>/remove', remove_revocation_view, name='remove-revocation'),
-    path('revocation/<doc_id>', get_revocation_view, name='get-doc-revocation'),
+    path('<id>/revocation/new', NewInterventionRevocationView.as_view(), name='new-revocation'),
+    path('<id>/revocation/<revocation_id>/edit', EditInterventionRevocationView.as_view(), name='edit-revocation'),
+    path('<id>/revocation/<revocation_id>/remove', RemoveInterventionRevocationView.as_view(), name='remove-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,35 +5,44 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib.auth.decorators import login_required
-from django.http import HttpRequest
+from django.contrib.auth.mixins import LoginRequiredMixin
+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
-@registration_office_group_required
-@shared_access_required(Intervention, "id")
-def check_view(request: HttpRequest, id: str):
-    """ Renders check form for an intervention
+    def __process_request(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+        """ Renders check form for an intervention
 
-    Args:
-        request (HttpRequest): The incoming request
-        id (str): Intervention's id
+        Args:
+            request (HttpRequest): The incoming request
+            id (str): Intervention's id
 
-    Returns:
+        Returns:
 
-    """
-    intervention = get_object_or_404(Intervention, id=id)
-    form = CheckModalForm(request.POST or None, instance=intervention, request=request)
-    return form.process_request(
-        request,
-        msg_success=_("Check performed"),
-        msg_error=INTERVENTION_INVALID
-    )
+        """
+        intervention = get_object_or_404(Intervention, id=id)
+        form = CheckModalForm(request.POST or None, instance=intervention, request=request)
+        return form.process_request(
+            request,
+            msg_success=_("Check performed"),
+            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,42 +5,50 @@ 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
-@login_required
-@shared_access_required(Intervention, "id")
-def remove_compensation_view(request: HttpRequest, id: str, comp_id: str):
-    """ Renders a modal view for removing the compensation
+class RemoveCompensationFromInterventionView(LoginRequiredMixin, View):
 
-    Args:
-        request (HttpRequest): The incoming request
-        id (str): The compensation's id
+    def __process_request(self, request: HttpRequest, id: str, comp_id: str, *args, **kwargs) -> HttpResponse:
+        """ Renders a modal view for removing the compensation
 
-    Returns:
+        Args:
+            request (HttpRequest): The incoming request
+            id (str): The compensation's id
 
-    """
-    intervention = get_object_or_404(Intervention, id=id)
-    try:
-        comp = intervention.compensations.get(
-            id=comp_id
+        Returns:
+
+        """
+        intervention = get_object_or_404(Intervention, id=id)
+        try:
+            comp = intervention.compensations.get(
+                id=comp_id
+            )
+        except ObjectDoesNotExist:
+            raise Http404("Unknown compensation")
+        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("intervention:detail", args=(id,)) + "#related_data",
         )
-    except ObjectDoesNotExist:
-        raise Http404("Unknown compensation")
-    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("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,75 +7,98 @@ 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, \
-    uuid_required
+from konova.decorators import default_group_required, shared_access_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, \
-    CHECK_STATE_RESET, FORM_INVALID, IDENTIFIER_REPLACED, DO_NOT_FORGET_TO_SHARE, GEOMETRY_SIMPLIFIED
+from konova.utils.message_templates import RECORDED_BLOCKS_EDIT, \
+    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
-@any_group_check
-def index_view(request: HttpRequest):
-    """
-    Renders the index view for Interventions
+class IndexInterventionView(AbstractIndexView):
+    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
+        """
+        Renders the index view for Interventions
 
-    Args:
-        request (HttpRequest): The incoming request
+        Args:
+            request (HttpRequest): The incoming request
 
-    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
-    ).select_related(
-        "legal"
-    ).order_by(
-        "-modified__timestamp"
-    )
-    table = InterventionTable(
-        request=request,
-        queryset=interventions
-    )
-    context = {
-        "table": table,
-        TAB_TITLE_IDENTIFIER: _("Interventions - Overview"),
-    }
-    context = BaseContext(request, context).context
-    return render(request, template, context)
+        Returns:
+            A rendered view
+        """
+        # Filtering by user access is performed in table filter inside InterventionTableFilter class
+        interventions = Intervention.objects.filter(
+            deleted=None,  # not deleted
+        ).select_related(
+            "legal"
+        ).order_by(
+            "-modified__timestamp"
+        )
+        table = InterventionTable(
+            request=request,
+            queryset=interventions
+        )
+        context = {
+            "table": table,
+            TAB_TITLE_IDENTIFIER: _("Interventions - Overview"),
+        }
+        context = BaseContext(request, context).context
+        return render(request, self._TEMPLATE, context)
 
 
-@login_required
-@default_group_required
-def new_view(request: HttpRequest):
-    """
-    Renders a view for a new intervention creation
+class NewInterventionView(LoginRequiredMixin, View):
+    _TEMPLATE = "intervention/form/view.html"
 
-    Args:
-        request (HttpRequest): The incoming request
+    @method_decorator(default_group_required)
+    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
 
-    Returns:
+        """
+        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
+
+        Args:
+            request (HttpRequest): The incoming request
+
+        Returns:
+
+        """
+        data_form = NewInterventionForm(request.POST or None)
+        geom_form = SimpleGeomForm(request.POST or None, read_only=False)
 
-    """
-    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,147 +110,100 @@ 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)
-
-
-@login_required
-@default_group_required
-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
+            messages.error(request, FORM_INVALID, extra_tags="danger", )
+        context = {
+            "form": data_form,
+            "geom_form": geom_form,
+            TAB_TITLE_IDENTIFIER: _("New intervention"),
         }
-    )
+        context = BaseContext(request, context).context
+        return render(request, self._TEMPLATE, context)
 
 
-@login_required
-@any_group_check
-@uuid_required
-def detail_view(request: HttpRequest, id: str):
-    """ Renders a detail view for viewing an intervention's data
-
-    Args:
-        request (HttpRequest): The incoming request
-        id (str): The intervention's id
-
-    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,
-        "has_access": 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)
+class InterventionIdentifierGeneratorView(AbstractIdentifierGeneratorView):
+    _MODEL = Intervention
 
 
-@login_required
-@default_group_required
-@shared_access_required(Intervention, "id")
-def edit_view(request: HttpRequest, id: str):
-    """
-    Renders a view for editing interventions
+class EditInterventionView(LoginRequiredMixin, View):
+    _TEMPLATE = "intervention/form/view.html"
 
-    Args:
-        request (HttpRequest): The incoming request
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+        """
+        Renders a view for editing interventions
 
-    Returns:
+        Args:
+            request (HttpRequest): The incoming request
+            id (str): The intervention identifier
 
-    """
-    template = "intervention/form/view.html"
-    # 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)
+        Returns:
+            HttpResponse: The rendered view
+        """
 
-    # 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":
+        # 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:
+        """
+        # 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)
         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)
-
-
-@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")
-    )
+        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)

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,72 +5,78 @@ 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
-def report_view(request: HttpRequest, id: str):
-    """ Renders the public report view
+class InterventionPublicReportView(AbstractPublicReportView):
+    _TEMPLATE = "intervention/report/report.html"
 
-    Args:
-        request (HttpRequest): The incoming request
-        id (str): The id of the intervention
+    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+        """ Renders the public report view
 
-    Returns:
+        Args:
+            request (HttpRequest): The incoming request
+            id (str): The id of the intervention
 
-    """
-    template = "intervention/report/report.html"
-    intervention = get_object_or_404(Intervention, id=id)
+        Returns:
+
+        """
+        intervention = get_object_or_404(Intervention, id=id)
+
+        tab_title = _("Report {}").format(intervention.identifier)
+        # If intervention is not recorded (yet or currently) we need to render another template without any data
+        if not intervention.is_ready_for_publish():
+            template = "report/unavailable.html"
+            context = {
+                TAB_TITLE_IDENTIFIER: tab_title,
+            }
+            context = BaseContext(request, context).context
+            return render(request, template, context)
+
+        # Prepare data for map viewer
+        geom_form = SimpleGeomForm(
+            instance=intervention
+        )
+        parcels = intervention.get_underlying_parcels()
+
+        distinct_deductions = intervention.deductions.all().distinct(
+            "account"
+        )
+
+        qrcode = QrCode(
+            content=request.build_absolute_uri(reverse("intervention:report", args=(id,))),
+            size=10
+        )
+        qrcode_lanis = QrCode(
+            content=intervention.get_LANIS_link(),
+            size=7
+        )
 
-    tab_title = _("Report {}").format(intervention.identifier)
-    # If intervention is not recorded (yet or currently) we need to render another template without any data
-    if not intervention.is_ready_for_publish():
-        template = "report/unavailable.html"
         context = {
+            "obj": intervention,
+            "deductions": distinct_deductions,
+            "qrcode": {
+                "img": qrcode.get_img(),
+                "url": qrcode.get_content(),
+            },
+            "qrcode_lanis": {
+                "img": qrcode_lanis.get_img(),
+                "url": qrcode_lanis.get_content(),
+            },
+            "geom_form": geom_form,
+            "parcels": parcels,
+            "tables_scrollable": False,
             TAB_TITLE_IDENTIFIER: tab_title,
         }
         context = BaseContext(request, context).context
-        return render(request, template, context)
-
-    # Prepare data for map viewer
-    geom_form = SimpleGeomForm(
-        instance=intervention
-    )
-    parcels = intervention.get_underlying_parcels()
-
-    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_lanis_url = intervention.get_LANIS_link()
-    qrcode_img_lanis = generate_qr_code(qrcode_lanis_url, 7)
-
-    context = {
-        "obj": intervention,
-        "deductions": distinct_deductions,
-        "qrcode": {
-            "img": qrcode_img,
-            "url": qrcode_url,
-        },
-        "qrcode_lanis": {
-            "img": qrcode_img_lanis,
-            "url": qrcode_lanis_url,
-        },
-        "geom_form": geom_form,
-        "parcels": parcels,
-        "tables_scrollable": False,
-        TAB_TITLE_IDENTIFIER: tab_title,
-    }
-    context = BaseContext(request, context).context
-    return render(request, template, context)
+        return render(request, self._TEMPLATE, context)