# Renaming

* renames certain classes to match their content
* splits larger files into smaller ones

analysis/urls.py

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

analysis/views.py

@@ -1,12 +1,8 @@
 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
@@ -46,112 +42,57 @@ 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:
+    Args:
-            request (HttpRequest): The incoming request
+        request (HttpRequest): The incoming request
+        id (str): The conservation_office KonovaCode id
 
-        Returns:
+    Returns:
 
-        """
+    """
-        template = "analysis/reports/index.html"
+    # Try to resolve the requested office id
-        form = TimespanReportForm(None)
+    cons_office = get_object_or_404(
-        context = {
+        KonovaCode,
-            "form": form
+        id=id
-        }
+    )
-        context = BaseContext(request, context).context
+    # Try to resolve the date parameters into Date objects -> redirect if this fails
-        return render(request, template, context)
+    try:
-
+        df = request.GET.get("df", None)
-    @method_decorator(conservation_office_group_required)
+        dt = request.GET.get("dt", None)
-    def post(self, request: HttpRequest) -> HttpResponse:
+        date_from = timezone.make_aware(timezone.datetime.fromisoformat(df))
-
+        date_to = timezone.make_aware(timezone.datetime.fromisoformat(dt))
-        """
+    except ValueError:
-
+        messages.error(
-        Args:
+            request,
-            request (HttpRequest): The incoming request
+            PARAMS_INVALID,
-
+            extra_tags="danger",
-        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
         )
-        # Try to resolve the date parameters into Date objects -> redirect if this fails
+        return redirect("analysis:reports")
-        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
+    # Check whether the html default rendering is requested or an alternative
-        format_param = request.GET.get("format", "html")
+    format_param = request.GET.get("format", "html")
-        report = TimespanReport(id, date_from, date_to)
+    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": office,
+            "office": cons_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={office.long_name}_{df}_{dt}.xlsx'
+        response['Content-Disposition'] = f'attachment; filename={cons_office.long_name}_{df}_{dt}.xlsx'
         return response
+    else:
+        raise NotImplementedError

api/migrations/0004_externalidentifier.py

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

api/models/__init__.py

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

api/models/external_identifier.py

@@ -1,33 +0,0 @@
-"""
-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/tests/v1/create/compensation_create_post_body.json

@@ -8,7 +8,6 @@
         "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,7 +4,6 @@
     ],
     "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,7 +4,6 @@
     ],
     "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,7 +4,6 @@
     ],
     "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,7 +9,6 @@ import json
 
 from django.urls import reverse
 
-from api.models import ExternalIdentifier
 from api.tests.v1.share.test_api_sharing import BaseAPIV1TestCase
 
 
@@ -43,22 +42,7 @@ 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)
-        _id = content.get("id", None)
+        self.assertIsNotNone(content.get("id", None), msg=response.content)
-        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
@@ -70,8 +54,7 @@ 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)
-        internal_id = self._test_create_object(url, post_body)
+        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
@@ -88,14 +71,13 @@ 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, 400, msg=response.content)
+        self.assertEqual(response.status_code, 500, 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)
-        internal_id = self._test_create_object(url, post_body)
+        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
@@ -107,8 +89,7 @@ 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)
-        internal_id = self._test_create_object(url, post_body)
+        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
@@ -120,8 +101,7 @@ 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)
-        internal_id = self._test_create_object(url, post_body)
+        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,7 +44,6 @@
         ],
     "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,7 +44,6 @@
         ],
     "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,7 +44,6 @@
         ],
     "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,7 +44,6 @@
         ],
     "properties": {
         "title": "Test_intervention_CHANGED",
-        "external_identifier": "LOREMIPSUM-1236_CHANGED",
         "responsible": {
             "registration_office": null,
             "registration_file_number": "CHANGED",

api/utils/serializer/serializer.py

@@ -10,11 +10,9 @@ 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 api.models import ExternalIdentifier
 from konova.models import Geometry
 from konova.utils.message_templates import DATA_UNSHARED
 
@@ -78,14 +76,6 @@ 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(
@@ -171,14 +161,6 @@ 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,11 +88,6 @@ 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,
         )
@@ -119,10 +114,6 @@ 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"]
@@ -138,7 +129,6 @@ 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)
@@ -180,7 +170,6 @@ 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,14 +62,6 @@ 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,9 +121,7 @@ class EcoAccountAPISerializerV1(AbstractModelAPISerializerV1,
             obj = self._initialize_objects(json_model, user)
 
             # Fill in data to objects
-            properties = json_model.get("properties", None)
+            properties = json_model["properties"]
-            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)
@@ -149,7 +147,6 @@ 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)
 
@@ -175,10 +172,6 @@ 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"])
@@ -199,7 +192,6 @@ 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,10 +104,6 @@ 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)
@@ -123,7 +119,6 @@ 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)
 
@@ -166,7 +161,6 @@ 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,14 +150,10 @@ 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.get("title", None)
+            obj.title = properties["title"]
-            self._set_responsibility(obj, properties.get("responsible", None))
+            self._set_responsibility(obj, properties["responsible"])
-            self._set_legal(obj, properties.get("legal", None))
+            self._set_legal(obj, properties["legal"])
 
             obj.responsible.handler.save()
             obj.responsible.save()
@@ -165,7 +161,6 @@ 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)
 
@@ -191,7 +186,7 @@ class InterventionAPISerializerV1(AbstractModelAPISerializerV1,
 
             # Fill in data to objects
             properties = json_model["properties"]
-            obj.title = properties.get("title")
+            obj.title = properties["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))
@@ -205,7 +200,6 @@ 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,7 +12,6 @@ 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, \
@@ -40,20 +39,12 @@ 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
@@ -146,63 +137,6 @@ 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/v1/views.py

@@ -6,9 +6,7 @@ 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
@@ -68,12 +66,8 @@ 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 (JSONDecodeError,
+        except Exception as e:
-                AssertionError,
+            return self._return_error_response(e, 500)
-                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

@@ -81,7 +81,9 @@ class AbstractAPIView(View):
         Returns:
 
         """
-        content = [f"{error.__class__.__name__}: {str(error)}"]
+        content = [error.__str__()]
+        if hasattr(error, "messages"):
+            content = error.messages
         return JsonResponse(
             {
                 "errors": content

compensation/admin.py

@@ -45,14 +45,6 @@ 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/compensation.py

@@ -168,6 +168,17 @@ class NewCompensationForm(AbstractCompensationForm,
         comp.log.add(action)
         return comp, action
 
+    def is_valid(self):
+        valid = super().is_valid()
+        intervention = self.cleaned_data.get("intervention", None)
+        if intervention.is_recorded:
+            valid &= False
+            self.add_error(
+                "intervention",
+                _("This intervention is currently recorded. You cannot add further compensations as long as it is recorded.")
+            )
+        return valid
+
     def save(self, user: User, geom_form: SimpleGeomForm):
         with transaction.atomic():
             comp, action = self.__create_comp(user)

compensation/forms/eco_account.py

@@ -15,7 +15,6 @@ 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
 
@@ -238,7 +237,11 @@ class EditEcoAccountForm(NewEcoAccountForm):
 
 
 class RemoveEcoAccountModalForm(RemoveModalForm):
+    """ Form class
 
+    Provides a form for deleting eco accounts
+
+    """
     def is_valid(self):
         super_valid = super().is_valid()
         has_deductions = self.instance.deductions.exists()
@@ -247,13 +250,4 @@ 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/forms/modals/compensation_action.py

@@ -7,10 +7,12 @@ Created on: 18.08.22
 """
 from dal import autocomplete
 from django import forms
+from django.shortcuts import get_object_or_404
 from django.utils.translation import gettext_lazy as _
 
 from codelist.models import KonovaCode
 from codelist.settings import CODELIST_COMPENSATION_ACTION_ID, CODELIST_COMPENSATION_ACTION_DETAIL_ID
+from compensation.models import CompensationAction
 from intervention.inputs import CompensationActionTreeCheckboxSelectMultiple
 from konova.forms.modals import BaseModalForm, RemoveModalForm
 from konova.utils.message_templates import COMPENSATION_ACTION_EDITED, ADDED_COMPENSATION_ACTION
@@ -114,7 +116,8 @@ class EditCompensationActionModalForm(NewCompensationActionModalForm):
     action = None
 
     def __init__(self, *args, **kwargs):
-        self.action = kwargs.pop("action", None)
+        action_id = kwargs.pop("action_id", None)
+        self.action = get_object_or_404(CompensationAction, id=action_id)
         super().__init__(*args, **kwargs)
         self.form_title = _("Edit action")
         form_data = {
@@ -147,8 +150,8 @@ class RemoveCompensationActionModalForm(RemoveModalForm):
     action = None
 
     def __init__(self, *args, **kwargs):
-        action = kwargs.pop("action", None)
+        action_id = kwargs.pop("action_id", None)
-        self.action = action
+        self.action = get_object_or_404(CompensationAction, id=action_id)
         super().__init__(*args, **kwargs)
 
     def save(self):

compensation/forms/modals/deadline.py

@@ -6,10 +6,11 @@ Created on: 18.08.22
 
 """
 from django import forms
+from django.shortcuts import get_object_or_404
 from django.utils.translation import gettext_lazy as _
 
 from konova.forms.modals import BaseModalForm
-from konova.models import DeadlineType
+from konova.models import DeadlineType, Deadline
 from konova.utils import validators
 from konova.utils.message_templates import DEADLINE_EDITED
 
@@ -90,7 +91,8 @@ class EditDeadlineModalForm(NewDeadlineModalForm):
     deadline = None
 
     def __init__(self, *args, **kwargs):
-        self.deadline = kwargs.pop("deadline", None)
+        deadline_id = kwargs.pop("deadline_id", None)
+        self.deadline = get_object_or_404(Deadline, id=deadline_id)
         super().__init__(*args, **kwargs)
         self.form_title = _("Edit deadline")
         form_data = {

compensation/forms/modals/document.py

@@ -6,12 +6,27 @@ Created on: 18.08.22
 
 """
 from compensation.models import CompensationDocument, EcoAccountDocument
-from konova.forms.modals import NewDocumentModalForm
+from konova.forms.modals import NewDocumentModalForm, EditDocumentModalForm, RemoveDocumentModalForm
 
 
 class NewCompensationDocumentModalForm(NewDocumentModalForm):
-    document_model = CompensationDocument
+    _DOCUMENT_CLS = CompensationDocument
+
+
+class EditCompensationDocumentModalForm(EditDocumentModalForm):
+    _DOCUMENT_CLS = CompensationDocument
+
+
+class RemoveCompensationDocumentModalForm(RemoveDocumentModalForm):
+    _DOCUMENT_CLS = CompensationDocument
 
 
 class NewEcoAccountDocumentModalForm(NewDocumentModalForm):
-    document_model = EcoAccountDocument
+    _DOCUMENT_CLS = EcoAccountDocument
+
+class EditEcoAccountDocumentModalForm(EditDocumentModalForm):
+    _DOCUMENT_CLS = EcoAccountDocument
+
+class RemoveEcoAccountDocumentModalForm(RemoveDocumentModalForm):
+    _DOCUMENT_CLS = EcoAccountDocument
+

compensation/forms/modals/payment.py

@@ -6,8 +6,10 @@ Created on: 18.08.22
 
 """
 from django import forms
+from django.shortcuts import get_object_or_404
 from django.utils.translation import pgettext_lazy as _con, gettext_lazy as _
 
+from compensation.models import Payment
 from konova.forms.modals import RemoveModalForm, BaseModalForm
 from konova.utils import validators
 from konova.utils.message_templates import PAYMENT_EDITED
@@ -103,7 +105,8 @@ class EditPaymentModalForm(NewPaymentForm):
     payment = None
 
     def __init__(self, *args, **kwargs):
-        self.payment = kwargs.pop("payment", None)
+        payment_id = kwargs.pop("payment_id", None)
+        self.payment = get_object_or_404(Payment, id=payment_id)
         super().__init__(*args, **kwargs)
         self.form_title = _("Edit payment")
         form_date = {
@@ -133,8 +136,8 @@ class RemovePaymentModalForm(RemoveModalForm):
     payment = None
 
     def __init__(self, *args, **kwargs):
-        payment = kwargs.pop("payment", None)
+        payment_id = kwargs.pop("payment_id", None)
-        self.payment = payment
+        self.payment = get_object_or_404(Payment, id=payment_id)
         super().__init__(*args, **kwargs)
 
     def save(self):

compensation/forms/modals/resubmission.py

@@ -0,0 +1,15 @@
+"""
+Author: Michel Peltriaux
+Created on: 21.10.25
+
+"""
+from compensation.models import Compensation, EcoAccount
+from konova.forms.modals import ResubmissionModalForm
+
+
+class CompensationResubmissionModalForm(ResubmissionModalForm):
+    _MODEL_CLS = Compensation
+
+
+class EcoAccountResubmissionModalForm(ResubmissionModalForm):
+    _MODEL_CLS = EcoAccount

compensation/forms/modals/state.py

@@ -5,21 +5,17 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 18.08.22
 
 """
-from bootstrap_modal_forms.mixins import is_ajax
 from dal import autocomplete
 from django import forms
-from django.contrib import messages
-from django.http import HttpResponseRedirect, HttpRequest
-from django.shortcuts import render
 from django.utils.translation import gettext_lazy as _
 
 from codelist.models import KonovaCode
 from codelist.settings import CODELIST_BIOTOPES_ID, \
     CODELIST_BIOTOPES_EXTRA_CODES_FULL_ID
+from compensation.models import CompensationState
 from intervention.inputs import CompensationStateTreeRadioSelect
-from konova.contexts import BaseContext
 from konova.forms.modals import RemoveModalForm, BaseModalForm
-from konova.utils.message_templates import COMPENSATION_STATE_EDITED, FORM_INVALID, ADDED_COMPENSATION_STATE
+from konova.utils.message_templates import COMPENSATION_STATE_EDITED, ADDED_COMPENSATION_STATE
 
 
 class NewCompensationStateModalForm(BaseModalForm):
@@ -68,10 +64,13 @@ class NewCompensationStateModalForm(BaseModalForm):
         )
     )
 
+    _is_before_state: bool = False
+
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.form_title = _("New state")
         self.form_caption = _("Insert data for the new state")
+        self._is_before_state = bool(self.request.GET.get("before", False))
         choices = KonovaCode.objects.filter(
             code_lists__in=[CODELIST_BIOTOPES_ID],
             is_archived=False,
@@ -83,65 +82,19 @@ class NewCompensationStateModalForm(BaseModalForm):
         ]
         self.fields["biotope_type"].choices = choices
 
-    def save(self, is_before_state: bool = False):
+    def save(self):
-        state = self.instance.add_state(self, is_before_state)
+        state = self.instance.add_state(self, self._is_before_state)
         self.instance.mark_as_edited(self.user, self.request, ADDED_COMPENSATION_STATE)
         return state
 
-    def process_request(self, request: HttpRequest, msg_success: str = _("Object removed"), msg_error: str = FORM_INVALID, redirect_url: str = None):
-        """ Generic processing of request
-
-        Wraps the request processing logic, so we don't need the same code everywhere a RemoveModalForm is being used
-
-        +++
-        The generic method from super class can not be used, since we need to do some request parameter check in here.
-        +++
-
-        Args:
-            request (HttpRequest): The incoming request
-            msg_success (str): The message in case of successful removing
-            msg_error (str): The message in case of an error
-
-        Returns:
-
-        """
-        redirect_url = redirect_url if redirect_url is not None else request.META.get("HTTP_REFERER", "home")
-        template = self.template
-        if request.method == "POST":
-            if self.is_valid():
-                # Modal forms send one POST for checking on data validity. This can be used to return possible errors
-                # on the form. A second POST (if no errors occured) is sent afterwards and needs to process the
-                # saving/commiting of the data to the database. is_ajax() performs this check. The first request is
-                # an ajax call, the second is a regular form POST.
-                if not is_ajax(request.META):
-                    is_before_state = bool(request.GET.get("before", False))
-                    self.save(is_before_state=is_before_state)
-                    messages.success(
-                        request,
-                        msg_success
-                    )
-                return HttpResponseRedirect(redirect_url)
-            else:
-                context = {
-                    "form": self,
-                }
-                context = BaseContext(request, context).context
-                return render(request, template, context)
-        elif request.method == "GET":
-            context = {
-                "form": self,
-            }
-            context = BaseContext(request, context).context
-            return render(request, template, context)
-        else:
-            raise NotImplementedError
-
 
 class EditCompensationStateModalForm(NewCompensationStateModalForm):
     state = None
 
     def __init__(self, *args, **kwargs):
-        self.state = kwargs.pop("state", None)
+        state_id = kwargs.pop("state_id", None)
+        self.state = CompensationState.objects.get(id=state_id)
+
         super().__init__(*args, **kwargs)
         self.form_title = _("Edit state")
         biotope_type_id = self.state.biotope_type.id if self.state.biotope_type else None
@@ -172,8 +125,8 @@ class RemoveCompensationStateModalForm(RemoveModalForm):
     state = None
 
     def __init__(self, *args, **kwargs):
-        state = kwargs.pop("state", None)
+        state_id = kwargs.pop("state_id", None)
-        self.state = state
+        self.state = CompensationState.objects.get(id=state_id)
         super().__init__(*args, **kwargs)
 
     def save(self):

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, None)
+        return format_html(html)
 
     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, None)
+        return format_html(html)
 

compensation/tables/eco_account.py

@@ -95,7 +95,7 @@ class EcoAccountTable(BaseTable, TableRenderMixin, TableOrderMixin):
             txt=value,
             new_tab=False,
         )
-        return format_html(html, None)
+        return format_html(html)
 
     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, None)
+        return format_html(html)
 
     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, None)
+        return format_html(html)

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' %} {{deduction.intervention.recorded.timestamp}} {% trans 'by' %} {{deduction.intervention.recorded.user}}" class='fas fa-bookmark registered-bookmark'></em>
+                        <em title="{% trans 'Recorded on' %} {{obj.recorded.timestamp}} {% trans 'by' %} {{obj.recorded.user}}" class='fas fa-bookmark registered-bookmark'></em>
                     {% else %}
                         <em title="{% trans 'Not recorded yet' %}" class='far fa-bookmark'></em>
                     {% endif %}

compensation/tests/compensation/unit/test_forms.py

@@ -80,7 +80,11 @@ class EditCompensationActionModalFormTestCase(NewCompensationActionModalFormTest
         self.compensation.actions.add(self.comp_action)
 
     def test_init(self):
-        form = EditCompensationActionModalForm(request=self.request, instance=self.compensation, action=self.comp_action)
+        form = EditCompensationActionModalForm(
+            request=self.request,
+            instance=self.compensation,
+            action_id=self.comp_action.id
+        )
         self.assertEqual(form.form_title, str(_("Edit action")))
         self.assertEqual(len(form.fields["action_type"].initial), self.comp_action.action_type.count())
         self.assertEqual(len(form.fields["action_type_details"].initial), self.comp_action.action_type_details.count())
@@ -101,7 +105,7 @@ class EditCompensationActionModalFormTestCase(NewCompensationActionModalFormTest
             "comment": comment,
         }
 
-        form = EditCompensationActionModalForm(data, request=self.request, instance=self.compensation, action=self.comp_action)
+        form = EditCompensationActionModalForm(data, request=self.request, instance=self.compensation, action_id=self.comp_action.id)
 
         self.assertTrue(form.is_valid())
         action = form.save()
@@ -126,7 +130,7 @@ class RemoveCompensationActionModalFormTestCase(EditCompensationActionModalFormT
         
     def test_init(self):
         self.assertIn(self.comp_action, self.compensation.actions.all())
-        form = RemoveCompensationActionModalForm(request=self.request, instance=self.compensation, action=self.comp_action)
+        form = RemoveCompensationActionModalForm(request=self.request, instance=self.compensation, action_id=self.comp_action.id)
         self.assertEqual(form.action, self.comp_action)
         
     def test_save(self):
@@ -137,7 +141,7 @@ class RemoveCompensationActionModalFormTestCase(EditCompensationActionModalFormT
             data, 
             request=self.request,
             instance=self.compensation,
-            action=self.comp_action
+            action_id=self.comp_action.id
         )
         self.assertTrue(form.is_valid())
         self.assertIn(self.comp_action, self.compensation.actions.all())
@@ -186,12 +190,20 @@ class NewCompensationStateModalFormTestCase(BaseTestCase):
         self.assertEqual(self.compensation.before_states.count(), 0)
         self.assertEqual(self.compensation.after_states.count(), 0)
 
-        form = NewCompensationStateModalForm(data, request=self.request, instance=self.compensation)
+        self.request.GET._mutable = True
-
+        self.request.GET.update(
+            {
+                "before": True,
+            }
+        )
+        self.request.GET._mutable = False
+        form = NewCompensationStateModalForm(
+            data,
+            request=self.request,
+            instance=self.compensation,
+        )
         self.assertTrue(form.is_valid(), msg=form.errors)
-
+        state = form.save()
-        is_before_state = True
-        state = form.save(is_before_state)
 
         self.assertEqual(self.compensation.before_states.count(), 1)
         self.assertEqual(self.compensation.after_states.count(), 0)
@@ -205,8 +217,16 @@ class NewCompensationStateModalFormTestCase(BaseTestCase):
         self.assertEqual(last_log.action, UserAction.EDITED)
         self.assertEqual(last_log.comment, ADDED_COMPENSATION_STATE)
 
-        is_before_state = False
+        self.request.GET._mutable = True
-        state = form.save(is_before_state)
+        del self.request.GET["before"]
+        self.request.GET._mutable = False
+        form = NewCompensationStateModalForm(
+            data,
+            request=self.request,
+            instance=self.compensation,
+        )
+        self.assertTrue(form.is_valid(), msg=form.errors)
+        state = form.save()
 
         self.assertEqual(self.compensation.before_states.count(), 1)
         self.assertEqual(self.compensation.after_states.count(), 1)
@@ -230,7 +250,11 @@ class EditCompensationStateModalFormTestCase(NewCompensationStateModalFormTestCa
         self.compensation.after_states.add(self.comp_state)
 
     def test_init(self):
-        form = EditCompensationStateModalForm(request=self.request, instance=self.compensation, state=self.comp_state)
+        form = EditCompensationStateModalForm(
+            request=self.request,
+            instance=self.compensation,
+            state_id=self.comp_state.id
+        )
 
         self.assertEqual(form.state, self.comp_state)
         self.assertEqual(form.form_title, str(_("Edit state")))
@@ -261,7 +285,7 @@ class EditCompensationStateModalFormTestCase(NewCompensationStateModalFormTestCa
             data,
             request=self.request,
             instance=self.compensation,
-            state=self.comp_state
+            state_id=self.comp_state.id
         )
         self.assertTrue(form.is_valid(), msg=form.errors)
 
@@ -282,7 +306,11 @@ class RemoveCompensationStateModalFormTestCase(EditCompensationStateModalFormTes
         super().setUp()
 
     def test_init(self):
-        form = RemoveCompensationStateModalForm(request=self.request, instance=self.compensation, state=self.comp_state)
+        form = RemoveCompensationStateModalForm(
+            request=self.request,
+            instance=self.compensation,
+            state_id=self.comp_state.id
+        )
 
         self.assertEqual(form.state, self.comp_state)
 
@@ -294,7 +322,7 @@ class RemoveCompensationStateModalFormTestCase(EditCompensationStateModalFormTes
             data,
             request=self.request,
             instance=self.compensation,
-            state=self.comp_state
+            state_id=self.comp_state.id
         )
         self.assertTrue(form.is_valid(), msg=form.errors)
 

compensation/tests/compensation/unit/test_models.py

@@ -36,7 +36,7 @@ class AbstractCompensationModelTestCase(BaseTestCase):
             data,
             request=self.request,
             instance=self.compensation,
-            deadline=self.finished_deadline,
+            deadline_id=self.finished_deadline.id,
         )
         self.assertTrue(form.is_valid(), msg=form.errors)
         self.assertIn(self.finished_deadline, self.compensation.deadlines.all())

compensation/urls/compensation.py

@@ -7,31 +7,30 @@ 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 CompensationPublicReportView
+from compensation.views.compensation.report import CompensationReportView
 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 IndexCompensationView, CompensationIdentifierGeneratorView, \
+from compensation.views.compensation.compensation import \
-    EditCompensationView, NewCompensationView
+    CompensationIndexView, CompensationIdentifierGeneratorView, CompensationDetailView, \
+    NewCompensationFormView, EditCompensationFormView, RemoveCompensationView
 from compensation.views.compensation.log import CompensationLogView
 
 urlpatterns = [
     # Main compensation
-    path("", IndexCompensationView.as_view(), name="index"),
+    path("", CompensationIndexView.as_view(), name="index"),
     path('new/id', CompensationIdentifierGeneratorView.as_view(), name='new-id'),
-    path('new/<intervention_id>', NewCompensationView.as_view(), name='new'),
+    path('new/<intervention_id>', NewCompensationFormView.as_view(), name='new'),
-    path('new', NewCompensationView.as_view(), name='new'),
+    path('new', NewCompensationFormView.as_view(), name='new'),
-    path('<id>', DetailCompensationView.as_view(), name='detail'),
+    path('<id>', CompensationDetailView.as_view(), name='detail'),
     path('<id>/log', CompensationLogView.as_view(), name='log'),
-    path('<id>/edit', EditCompensationView.as_view(), name='edit'),
+    path('<id>/edit', EditCompensationFormView.as_view(), name='edit'),
     path('<id>/remove', RemoveCompensationView.as_view(), name='remove'),
 
     path('<id>/state/new', NewCompensationStateView.as_view(), name='new-state'),
@@ -45,7 +44,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', CompensationPublicReportView.as_view(), name='report'),
+    path('<id>/report', CompensationReportView.as_view(), name='report'),
     path('<id>/resub', CompensationResubmissionView.as_view(), name='resubmission-create'),
 
     # Documents

compensation/urls/eco_account.py

@@ -8,13 +8,11 @@ Created on: 24.08.21
 from django.urls import path
 
 from compensation.autocomplete.eco_account import EcoAccountAutocomplete
-from compensation.views.eco_account.detail import DetailEcoAccountView
+from compensation.views.eco_account.eco_account import EcoAccountIndexView, EcoAccountIdentifierGeneratorView, \
-from compensation.views.eco_account.eco_account import IndexEcoAccountView, EcoAccountIdentifierGeneratorView, \
+    EcoAccountDetailView, NewEcoAccountFormView, EditEcoAccountFormView, RemoveEcoAccountView
-    NewEcoAccountView, EditEcoAccountView
 from compensation.views.eco_account.log import EcoAccountLogView
 from compensation.views.eco_account.record import EcoAccountRecordView
-from compensation.views.eco_account.remove import RemoveEcoAccountView
+from compensation.views.eco_account.report import EcoAccountReportView
-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
@@ -30,14 +28,14 @@ from compensation.views.eco_account.deduction import NewEcoAccountDeductionView,
 
 app_name = "acc"
 urlpatterns = [
-    path("", IndexEcoAccountView.as_view(), name="index"),
+    path("", EcoAccountIndexView.as_view(), name="index"),
-    path('new/', NewEcoAccountView.as_view(), name='new'),
+    path('new/', NewEcoAccountFormView.as_view(), name='new'),
     path('new/id', EcoAccountIdentifierGeneratorView.as_view(), name='new-id'),
-    path('<id>', DetailEcoAccountView.as_view(), name='detail'),
+    path('<id>', EcoAccountDetailView.as_view(), name='detail'),
     path('<id>/log', EcoAccountLogView.as_view(), name='log'),
     path('<id>/record', EcoAccountRecordView.as_view(), name='record'),
-    path('<id>/report', EcoAccountPublicReportView.as_view(), name='report'),
+    path('<id>/report', EcoAccountReportView.as_view(), name='report'),
-    path('<id>/edit', EditEcoAccountView.as_view(), name='edit'),
+    path('<id>/edit', EditEcoAccountFormView.as_view(), name='edit'),
     path('<id>/remove', RemoveEcoAccountView.as_view(), name='remove'),
     path('<id>/resub', EcoAccountResubmissionView.as_view(), name='resubmission-create'),
 

compensation/urls/payment.py

@@ -6,7 +6,7 @@ Created on: 24.08.21
 
 """
 from django.urls import path
-from compensation.views.payment import *
+from compensation.views.payment import NewPaymentView, RemovePaymentView, EditPaymentView
 
 app_name = "pay"
 urlpatterns = [

compensation/views/compensation/action.py

@@ -5,53 +5,23 @@ 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.shortcuts import get_object_or_404
-from django.urls import reverse
-from django.utils.decorators import method_decorator
 
-from compensation.forms.modals.compensation_action import RemoveCompensationActionModalForm, \
+from compensation.models import Compensation
-    EditCompensationActionModalForm, NewCompensationActionModalForm
-from compensation.models import Compensation, CompensationAction
-from konova.decorators import shared_access_required, default_group_required, login_required_modal
-from konova.utils.message_templates import COMPENSATION_ACTION_REMOVED, COMPENSATION_ACTION_EDITED, \
-    COMPENSATION_ACTION_ADDED
 from konova.views.action import AbstractNewCompensationActionView, AbstractEditCompensationActionView, \
     AbstractRemoveCompensationActionView
 
+_COMPENSATION_DETAIL_URL_NAME = "compensation:detail"
 
 class NewCompensationActionView(AbstractNewCompensationActionView):
-    model = Compensation
+    _MODEL_CLS = Compensation
-    redirect_url = "compensation:detail"
+    _REDIRECT_URL = _COMPENSATION_DETAIL_URL_NAME
-
-    @method_decorator(login_required_modal)
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(Compensation, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
 
 
 class EditCompensationActionView(AbstractEditCompensationActionView):
-    model = Compensation
+    _MODEL_CLS = Compensation
-    redirect_url = "compensation:detail"
+    _REDIRECT_URL = _COMPENSATION_DETAIL_URL_NAME
-
-    @method_decorator(login_required_modal)
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(Compensation, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
 
 
 class RemoveCompensationActionView(AbstractRemoveCompensationActionView):
-    model = Compensation
+    _MODEL_CLS = Compensation
-    redirect_url = "compensation:detail"
+    _REDIRECT_URL = _COMPENSATION_DETAIL_URL_NAME
-
-    @method_decorator(login_required_modal)
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(Compensation, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)

compensation/views/compensation/compensation.py

@@ -7,259 +7,165 @@ Created on: 19.08.22
 """
 from django.contrib import messages
 from django.contrib.auth.mixins import LoginRequiredMixin
-from django.http import HttpRequest, HttpResponse
+from django.core.exceptions import ObjectDoesNotExist
-from django.shortcuts import get_object_or_404, render, redirect
+from django.shortcuts import get_object_or_404, redirect
-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.forms.modals import RemoveModalForm
-from konova.decorators import shared_access_required, default_group_required
+from konova.utils.message_templates import DATA_CHECKED_PREVIOUSLY_TEMPLATE, \
-from konova.forms import SimpleGeomForm
+    RECORDED_BLOCKS_EDIT, PARAMS_INVALID
-from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
-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.form import AbstractNewGeometryFormView, AbstractEditGeometryFormView
 from konova.views.index import AbstractIndexView
+from konova.views.detail import BaseDetailView
+from konova.views.remove import BaseRemoveModalFormView
 
 
-class IndexCompensationView(AbstractIndexView):
+class CompensationIndexView(LoginRequiredMixin, AbstractIndexView):
-    def get(self, request, *args, **kwargs) -> HttpResponse:
+    _TAB_TITLE = _("Compensations - Overview")
-        """
+    _INDEX_TABLE_CLS = CompensationTable
-        Renders the index view for compensation
 
-        Args:
+    def _get_queryset(self):
-            request (HttpRequest): The incoming request
+        qs = Compensation.objects.filter(
-
-        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(
+        return qs
-            request=request,
-            queryset=compensations
-        )
-        context = {
-            "table": table,
-            TAB_TITLE_IDENTIFIER: _("Compensations - Overview"),
-        }
-        context = BaseContext(request, context).context
-        return render(request, self._TEMPLATE, context)
 
 
-class NewCompensationView(LoginRequiredMixin, View):
+class NewCompensationFormView(AbstractNewGeometryFormView):
+    _FORM_CLS = NewCompensationForm
+    _MODEL_CLS = Compensation
     _TEMPLATE = "compensation/form/view.html"
+    _TAB_TITLE = _("New Compensation")
+    _REDIRECT_URL = "compensation:detail"
 
-    @method_decorator(default_group_required)
+    def _user_has_shared_access(self, user, **kwargs):
-    @method_decorator(shared_access_required(Intervention, "intervention_id"))
+        # On a new compensation make sure the intervention (if call came directly through an intervention's detail
-    def get(self, request: HttpRequest, intervention_id: str = None, *args, **kwargs) -> HttpResponse:
+        # view) is shared with the user
-        """
+        intervention_id = kwargs.get("intervention_id", None)
-        Renders a view for new compensation
+        if not intervention_id:
-
+            return True
-        A compensation creation may be called directly from the parent-intervention object. If so - we may take
+        else:
-        the intervention's id and directly link the compensation to it.
-
-        Args:
-            request (HttpRequest): The incoming request
-            intervention_id (str): The intervention identifier
-
-        Returns:
-
-        """
-        if intervention_id:
-            # If the parent-intervention is recorded, we are not allowed to change anything on it's data.
-            # Not even adding new child elements like compensations!
             intervention = get_object_or_404(Intervention, id=intervention_id)
-            recording_state_blocks_actions = intervention.is_recorded
+            return intervention.is_shared_with(user)
-            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)
+    def _user_has_permission(self, user, **kwargs):
-        geom_form = SimpleGeomForm(request.POST or None, read_only=False)
+        # User has to be an ets user
+        return user.is_default_user()
 
-        context = {
+    def dispatch(self, request, *args, **kwargs):
-            "form": data_form,
+        # Make sure there is an existing intervention based on the given id
-            "geom_form": geom_form,
+        # Compensations can not exist without an intervention
-            TAB_TITLE_IDENTIFIER: _("New compensation"),
+        intervention_id = kwargs.get("intervention_id", None)
-        }
-        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.
+            try:
-            # Not even adding new child elements like compensations!
+                intervention = Intervention.objects.get(id=intervention_id)
-            intervention = get_object_or_404(Intervention, id=intervention_id)
+                if intervention.is_recorded:
-            recording_state_blocks_actions = intervention.is_recorded
+                    messages.info(
-            if recording_state_blocks_actions:
+                        request,
-                messages.info(
+                        RECORDED_BLOCKS_EDIT
-                    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)
-
-        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)
-            if generated_identifier != comp.identifier:
-                messages.info(
-                    request,
-                    IDENTIFIER_REPLACED.format(
-                        generated_identifier,
-                        comp.identifier
                     )
-                )
+                    return redirect("intervention:detail", id=intervention_id)
-            messages.success(request, COMPENSATION_ADDED_TEMPLATE.format(comp.identifier))
+            except ObjectDoesNotExist:
-            if geom_form.has_geometry_simplified():
+                messages.error(request, PARAMS_INVALID, extra_tags="danger")
-                messages.info(
+                return redirect("home")
-                    request,
+        return super().dispatch(request, *args, **kwargs)
-                    GEOMETRY_SIMPLIFIED
-                )
-            num_ignored_geometries = geom_form.get_num_geometries_ignored()
-            if num_ignored_geometries > 0:
-                messages.info(
-                    request,
-                    GEOMETRIES_IGNORED_TEMPLATE.format(num_ignored_geometries)
-                )
-            return redirect("compensation:detail", id=comp.id)
-        else:
-            messages.error(request, FORM_INVALID, extra_tags="danger", )
-
-        context = {
-            "form": data_form,
-            "geom_form": geom_form,
-            TAB_TITLE_IDENTIFIER: _("New compensation"),
-        }
-        context = BaseContext(request, context).context
-
-        return render(request, self._TEMPLATE, context)
 
 
-class CompensationIdentifierGeneratorView(AbstractIdentifierGeneratorView):
+class EditCompensationFormView(AbstractEditGeometryFormView):
-    _MODEL = Compensation
+    _MODEL_CLS = Compensation
-
+    _FORM_CLS = EditCompensationForm
-
-class EditCompensationView(LoginRequiredMixin, View):
     _TEMPLATE = "compensation/form/view.html"
+    _REDIRECT_URL = "compensation:detail"
 
-    @method_decorator(default_group_required)
+    def _user_has_permission(self, user, **kwargs):
-    @method_decorator(shared_access_required(Compensation, "id"))
+        # User has to be a default user
-    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+        return user.is_default_user()
 
-        """
+
-        Renders a view for editing compensations
+class CompensationIdentifierGeneratorView(LoginRequiredMixin, AbstractIdentifierGeneratorView):
+    _MODEL_CLS = Compensation
+    _REDIRECT_URL = "compensation:index"
+
+
+class CompensationDetailView(BaseDetailView):
+    _MODEL_CLS = Compensation
+    _TEMPLATE = "compensation/detail/compensation/view.html"
+
+    def _get_object(self, id: str):
+        """ Returns the compensation
 
         Args:
-            request (HttpRequest): The incoming request
+            id (str): The compensation's id
+
+        Returns:
+            obj (Compensation): The compensation
+        """
+        comp = get_object_or_404(
+            Compensation.objects.select_related(
+                "modified",
+                "created",
+                "geometry"
+            ),
+            id=id,
+            deleted=None,
+            intervention__deleted=None,
+        )
+        return comp
+
+    def _get_detail_context(self, obj: Compensation):
+        """ Generate object specific detail context for  view
+
+        Args:
+            obj (): The record
 
         Returns:
 
         """
-        # Get object from db
+        # Order states according to surface
-        comp = get_object_or_404(Compensation, id=id)
+        before_states = obj.before_states.all().prefetch_related("biotope_type").order_by("-surface")
-        if comp.is_recorded:
+        after_states = obj.after_states.all().prefetch_related("biotope_type").order_by("-surface")
-            messages.info(
+        actions = obj.actions.all().prefetch_related("action_type")
-                request,
-                RECORDED_BLOCKS_EDIT
-            )
-            return redirect("compensation:detail", id=id)
 
-        # Create forms, initialize with values from db/from POST request
+        # Precalculate logical errors between before- and after-states
-        data_form = EditCompensationForm(request.POST or None, instance=comp)
+        # Sum() returns None in case of no states, so we catch that and replace it with 0 for easier handling
-        geom_form = SimpleGeomForm(request.POST or None, read_only=False, instance=comp)
+        sum_before_states = obj.get_surface_before_states()
+        sum_after_states = obj.get_surface_after_states()
+        diff_states = abs(sum_before_states - sum_after_states)
+
+        last_checked = obj.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
+            )
 
         context = {
-            "form": data_form,
+            "last_checked": last_checked,
-            "geom_form": geom_form,
+            "last_checked_tooltip": last_checked_tooltip,
-            TAB_TITLE_IDENTIFIER: _("Edit {}").format(comp.identifier),
+            "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,
+            "has_finished_deadlines": obj.get_finished_deadlines().exists(),
         }
-        context = BaseContext(request, context).context
+        return context
 
-        return render(request, self._TEMPLATE, context)
 
-    @method_decorator(default_group_required)
+class RemoveCompensationView(LoginRequiredMixin, BaseRemoveModalFormView):
-    @method_decorator(shared_access_required(Compensation, "id"))
+    _MODEL_CLS = Compensation
-    def post(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+    _FORM_CLS = RemoveModalForm
+    _REDIRECT_URL = "compensation:index"
 
-        """
+    def _user_has_permission(self, user, **kwargs):
-        Renders a view for editing compensations
+        return user.is_default_user()
-
-        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.has_geometry_simplified():
-                messages.info(
-                    request,
-                    GEOMETRY_SIMPLIFIED
-                )
-            num_ignored_geometries = geom_form.get_num_geometries_ignored()
-            if num_ignored_geometries > 0:
-                messages.info(
-                    request,
-                    GEOMETRIES_IGNORED_TEMPLATE.format(num_ignored_geometries)
-                )
-            return redirect("compensation:detail", id=comp.id)
-        else:
-            messages.error(request, FORM_INVALID, extra_tags="danger", )
-
-        context = {
-            "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)

compensation/views/compensation/deadline.py

@@ -5,45 +5,21 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib.auth.decorators import login_required
-from django.utils.decorators import method_decorator
-
 from compensation.models import Compensation
-from konova.decorators import shared_access_required, default_group_required, login_required_modal
 from konova.views.deadline import AbstractRemoveDeadlineView, AbstractEditDeadlineView, AbstractNewDeadlineView
 
+_COMPENSATION_DETAIL_URL_NAME = "compensation:detail"
 
 class NewCompensationDeadlineView(AbstractNewDeadlineView):
-    model = Compensation
+    _MODEL_CLS = Compensation
-    redirect_url = "compensation:detail"
+    _REDIRECT_URL = _COMPENSATION_DETAIL_URL_NAME
-
-    @method_decorator(login_required_modal)
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(Compensation, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
 
 
 class EditCompensationDeadlineView(AbstractEditDeadlineView):
-    model = Compensation
+    _MODEL_CLS = Compensation
-    redirect_url = "compensation:detail"
+    _REDIRECT_URL = _COMPENSATION_DETAIL_URL_NAME
-
-    @method_decorator(login_required_modal)
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(Compensation, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
 
 
 class RemoveCompensationDeadlineView(AbstractRemoveDeadlineView):
-    model = Compensation
+    _MODEL_CLS = Compensation
-    redirect_url = "compensation:detail"
+    _REDIRECT_URL = _COMPENSATION_DETAIL_URL_NAME
-
-    @method_decorator(login_required_modal)
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(Compensation, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)

compensation/views/compensation/detail.py

@@ -1,97 +0,0 @@
-"""
-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/document.py

@@ -5,62 +5,33 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib.auth.decorators import login_required
+from compensation.forms.modals.document import NewCompensationDocumentModalForm, EditCompensationDocumentModalForm, \
-from django.utils.decorators import method_decorator
+    RemoveCompensationDocumentModalForm
-
-from compensation.forms.modals.document import NewCompensationDocumentModalForm
 from compensation.models import Compensation, CompensationDocument
-from konova.decorators import shared_access_required, default_group_required, login_required_modal
-from konova.forms.modals import EditDocumentModalForm
 from konova.views.document import AbstractNewDocumentView, AbstractGetDocumentView, AbstractRemoveDocumentView, \
     AbstractEditDocumentView
 
 
 class NewCompensationDocumentView(AbstractNewDocumentView):
-    model = Compensation
+    _MODEL_CLS = Compensation
-    form = NewCompensationDocumentModalForm
+    _FORM_CLS = NewCompensationDocumentModalForm
-    redirect_url = "compensation:detail"
+    _REDIRECT_URL = "compensation:detail"
-
-    @method_decorator(login_required_modal)
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(Compensation, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
 
 
 class GetCompensationDocumentView(AbstractGetDocumentView):
-    model = Compensation
+    _MODEL_CLS = Compensation
-    document_model = CompensationDocument
+    _DOCUMENT_CLS = CompensationDocument
-
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(Compensation, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
 
 
 class RemoveCompensationDocumentView(AbstractRemoveDocumentView):
-    model = Compensation
+    _MODEL_CLS = Compensation
-    document_model = CompensationDocument
+    _DOCUMENT_CLS = CompensationDocument
-
+    _FORM_CLS = RemoveCompensationDocumentModalForm
-    @method_decorator(login_required_modal)
+    _REDIRECT_URL = "compensation:detail"
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(Compensation, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
 
 
 class EditCompensationDocumentView(AbstractEditDocumentView):
-    model = Compensation
+    _MODEL_CLS = Compensation
-    document_model = CompensationDocument
+    _DOCUMENT_CLS = CompensationDocument
-    form = EditDocumentModalForm
+    _FORM_CLS = EditCompensationDocumentModalForm
-    redirect_url = "compensation:detail"
+    _REDIRECT_URL = "compensation:detail"
-
-    @method_decorator(login_required_modal)
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(Compensation, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)

compensation/views/compensation/log.py

@@ -5,20 +5,11 @@ 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.utils.decorators import method_decorator
 
 from compensation.models import Compensation
-from konova.decorators import shared_access_required, default_group_required, login_required_modal
 from konova.views.log import AbstractLogView
 
 
-class CompensationLogView(AbstractLogView):
+class CompensationLogView(LoginRequiredMixin, AbstractLogView):
-    model = Compensation
+    _MODEL_CLS = Compensation
-
-    @method_decorator(login_required_modal)
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(Compensation, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)

compensation/views/compensation/remove.py

@@ -1,20 +0,0 @@
-"""
-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,81 +5,48 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.http import HttpRequest, HttpResponse
-from django.shortcuts import get_object_or_404, render
 from django.urls import reverse
-from django.utils.translation import gettext_lazy as _
 
 from compensation.models import Compensation
-from konova.contexts import BaseContext
+from konova.sub_settings.django_settings import BASE_URL
-from konova.forms import SimpleGeomForm
-from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.qrcode import QrCode
-from konova.views.report import AbstractPublicReportView
+from konova.views.report import AbstractReportView
 
 
-class CompensationPublicReportView(AbstractPublicReportView):
+class BaseCompensationReportView(AbstractReportView):
+    def _get_compensation_report_context(self, obj):
+        # Order states by surface
+        before_states = obj.before_states.all().order_by("-surface").prefetch_related("biotope_type")
+        after_states = obj.after_states.all().order_by("-surface").prefetch_related("biotope_type")
+        actions = obj.actions.all().prefetch_related("action_type")
+
+        return {
+            "before_states": before_states,
+            "after_states": after_states,
+            "actions": actions,
+        }
+
+
+class CompensationReportView(BaseCompensationReportView):
+    _MODEL = Compensation
     _TEMPLATE = "compensation/report/compensation/report.html"
 
-    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+    def _get_report_context(self, obj):
-        """ Renders the public report view
+        report_url = BASE_URL + reverse("compensation:report", args=(obj.id,))
+        qrcode_report = QrCode(report_url, 10)
+        qrcode_lanis = QrCode(obj.get_LANIS_link(), 7)
 
-        Args:
+        report_context = {
-            request (HttpRequest): The incoming request
-            id (str): The id of the intervention
-
-        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")
-
-        context = {
-            "obj": comp,
             "qrcode": {
-                "img": qrcode.get_img(),
+                "img": qrcode_report.get_img(),
-                "url": qrcode.get_content(),
+                "url": qrcode_report.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
+        report_context.update(self._get_compensation_report_context(obj))
-        return render(request, self._TEMPLATE, context)
+        return report_context

compensation/views/compensation/resubmission.py

@@ -5,22 +5,12 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib.auth.decorators import login_required
+from compensation.forms.modals.resubmission import CompensationResubmissionModalForm
-from django.utils.decorators import method_decorator
-
 from compensation.models import Compensation
-from konova.decorators import shared_access_required, default_group_required, login_required_modal
 from konova.views.resubmission import AbstractResubmissionView
 
 
 class CompensationResubmissionView(AbstractResubmissionView):
-    model = Compensation
+    _MODEL_CLS = Compensation
-    redirect_url_base = "compensation:detail"
+    _FORM_CLS = CompensationResubmissionModalForm
-    form_action_url_base = "compensation:resubmission-create"
+    _REDIRECT_URL = "compensation:detail"
-
-    @method_decorator(login_required_modal)
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(Compensation, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)

compensation/views/compensation/state.py

@@ -5,46 +5,21 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib.auth.decorators import login_required
-from django.utils.decorators import method_decorator
-
 from compensation.models import Compensation
-from konova.decorators import shared_access_required, default_group_required, login_required_modal
 from konova.views.state import AbstractNewCompensationStateView, AbstractEditCompensationStateView, \
     AbstractRemoveCompensationStateView
 
 
 class NewCompensationStateView(AbstractNewCompensationStateView):
-    model = Compensation
+    _MODEL_CLS = Compensation
-    redirect_url = "compensation:detail"
+    _REDIRECT_URL = "compensation:detail"
-
-    @method_decorator(login_required_modal)
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(Compensation, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
 
 
 class EditCompensationStateView(AbstractEditCompensationStateView):
-    model = Compensation
+    _MODEL_CLS = Compensation
-    redirect_url = "compensation:detail"
+    _REDIRECT_URL = "compensation:detail"
-
-    @method_decorator(login_required_modal)
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(Compensation, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
 
 
 class RemoveCompensationStateView(AbstractRemoveCompensationStateView):
-    model = Compensation
+    _MODEL_CLS = Compensation
-    redirect_url = "compensation:detail"
+    _REDIRECT_URL = "compensation:detail"
-
-    @method_decorator(login_required_modal)
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(Compensation, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)

compensation/views/eco_account/action.py

@@ -5,46 +5,22 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib.auth.decorators import login_required
-from django.utils.decorators import method_decorator
-
 from compensation.models import EcoAccount
-from konova.decorators import shared_access_required, default_group_required, login_required_modal
 from konova.views.action import AbstractNewCompensationActionView, AbstractEditCompensationActionView, \
     AbstractRemoveCompensationActionView
 
+_ECO_ACCOUNT_DETAIL_URL_NAME = "compensation:acc:detail"
 
 class NewEcoAccountActionView(AbstractNewCompensationActionView):
-    model = EcoAccount
+    _MODEL_CLS = EcoAccount
-    redirect_url = "compensation:acc:detail"
+    _REDIRECT_URL = _ECO_ACCOUNT_DETAIL_URL_NAME
-
-    @method_decorator(login_required_modal)
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(EcoAccount, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
 
 
 class EditEcoAccountActionView(AbstractEditCompensationActionView):
-    model = EcoAccount
+    _MODEL_CLS = EcoAccount
-    redirect_url = "compensation:acc:detail"
+    _REDIRECT_URL = _ECO_ACCOUNT_DETAIL_URL_NAME
-
-    @method_decorator(login_required_modal)
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(EcoAccount, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
 
 
 class RemoveEcoAccountActionView(AbstractRemoveCompensationActionView):
-    model = EcoAccount
+    _MODEL_CLS = EcoAccount
-    redirect_url = "compensation:acc:detail"
+    _REDIRECT_URL = _ECO_ACCOUNT_DETAIL_URL_NAME
-
-    @method_decorator(login_required_modal)
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(EcoAccount, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)

compensation/views/eco_account/deadline.py

@@ -5,45 +5,22 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib.auth.decorators import login_required
-from django.utils.decorators import method_decorator
-
 from compensation.models import EcoAccount
-from konova.decorators import shared_access_required, default_group_required, login_required_modal
 from konova.views.deadline import AbstractNewDeadlineView, AbstractEditDeadlineView, AbstractRemoveDeadlineView
 
+_ECO_ACCOUNT_DETAIL_URL_NAME = "compensation:acc:detail"
 
 class NewEcoAccountDeadlineView(AbstractNewDeadlineView):
-    model = EcoAccount
+    _MODEL_CLS = EcoAccount
-    redirect_url = "compensation:acc:detail"
+    _REDIRECT_URL = _ECO_ACCOUNT_DETAIL_URL_NAME
-
-    @method_decorator(login_required_modal)
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(EcoAccount, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
 
 
 class EditEcoAccountDeadlineView(AbstractEditDeadlineView):
-    model = EcoAccount
+    _MODEL_CLS = EcoAccount
-    redirect_url = "compensation:acc:detail"
+    _REDIRECT_URL = _ECO_ACCOUNT_DETAIL_URL_NAME
-
-    @method_decorator(login_required_modal)
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(EcoAccount, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
 
 
 class RemoveEcoAccountDeadlineView(AbstractRemoveDeadlineView):
-    model = EcoAccount
+    _MODEL_CLS = EcoAccount
-    redirect_url = "compensation:acc:detail"
+    _REDIRECT_URL = _ECO_ACCOUNT_DETAIL_URL_NAME
 
-    @method_decorator(login_required_modal)
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(EcoAccount, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)

compensation/views/eco_account/deduction.py

@@ -5,54 +5,33 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib.auth.decorators import login_required
+from django.contrib.auth.mixins import LoginRequiredMixin
 from django.http import Http404
-from django.utils.decorators import method_decorator
 
 from compensation.models import EcoAccount
-from konova.decorators import default_group_required, login_required_modal
 from konova.views.deduction import AbstractNewDeductionView, AbstractEditDeductionView, AbstractRemoveDeductionView
 
+_ECO_ACCOUNT_DETAIl_URL_NAME = "compensation:acc:detail"
 
-class NewEcoAccountDeductionView(AbstractNewDeductionView):
+class NewEcoAccountDeductionView(LoginRequiredMixin, AbstractNewDeductionView):
-    model = EcoAccount
+    _MODEL_CLS = EcoAccount
-    redirect_url = "compensation:acc:detail"
+    _REDIRECT_URL = _ECO_ACCOUNT_DETAIl_URL_NAME
-
-    @method_decorator(login_required_modal)
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
 
     def _custom_check(self, obj):
+        # New deductions can only be created if the eco account has been recorded
         if not obj.recorded:
             raise Http404()
 
-
+    def _check_for_recorded_instance(self, obj):
-class EditEcoAccountDeductionView(AbstractEditDeductionView):
+        # Deductions can be created on recorded as well as on non-recorded entries
-    def _custom_check(self, obj):
+        return None
-        pass
-
-    model = EcoAccount
-    redirect_url = "compensation:acc:detail"
-
-    @method_decorator(login_required_modal)
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
 
 
-class RemoveEcoAccountDeductionView(AbstractRemoveDeductionView):
+class EditEcoAccountDeductionView(LoginRequiredMixin, AbstractEditDeductionView):
-    def _custom_check(self, obj):
+    _MODEL_CLS = EcoAccount
-        pass
+    _REDIRECT_URL = _ECO_ACCOUNT_DETAIl_URL_NAME
 
-    model = EcoAccount
-    redirect_url = "compensation:acc:detail"
-
-    @method_decorator(login_required_modal)
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
 
+class RemoveEcoAccountDeductionView(LoginRequiredMixin, AbstractRemoveDeductionView):
+    _MODEL_CLS = EcoAccount
+    _REDIRECT_URL = _ECO_ACCOUNT_DETAIl_URL_NAME

compensation/views/eco_account/detail.py

@@ -1,97 +0,0 @@
-"""
-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/document.py

@@ -5,65 +5,33 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib.auth.decorators import login_required
+from compensation.forms.modals.document import NewEcoAccountDocumentModalForm, RemoveEcoAccountDocumentModalForm, \
-from django.http import HttpRequest
+    EditEcoAccountDocumentModalForm
-from django.shortcuts import get_object_or_404
-from django.urls import reverse
-from django.utils.decorators import method_decorator
-
-from compensation.forms.modals.document import NewEcoAccountDocumentModalForm
 from compensation.models import EcoAccount, EcoAccountDocument
-from konova.decorators import shared_access_required, default_group_required, login_required_modal
-from konova.forms.modals import EditDocumentModalForm
 from konova.views.document import AbstractNewDocumentView, AbstractGetDocumentView, AbstractRemoveDocumentView, \
     AbstractEditDocumentView
 
 
 class NewEcoAccountDocumentView(AbstractNewDocumentView):
-    model = EcoAccount
+    _MODEL_CLS = EcoAccount
-    form = NewEcoAccountDocumentModalForm
+    _FORM_CLS = NewEcoAccountDocumentModalForm
-    redirect_url = "compensation:acc:detail"
+    _REDIRECT_URL = "compensation:acc:detail"
-
-    @method_decorator(login_required_modal)
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(EcoAccount, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
 
 
 class GetEcoAccountDocumentView(AbstractGetDocumentView):
-    model = EcoAccount
+    _MODEL_CLS = EcoAccount
-    document_model = EcoAccountDocument
+    _DOCUMENT_CLS = EcoAccountDocument
-
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(EcoAccount, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
 
 
 class RemoveEcoAccountDocumentView(AbstractRemoveDocumentView):
-    model = EcoAccount
+    _MODEL_CLS = EcoAccount
-    document_model = EcoAccountDocument
+    _DOCUMENT_CLS = EcoAccountDocument
-
+    _FORM_CLS = RemoveEcoAccountDocumentModalForm
-    @method_decorator(login_required_modal)
+    _REDIRECT_URL = "compensation:acc:detail"
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(EcoAccount, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
 
 
 class EditEcoAccountDocumentView(AbstractEditDocumentView):
-    model = EcoAccount
+    _MODEL_CLS = EcoAccount
-    document_model = EcoAccountDocument
+    _DOCUMENT_CLS = EcoAccountDocument
-    form = EditDocumentModalForm
+    _FORM_CLS = EditEcoAccountDocumentModalForm
-    redirect_url = "compensation:acc:detail"
+    _REDIRECT_URL = "compensation:acc:detail"
-
-    @method_decorator(login_required_modal)
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(EcoAccount, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)

compensation/views/eco_account/eco_account.py

@@ -5,224 +5,159 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib import messages
 from django.contrib.auth.mixins import LoginRequiredMixin
-from django.http import HttpRequest, HttpResponse
+from django.shortcuts import get_object_or_404
-from django.shortcuts import get_object_or_404, redirect, render
-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
+from compensation.forms.eco_account import EditEcoAccountForm, NewEcoAccountForm, RemoveEcoAccountModalForm
 from compensation.models import EcoAccount
 from compensation.tables.eco_account import EcoAccountTable
-from konova.contexts import BaseContext
-from konova.decorators import shared_access_required, default_group_required
-from konova.forms import SimpleGeomForm
-from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
-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.form import AbstractNewGeometryFormView, AbstractEditGeometryFormView
 from konova.views.index import AbstractIndexView
+from konova.views.detail import BaseDetailView
+from konova.views.remove import BaseRemoveModalFormView
 
 
-class IndexEcoAccountView(AbstractIndexView):
+class EcoAccountIndexView(LoginRequiredMixin, AbstractIndexView):
-    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
+    """ View class for indexing eco accounts
-        """
-        Renders the index view for eco accounts
 
-        Args:
+    """
-            request (HttpRequest): The incoming request
+    _INDEX_TABLE_CLS = EcoAccountTable
+    _TAB_TITLE = _("Eco-account - Overview")
 
-        Returns:
+    def _get_queryset(self):
-            A rendered view
+        qs = EcoAccount.objects.filter(
-        """
-        eco_accounts = EcoAccount.objects.filter(
             deleted=None,
         ).order_by(
             "-modified__timestamp"
         )
-        table = EcoAccountTable(
+        return qs
-            request=request,
+
-            queryset=eco_accounts
+
+class NewEcoAccountFormView(AbstractNewGeometryFormView):
+    """ Form view class
+
+    Renders a form for new eco accounts
+
+    """
+    _FORM_CLS = NewEcoAccountForm
+    _MODEL_CLS = EcoAccount
+    _TEMPLATE = "compensation/form/view.html"
+    _TAB_TITLE = _("New Eco-Account")
+    _REDIRECT_URL = "compensation:acc:detail"
+
+    def _user_has_permission(self, user, **kwargs):
+        # User has to be a default user
+        return user.is_default_user()
+
+
+class EditEcoAccountFormView(AbstractEditGeometryFormView):
+    """ Form view class
+
+    Renders a form for editing of eco accounts
+
+    """
+    _FORM_CLS = EditEcoAccountForm
+    _MODEL_CLS = EcoAccount
+    _TEMPLATE = "compensation/form/view.html"
+    _REDIRECT_URL = "compensation:acc:detail"
+
+    def _user_has_permission(self, user, **kwargs):
+        # User has to be a default user
+        return user.is_default_user()
+
+
+class EcoAccountIdentifierGeneratorView(LoginRequiredMixin, AbstractIdentifierGeneratorView):
+    """ View class for identifier generation on eco accounts
+
+    """
+    _MODEL_CLS = EcoAccount
+    _REDIRECT_URL = "compensation:acc:index"
+
+
+class EcoAccountDetailView(BaseDetailView):
+    """ Detail view class
+
+    Renders details of an eco account
+
+    """
+    _MODEL_CLS = EcoAccount
+    _TEMPLATE = "compensation/detail/eco_account/view.html"
+
+    def _get_object(self, id: str):
+        """ Fetch object for detail view
+
+        Args:
+            id (str): The record's id'
+
+        Returns:
+
+        """
+        acc = get_object_or_404(
+            EcoAccount.objects.prefetch_related(
+                "deadlines",
+            ).select_related(
+                'geometry',
+                'responsible',
+            ),
+            id=id,
+            deleted=None,
         )
-        context = {
+        return acc
-            "table": table,
-            TAB_TITLE_IDENTIFIER: _("Eco-account - Overview"),
-        }
-        context = BaseContext(request, context).context
-        return render(request, self._TEMPLATE, context)
 
-
+    def _get_detail_context(self, obj: EcoAccount):
-class NewEcoAccountView(LoginRequiredMixin, View):
+        """ Generate object specific detail context for  view
-    _TEMPLATE = "compensation/form/view.html"
-
-    @method_decorator(default_group_required)
-    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
-        """
-        Renders a view for a new eco account creation
 
         Args:
-            request (HttpRequest): The incoming request
+            obj (): The record
 
         Returns:
 
         """
-        data_form = NewEcoAccountForm(request.POST or None)
+        # Order states according to surface
-        geom_form = SimpleGeomForm(request.POST or None, read_only=False)
+        before_states = obj.before_states.order_by("-surface")
+        after_states = obj.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 = obj.get_surface_before_states()
+        sum_after_states = obj.get_surface_after_states()
+        diff_states = abs(sum_before_states - sum_after_states)
+        # Calculate rest of available surface for deductions
+        available_total = obj.deductable_rest
+        available_relative = obj.get_deductable_rest_relative()
+
+        # Prefetch related data to decrease the amount of db connections
+        deductions = obj.deductions.filter(
+            intervention__deleted=None,
+        )
+        actions = obj.actions.all()
 
         context = {
-            "form": data_form,
+            "before_states": before_states,
-            "geom_form": geom_form,
+            "after_states": after_states,
-            TAB_TITLE_IDENTIFIER: _("New Eco-Account"),
+            "sum_before_states": sum_before_states,
+            "sum_after_states": sum_after_states,
+            "diff_states": diff_states,
+            "available": available_relative,
+            "available_total": available_total,
+            "deductions": deductions,
+            "actions": actions,
+            "has_finished_deadlines": obj.get_finished_deadlines().exists(),
         }
-        context = BaseContext(request, context).context
+        return 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)
-            if generated_identifier != acc.identifier:
-                messages.info(
-                    request,
-                    IDENTIFIER_REPLACED.format(
-                        generated_identifier,
-                        acc.identifier
-                    )
-                )
-            messages.success(request, _("Eco-Account {} added").format(acc.identifier))
-            if geom_form.has_geometry_simplified():
-                messages.info(
-                    request,
-                    GEOMETRY_SIMPLIFIED
-                )
-            num_ignored_geometries = geom_form.get_num_geometries_ignored()
-            if num_ignored_geometries > 0:
-                messages.info(
-                    request,
-                    GEOMETRIES_IGNORED_TEMPLATE.format(num_ignored_geometries)
-                )
-            return redirect("compensation:acc:detail", id=acc.id)
-        else:
-            messages.error(request, FORM_INVALID, extra_tags="danger", )
-
-        context = {
-            "form": data_form,
-            "geom_form": geom_form,
-            TAB_TITLE_IDENTIFIER: _("New Eco-Account"),
-        }
-        context = BaseContext(request, context).context
-
-        return render(request, self._TEMPLATE, context)
-
-class EcoAccountIdentifierGeneratorView(AbstractIdentifierGeneratorView):
-    _MODEL = EcoAccount
 
 
-class EditEcoAccountView(LoginRequiredMixin, View):
+class RemoveEcoAccountView(LoginRequiredMixin, BaseRemoveModalFormView):
-    _TEMPLATE = "compensation/form/view.html"
+    """ Form view class
 
-    @method_decorator(default_group_required)
+    Renders a form for removing eco accounts
-    @method_decorator(shared_access_required(EcoAccount, "id"))
-    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
 
-        """
+    """
-        Renders a view for editing compensations
+    _MODEL_CLS = EcoAccount
+    _FORM_CLS = RemoveEcoAccountModalForm
+    _REDIRECT_URL = "compensation:acc:index"
 
-        Args:
+    def _user_has_permission(self, user, **kwargs):
-            request (HttpRequest): The incoming request
+        return user.is_default_user()
-
-        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)
-
-        data_form_valid = data_form.is_valid()
-        geom_form_valid = geom_form.is_valid()
-        if data_form_valid and geom_form_valid:
-            # The data form takes the geom form for processing, as well as the performing user
-            acc = data_form.save(request.user, geom_form)
-            messages.success(request, _("Eco-Account {} edited").format(acc.identifier))
-            if geom_form.has_geometry_simplified():
-                messages.info(
-                    request,
-                    GEOMETRY_SIMPLIFIED
-                )
-            num_ignored_geometries = geom_form.get_num_geometries_ignored()
-            if num_ignored_geometries > 0:
-                messages.info(
-                    request,
-                    GEOMETRIES_IGNORED_TEMPLATE.format(num_ignored_geometries)
-                )
-            return redirect("compensation:acc:detail", id=acc.id)
-        else:
-            messages.error(request, FORM_INVALID, extra_tags="danger", )
-
-        context = {
-            "form": data_form,
-            "geom_form": geom_form,
-            TAB_TITLE_IDENTIFIER: _("Edit {}").format(acc.identifier),
-        }
-        context = BaseContext(request, context).context
-
-        return render(request, self._TEMPLATE, context)

compensation/views/eco_account/log.py

@@ -5,20 +5,11 @@ 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.utils.decorators import method_decorator
 
 from compensation.models import EcoAccount
-from konova.decorators import shared_access_required, default_group_required, login_required_modal
 from konova.views.log import AbstractLogView
 
 
-class EcoAccountLogView(AbstractLogView):
+class EcoAccountLogView(LoginRequiredMixin, AbstractLogView):
-    model = EcoAccount
+    _MODEL_CLS = EcoAccount
-
-    @method_decorator(login_required_modal)
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(EcoAccount, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)

compensation/views/eco_account/record.py

@@ -5,20 +5,12 @@ 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.utils.decorators import method_decorator
 
 from compensation.models import EcoAccount
-from konova.decorators import shared_access_required, conservation_office_group_required, login_required_modal
 from konova.views.record import AbstractRecordView
 
 
-class EcoAccountRecordView(AbstractRecordView):
+class EcoAccountRecordView(LoginRequiredMixin, AbstractRecordView):
-    model = EcoAccount
+    _MODEL_CLS = EcoAccount
-
+    _REDIRECT_URL = "compensation:acc:detail"
-    @method_decorator(login_required_modal)
-    @method_decorator(login_required)
-    @method_decorator(conservation_office_group_required)
-    @method_decorator(shared_access_required(EcoAccount, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)

compensation/views/eco_account/remove.py

@@ -1,22 +0,0 @@
-"""
-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,88 +5,41 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.http import HttpRequest, HttpResponse
-from django.shortcuts import get_object_or_404, render
 from django.urls import reverse
-from django.utils.translation import gettext_lazy as _
 
 from compensation.models import EcoAccount
-from konova.contexts import BaseContext
+from compensation.views.compensation.report import BaseCompensationReportView
-from konova.forms import SimpleGeomForm
+from konova.sub_settings.django_settings import BASE_URL
-from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.qrcode import QrCode
-from konova.views.report import AbstractPublicReportView
 
 
-class EcoAccountPublicReportView(AbstractPublicReportView):
+class EcoAccountReportView(BaseCompensationReportView):
+    _MODEL = EcoAccount
     _TEMPLATE = "compensation/report/eco_account/report.html"
 
-    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+    def _get_report_context(self, obj):
-        """ Renders the public report view
+        report_url = BASE_URL + reverse("compensation:acc:report", args=(obj.id,))
-
+        qrcode_report = QrCode(report_url, 10)
-        Args:
+        qrcode_lanis = QrCode(obj.get_LANIS_link(), 7)
-            request (HttpRequest): The incoming request
-            id (str): The id of the intervention
-
-        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() \
+        deductions = obj.deductions.all() \
             .distinct("intervention") \
             .select_related("intervention") \
             .values_list("intervention__id", "intervention__identifier", "intervention__title", named=True)
 
-        context = {
+        report_context = {
-            "obj": acc,
             "qrcode": {
-                "img": qrcode.get_img(),
+                "img": qrcode_report.get_img(),
-                "url": qrcode.get_content(),
+                "url": qrcode_report.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
+        report_context.update(self._get_compensation_report_context(obj))
-        return render(request, self._TEMPLATE, context)
+        return report_context

compensation/views/eco_account/resubmission.py

@@ -5,22 +5,12 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib.auth.decorators import login_required
+from compensation.forms.modals.resubmission import EcoAccountResubmissionModalForm
-from django.utils.decorators import method_decorator
-
 from compensation.models import EcoAccount
-from konova.decorators import shared_access_required, default_group_required, login_required_modal
 from konova.views.resubmission import AbstractResubmissionView
 
 
 class EcoAccountResubmissionView(AbstractResubmissionView):
-    model = EcoAccount
+    _MODEL_CLS = EcoAccount
-    redirect_url_base = "compensation:acc:detail"
+    _FORM_CLS = EcoAccountResubmissionModalForm
-    form_action_url_base = "compensation:acc:resubmission-create"
+    _REDIRECT_URL = "compensation:acc:detail"
-
-    @method_decorator(login_required_modal)
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(EcoAccount, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)

compensation/views/eco_account/share.py

@@ -5,29 +5,15 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib.auth.decorators import login_required
-from django.utils.decorators import method_decorator
-
 from compensation.models import EcoAccount
-from konova.decorators import shared_access_required, default_group_required, login_required_modal
 from konova.views.share import AbstractShareByTokenView, AbstractShareFormView
 
 
 class EcoAccountShareByTokenView(AbstractShareByTokenView):
-    model = EcoAccount
+    _MODEL_CLS = EcoAccount
-    redirect_url = "compensation:acc:detail"
+    _REDIRECT_URL = "compensation:acc:detail"
-
-    @method_decorator(login_required)
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
 
 
 class EcoAccountShareFormView(AbstractShareFormView):
-    model = EcoAccount
+    _MODEL_CLS = EcoAccount
-
+    _REDIRECT_URL = "compensation:acc:detail"
-    @method_decorator(login_required_modal)
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(EcoAccount, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)

compensation/views/eco_account/state.py

@@ -5,46 +5,21 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib.auth.decorators import login_required
-from django.utils.decorators import method_decorator
-
 from compensation.models import EcoAccount
-from konova.decorators import shared_access_required, default_group_required, login_required_modal
 from konova.views.state import AbstractNewCompensationStateView, AbstractEditCompensationStateView, \
     AbstractRemoveCompensationStateView
 
 
 class NewEcoAccountStateView(AbstractNewCompensationStateView):
-    model = EcoAccount
+    _MODEL_CLS = EcoAccount
-    redirect_url = "compensation:acc:detail"
+    _REDIRECT_URL = "compensation:acc:detail"
-
-    @method_decorator(login_required_modal)
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(EcoAccount, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
 
 
 class EditEcoAccountStateView(AbstractEditCompensationStateView):
-    model = EcoAccount
+    _MODEL_CLS = EcoAccount
-    redirect_url = "compensation:acc:detail"
+    _REDIRECT_URL = "compensation:acc:detail"
-
-    @method_decorator(login_required_modal)
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(EcoAccount, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
 
 
 class RemoveEcoAccountStateView(AbstractRemoveCompensationStateView):
-    model = EcoAccount
+    _MODEL_CLS = EcoAccount
-    redirect_url = "compensation:acc:detail"
+    _REDIRECT_URL = "compensation:acc:detail"
-
-    @method_decorator(login_required_modal)
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(EcoAccount, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)

compensation/views/payment.py

@@ -6,110 +6,37 @@ Created on: 09.08.21
 
 """
 from django.contrib.auth.mixins import LoginRequiredMixin
-from django.urls import reverse
-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
 from intervention.models import Intervention
-from konova.decorators import default_group_required, shared_access_required
 from konova.utils.message_templates import PAYMENT_ADDED, PAYMENT_REMOVED, PAYMENT_EDITED
+from konova.views.modal import AbstractModalFormView
 
 
-class NewPaymentView(LoginRequiredMixin, View):
+class BasePaymentView(LoginRequiredMixin, AbstractModalFormView):
+    _MODEL_CLS = Intervention
+    _REDIRECT_URL = "intervention:detail"
 
-    def __process_request(self, request: HttpRequest, id: str):
+    class Meta:
-        """ Renders a modal view for adding new payments
+        abstract = True
 
-        Args:
+    def _get_redirect_url(self, *args, **kwargs):
-            request (HttpRequest): The incoming request
+        url = super()._get_redirect_url(*args, **kwargs)
-            id (str): The intervention's id for which a new payment shall be added
+        return f"{url}#related_data"
 
-        Returns:
+    def _user_has_permission(self, user, **kwargs):
-
+        return user.is_default_user()
-        """
-        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)
 
 
-class RemovePaymentView(LoginRequiredMixin, View):
+class NewPaymentView(BasePaymentView):
-
+    _FORM_CLS = NewPaymentForm
-    def __process_request(self, request: HttpRequest, id: str, payment_id: str):
+    _MSG_SUCCESS = PAYMENT_ADDED
-        """ Renders a modal view for removing payments
-
-        Args:
-            request (HttpRequest): The incoming request
-            id (str): The intervention's id
-            payment_id (str): The payment's id
-
-        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)
 
 
-class EditPaymentView(LoginRequiredMixin, View):
+class EditPaymentView(BasePaymentView):
-    def __process_request(self, request: HttpRequest, id: str, payment_id: str):
+    _MSG_SUCCESS = PAYMENT_EDITED
-        """ Renders a modal view for editing payments
+    _FORM_CLS = EditPaymentModalForm
 
-        Args:
+class RemovePaymentView(BasePaymentView):
-            request (HttpRequest): The incoming request
+    _MSG_SUCCESS = PAYMENT_REMOVED
-            id (str): The intervention's id
+    _FORM_CLS = RemovePaymentModalForm
-            payment_id (str): The payment's id
-
-        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"
-        )
-
-    @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/forms.py

@@ -15,7 +15,8 @@ from compensation.forms.compensation import AbstractCompensationForm
 from ema.models import Ema, EmaDocument
 from intervention.models import Responsibility, Handler
 from konova.forms import SimpleGeomForm
-from konova.forms.modals import NewDocumentModalForm
+from konova.forms.modals import NewDocumentModalForm, EditDocumentModalForm, RemoveDocumentModalForm, \
+    ResubmissionModalForm
 from user.models import UserActionLogEntry
 
 
@@ -170,4 +171,13 @@ class EditEmaForm(NewEmaForm):
 
 
 class NewEmaDocumentModalForm(NewDocumentModalForm):
-    document_model = EmaDocument
+    _DOCUMENT_CLS = EmaDocument
+
+class EditEmaDocumentModalForm(EditDocumentModalForm):
+    _DOCUMENT_CLS = EmaDocument
+
+class RemoveEmaDocumentModalForm(RemoveDocumentModalForm):
+    _DOCUMENT_CLS = EmaDocument
+
+class EmaResubmissionModalForm(ResubmissionModalForm):
+    _MODEL_CLS = Ema

ema/tables.py

@@ -88,7 +88,7 @@ class EmaTable(BaseTable, TableRenderMixin, TableOrderMixin):
             txt=value,
             new_tab=False,
         )
-        return format_html(html, None)
+        return format_html(html)
 
     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, None)
+        return format_html(html)

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

@@ -15,10 +15,10 @@
         <button class="btn btn-default btn-modal mr-2" title="{% trans 'Resubmission' %}" data-form-url="{% url 'ema:resubmission-create' obj.id %}">
             {% fa5_icon 'bell' %}
         </button>
+        <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,21 +28,19 @@
                     {% 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 %}
-            <button class="btn btn-default btn-modal mr-2" data-form-url="{% url 'ema:log' obj.id %}" title="{% trans 'Show log' %}">
+        <a href="{% url 'ema:edit' obj.id %}" class="mr-2">
-                {% fa5_icon 'history' %}
+            <button class="btn btn-default" title="{% trans 'Edit' %}">
-            </button>
+                {% fa5_icon 'edit' %}
-        {% 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/tests/test_views.py

@@ -118,7 +118,6 @@ class EmaViewTestCase(CompensationViewTestCase):
             self.index_url,
             self.detail_url,
             self.report_url,
-            self.log_url,
         ]
         fail_urls = [
             self.new_url,
@@ -134,6 +133,7 @@ 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/urls.py

@@ -9,28 +9,27 @@ 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 IndexEmaView, EmaIdentifierGeneratorView, EditEmaView, NewEmaView
+from ema.views.ema import EmaIndexView, EmaIdentifierGeneratorView, EmaDetailView, EditEmaFormView, NewEmaFormView, \
+    RemoveEmaView
 from ema.views.log import EmaLogView
 from ema.views.record import EmaRecordView
-from ema.views.remove import RemoveEmaView
+from ema.views.report import EmaReportView
-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("", IndexEmaView.as_view(), name="index"),
+    path("", EmaIndexView.as_view(), name="index"),
-    path("new/", NewEmaView.as_view(), name="new"),
+    path("new/", NewEmaFormView.as_view(), name="new"),
     path("new/id", EmaIdentifierGeneratorView.as_view(), name="new-id"),
-    path("<id>", DetailEmaView.as_view(), name="detail"),
+    path("<id>", EmaDetailView.as_view(), name="detail"),
     path('<id>/log', EmaLogView.as_view(), name='log'),
-    path('<id>/edit', EditEmaView.as_view(), name='edit'),
+    path('<id>/edit', EditEmaFormView.as_view(), name='edit'),
     path('<id>/remove', RemoveEmaView.as_view(), name='remove'),
     path('<id>/record', EmaRecordView.as_view(), name='record'),
-    path('<id>/report', EmaPublicReportView.as_view(), name='report'),
+    path('<id>/report', EmaReportView.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/action.py

@@ -5,46 +5,31 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib.auth.decorators import login_required
-from django.utils.decorators import method_decorator
 
 from ema.models import Ema
-from konova.decorators import shared_access_required, conservation_office_group_required, login_required_modal
 from konova.views.action import AbstractNewCompensationActionView, AbstractEditCompensationActionView, \
     AbstractRemoveCompensationActionView
 
+_EMA_ACCOUNT_DETAIL_URL_NAME = "ema:detail"
 
 class NewEmaActionView(AbstractNewCompensationActionView):
-    model = Ema
+    _MODEL_CLS = Ema
-    redirect_url = "ema:detail"
+    _REDIRECT_URL = _EMA_ACCOUNT_DETAIL_URL_NAME
-
-    @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)
 
+    def _user_has_permission(self, user, **kwargs):
+        return user.is_ets_user()
 
 class EditEmaActionView(AbstractEditCompensationActionView):
-    model = Ema
+    _MODEL_CLS = Ema
-    redirect_url = "ema:detail"
+    _REDIRECT_URL = _EMA_ACCOUNT_DETAIL_URL_NAME
 
-    @method_decorator(login_required_modal)
+    def _user_has_permission(self, user, **kwargs):
-    @method_decorator(login_required)
+        return user.is_ets_user()
-    @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)
 
 
 class RemoveEmaActionView(AbstractRemoveCompensationActionView):
-    model = Ema
+    _MODEL_CLS = Ema
-    redirect_url = "ema:detail"
+    _REDIRECT_URL = _EMA_ACCOUNT_DETAIL_URL_NAME
 
-    @method_decorator(login_required_modal)
+    def _user_has_permission(self, user, **kwargs):
-    @method_decorator(login_required)
+        return user.is_ets_user()
-    @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/deadline.py

@@ -5,46 +5,30 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib.auth.decorators import login_required
-from django.utils.decorators import method_decorator
-
 from ema.models import Ema
-from konova.decorators import shared_access_required, conservation_office_group_required, login_required_modal
 from konova.views.deadline import AbstractNewDeadlineView, AbstractRemoveDeadlineView, AbstractEditDeadlineView
 
+_EMA_DETAIL_URL_NAME = "ema:detail"
 
 class NewEmaDeadlineView(AbstractNewDeadlineView):
-    model = Ema
+    _MODEL_CLS = Ema
-    redirect_url = "ema:detail"
+    _REDIRECT_URL = _EMA_DETAIL_URL_NAME
 
-    @method_decorator(login_required_modal)
+    def _user_has_permission(self, user, **kwargs):
-    @method_decorator(login_required)
+        return user.is_ets_user()
-    @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)
 
 
 class EditEmaDeadlineView(AbstractEditDeadlineView):
-    model = Ema
+    _MODEL_CLS = Ema
-    redirect_url = "ema:detail"
+    _REDIRECT_URL = _EMA_DETAIL_URL_NAME
 
-    @method_decorator(login_required_modal)
+    def _user_has_permission(self, user, **kwargs):
-    @method_decorator(login_required)
+        return user.is_ets_user()
-    @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)
 
 
 class RemoveEmaDeadlineView(AbstractRemoveDeadlineView):
-    model = Ema
+    _MODEL_CLS = Ema
-    redirect_url = "ema:detail"
+    _REDIRECT_URL = _EMA_DETAIL_URL_NAME
-
-    @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)
 
+    def _user_has_permission(self, user, **kwargs):
+        return user.is_ets_user()

ema/views/detail.py

@@ -1,76 +0,0 @@
-"""
-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/document.py

@@ -5,62 +5,41 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib.auth.decorators import login_required
+from ema.forms import NewEmaDocumentModalForm, RemoveEmaDocumentModalForm, EditEmaDocumentModalForm
-from django.utils.decorators import method_decorator
-
-from ema.forms import NewEmaDocumentModalForm
 from ema.models import Ema, EmaDocument
-from konova.decorators import shared_access_required, conservation_office_group_required, login_required_modal
-from konova.forms.modals import EditDocumentModalForm
 from konova.views.document import AbstractEditDocumentView, AbstractRemoveDocumentView, AbstractGetDocumentView, \
     AbstractNewDocumentView
 
 
 class NewEmaDocumentView(AbstractNewDocumentView):
-    model = Ema
+    _MODEL_CLS = Ema
-    form = NewEmaDocumentModalForm
+    _FORM_CLS = NewEmaDocumentModalForm
-    redirect_url = "ema:detail"
+    _REDIRECT_URL = "ema:detail"
-
-    @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)
 
+    def _user_has_permission(self, user, **kwargs):
+        return user.is_ets_user()
 
 class GetEmaDocumentView(AbstractGetDocumentView):
-    model = Ema
+    _MODEL_CLS = Ema
-    document_model = EmaDocument
+    _DOCUMENT_CLS = EmaDocument
-
-    @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)
 
+    def _user_has_permission(self, user, **kwargs):
+        return user.is_ets_user()
 
 class RemoveEmaDocumentView(AbstractRemoveDocumentView):
-    model = Ema
+    _MODEL_CLS = Ema
-    document_model = EmaDocument
+    _DOCUMENT_CLS = EmaDocument
-
+    _FORM_CLS = RemoveEmaDocumentModalForm
-    @method_decorator(login_required_modal)
+    _REDIRECT_URL = "ema:detail"
-    @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)
 
+    def _user_has_permission(self, user, **kwargs):
+        return user.is_ets_user()
 
 class EditEmaDocumentView(AbstractEditDocumentView):
-    model = Ema
+    _MODEL_CLS = Ema
-    document_model = EmaDocument
+    _FORM_CLS = EditEmaDocumentModalForm
-    form = EditDocumentModalForm
+    _DOCUMENT_CLS = EmaDocument
-    redirect_url = "ema:detail"
+    _REDIRECT_URL = "ema:detail"
 
-    @method_decorator(login_required_modal)
+    def _user_has_permission(self, user, **kwargs):
-    @method_decorator(login_required)
+        return user.is_ets_user()
-    @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/ema.py

@@ -5,228 +5,113 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib import messages
-from django.contrib.auth.decorators import login_required
 from django.contrib.auth.mixins import LoginRequiredMixin
-from django.http import HttpRequest, HttpResponse
+from django.shortcuts import get_object_or_404
-from django.shortcuts import get_object_or_404, redirect, render
-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
-from konova.forms import SimpleGeomForm
-from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
-from konova.utils.message_templates import RECORDED_BLOCKS_EDIT, IDENTIFIER_REPLACED, FORM_INVALID, \
-    GEOMETRY_SIMPLIFIED, GEOMETRIES_IGNORED_TEMPLATE
 from konova.views.identifier import AbstractIdentifierGeneratorView
+from konova.views.form import AbstractNewGeometryFormView, AbstractEditGeometryFormView
 from konova.views.index import AbstractIndexView
+from konova.views.detail import BaseDetailView
+from konova.views.remove import BaseRemoveModalFormView
 
 
-class IndexEmaView(AbstractIndexView):
+class EmaIndexView(LoginRequiredMixin, AbstractIndexView):
-    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
+    _TAB_TITLE = _("EMAs - Overview")
-        """ Renders the index view for EMAs
+    _INDEX_TABLE_CLS = EmaTable
 
-        Args:
+    def _get_queryset(self):
-            request (HttpRequest): The incoming request
+        qs = Ema.objects.filter(
-
-        Returns:
-
-        """
-        emas = Ema.objects.filter(
             deleted=None,
         ).order_by(
             "-modified__timestamp"
         )
+        return qs
 
-        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):
+class NewEmaFormView(AbstractNewGeometryFormView):
+    _FORM_CLS = NewEmaForm
+    _MODEL_CLS = Ema
     _TEMPLATE = "ema/form/view.html"
+    _TAB_TITLE = _("New EMA")
+    _REDIRECT_URL = "ema:detail"
 
-    @method_decorator(conservation_office_group_required)
+    def _user_has_permission(self, user, **kwargs):
-    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
+        # User has to be an ets user
-        """ GET endpoint
+        return user.is_ets_user()
 
-        Renders form for new EMA
+
+class EditEmaFormView(AbstractEditGeometryFormView):
+    _MODEL_CLS = Ema
+    _FORM_CLS = EditEmaForm
+    _TEMPLATE = "ema/form/view.html"
+    _REDIRECT_URL = "ema:detail"
+    _TAB_TITLE = _("Edit {}")
+
+    def _user_has_permission(self, user, **kwargs):
+        # User has to be an ets user
+        return user.is_ets_user()
+
+
+class EmaIdentifierGeneratorView(LoginRequiredMixin, AbstractIdentifierGeneratorView):
+    _MODEL_CLS = Ema
+    _REDIRECT_URL = "ema:index"
+
+    def _user_has_permission(self, user, **kwargs):
+        return user.is_ets_user()
+
+
+class EmaDetailView(BaseDetailView):
+    _MODEL_CLS = Ema
+    _TEMPLATE = "ema/detail/view.html"
+
+    def _get_object(self, id: str):
+        """ Fetch object for detail view
 
         Args:
-            request (HttpRequest): The incoming request
+            id (str): The record's id'
-            *args ():
-            **kwargs ():
 
         Returns:
 
         """
-        data_form = NewEmaForm(request.POST or None)
+        ema = get_object_or_404(Ema, id=id, deleted=None)
-        geom_form = SimpleGeomForm(request.POST or None, read_only=False)
+        return ema
-        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 _get_detail_context(self, obj: Ema):
-    def post(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
+        """ Generate object specific detail context for  view
-        """ POST endpoint
-
-        Processes submitted form
 
         Args:
-            request (HttpRequest): The incoming request
+            obj (): The record
-            *args ():
-            **kwargs ():
 
         Returns:
 
         """
-        data_form = NewEmaForm(request.POST or None)
+        # Order states according to surface
-        geom_form = SimpleGeomForm(request.POST or None, read_only=False)
+        before_states = obj.before_states.all().order_by("-surface")
-        if data_form.is_valid() and geom_form.is_valid():
+        after_states = obj.after_states.all().order_by("-surface")
-            generated_identifier = data_form.cleaned_data.get("identifier", None)
+
-            ema = data_form.save(request.user, geom_form)
+        # Precalculate logical errors between before- and after-states
-            if generated_identifier != ema.identifier:
+        # Sum() returns None in case of no states, so we catch that and replace it with 0 for easier handling
-                messages.info(
+        sum_before_states = obj.get_surface_before_states()
-                    request,
+        sum_after_states = obj.get_surface_after_states()
-                    IDENTIFIER_REPLACED.format(
+        diff_states = abs(sum_before_states - sum_after_states)
-                        generated_identifier,
+
-                        ema.identifier
-                    )
-                )
-            messages.success(request, _("EMA {} added").format(ema.identifier))
-            if geom_form.has_geometry_simplified():
-                messages.info(
-                    request,
-                    GEOMETRY_SIMPLIFIED
-                )
-            num_ignored_geometries = geom_form.get_num_geometries_ignored()
-            if num_ignored_geometries > 0:
-                messages.info(
-                    request,
-                    GEOMETRIES_IGNORED_TEMPLATE.format(num_ignored_geometries)
-                )
-            return redirect("ema:detail", id=ema.id)
-        else:
-            messages.error(request, FORM_INVALID, extra_tags="danger",)
         context = {
-            "form": data_form,
+            "before_states": before_states,
-            "geom_form": geom_form,
+            "after_states": after_states,
-            TAB_TITLE_IDENTIFIER: _("New EMA"),
+            "sum_before_states": sum_before_states,
+            "sum_after_states": sum_after_states,
+            "diff_states": diff_states,
+            "has_finished_deadlines": obj.get_finished_deadlines().exists(),
         }
-        context = BaseContext(request, context).context
+        return context
-        return render(request, self._TEMPLATE, context)
 
-class EmaIdentifierGeneratorView(AbstractIdentifierGeneratorView):
+class RemoveEmaView(LoginRequiredMixin, BaseRemoveModalFormView):
-    _MODEL = Ema
+    _MODEL_CLS = Ema
+    _REDIRECT_URL = "ema:index"
 
-    @method_decorator(conservation_office_group_required)
+    def _user_has_permission(self, user, **kwargs):
-    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
+        return user.is_ets_user()
-        return super().get(request, *args, **kwargs)
-
-class EditEmaView(LoginRequiredMixin, View):
-    _TEMPLATE = "compensation/form/view.html"
-
-    @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
-
-        Renders form
-
-        Args:
-            request (HttpRequest): The incoming request
-            id (str): The ema identifier
-            *args ():
-            **kwargs ():
-
-        Returns:
-
-        """
-        # 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(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)
-
-    @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
-
-        Process submitted forms
-
-        Args:
-            request (HttpRequest): The incoming request
-            id (str): The id of the ema
-            *args ():
-            **kwargs ():
-
-        Returns:
-
-        """
-        # 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 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.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", )
-        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

@@ -5,19 +5,14 @@ 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.utils.decorators import method_decorator
 
 from ema.models import Ema
-from konova.decorators import shared_access_required, conservation_office_group_required, login_required_modal
 from konova.views.log import AbstractLogView
 
 
-class EmaLogView(AbstractLogView):
+class EmaLogView(LoginRequiredMixin, AbstractLogView):
-    model = Ema
+    _MODEL_CLS = Ema
 
-    @method_decorator(login_required_modal)
+    def _user_has_permission(self, user, **kwargs):
-    @method_decorator(login_required)
+        return user.is_ets_user()
-    @method_decorator(shared_access_required(Ema, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)

ema/views/record.py

@@ -5,20 +5,12 @@ 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.utils.decorators import method_decorator
 
 from ema.models import Ema
-from konova.decorators import shared_access_required, conservation_office_group_required, login_required_modal
 from konova.views.record import AbstractRecordView
 
 
-class EmaRecordView(AbstractRecordView):
+class EmaRecordView(LoginRequiredMixin, AbstractRecordView):
-    model = Ema
+    _MODEL_CLS = Ema
-
+    _REDIRECT_URL = "ema:detail"
-    @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

@@ -1,21 +0,0 @@
-"""
-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,81 +5,36 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.http import HttpRequest, HttpResponse
-from django.shortcuts import get_object_or_404, render
 from django.urls import reverse
-from django.utils.translation import gettext_lazy as _
 
+from compensation.views.compensation.report import BaseCompensationReportView
 from ema.models import Ema
-from konova.contexts import BaseContext
+from konova.sub_settings.django_settings import BASE_URL
-from konova.forms import SimpleGeomForm
-from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.qrcode import QrCode
-from konova.views.report import AbstractPublicReportView
 
 
-class EmaPublicReportView(AbstractPublicReportView):
+class EmaReportView(BaseCompensationReportView):
     _TEMPLATE = "ema/report/report.html"
+    _MODEL = Ema
 
-    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+    def _get_report_context(self, obj):
-        """ Renders the public report view
+        report_url = BASE_URL + reverse("ema:report", args=(obj.id,))
+        qrcode_report = QrCode(report_url, 10)
+        qrcode_lanis = QrCode(obj.get_LANIS_link(), 7)
 
-        Args:
+        generic_compensation_report_context = self._get_compensation_report_context(obj)
-            request (HttpRequest): The incoming request
-            id (str): The id of the intervention
 
-        Returns:
+        report_context = {
-
-        """
-        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")
-
-        context = {
-            "obj": ema,
             "qrcode": {
-                "img": qrcode.get_img(),
+                "img": qrcode_report.get_img(),
-                "url": qrcode.get_content(),
+                "url": qrcode_report.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
+        report_context.update(generic_compensation_report_context)
-        return render(request, self._TEMPLATE, context)
+        return report_context

ema/views/resubmission.py

@@ -5,22 +5,16 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib.auth.decorators import login_required
+from ema.forms import EmaResubmissionModalForm
-from django.utils.decorators import method_decorator
-
 from ema.models import Ema
-from konova.decorators import shared_access_required, conservation_office_group_required, login_required_modal
 from konova.views.resubmission import AbstractResubmissionView
 
 
 class EmaResubmissionView(AbstractResubmissionView):
-    model = Ema
+    _MODEL_CLS = Ema
-    redirect_url_base = "ema:detail"
+    _FORM_CLS = EmaResubmissionModalForm
-    form_action_url_base = "ema:resubmission-create"
+    _REDIRECT_URL = "ema:detail"
+    action_url = "ema:resubmission-create"
 
-    @method_decorator(login_required_modal)
+    def _user_has_permission(self, user, **kwargs):
-    @method_decorator(login_required)
+        return user.is_ets_user()
-    @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/share.py

@@ -5,29 +5,17 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib.auth.decorators import login_required
-from django.utils.decorators import method_decorator
-
 from ema.models import Ema
-from konova.decorators import conservation_office_group_required, shared_access_required, login_required_modal
 from konova.views.share import AbstractShareByTokenView, AbstractShareFormView
 
 
 class EmaShareByTokenView(AbstractShareByTokenView):
-    model = Ema
+    _MODEL_CLS = Ema
-    redirect_url = "ema:detail"
+    _REDIRECT_URL = "ema:detail"
-
-    @method_decorator(login_required)
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
-
 
 class EmaShareFormView(AbstractShareFormView):
-    model = Ema
+    _MODEL_CLS = Ema
+    _REDIRECT_URL = "ema:detail"
 
-    @method_decorator(login_required_modal)
+    def _user_has_permission(self, user, **kwargs):
-    @method_decorator(login_required)
+        return user.is_ets_user()
-    @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/state.py

@@ -5,46 +5,30 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib.auth.decorators import login_required
-from django.utils.decorators import method_decorator
-
 from ema.models import Ema
-from konova.decorators import conservation_office_group_required, shared_access_required, login_required_modal
 from konova.views.state import AbstractNewCompensationStateView, AbstractEditCompensationStateView, \
     AbstractRemoveCompensationStateView
 
 
 class NewEmaStateView(AbstractNewCompensationStateView):
-    model = Ema
+    _MODEL_CLS = Ema
-    redirect_url = "ema:detail"
+    _REDIRECT_URL = "ema:detail"
 
-    @method_decorator(login_required_modal)
+    def _user_has_permission(self, user, **kwargs):
-    @method_decorator(login_required)
+        return user.is_ets_user()
-    @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)
 
 
 class EditEmaStateView(AbstractEditCompensationStateView):
-    model = Ema
+    _MODEL_CLS = Ema
-    redirect_url = "ema:detail"
+    _REDIRECT_URL = "ema:detail"
 
-    @method_decorator(login_required_modal)
+    def _user_has_permission(self, user, **kwargs):
-    @method_decorator(login_required)
+        return user.is_ets_user()
-    @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)
 
 
 class RemoveEmaStateView(AbstractRemoveCompensationStateView):
-    model = Ema
+    _MODEL_CLS = Ema
-    redirect_url = "ema:detail"
+    _REDIRECT_URL = "ema:detail"
 
-    @method_decorator(login_required_modal)
+    def _user_has_permission(self, user, **kwargs):
-    @method_decorator(login_required)
+        return user.is_ets_user()
-    @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)

intervention/admin.py

@@ -37,14 +37,6 @@ 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/forms/modals/deduction.py

@@ -172,7 +172,8 @@ class EditEcoAccountDeductionModalForm(NewEcoAccountDeductionModalForm):
     deduction = None
 
     def __init__(self, *args, **kwargs):
-        self.deduction = kwargs.pop("deduction", None)
+        deduction_id = kwargs.pop("deduction_id", None)
+        self.deduction = EcoAccountDeduction.objects.get(id=deduction_id)
         super().__init__(*args, **kwargs)
         self.form_title = _("Edit Deduction")
         form_data = {
@@ -252,19 +253,20 @@ class RemoveEcoAccountDeductionModalForm(RemoveModalForm):
     Can be used for anything, where removing shall be confirmed by the user a second time.
 
     """
-    deduction = None
+    _DEDUCTION_OBJ = None
 
     def __init__(self, *args, **kwargs):
-        deduction = kwargs.pop("deduction", None)
+        deduction_id = kwargs.pop("deduction_id", None)
-        self.deduction = deduction
+        deduction = EcoAccountDeduction.objects.get(id=deduction_id)
+        self._DEDUCTION_OBJ = deduction
         super().__init__(*args, **kwargs)
 
     def save(self):
         with transaction.atomic():
-            self.deduction.intervention.mark_as_edited(self.user, edit_comment=DEDUCTION_REMOVED)
+            self._DEDUCTION_OBJ.intervention.mark_as_edited(self.user, edit_comment=DEDUCTION_REMOVED)
-            self.deduction.account.mark_as_edited(self.user, edit_comment=DEDUCTION_REMOVED)
+            self._DEDUCTION_OBJ.account.mark_as_edited(self.user, edit_comment=DEDUCTION_REMOVED)
-            self.deduction.delete()
+            self._DEDUCTION_OBJ.delete()
 
     def check_for_recorded_instance(self):
-        if self.deduction.intervention.is_recorded:
+        if self._DEDUCTION_OBJ.intervention.is_recorded:
             self.block_form()

intervention/forms/modals/document.py

@@ -6,11 +6,11 @@ Created on: 18.08.22
 
 """
 from intervention.models import InterventionDocument
-from konova.forms.modals import NewDocumentModalForm
+from konova.forms.modals import NewDocumentModalForm, EditDocumentModalForm, RemoveDocumentModalForm
 
 
 class NewInterventionDocumentModalForm(NewDocumentModalForm):
-    document_model = InterventionDocument
+    _DOCUMENT_CLS = InterventionDocument
 
     def save(self, *args, **kwargs):
         """ Extension of regular NewDocumentModalForm
@@ -28,3 +28,31 @@ class NewInterventionDocumentModalForm(NewDocumentModalForm):
         self.instance.send_data_to_egon()
 
         return doc
+
+class EditInterventionDocumentModalForm(EditDocumentModalForm):
+    _DOCUMENT_CLS = InterventionDocument
+
+    def save(self, *args, **kwargs):
+        """ Extension of regular EditDocumentModalForm
+
+        Checks whether payments exist on the intervention and sends the data to EGON
+
+        Args:
+            *args ():
+            **kwargs ():
+
+        Returns:
+
+        """
+        doc = super().save(*args, **kwargs)
+        self.instance.send_data_to_egon()
+
+        return doc
+
+
+class RemoveInterventionDocumentModalForm(RemoveDocumentModalForm):
+    _DOCUMENT_CLS = InterventionDocument
+
+    def save(self, *args, **kwargs):
+        super().save(*args, **kwargs)
+        self.instance.send_data_to_egon()

intervention/forms/modals/remove.py

@@ -0,0 +1,22 @@
+"""
+Author: Michel Peltriaux
+Created on: 08.11.25
+
+"""
+from django.shortcuts import get_object_or_404
+
+from compensation.models import Compensation
+from konova.forms.modals import RemoveModalForm
+
+
+class RemoveCompensationFromInterventionModalForm(RemoveModalForm):
+    """ Specific form for removing a compensation from an intervention
+
+    """
+    def __init__(self, *args, **kwargs):
+        # The 'instance' that is pushed into the constructor by the generic base class points to the
+        # intervention instead of the compensation, which shall be deleted. Therefore we need to fetch the compensation
+        # and replace the instance parameter with that object
+        instance = get_object_or_404(Compensation, id=kwargs.pop("comp_id"))
+        kwargs["instance"] = instance
+        super().__init__(*args, **kwargs)

intervention/forms/modals/resubmission.py

@@ -0,0 +1,11 @@
+"""
+Author: Michel Peltriaux
+Created on: 21.10.25
+
+"""
+from intervention.models import Intervention
+from konova.forms.modals import ResubmissionModalForm
+
+
+class InterventionResubmissionModalForm(ResubmissionModalForm):
+    _MODEL_CLS = Intervention

intervention/forms/modals/revocation.py

@@ -7,9 +7,10 @@ Created on: 18.08.22
 """
 from django import forms
 from django.core.exceptions import ObjectDoesNotExist
+from django.shortcuts import get_object_or_404
 from django.utils.translation import gettext_lazy as _
 
-from intervention.models import RevocationDocument
+from intervention.models import RevocationDocument, Revocation
 from konova.forms.modals import BaseModalForm, RemoveModalForm
 from konova.utils import validators
 from konova.utils.message_templates import REVOCATION_ADDED, REVOCATION_EDITED
@@ -75,7 +76,8 @@ class EditRevocationModalForm(NewRevocationModalForm):
     revocation = None
 
     def __init__(self, *args, **kwargs):
-        self.revocation = kwargs.pop("revocation", None)
+        revocation_id = kwargs.pop("revocation_id", None)
+        self.revocation = get_object_or_404(Revocation, id=revocation_id)
         super().__init__(*args, **kwargs)
         self.form_title = _("Edit revocation")
         try:
@@ -104,8 +106,8 @@ class RemoveRevocationModalForm(RemoveModalForm):
     revocation = None
 
     def __init__(self, *args, **kwargs):
-        revocation = kwargs.pop("revocation", None)
+        revocation_id = kwargs.pop("revocation_id", None)
-        self.revocation = revocation
+        self.revocation = get_object_or_404(Revocation, id=revocation_id)
         super().__init__(*args, **kwargs)
 
     def save(self):

intervention/tables.py

@@ -127,7 +127,7 @@ class InterventionTable(BaseTable, TableRenderMixin, TableOrderMixin):
             html += self.render_previously_checked_star(
                 tooltip=tooltip,
             )
-        return format_html(html, None)
+        return format_html(html)
 
     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, None)
+        return format_html(html)
 

intervention/tests/unit/test_forms.py

@@ -280,7 +280,7 @@ class EditRevocationModalFormTestCase(NewRevocationModalFormTestCase):
             data,
             request=self.request,
             instance=self.intervention,
-            revocation=self.revoc
+            revocation_id=self.revoc.id
         )
         self.assertTrue(form.is_valid(), msg=form.errors)
         obj = form.save()
@@ -302,7 +302,7 @@ class RemoveRevocationModalFormTestCase(EditRevocationModalFormTestCase):
         form = RemoveRevocationModalForm(
             request=self.request,
             instance=self.intervention,
-            revocation=self.revoc,
+            revocation_id=self.revoc.id,
         )
         self.assertEqual(form.instance, self.intervention)
         self.assertEqual(form.revocation, self.revoc)
@@ -317,7 +317,7 @@ class RemoveRevocationModalFormTestCase(EditRevocationModalFormTestCase):
             data,
             request=self.request,
             instance=self.intervention,
-            revocation=self.revoc
+            revocation_id=self.revoc.id
         )
         self.assertTrue(form.is_valid(), msg=form.errors)
         form.save()

intervention/urls.py

@@ -14,32 +14,30 @@ from intervention.views.deduction import NewInterventionDeductionView, EditInter
     RemoveInterventionDeductionView
 from intervention.views.document import NewInterventionDocumentView, GetInterventionDocumentView, \
     RemoveInterventionDocumentView, EditInterventionDocumentView
-from intervention.views.intervention import IndexInterventionView, InterventionIdentifierGeneratorView, \
+from intervention.views.intervention import InterventionIndexView, InterventionIdentifierGeneratorView, \
-    NewInterventionView, EditInterventionView
+    InterventionDetailView, NewInterventionFormView, EditInterventionFormView, RemoveInterventionView
-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 InterventionPublicReportView
+from intervention.views.report import InterventionReportView
 from intervention.views.resubmission import InterventionResubmissionView
-from intervention.views.revocation import NewInterventionRevocationView, GetInterventionRevocationView, \
+from intervention.views.revocation import NewRevocationView, GetRevocationDocumentView, EditRevocationView, \
-    EditInterventionRevocationView, RemoveInterventionRevocationView
+    RemoveRevocationView
 from intervention.views.share import InterventionShareFormView, InterventionShareByTokenView
 
 app_name = "intervention"
 urlpatterns = [
-    path("", IndexInterventionView.as_view(), name="index"),
+    path("", InterventionIndexView.as_view(), name="index"),
-    path('new/', NewInterventionView.as_view(), name='new'),
+    path('new/', NewInterventionFormView.as_view(), name='new'),
     path('new/id', InterventionIdentifierGeneratorView.as_view(), name='new-id'),
-    path('<id>', DetailInterventionView.as_view(), name='detail'),
+    path('<id>', InterventionDetailView.as_view(), name='detail'),
     path('<id>/log', InterventionLogView.as_view(), name='log'),
-    path('<id>/edit', EditInterventionView.as_view(), name='edit'),
+    path('<id>/edit', EditInterventionFormView.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', InterventionCheckView.as_view(), name='check'),
     path('<id>/record', InterventionRecordView.as_view(), name='record'),
-    path('<id>/report', InterventionPublicReportView.as_view(), name='report'),
+    path('<id>/report', InterventionReportView.as_view(), name='report'),
     path('<id>/resub', InterventionResubmissionView.as_view(), name='resubmission-create'),
 
     # Compensations
@@ -57,10 +55,10 @@ urlpatterns = [
     path('<id>/deduction/<deduction_id>/remove', RemoveInterventionDeductionView.as_view(), name='remove-deduction'),
 
     # Revocation routes
-    path('<id>/revocation/new', NewInterventionRevocationView.as_view(), name='new-revocation'),
+    path('<id>/revocation/new', NewRevocationView.as_view(), name='new-revocation'),
-    path('<id>/revocation/<revocation_id>/edit', EditInterventionRevocationView.as_view(), name='edit-revocation'),
+    path('<id>/revocation/<revocation_id>/edit', EditRevocationView.as_view(), name='edit-revocation'),
-    path('<id>/revocation/<revocation_id>/remove', RemoveInterventionRevocationView.as_view(), name='remove-revocation'),
+    path('<id>/revocation/<revocation_id>/remove', RemoveRevocationView.as_view(), name='remove-revocation'),
-    path('revocation/<doc_id>', GetInterventionRevocationView.as_view(), name='get-doc-revocation'),
+    path('revocation/<doc_id>', GetRevocationDocumentView.as_view(), name='get-doc-revocation'),
 
     # Autocomplete
     path("atcmplt/interventions", InterventionAutocomplete.as_view(), name="autocomplete"),

intervention/views/check.py

@@ -6,43 +6,23 @@ Created on: 19.08.22
 
 """
 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.views.modal import AbstractModalFormView
-from konova.utils.message_templates import INTERVENTION_INVALID
 
-class InterventionCheckView(LoginRequiredMixin, View):
 
-    def __process_request(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+class InterventionCheckView(LoginRequiredMixin, AbstractModalFormView):
-        """ Renders check form for an intervention
+    _MODEL_CLS = Intervention
+    _FORM_CLS = CheckModalForm
+    _MSG_SUCCESS = _("Check performed")
+    _REDIRECT_URL = "intervention:detail"
 
-        Args:
+    def _user_has_permission(self, user, **kwargs):
-            request (HttpRequest): The incoming request
+        return user.is_zb_user()
-            id (str): Intervention's id
 
-        Returns:
+    def _get_redirect_url(self, *args, **kwargs):
-
+        redirect_url = super()._get_redirect_url(*args, **kwargs)
-        """
+        redirect_url += "#related_data"
-        intervention = get_object_or_404(Intervention, id=id)
+        return redirect_url
-        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

@@ -6,49 +6,35 @@ Created on: 19.08.22
 
 """
 from django.contrib.auth.mixins import LoginRequiredMixin
-from django.core.exceptions import ObjectDoesNotExist
-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 compensation.models import Compensation
+from intervention.forms.modals.remove import RemoveCompensationFromInterventionModalForm
 from intervention.models import Intervention
-from konova.decorators import shared_access_required
-from konova.forms.modals import RemoveModalForm
 from konova.utils.message_templates import COMPENSATION_REMOVED_TEMPLATE
+from konova.views.remove import BaseRemoveModalFormView
 
 
-class RemoveCompensationFromInterventionView(LoginRequiredMixin, View):
+class RemoveCompensationFromInterventionView(LoginRequiredMixin, BaseRemoveModalFormView):
+    _MODEL_CLS = Intervention
+    _FORM_CLS = RemoveCompensationFromInterventionModalForm
+    _MSG_SUCCESS = COMPENSATION_REMOVED_TEMPLATE
+    _REDIRECT_URL = "intervention:detail"
 
-    def __process_request(self, request: HttpRequest, id: str, comp_id: str, *args, **kwargs) -> HttpResponse:
+    def _user_has_shared_access(self, user, **kwargs):
-        """ Renders a modal view for removing the compensation
+        compensation_id = kwargs.get("comp_id", None)
+        compensation = get_object_or_404(Compensation, id=compensation_id)
+        return compensation.is_shared_with(user)
 
-        Args:
+    def _user_has_permission(self, user, **kwargs):
-            request (HttpRequest): The incoming request
+        return user.is_default_user()
-            id (str): The compensation's id
 
-        Returns:
+    def _get_msg_success(self, *args, **kwargs):
+        compensation_id = kwargs.get("comp_id", None)
+        compensation = get_object_or_404(Compensation, id=compensation_id)
+        return self._MSG_SUCCESS.format(compensation.identifier)
 
-        """
+    def _get_redirect_url(self, *args, **kwargs):
-        intervention = get_object_or_404(Intervention, id=id)
+        obj = kwargs.get("obj")
-        try:
+        return reverse(self._REDIRECT_URL, args=(obj.id,)) + "#related_data"
-            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",
-        )
-
-    @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/deduction.py

@@ -5,51 +5,27 @@ 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.utils.decorators import method_decorator
 
 from intervention.models import Intervention
-from konova.decorators import default_group_required, shared_access_required
+from konova.utils.message_templates import DEDUCTION_ADDED, DEDUCTION_EDITED, DEDUCTION_REMOVED
 from konova.views.deduction import AbstractNewDeductionView, AbstractEditDeductionView, AbstractRemoveDeductionView
 
+_INTERVENTION_DETAIL_URL_NAME = "intervention:detail"
 
-class NewInterventionDeductionView(AbstractNewDeductionView):
+class NewInterventionDeductionView(LoginRequiredMixin, AbstractNewDeductionView):
-    def _custom_check(self, obj):
+    _MODEL_CLS = Intervention
-        pass
+    _MSG_SUCCESS = DEDUCTION_ADDED
-
+    _REDIRECT_URL = _INTERVENTION_DETAIL_URL_NAME
-    model = Intervention
-    redirect_url = "intervention:detail"
-
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(Intervention, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
 
 
-class EditInterventionDeductionView(AbstractEditDeductionView):
+class EditInterventionDeductionView(LoginRequiredMixin, AbstractEditDeductionView):
-    def _custom_check(self, obj):
+    _MODEL_CLS = Intervention
-        pass
+    _MSG_SUCCESS = DEDUCTION_EDITED
-
+    _REDIRECT_URL = _INTERVENTION_DETAIL_URL_NAME
-    model = Intervention
-    redirect_url = "intervention:detail"
-
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(Intervention, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
 
 
-class RemoveInterventionDeductionView(AbstractRemoveDeductionView):
+class RemoveInterventionDeductionView(LoginRequiredMixin, AbstractRemoveDeductionView):
-    def _custom_check(self, obj):
+    _MODEL_CLS = Intervention
-        pass
+    _MSG_SUCCESS = DEDUCTION_REMOVED
-
+    _REDIRECT_URL = _INTERVENTION_DETAIL_URL_NAME
-    model = Intervention
-    redirect_url = "intervention:detail"
-
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(Intervention, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)

intervention/views/detail.py

@@ -1,79 +0,0 @@
-"""
-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/document.py

@@ -5,59 +5,33 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib.auth.decorators import login_required
+from intervention.forms.modals.document import NewInterventionDocumentModalForm, EditInterventionDocumentModalForm, \
-from django.utils.decorators import method_decorator
+    RemoveInterventionDocumentModalForm
-
-from intervention.forms.modals.document import NewInterventionDocumentModalForm
 from intervention.models import Intervention, InterventionDocument
-from konova.decorators import default_group_required, shared_access_required
-from konova.forms.modals import EditDocumentModalForm
 from konova.views.document import AbstractNewDocumentView, AbstractGetDocumentView, AbstractRemoveDocumentView, \
     AbstractEditDocumentView
 
 
 class NewInterventionDocumentView(AbstractNewDocumentView):
-    model = Intervention
+    _MODEL_CLS = Intervention
-    form = NewInterventionDocumentModalForm
+    _DOCUMENT_MODEL = InterventionDocument
-    redirect_url = "intervention:detail"
+    _FORM_CLS = NewInterventionDocumentModalForm
-
+    _REDIRECT_URL = "intervention:detail"
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(Intervention, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
 
 
 class GetInterventionDocumentView(AbstractGetDocumentView):
-    model = Intervention
+    _MODEL_CLS = Intervention
-    document_model = InterventionDocument
+    _DOCUMENT_CLS = InterventionDocument
-
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(Intervention, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
 
 
 class RemoveInterventionDocumentView(AbstractRemoveDocumentView):
-    model = Intervention
+    _MODEL_CLS = Intervention
-    document_model = InterventionDocument
+    _DOCUMENT_CLS = InterventionDocument
-
+    _FORM_CLS = RemoveInterventionDocumentModalForm
-    @method_decorator(login_required)
+    _REDIRECT_URL = "intervention:detail"
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(Intervention, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)
-
 
 class EditInterventionDocumentView(AbstractEditDocumentView):
-    model = Intervention
+    _MODEL_CLS = Intervention
-    document_model = InterventionDocument
+    _DOCUMENT_CLS = InterventionDocument
-    form = EditDocumentModalForm
+    _FORM_CLS = EditInterventionDocumentModalForm
-    redirect_url = "intervention:detail"
+    _REDIRECT_URL = "intervention:detail"
-
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(Intervention, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)

intervention/views/intervention.py

@@ -5,229 +5,111 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib import messages
-from django.contrib.auth.decorators import login_required
 from django.contrib.auth.mixins import LoginRequiredMixin
-from django.http import HttpRequest, HttpResponse
+from django.shortcuts import get_object_or_404
-from django.shortcuts import get_object_or_404, render, redirect
-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.utils.message_templates import DATA_CHECKED_PREVIOUSLY_TEMPLATE
-from konova.decorators import default_group_required, shared_access_required
-from konova.forms import SimpleGeomForm
-from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
-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.form import AbstractNewGeometryFormView, AbstractEditGeometryFormView
 from konova.views.index import AbstractIndexView
+from konova.views.detail import BaseDetailView
+from konova.views.remove import BaseRemoveModalFormView
 
 
-class IndexInterventionView(AbstractIndexView):
+class InterventionIndexView(LoginRequiredMixin, AbstractIndexView):
-    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
+    _INDEX_TABLE_CLS = InterventionTable
-        """
+    _TAB_TITLE = _("Interventions - Overview")
-        Renders the index view for Interventions
 
-        Args:
+    def _get_queryset(self):
-            request (HttpRequest): The incoming request
+        qs = Intervention.objects.filter(
-
+            deleted=None,
-        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(
+        return qs
-            request=request,
+
-            queryset=interventions
+
+class NewInterventionFormView(AbstractNewGeometryFormView):
+    _MODEL_CLS = Intervention
+    _FORM_CLS = NewInterventionForm
+    _TEMPLATE = "intervention/form/view.html"
+    _REDIRECT_URL = "intervention:detail"
+    _TAB_TITLE = _("New intervention")
+
+
+class EditInterventionFormView(AbstractEditGeometryFormView):
+    _MODEL_CLS = Intervention
+    _FORM_CLS = EditInterventionForm
+    _TEMPLATE = "intervention/form/view.html"
+    _REDIRECT_URL = "intervention:detail"
+    _TAB_TITLE = _("Edit {}")
+
+
+class InterventionIdentifierGeneratorView(LoginRequiredMixin, AbstractIdentifierGeneratorView):
+    _MODEL_CLS = Intervention
+    _REDIRECT_URL = "intervention:index"
+
+
+class InterventionDetailView(BaseDetailView):
+    _MODEL_CLS = Intervention
+    _TEMPLATE = "intervention/detail/view.html"
+
+    def _get_object(self, id: str):
+        """ Returns the intervention
+
+        Args:
+            id (str): The intervention's id
+
+        Returns:
+            obj (Intervention): The intervention
+        """
+        # Fetch data, filter out deleted related data
+        obj = get_object_or_404(
+            self._MODEL_CLS.objects.select_related(
+                "geometry",
+                "legal",
+                "responsible",
+            ).prefetch_related(
+                "legal__revocations",
+            ),
+            id=id,
+            deleted=None
         )
-        context = {
+        return obj
-            "table": table,
-            TAB_TITLE_IDENTIFIER: _("Interventions - Overview"),
-        }
-        context = BaseContext(request, context).context
-        return render(request, self._TEMPLATE, context)
 
-
+    def _get_detail_context(self, obj: Intervention):
-class NewInterventionView(LoginRequiredMixin, View):
+        """ Generate object specific detail context for  view
-    _TEMPLATE = "intervention/form/view.html"
-
-    @method_decorator(default_group_required)
-    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
-
-        """
-        Renders a view for a new intervention creation
 
         Args:
-            request (HttpRequest): The incoming request
+            obj (): The record
 
         Returns:
 
         """
-        data_form = NewInterventionForm()
+        compensations = obj.compensations.filter(deleted=None)
-        geom_form = SimpleGeomForm(read_only=False)
+        last_checked = obj.get_last_checked_action()
-        context = {
+        last_checked_tooltip = ""
-            "form": data_form,
+        if last_checked:
-            "geom_form": geom_form,
+            last_checked_tooltip = DATA_CHECKED_PREVIOUSLY_TEMPLATE.format(
-            TAB_TITLE_IDENTIFIER: _("New intervention"),
+                last_checked.get_timestamp_str_formatted(),
-        }
+                last_checked.user
-        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)
-
-        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)
-            if generated_identifier != intervention.identifier:
-                messages.info(
-                    request,
-                    IDENTIFIER_REPLACED.format(
-                        generated_identifier,
-                        intervention.identifier
-                    )
-                )
-
-            messages.success(request, _("Intervention {} added").format(intervention.identifier))
-            if geom_form.has_geometry_simplified():
-                messages.info(
-                    request,
-                    GEOMETRY_SIMPLIFIED
-                )
-
-            num_ignored_geometries = geom_form.get_num_geometries_ignored()
-            if num_ignored_geometries > 0:
-                messages.info(
-                    request,
-                    GEOMETRIES_IGNORED_TEMPLATE.format(num_ignored_geometries)
-                )
-            return redirect("intervention:detail", id=intervention.id)
-
-        else:
-            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)
-
-
-class InterventionIdentifierGeneratorView(AbstractIdentifierGeneratorView):
-    _MODEL = Intervention
-
-
-class EditInterventionView(LoginRequiredMixin, View):
-    _TEMPLATE = "intervention/form/view.html"
-
-    @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
-
-        Args:
-            request (HttpRequest): The incoming request
-            id (str): The intervention identifier
-
-        Returns:
-            HttpResponse: The rendered view
-        """
-
-        # Get object from db
-        intervention = get_object_or_404(Intervention, id=id)
-        if intervention.is_recorded:
-            messages.info(
-                request,
-                RECORDED_BLOCKS_EDIT
             )
-            return redirect("intervention:detail", id=id)
 
-        # Create forms, initialize with values from db/from POST request
+        has_payment_without_document = obj.payments.exists() and not obj.get_documents()[1].exists()
-        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,
+            "last_checked": last_checked,
-            "geom_form": geom_form,
+            "last_checked_tooltip": last_checked_tooltip,
-            TAB_TITLE_IDENTIFIER: _("Edit {}").format(intervention.identifier),
+            "compensations": compensations,
+            "has_payment_without_document": has_payment_without_document,
         }
-        context = BaseContext(request, context).context
+        return context
-        return render(request, self._TEMPLATE, context)
 
-
+class RemoveInterventionView(LoginRequiredMixin, BaseRemoveModalFormView):
-    @method_decorator(default_group_required)
+    _MODEL_CLS = Intervention
-    @method_decorator(shared_access_required(Intervention, "id"))
+    _REDIRECT_URL = "intervention:index"
-    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
-            intervention_is_checked = intervention.checked is not None
-            intervention = data_form.save(request.user, geom_form)
-            messages.success(request, _("Intervention {} edited").format(intervention.identifier))
-            if intervention_is_checked:
-                messages.info(request, CHECK_STATE_RESET)
-            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)
-        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/log.py

@@ -5,19 +5,11 @@ 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.utils.decorators import method_decorator
 
 from intervention.models import Intervention
-from konova.decorators import shared_access_required, default_group_required
 from konova.views.log import AbstractLogView
 
 
-class InterventionLogView(AbstractLogView):
+class InterventionLogView(LoginRequiredMixin, AbstractLogView):
-    model = Intervention
+    _MODEL_CLS = Intervention
-
-    @method_decorator(login_required)
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(Intervention, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)

intervention/views/record.py

@@ -5,19 +5,12 @@ 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.utils.decorators import method_decorator
 
 from intervention.models import Intervention
-from konova.decorators import conservation_office_group_required, shared_access_required
 from konova.views.record import AbstractRecordView
 
 
-class InterventionRecordView(AbstractRecordView):
+class InterventionRecordView(LoginRequiredMixin, AbstractRecordView):
-    model = Intervention
+    _MODEL_CLS = Intervention
-
+    _REDIRECT_URL = "intervention:detail"
-    @method_decorator(login_required)
-    @method_decorator(conservation_office_group_required)
-    @method_decorator(shared_access_required(Intervention, "id"))
-    def dispatch(self, request, *args, **kwargs):
-        return super().dispatch(request, *args, **kwargs)

intervention/views/remove.py

@@ -1,20 +0,0 @@
-"""
-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)