Switch to githubb.com for actions loaded

.env.sample

@@ -1,48 +0,0 @@
-# General
-SECRET_KEY=CHANGE_ME
-DEBUG=True
-ALLOWED_HOSTS=127.0.0.1,localhost,example.org
-BASE_URL=http://localhost:8002
-ADMINS=Admin1:mail@example.org,Admin2:mail2@example.org
-
-# Database
-DB_USER=postgres
-DB_PASSWORD=
-DB_NAME=konova
-DB_HOST=127.0.0.1
-DB_PORT=5432
-
-# Redis (for celery)
-REDIS_HOST=CHANGE_ME
-REDIS_PORT=CHANGE_ME
-
-# E-Mail
-SMTP_HOST=localhost
-SMTP_PORT=25
-REPLY_TO_ADDR=ksp-servicestelle@sgdnord.rlp.de
-DEFAULT_FROM_EMAIL=service@ksp.de
-
-# Proxy
-PROXY=CHANGE_ME
-MAP_PROXY_HOST_WHITELIST=CHANGE_ME_1,CHANGE_ME_2
-GEOPORTAL_RLP_USER=CHANGE_ME
-GEOPORTAL_RLP_PASSWORD=CHANGE_ME
-
-# Schneider
-SCHNEIDER_BASE_URL=https://schneider.naturschutz.rlp.de
-SCHNEIDER_AUTH_TOKEN=CHANGE_ME
-SCHNEIDER_AUTH_HEADER=auth
-
-# SSO
-SSO_SERVER_BASE_URL=https://login.naturschutz.rlp.de
-OAUTH_CODE_VERIFIER=CHANGE_ME
-OAUTH_CLIENT_ID=CHANGE_ME
-OAUTH_CLIENT_SECRET=CHANGE_ME
-PROPAGATION_SECRET=CHANGE_ME
-
-# RabbitMQ
-## For connections to EGON
-EGON_RABBITMQ_HOST=CHANGE_ME
-EGON_RABBITMQ_PORT=CHANGE_ME
-EGON_RABBITMQ_USER=CHANGE_ME
-EGON_RABBITMQ_PW=CHANGE_ME

.gitea/workflows/demo.yaml

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

.gitignore

@@ -3,4 +3,3 @@
 /.idea/
 /.coverage
 /htmlcov/
-/.env

api/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from api.models.token import APIUserToken, OAuthToken
+from api.models.token import APIUserToken
 
 
 class APITokenAdmin(admin.ModelAdmin):
@@ -17,17 +17,4 @@ class APITokenAdmin(admin.ModelAdmin):
     ]
 
 
-class OAuthTokenAdmin(admin.ModelAdmin):
-    list_display = [
-        "access_token",
-        "refresh_token",
-        "expires_on",
-    ]
-    search_fields = [
-        "access_token",
-        "refresh_token",
-    ]
-
-
 admin.site.register(APIUserToken, APITokenAdmin)
-admin.site.register(OAuthToken, OAuthTokenAdmin)

api/migrations/0003_oauthtoken.py

@@ -1,26 +0,0 @@
-# Generated by Django 5.0.4 on 2024-04-30 07:20
-
-import uuid
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('api', '0002_alter_apiusertoken_valid_until'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='OAuthToken',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
-                ('access_token', models.CharField(db_comment='OAuth access token', max_length=255)),
-                ('refresh_token', models.CharField(db_comment='OAuth refresh token', max_length=255)),
-                ('expires_on', models.DateTimeField(db_comment='When the token will be expired')),
-        ],
-            options={
-                'abstract': False,
-            },
-        ),
-    ]

api/models/token.py

@@ -1,14 +1,7 @@
-import json
-from datetime import timedelta
-
-import requests
 from django.core.exceptions import ObjectDoesNotExist
 from django.db import models
 from django.utils import timezone
-from django.utils.timezone import now
 
-from konova.models import UuidModel
-from konova.sub_settings.sso_settings import OAUTH_CLIENT_ID, OAUTH_CLIENT_SECRET, SSO_SERVER_BASE
 from konova.utils.generators import generate_token
 
 
@@ -51,129 +44,5 @@ class APIUserToken(models.Model):
             if token_obj.valid_until is not None and token_obj.valid_until < _today:
                 raise PermissionError("Token validity expired")
         except ObjectDoesNotExist:
-            raise PermissionError("Token unknown")
+            raise PermissionError("Credentials invalid")
         return token_obj.user
-
-
-class OAuthToken(UuidModel):
-    access_token = models.CharField(
-        max_length=255,
-        blank=False,
-        null=False,
-        db_comment="OAuth access token"
-    )
-    refresh_token = models.CharField(
-        max_length=255,
-        blank=False,
-        null=False,
-        db_comment="OAuth refresh token"
-    )
-    expires_on = models.DateTimeField(
-        db_comment="When the token will be expired"
-    )
-
-    ASSUMED_LATENCY = 1000  # assumed latency between creation and receiving of an access token
-
-    def __str__(self):
-        return str(self.access_token)
-
-    @staticmethod
-    def from_access_token_response(access_token_data: str, received_on):
-        """
-        Creates an OAuthToken based on retrieved access token data (OAuth2.0 specification)
-
-        Args:
-            access_token_data (str): OAuth2.0 response data
-            received_on (): Timestamp when the response has been received
-
-        Returns:
-
-        """
-        oauth_token = OAuthToken()
-        data = json.loads(access_token_data)
-
-        oauth_token.access_token = data.get("access_token")
-        oauth_token.refresh_token = data.get("refresh_token")
-
-        expires_on = received_on + timedelta(
-            seconds=(data.get("expires_in") + OAuthToken.ASSUMED_LATENCY)
-        )
-        oauth_token.expires_on = expires_on
-
-        return oauth_token
-
-    def refresh(self):
-        url = f"{SSO_SERVER_BASE}o/token/"
-        params = {
-            "grant_type": "refresh_token",
-            "refresh_token": self.refresh_token,
-            "client_id": OAUTH_CLIENT_ID,
-            "client_secret": OAUTH_CLIENT_SECRET
-        }
-        response = requests.post(
-            url,
-            params
-        )
-        _now = now()
-        is_response_invalid = response.status_code != 200
-        if is_response_invalid:
-            raise RuntimeError(f"Refreshing token not possible: {response.status_code}")
-
-        response_content = response.content.decode("utf-8")
-        response_content = json.loads(response_content)
-
-        access_token = response_content.get("access_token")
-        refresh_token = response_content.get("refresh_token")
-        expires_in = response_content.get("expires")
-
-        self.access_token = access_token
-        self.refresh_token = refresh_token
-        self.expires_in = expires_in
-        self.save()
-
-        return self
-
-    def update_and_get_user(self):
-        from user.models import User
-        url = f"{SSO_SERVER_BASE}users/oauth/data/"
-
-        access_token = self.access_token
-        response = requests.get(
-            url,
-            headers={
-                "Authorization": f"Bearer {access_token}",
-            }
-        )
-
-        is_response_code_invalid = response.status_code != 200
-        if is_response_code_invalid:
-            raise RuntimeError(f"OAuth user data fetching unsuccessful: {response.status_code}")
-
-        response_content = response.content.decode("utf-8")
-        response_content = json.loads(response_content)
-        user = User.oauth_update_user(response_content)
-
-        return user
-
-    def revoke(self) -> int:
-        """ Revokes the OAuth2 token of the user
-
-        (/o/revoke_token/ indeed removes the corresponding access token on provider side and invalidates the
-        submitted refresh token in one step)
-
-        Returns:
-            revocation_status_code (int): HTTP status code for revocation of refresh_token
-        """
-        revoke_url = f"{SSO_SERVER_BASE}o/revoke_token/"
-        token = self.refresh_token
-        revocation_status_code = requests.post(
-                revoke_url,
-                data={
-                    'token': token,
-                    'token_type_hint': "refresh_token",
-                },
-                auth=(OAUTH_CLIENT_ID, OAUTH_CLIENT_SECRET),
-            ).status_code
-
-        return revocation_status_code
-

api/tests/v1/update/test_api_update.py

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

api/utils/serializer/serializer.py

@@ -11,9 +11,8 @@ from abc import abstractmethod
 from django.contrib.gis import geos
 from django.contrib.gis.geos import GEOSGeometry
 from django.core.paginator import Paginator
-from django.db.models import Q
 
-from konova.models import Geometry
+from konova.sub_settings.lanis_settings import DEFAULT_SRID_RLP
 from konova.utils.message_templates import DATA_UNSHARED
 
 
@@ -33,8 +32,8 @@ class AbstractModelAPISerializer:
         self.lookup = {
             "id": None,  # must be set
             "deleted__isnull": True,
+            "users__in": [],  # must be set
         }
-        self.shared_lookup = Q()  # must be set, so user or team based share will be used properly
         super().__init__(*args, **kwargs)
 
     @abstractmethod
@@ -77,11 +76,7 @@ class AbstractModelAPISerializer:
         else:
             # Return certain object
             self.lookup["id"] = _id
-
-        self.shared_lookup = Q(
-            Q(users__in=[user]) |
-            Q(teams__in=list(user.shared_teams))
-        )
+        self.lookup["users__in"] = [user]
 
     def fetch_and_serialize(self):
         """ Serializes the model entry according to the given lookup data
@@ -91,13 +86,7 @@ class AbstractModelAPISerializer:
         Returns:
             serialized_data (dict)
         """
-        entries = self.model.objects.filter(
-            **self.lookup
-        ).filter(
-            self.shared_lookup
-        ).order_by(
-            "id"
-        ).distinct()
+        entries = self.model.objects.filter(**self.lookup).order_by("id")
         self.paginator = Paginator(entries, self.rpp)
         requested_entries = self.paginator.page(self.page_number)
 
@@ -145,8 +134,8 @@ class AbstractModelAPISerializer:
         if isinstance(geojson, dict):
             geojson = json.dumps(geojson)
         geometry = geos.fromstr(geojson)
-        geometry = Geometry.cast_to_rlp_srid(geometry)
-        geometry = Geometry.cast_to_multipolygon(geometry)
+        if geometry.srid != DEFAULT_SRID_RLP:
+            geometry.transform(DEFAULT_SRID_RLP)
         return geometry
 
     def _get_obj_from_db(self, id, user):

api/utils/serializer/v1/compensation.py

@@ -6,7 +6,6 @@ Created on: 24.01.22
 
 """
 from django.db import transaction
-from django.db.models import Q
 
 from api.utils.serializer.v1.serializer import AbstractModelAPISerializerV1, AbstractCompensationAPISerializerV1Mixin
 from compensation.models import Compensation
@@ -22,10 +21,8 @@ class CompensationAPISerializerV1(AbstractModelAPISerializerV1, AbstractCompensa
 
     def prepare_lookup(self, id, user):
         super().prepare_lookup(id, user)
-        self.shared_lookup = Q(
-            Q(intervention__users__in=[user]) |
-            Q(intervention__teams__in=user.shared_teams)
-        )
+        del self.lookup["users__in"]
+        self.lookup["intervention__users__in"] = [user]
 
     def intervention_to_json(self, entry):
         return {

api/utils/serializer/v1/deduction.py

@@ -6,7 +6,6 @@ Created on: 28.01.22
 
 """
 from django.core.exceptions import ObjectDoesNotExist
-from django.db.models import Q
 
 from api.utils.serializer.v1.serializer import DeductableAPISerializerV1Mixin, AbstractModelAPISerializerV1
 from compensation.models import EcoAccountDeduction, EcoAccount
@@ -29,11 +28,9 @@ class DeductionAPISerializerV1(AbstractModelAPISerializerV1,
 
         """
         super().prepare_lookup(_id, user)
+        del self.lookup["users__in"]
         del self.lookup["deleted__isnull"]
-        self.shared_lookup = Q(
-            Q(intervention__users__in=[user]) |
-            Q(intervention__teams__in=user.shared_teams)
-        )
+        self.lookup["intervention__users__in"] = [user]
 
     def _model_to_geo_json(self, entry):
         """ Adds the basic data

api/utils/serializer/v1/serializer.py

@@ -16,8 +16,7 @@ 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, \
     CODELIST_LAW_ID, CODELIST_REGISTRATION_OFFICE_ID, CODELIST_CONSERVATION_OFFICE_ID, \
-    CODELIST_COMPENSATION_ACTION_DETAIL_ID, CODELIST_HANDLER_ID, \
-    CODELIST_BIOTOPES_EXTRA_CODES_FULL_ID
+    CODELIST_COMPENSATION_ACTION_DETAIL_ID, CODELIST_BIOTOPES_EXTRA_CODES_ID, CODELIST_HANDLER_ID
 from compensation.models import CompensationAction, UnitChoices, CompensationState
 from intervention.models import Responsibility, Legal, Handler
 from konova.models import Deadline, DeadlineType
@@ -348,7 +347,7 @@ class AbstractCompensationAPISerializerV1Mixin:
             try:
                 biotope_type = entry["biotope"]
                 biotope_details = [
-                    self._konova_code_from_json(e, CODELIST_BIOTOPES_EXTRA_CODES_FULL_ID) for e in entry["biotope_details"]
+                    self._konova_code_from_json(e, CODELIST_BIOTOPES_EXTRA_CODES_ID) for e in entry["biotope_details"]
                 ]
                 surface = float(entry["surface"])
             except KeyError:

api/views/v1/views.py

@@ -23,6 +23,11 @@ class AbstractAPIViewV1(AbstractAPIView):
     """
 
     def __init__(self, *args, **kwargs):
+        self.lookup = {
+            "id": None,  # must be set in subclasses
+            "deleted__isnull": True,
+            "users__in": [],  # must be set in subclasses
+        }
         super().__init__(*args, **kwargs)
         self.serializer = self.serializer()
 

api/views/views.py

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

codelist/autocomplete/biotope.py

@@ -9,8 +9,7 @@ import collections
 
 from django.core.exceptions import ImproperlyConfigured
 
-from codelist.settings import CODELIST_BIOTOPES_ID, \
-    CODELIST_BIOTOPES_EXTRA_CODES_FULL_ID
+from codelist.settings import CODELIST_BIOTOPES_ID, CODELIST_BIOTOPES_EXTRA_CODES_ID
 from codelist.autocomplete.base import KonovaCodeAutocomplete
 from konova.utils.message_templates import UNGROUPED
 
@@ -85,11 +84,11 @@ class BiotopeExtraCodeAutocomplete(KonovaCodeAutocomplete):
     Due to limitations of the django dal package, we need to subclass for each code list
     """
     group_by_related = "parent"
-    related_field_name = "short_name"
+    related_field_name = "long_name"
     paginate_by = 200
 
     def __init__(self, *args, **kwargs):
-        self.c = CODELIST_BIOTOPES_EXTRA_CODES_FULL_ID
+        self.c = CODELIST_BIOTOPES_EXTRA_CODES_ID
         super().__init__(*args, **kwargs)
 
     def order_by(self, qs):
@@ -104,11 +103,8 @@ class BiotopeExtraCodeAutocomplete(KonovaCodeAutocomplete):
             qs (QuerySet): The ordered queryset
         """
         return qs.order_by(
-            "short_name",
+            "long_name",
         )
 
     def get_result_label(self, result):
         return f"{result.long_name} ({result.short_name})"
-
-    def get_selected_result_label(self, result):
-        return f"{result.parent.short_name} > {result.long_name} ({result.short_name})"

codelist/management/commands/update_codelist.py

@@ -13,7 +13,7 @@ from codelist.settings import CODELIST_INTERVENTION_HANDLER_ID, CODELIST_CONSERV
     CODELIST_REGISTRATION_OFFICE_ID, CODELIST_BIOTOPES_ID, CODELIST_LAW_ID, CODELIST_HANDLER_ID, \
     CODELIST_COMPENSATION_ACTION_ID, CODELIST_COMPENSATION_ACTION_CLASS_ID, CODELIST_COMPENSATION_ADDITIONAL_TYPE_ID, \
     CODELIST_BASE_URL, CODELIST_PROCESS_TYPE_ID, CODELIST_BIOTOPES_EXTRA_CODES_ID, \
-    CODELIST_COMPENSATION_ACTION_DETAIL_ID, CODELIST_BIOTOPES_EXTRA_CODES_FULL_ID
+    CODELIST_COMPENSATION_ACTION_DETAIL_ID
 from konova.management.commands.setup import BaseKonovaCommand
 from konova.settings import PROXIES
 
@@ -34,7 +34,6 @@ class Command(BaseKonovaCommand):
                 CODELIST_REGISTRATION_OFFICE_ID,
                 CODELIST_BIOTOPES_ID,
                 CODELIST_BIOTOPES_EXTRA_CODES_ID,
-                CODELIST_BIOTOPES_EXTRA_CODES_FULL_ID,
                 CODELIST_LAW_ID,
                 CODELIST_HANDLER_ID,
                 CODELIST_COMPENSATION_ACTION_ID,
@@ -56,7 +55,7 @@ class Command(BaseKonovaCommand):
                 content = result.content.decode("utf-8")
                 root = etree.fromstring(content)
                 items = root.findall("item")
-                self._write_warning("   Found {} codes. Process now...".format(len(items)))
+                self._write_warning("Found {} codes. Process now...".format(len(items)))
 
                 code_list = KonovaCodeList.objects.get_or_create(
                     id=list_id,
@@ -75,15 +74,15 @@ class Command(BaseKonovaCommand):
         if items is None:
             return
         else:
-            self._write_warning("       --- Found {} subcodes. Process now...".format(len(items)))
+            self._write_warning(" --- Found {} subcodes. Process now...".format(len(items)))
             for element in items:
                 children = element.find("items")
                 _id = element.find("id").text
                 atom_id = element.find("atomid").text
                 selectable = element.find("selectable").text.lower()
                 selectable = bool_map.get(selectable, False)
-                short_name = element.find("shortname").text or ""
-                long_name = element.find("longname").text or ""
+                short_name = element.find("shortname").text
+                long_name = element.find("longname").text
                 is_archived = bool_map.get((element.find("archive").text.lower()), False)
 
                 code = KonovaCode.objects.get_or_create(

codelist/migrations/0002_migrate_975_to_288.py

@@ -1,60 +0,0 @@
-# Generated by Django 5.0.7 on 2024-08-06 13:40
-
-from django.core.exceptions import ObjectDoesNotExist
-from django.db import migrations
-from django.db.models import Q
-
-from codelist.settings import CODELIST_BIOTOPES_EXTRA_CODES_FULL_ID, CODELIST_BIOTOPES_EXTRA_CODES_ID
-
-
-def migrate_975_to_288(apps, schema_editor):
-    KonovaCodeList = apps.get_model('codelist', 'KonovaCodeList')
-    CompensationState = apps.get_model('compensation', 'CompensationState')
-
-    try:
-        list_288 = KonovaCodeList.objects.get(
-            id=CODELIST_BIOTOPES_EXTRA_CODES_FULL_ID
-        ).codes.all()
-    except ObjectDoesNotExist:
-        raise AssertionError("KonovaCodeList 288 does not exist. Did you run 'update_codelist' before migrating?")
-
-    states_with_extra_code = CompensationState.objects.filter(
-        ~Q(biotope_type_details=None)
-    )
-
-    print(f"... Found {states_with_extra_code.count()} biotope state entries")
-    for state in states_with_extra_code:
-        extra_codes_975 = state.biotope_type_details.filter(
-            code_lists__in=[CODELIST_BIOTOPES_EXTRA_CODES_ID]
-        )
-        count_extra_codes_975 = extra_codes_975.count()
-        if count_extra_codes_975 > 0:
-            print(f"    --> Found {count_extra_codes_975} codes from list 975 in biotope entry {state.id}")
-        extra_codes_288 = []
-        for extra_code_975 in extra_codes_975:
-            atom_id = extra_code_975.atom_id
-            codes_from_288 = list_288.filter(
-                atom_id=atom_id,
-            )
-            extra_codes_288 += codes_from_288
-
-        state.biotope_type_details.set(extra_codes_288)
-    print("    --> Migrated to list 288 for all biotope entries")
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('codelist', '0001_initial'),
-        ('compensation', '0003_auto_20220202_0846'),
-    ]
-
-    # If migration of codelist is not necessary, this variable can shut down the logic whilst not disturbing the
-    # migration history
-    EXECUTE_CODELIST_MIGRATION = True
-
-    operations = []
-
-    if EXECUTE_CODELIST_MIGRATION:
-        operations.append(migrations.RunPython(migrate_975_to_288))
-

codelist/migrations/0003_alter_konovacode_long_name_and_more.py

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

codelist/models.py

@@ -25,11 +25,13 @@ class KonovaCode(models.Model):
     )
     short_name = models.CharField(
         max_length=500,
+        null=True,
         blank=True,
         help_text="Short version of long name",
     )
     long_name = models.CharField(
         max_length=1000,
+        null=True,
         blank=True,
         help_text="",
     )
@@ -48,28 +50,12 @@ class KonovaCode(models.Model):
 
     def __str__(self, with_parent: bool = True):
         ret_val = ""
-
-        long_name = self.long_name
-        short_name = self.short_name
-
-        both_names_exist = long_name is not None and short_name is not None
-
-        if both_names_exist:
-            if with_parent and self.parent:
-                parent_short_name_exists = self.parent.short_name is not None
-                parent_long_name_exists = self.parent.long_name is not None
-                if parent_long_name_exists:
-                    ret_val += self.parent.long_name + " > "
-                elif parent_short_name_exists:
-                    ret_val += self.parent.short_name + " > "
-
-            ret_val += long_name
-
-            if short_name and short_name != long_name:
-                ret_val += f" ({short_name})"
-        else:
-            ret_val += str(long_name or short_name)
-
+        if self.parent and self.parent.long_name and with_parent:
+            ret_val += self.parent.long_name + " > "
+        ret_val += self.long_name
+        if self.short_name and self.short_name != self.long_name:
+            # Only add short name, if we won't have stupid repition like 'thing a (thing a)' due to misused long-short names
+            ret_val += f" ({self.short_name})"
         return ret_val
 
     @property
@@ -89,8 +75,7 @@ class KonovaCode(models.Model):
             return self
 
         children = KonovaCode.objects.filter(
-            parent=self,
-            is_archived=False,
+            parent=self
         ).order_by(
             order_by
         )

codelist/settings.py

@@ -15,8 +15,7 @@ CODELIST_CONSERVATION_OFFICE_ID = 907  # CLNaturschutzbehörden
 CODELIST_REGISTRATION_OFFICE_ID = 1053  # CLZulassungsbehörden
 CODELIST_BIOTOPES_ID = 654  # CL_Biotoptypen
 CODELIST_AFTER_STATE_BIOTOPES_ID = 974  # CL-KSP_ZielBiotoptypen - USAGE HAS BEEN DROPPED IN 2022 IN FAVOR OF 654
-CODELIST_BIOTOPES_EXTRA_CODES_ID = 975  # CLZusatzbezeichnung - Subset of 288. Migration usage 975->288 in 08/2024
-CODELIST_BIOTOPES_EXTRA_CODES_FULL_ID = 288  # CLBiotoptypZusatzcode
+CODELIST_BIOTOPES_EXTRA_CODES_ID = 975  # CLZusatzbezeichnung
 CODELIST_LAW_ID = 1048  # CLVerfahrensrecht
 CODELIST_PROCESS_TYPE_ID = 44382  # CLVerfahrenstyp
 

compensation/forms/compensation.py

@@ -168,17 +168,6 @@ 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/modals/compensation_action.py

@@ -7,12 +7,10 @@ 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
@@ -116,8 +114,7 @@ class EditCompensationActionModalForm(NewCompensationActionModalForm):
     action = None
 
     def __init__(self, *args, **kwargs):
-        action_id = kwargs.pop("action_id", None)
-        self.action = get_object_or_404(CompensationAction, id=action_id)
+        self.action = kwargs.pop("action", None)
         super().__init__(*args, **kwargs)
         self.form_title = _("Edit action")
         form_data = {
@@ -150,8 +147,8 @@ class RemoveCompensationActionModalForm(RemoveModalForm):
     action = None
 
     def __init__(self, *args, **kwargs):
-        action_id = kwargs.pop("action_id", None)
-        self.action = get_object_or_404(CompensationAction, id=action_id)
+        action = kwargs.pop("action", None)
+        self.action = action
         super().__init__(*args, **kwargs)
 
     def save(self):

compensation/forms/modals/deadline.py

@@ -6,11 +6,10 @@ 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, Deadline
+from konova.models import DeadlineType
 from konova.utils import validators
 from konova.utils.message_templates import DEADLINE_EDITED
 
@@ -91,8 +90,7 @@ class EditDeadlineModalForm(NewDeadlineModalForm):
     deadline = None
 
     def __init__(self, *args, **kwargs):
-        deadline_id = kwargs.pop("deadline_id", None)
-        self.deadline = get_object_or_404(Deadline, id=deadline_id)
+        self.deadline = kwargs.pop("deadline", None)
         super().__init__(*args, **kwargs)
         self.form_title = _("Edit deadline")
         form_data = {

compensation/forms/modals/document.py

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

compensation/forms/modals/resubmission.py

@@ -1,15 +0,0 @@
-"""
-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,17 +5,20 @@ 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 codelist.settings import CODELIST_BIOTOPES_ID, CODELIST_BIOTOPES_EXTRA_CODES_ID
 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, ADDED_COMPENSATION_STATE
+from konova.utils.message_templates import COMPENSATION_STATE_EDITED, FORM_INVALID, ADDED_COMPENSATION_STATE
 
 
 class NewCompensationStateModalForm(BaseModalForm):
@@ -40,7 +43,7 @@ class NewCompensationStateModalForm(BaseModalForm):
         queryset=KonovaCode.objects.filter(
             is_archived=False,
             is_leaf=True,
-            code_lists__in=[CODELIST_BIOTOPES_EXTRA_CODES_FULL_ID],
+            code_lists__in=[CODELIST_BIOTOPES_EXTRA_CODES_ID],
         ),
         widget=autocomplete.ModelSelect2Multiple(
             url="codelist:biotope-extra-type-autocomplete",
@@ -64,13 +67,10 @@ 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,
@@ -82,19 +82,65 @@ class NewCompensationStateModalForm(BaseModalForm):
         ]
         self.fields["biotope_type"].choices = choices
 
-    def save(self):
-        state = self.instance.add_state(self, self._is_before_state)
+    def save(self, is_before_state: bool = False):
+        state = self.instance.add_state(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):
-        state_id = kwargs.pop("state_id", None)
-        self.state = CompensationState.objects.get(id=state_id)
-
+        self.state = kwargs.pop("state", None)
         super().__init__(*args, **kwargs)
         self.form_title = _("Edit state")
         biotope_type_id = self.state.biotope_type.id if self.state.biotope_type else None
@@ -125,8 +171,8 @@ class RemoveCompensationStateModalForm(RemoveModalForm):
     state = None
 
     def __init__(self, *args, **kwargs):
-        state_id = kwargs.pop("state_id", None)
-        self.state = CompensationState.objects.get(id=state_id)
+        state = kwargs.pop("state", None)
+        self.state = state
         super().__init__(*args, **kwargs)
 
     def save(self):

compensation/migrations/0016_alter_compensationstate_biotope_type_details.py

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

compensation/models/state.py

@@ -6,10 +6,10 @@ Created on: 16.11.21
 
 """
 from django.db import models
+from django.db.models import Q
 
 from codelist.models import KonovaCode
-from codelist.settings import CODELIST_BIOTOPES_ID, \
-    CODELIST_BIOTOPES_EXTRA_CODES_FULL_ID
+from codelist.settings import CODELIST_BIOTOPES_ID, CODELIST_BIOTOPES_EXTRA_CODES_ID
 from compensation.managers import CompensationStateManager
 from konova.models import UuidModel
 
@@ -34,7 +34,7 @@ class CompensationState(UuidModel):
         KonovaCode,
         blank=True,
         limit_choices_to={
-            "code_lists__in": [CODELIST_BIOTOPES_EXTRA_CODES_FULL_ID],
+            "code_lists__in": [CODELIST_BIOTOPES_EXTRA_CODES_ID],
             "is_selectable": True,
             "is_archived": False,
         },

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

@@ -11,7 +11,7 @@
             </div>
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
-                    {% if is_default_member and is_entry_shared  %}
+                    {% if is_default_member and has_access  %}
                     <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:new-action' obj.id %}" title="{% trans 'Add new action' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'seedling' %}
@@ -34,7 +34,7 @@
                 <th scope="col">
                     {% trans 'Comment' %}
                 </th>
-                {% if is_default_member and is_entry_shared %}
+                {% if is_default_member and has_access %}
                 <th class="w-10" scope="col">
                     <span class="float-right">
                         {% trans 'Action' %}
@@ -52,7 +52,7 @@
                     <hr>
                     {% endfor %}
                     {% for detail in action.action_type_details.all %}
-                        <span class="badge badge-pill rlp-r" title="{{ detail.parent.long_name }} > {{detail}}">{{ detail.parent.long_name }} > {{detail.long_name}}</span>
+                        <span class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</span>
                     {% empty %}
                         <span class="badge badge-pill rlp-r-outline" title="{% trans 'No action type details' %}">{% trans 'No action type details' %}</span>
                     {% endfor %}
@@ -64,7 +64,7 @@
                     </div>
                 </td>
                 <td class="align-middle float-right">
-                    {% if is_default_member and is_entry_shared  %}
+                    {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'compensation:action-edit' obj.id action.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit action' %}">
                         {% fa5_icon 'edit' %}
                     </button>

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

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

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

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

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

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

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

@@ -10,7 +10,7 @@
             </div>
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
-                    {% if is_default_member and is_entry_shared  %}
+                    {% if is_default_member and has_access  %}
                     <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:new-state' obj.id %}" title="{% trans 'Add new state after' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'layer-group' %}
@@ -35,7 +35,7 @@
                 <th scope="col">
                     {% trans 'Surface' %}
                 </th>
-                {% if is_default_member and is_entry_shared %}
+                {% if is_default_member and has_access %}
                 <th class="w-10" scope="col">
                     <span class="float-right">
                         {% trans 'Action' %}
@@ -51,14 +51,14 @@
                     <span>{{ state.biotope_type.parent.long_name }} {% fa5_icon 'angle-right' %} {{ state.biotope_type.long_name }} ({{state.biotope_type.short_name}})</span>
                     <br>
                     {% for detail in state.biotope_type_details.all %}
-                        <span class="badge badge-pill rlp-r" title="{{ detail.parent.short_name }} > {{detail}}">{{ detail.parent.short_name }} > {{ detail.long_name }}</span>
+                        <span class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</span>
                     {% empty %}
                         <span class="badge badge-pill rlp-r-outline" title="{% trans 'No biotope type details' %}">{% trans 'No biotope type details' %}</span>
                     {% endfor %}
                 </td>
                 <td>{{ state.surface|floatformat:2 }} m²</td>
                 <td class="align-middle float-right">
-                    {% if is_default_member and is_entry_shared  %}
+                    {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'compensation:state-edit' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit state' %}">
                         {% fa5_icon 'edit' %}
                     </button>

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

@@ -10,7 +10,7 @@
             </div>
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
-                    {% if is_default_member and is_entry_shared  %}
+                    {% if is_default_member and has_access  %}
                     <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:new-state' obj.id %}?before=true" title="{% trans 'Add new state before' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'layer-group' %}
@@ -35,7 +35,7 @@
                 <th scope="col">
                     {% trans 'Surface' %}
                 </th>
-                {% if is_default_member and is_entry_shared %}
+                {% if is_default_member and has_access %}
                 <th class="w-10" scope="col">
                     <span class="float-right">
                         {% trans 'Action' %}
@@ -51,14 +51,14 @@
                     <span>{{ state.biotope_type.parent.long_name }} {% fa5_icon 'angle-right' %} {{ state.biotope_type.long_name }} ({{state.biotope_type.short_name}})</span>
                     <br>
                     {% for detail in state.biotope_type_details.all %}
-                        <span class="badge badge-pill rlp-r" title="{{ detail.parent.short_name }} > {{detail}}">{{ detail.parent.short_name }} > {{ detail.long_name }}</span>
+                        <span class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</span>
                     {% empty %}
                         <span class="badge badge-pill rlp-r-outline" title="{% trans 'No biotope type details' %}">{% trans 'No biotope type details' %}</span>
                     {% endfor %}
                 </td>
                 <td>{{ state.surface|floatformat:2 }} m²</td>
                 <td class="align-middle float-right">
-                    {% if is_default_member and is_entry_shared  %}
+                    {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'compensation:state-edit' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit state' %}">
                         {% fa5_icon 'edit' %}
                     </button>

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

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

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

@@ -10,7 +10,7 @@
             </div>
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
-                    {% if is_default_member and is_entry_shared  %}
+                    {% if is_default_member and has_access  %}
                     <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc:new-action' obj.id %}" title="{% trans 'Add new action' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'seedling' %}
@@ -33,7 +33,7 @@
                 <th scope="col">
                     {% trans 'Comment' %}
                 </th>
-                {% if is_default_member and is_entry_shared %}
+                {% if is_default_member and has_access %}
                     <th class="w-10" scope="col">
                         <span class="float-right">
                             {% trans 'Action' %}
@@ -51,7 +51,7 @@
                     <hr>
                     {% endfor %}
                     {% for detail in action.action_type_details.all %}
-                        <span class="badge badge-pill rlp-r" title="{{ detail.parent.long_name }} > {{detail}}">{{ detail.parent.long_name }} > {{detail.long_name}}</span>
+                        <span class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</span>
                     {% empty %}
                         <span class="badge badge-pill rlp-r-outline" title="{% trans 'No action type details' %}">{% trans 'No action type details' %}</span>
                     {% endfor %}
@@ -63,7 +63,7 @@
                     </div>
                 </td>
                 <td class="align-middle float-right">
-                    {% if is_default_member and is_entry_shared  %}
+                    {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'compensation:acc:action-edit' obj.id action.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit action' %}">
                         {% fa5_icon 'edit' %}
                     </button>

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

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

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

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

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

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

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

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

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

@@ -10,7 +10,7 @@
             </div>
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
-                    {% if is_default_member and is_entry_shared  %}
+                    {% if is_default_member and has_access  %}
                     <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc:new-state' obj.id %}" title="{% trans 'Add new state after' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'layer-group' %}
@@ -35,7 +35,7 @@
                 <th scope="col">
                     {% trans 'Surface' %}
                 </th>
-                {% if is_default_member and is_entry_shared %}
+                {% if is_default_member and has_access %}
                 <th class="w-10" scope="col">
                     <span class="float-right">
                         {% trans 'Action' %}
@@ -51,14 +51,14 @@
                     <span>{{ state.biotope_type.parent.long_name }} {% fa5_icon 'angle-right' %} {{ state.biotope_type.long_name }} ({{state.biotope_type.short_name}})</span>
                     <br>
                     {% for detail in state.biotope_type_details.all %}
-                        <span class="badge badge-pill rlp-r" title="{{ detail.parent.short_name }} > {{detail}}">{{ detail.parent.short_name }} > {{ detail.long_name }}</span>
+                        <span class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</span>
                     {% empty %}
                         <span class="badge badge-pill rlp-r-outline" title="{% trans 'No biotope type details' %}">{% trans 'No biotope type details' %}</span>
                     {% endfor %}
                 </td>
                 <td>{{ state.surface|floatformat:2 }} m²</td>
                 <td class="align-middle float-right">
-                    {% if is_default_member and is_entry_shared  %}
+                    {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'compensation:acc:state-edit' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit state' %}">
                         {% fa5_icon 'edit' %}
                     </button>

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

@@ -10,7 +10,7 @@
             </div>
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
-                    {% if is_default_member and is_entry_shared  %}
+                    {% if is_default_member and has_access  %}
                     <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'compensation:acc:new-state' obj.id %}?before=true" title="{% trans 'Add new state before' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'layer-group' %}
@@ -35,7 +35,7 @@
                 <th scope="col">
                     {% trans 'Surface' %}
                 </th>
-                {% if is_default_member and is_entry_shared %}
+                {% if is_default_member and has_access %}
                 <th class="w-10" scope="col">
                     <span class="float-right">
                         {% trans 'Action' %}
@@ -51,14 +51,14 @@
                     <span>{{ state.biotope_type.parent.long_name }} {% fa5_icon 'angle-right' %} {{ state.biotope_type.long_name }} ({{state.biotope_type.short_name}})</span>
                     <br>
                     {% for detail in state.biotope_type_details.all %}
-                        <span class="badge badge-pill rlp-r" title="{{ detail.parent.short_name }} > {{detail}}">{{ detail.parent.short_name }} > {{ detail.long_name }}</span>
+                        <span class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</span>
                     {% empty %}
                         <span class="badge badge-pill rlp-r-outline" title="{% trans 'No biotope type details' %}">{% trans 'No biotope type details' %}</span>
                     {% endfor %}
                 </td>
                 <td>{{ state.surface|floatformat:2 }} m²</td>
                 <td class="align-middle float-right">
-                    {% if is_default_member and is_entry_shared  %}
+                    {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'compensation:acc:state-edit' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit state' %}">
                         {% fa5_icon 'edit' %}
                     </button>

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

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

compensation/tests/compensation/test_workflow.py

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

compensation/tests/compensation/unit/test_forms.py

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

compensation/tests/ecoaccount/test_workflow.py

@@ -46,7 +46,7 @@ class EcoAccountWorkflowTestCase(BaseWorkflowTestCase):
         post_data = {
             "identifier": test_id,
             "title": test_title,
-            "output": geom_json,
+            "geom": geom_json,
             "surface": test_deductable_surface,
             "conservation_office": test_conservation_office.id
         }
@@ -86,7 +86,7 @@ class EcoAccountWorkflowTestCase(BaseWorkflowTestCase):
         new_title = self.create_dummy_string()
         new_identifier = self.create_dummy_string()
         new_comment = self.create_dummy_string()
-        new_geometry = self.create_dummy_geometry()
+        new_geometry = MultiPolygon(srid=4326)  # Create an empty geometry
         test_conservation_office = self.get_conservation_office_code()
         test_deductable_surface = self.eco_account.deductable_surface + 100
 
@@ -103,7 +103,7 @@ class EcoAccountWorkflowTestCase(BaseWorkflowTestCase):
             "identifier": new_identifier,
             "title": new_title,
             "comment": new_comment,
-            "output": self.create_geojson(new_geometry),
+            "geom": new_geometry.geojson,
             "surface": test_deductable_surface,
             "conservation_office": test_conservation_office.id
         }

compensation/urls/compensation.py

@@ -10,28 +10,27 @@ from django.urls import path
 from compensation.views.compensation.document import EditCompensationDocumentView, NewCompensationDocumentView, \
     GetCompensationDocumentView, RemoveCompensationDocumentView
 from compensation.views.compensation.resubmission import CompensationResubmissionView
-from compensation.views.compensation.report import CompensationReportView
+from compensation.views.compensation.report import report_view
 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 \
-    CompensationIndexView, CompensationIdentifierGeneratorView, CompensationDetailView, \
-    NewCompensationFormView, EditCompensationFormView, RemoveCompensationView
+from compensation.views.compensation.compensation import index_view, new_view, new_id_view, detail_view, edit_view, \
+    remove_view
 from compensation.views.compensation.log import CompensationLogView
 
 urlpatterns = [
     # Main compensation
-    path("", CompensationIndexView.as_view(), name="index"),
-    path('new/id', CompensationIdentifierGeneratorView.as_view(), name='new-id'),
-    path('new/<intervention_id>', NewCompensationFormView.as_view(), name='new'),
-    path('new', NewCompensationFormView.as_view(), name='new'),
-    path('<id>', CompensationDetailView.as_view(), name='detail'),
+    path("", index_view, name="index"),
+    path('new/id', new_id_view, name='new-id'),
+    path('new/<intervention_id>', new_view, name='new'),
+    path('new', new_view, name='new'),
+    path('<id>', detail_view, name='detail'),
     path('<id>/log', CompensationLogView.as_view(), name='log'),
-    path('<id>/edit', EditCompensationFormView.as_view(), name='edit'),
-    path('<id>/remove', RemoveCompensationView.as_view(), name='remove'),
+    path('<id>/edit', edit_view, name='edit'),
+    path('<id>/remove', remove_view, name='remove'),
 
     path('<id>/state/new', NewCompensationStateView.as_view(), name='new-state'),
     path('<id>/state/<state_id>/edit', EditCompensationStateView.as_view(), name='state-edit'),
@@ -44,7 +43,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', CompensationReportView.as_view(), name='report'),
+    path('<id>/report', report_view, name='report'),
     path('<id>/resub', CompensationResubmissionView.as_view(), name='resubmission-create'),
 
     # Documents

compensation/urls/eco_account.py

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

compensation/views/compensation/action.py

@@ -5,23 +5,53 @@ 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.models import Compensation
+from compensation.forms.modals.compensation_action import RemoveCompensationActionModalForm, \
+    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_CLS = Compensation
-    _REDIRECT_URL = _COMPENSATION_DETAIL_URL_NAME
+    model = Compensation
+    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 EditCompensationActionView(AbstractEditCompensationActionView):
-    _MODEL_CLS = Compensation
-    _REDIRECT_URL = _COMPENSATION_DETAIL_URL_NAME
+    model = Compensation
+    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 RemoveCompensationActionView(AbstractRemoveCompensationActionView):
-    _MODEL_CLS = Compensation
-    _REDIRECT_URL = _COMPENSATION_DETAIL_URL_NAME
+    model = Compensation
+    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/compensation.py

@@ -7,8 +7,8 @@ Created on: 19.08.22
 """
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
-from django.contrib.auth.mixins import LoginRequiredMixin
 from django.core.exceptions import ObjectDoesNotExist
+from django.db.models import Sum
 from django.http import HttpRequest, JsonResponse
 from django.shortcuts import get_object_or_404, render, redirect
 from django.urls import reverse
@@ -18,157 +18,284 @@ from compensation.forms.compensation import EditCompensationForm, NewCompensatio
 from compensation.models import Compensation
 from compensation.tables.compensation import CompensationTable
 from intervention.models import Intervention
-from konova.decorators import shared_access_required, default_group_required, login_required_modal
+from konova.contexts import BaseContext
+from konova.decorators import shared_access_required, default_group_required, any_group_check, login_required_modal, \
+    uuid_required
+from konova.forms import SimpleGeomForm
 from konova.forms.modals import RemoveModalForm
+from konova.settings import DEFAULT_GROUP, ZB_GROUP, ETS_GROUP
+from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.message_templates import COMPENSATION_REMOVED_TEMPLATE, DATA_CHECKED_PREVIOUSLY_TEMPLATE, \
-    RECORDED_BLOCKS_EDIT, PARAMS_INVALID
-from konova.views.base import BaseIndexView, BaseIdentifierGeneratorView, BaseNewSpatialLocatedObjectFormView, \
-    BaseEditSpatialLocatedObjectFormView
-from konova.views.detail import BaseDetailView
-from konova.views.remove import BaseRemoveModalFormView
+    RECORDED_BLOCKS_EDIT, CHECK_STATE_RESET, FORM_INVALID, PARAMS_INVALID, IDENTIFIER_REPLACED, \
+    COMPENSATION_ADDED_TEMPLATE, DO_NOT_FORGET_TO_SHARE, GEOMETRY_SIMPLIFIED
 
 
-class CompensationIndexView(LoginRequiredMixin, BaseIndexView):
-    _TAB_TITLE = _("Compensations - Overview")
-    _INDEX_TABLE_CLS = CompensationTable
+@login_required
+@any_group_check
+def index_view(request: HttpRequest):
+    """
+    Renders the index view for compensation
 
-    def _get_queryset(self):
-        qs = 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"
-        )
-        return qs
+    Args:
+        request (HttpRequest): The incoming request
+
+    Returns:
+        A rendered view
+    """
+    template = "generic_index.html"
+    compensations = Compensation.objects.filter(
+        deleted=None,  # only show those which are not deleted individually
+        intervention__deleted=None,  # and don't show the ones whose intervention has been deleted
+    ).order_by(
+        "-modified__timestamp"
+    )
+    table = CompensationTable(
+        request=request,
+        queryset=compensations
+    )
+    context = {
+        "table": table,
+        TAB_TITLE_IDENTIFIER: _("Compensations - Overview"),
+    }
+    context = BaseContext(request, context).context
+    return render(request, template, context)
 
 
-class NewCompensationFormView(BaseNewSpatialLocatedObjectFormView):
-    _FORM_CLS = NewCompensationForm
-    _MODEL_CLS = Compensation
-    _TEMPLATE = "compensation/form/view.html"
-    _TAB_TITLE = _("New Compensation")
-    _REDIRECT_URL = "compensation:detail"
+@login_required
+@default_group_required
+@shared_access_required(Intervention, "intervention_id")
+def new_view(request: HttpRequest, intervention_id: str = None):
+    """
+    Renders a view for a new compensation creation
 
-    def _user_has_shared_access(self, user, **kwargs):
-        # On a new compensation make sure the intervention (if call came directly through an intervention's detail
-        # view) is shared with the user
-        intervention_id = kwargs.get("intervention_id", None)
-        if not intervention_id:
-            return True
-        else:
-            intervention = get_object_or_404(Intervention, id=intervention_id)
-            return intervention.is_shared_with(user)
+    Args:
+        request (HttpRequest): The incoming request
 
-    def _user_has_permission(self, user):
-        # User has to be an ets user
-        return user.is_default_user()
+    Returns:
 
-    def dispatch(self, request, *args, **kwargs):
-        # Make sure there is an existing intervention based on the given id
-        # Compensations can not exist without an intervention
-        intervention_id = kwargs.get("intervention_id", None)
-        if intervention_id:
-            try:
-                intervention = Intervention.objects.get(id=intervention_id)
-                if intervention.is_recorded:
-                    messages.info(
-                        request,
-                        RECORDED_BLOCKS_EDIT
-                    )
-                    return redirect("intervention:detail", id=intervention_id)
-            except ObjectDoesNotExist:
-                messages.error(request, PARAMS_INVALID, extra_tags="danger")
-                return redirect("home")
-        return super().dispatch(request, *args, **kwargs)
-
-
-class EditCompensationFormView(BaseEditSpatialLocatedObjectFormView):
-    _MODEL_CLS = Compensation
-    _FORM_CLS = EditCompensationForm
-    _TEMPLATE = "compensation/form/view.html"
-    _REDIRECT_URL = "compensation:detail"
-
-    def _user_has_permission(self, user):
-        # User has to be a default user
-        return user.is_default_user()
-
-
-class CompensationIdentifierGeneratorView(LoginRequiredMixin, BaseIdentifierGeneratorView):
-    _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:
-            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:
-
-        """
-        # Order states according to surface
-        before_states = obj.before_states.all().prefetch_related("biotope_type").order_by("-surface")
-        after_states = obj.after_states.all().prefetch_related("biotope_type").order_by("-surface")
-        actions = obj.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 = 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
+    """
+    template = "compensation/form/view.html"
+    if intervention_id is not None:
+        try:
+            intervention = Intervention.objects.get(id=intervention_id)
+        except ObjectDoesNotExist:
+            messages.error(request, PARAMS_INVALID)
+            return redirect("home")
+        if intervention.is_recorded:
+            messages.info(
+                request,
+                RECORDED_BLOCKS_EDIT
             )
+            return redirect("intervention:detail", id=intervention_id)
 
-        context = {
-            "last_checked": last_checked,
-            "last_checked_tooltip": last_checked_tooltip,
-            "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(),
+    data_form = NewCompensationForm(request.POST or None, intervention_id=intervention_id)
+    geom_form = SimpleGeomForm(request.POST or None, read_only=False)
+    if request.method == "POST":
+        if data_form.is_valid() and geom_form.is_valid():
+            generated_identifier = data_form.cleaned_data.get("identifier", None)
+            comp = data_form.save(request.user, geom_form)
+            if generated_identifier != comp.identifier:
+                messages.info(
+                    request,
+                    IDENTIFIER_REPLACED.format(
+                        generated_identifier,
+                        comp.identifier
+                    )
+                )
+            messages.success(request, COMPENSATION_ADDED_TEMPLATE.format(comp.identifier))
+            if geom_form.geometry_simplified:
+                messages.info(
+                    request,
+                    GEOMETRY_SIMPLIFIED
+                )
+            return redirect("compensation:detail", id=comp.id)
+        else:
+            messages.error(request, FORM_INVALID, extra_tags="danger",)
+    else:
+        # For clarification: nothing in this case
+        pass
+    context = {
+        "form": data_form,
+        "geom_form": geom_form,
+        TAB_TITLE_IDENTIFIER: _("New compensation"),
+    }
+    context = BaseContext(request, context).context
+    return render(request, template, context)
+
+
+@login_required
+@default_group_required
+def new_id_view(request: HttpRequest):
+    """ JSON endpoint
+
+    Provides fetching of free identifiers for e.g. AJAX calls
+
+    """
+    tmp = Compensation()
+    identifier = tmp.generate_new_identifier()
+    while Compensation.objects.filter(identifier=identifier).exists():
+        identifier = tmp.generate_new_identifier()
+    return JsonResponse(
+        data={
+            "gen_data": identifier
         }
-        return context
+    )
 
 
-class RemoveCompensationView(LoginRequiredMixin, BaseRemoveModalFormView):
-    _MODEL_CLS = Compensation
-    _FORM_CLS = RemoveModalForm
-    _REDIRECT_URL = "compensation:index"
+@login_required
+@default_group_required
+@shared_access_required(Compensation, "id")
+def edit_view(request: HttpRequest, id: str):
+    """
+    Renders a view for editing compensations
+
+    Args:
+        request (HttpRequest): The incoming request
+
+    Returns:
+
+    """
+    template = "compensation/form/view.html"
+    # Get object from db
+    comp = get_object_or_404(Compensation, id=id)
+    if comp.is_recorded:
+        messages.info(
+            request,
+            RECORDED_BLOCKS_EDIT
+        )
+        return redirect("compensation:detail", id=id)
+
+    # Create forms, initialize with values from db/from POST request
+    data_form = EditCompensationForm(request.POST or None, instance=comp)
+    geom_form = SimpleGeomForm(request.POST or None, read_only=False, instance=comp)
+    if request.method == "POST":
+        if data_form.is_valid() and geom_form.is_valid():
+            # Preserve state of intervention checked to determine whether the user must be informed or not
+            # about a change of the check state
+            intervention_is_checked = comp.intervention.checked is not None
+
+            # The data form takes the geom form for processing, as well as the performing user
+            comp = data_form.save(request.user, geom_form)
+            if intervention_is_checked:
+                messages.info(request, CHECK_STATE_RESET)
+            messages.success(request, _("Compensation {} edited").format(comp.identifier))
+            if geom_form.geometry_simplified:
+                messages.info(
+                    request,
+                    GEOMETRY_SIMPLIFIED
+                )
+            return redirect("compensation:detail", id=comp.id)
+        else:
+            messages.error(request, FORM_INVALID, extra_tags="danger",)
+    else:
+        # For clarification: nothing in this case
+        pass
+    context = {
+        "form": data_form,
+        "geom_form": geom_form,
+        TAB_TITLE_IDENTIFIER: _("Edit {}").format(comp.identifier),
+    }
+    context = BaseContext(request, context).context
+    return render(request, template, context)
+
+
+@login_required
+@any_group_check
+@uuid_required
+def detail_view(request: HttpRequest, id: str):
+    """ Renders a detail view for a compensation
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The compensation's id
+
+    Returns:
+
+    """
+    template = "compensation/detail/compensation/view.html"
+    comp = get_object_or_404(
+        Compensation.objects.select_related(
+            "modified",
+            "created",
+            "geometry"
+        ),
+        id=id,
+        deleted=None,
+        intervention__deleted=None,
+    )
+    geom_form = SimpleGeomForm(instance=comp)
+    parcels = comp.get_underlying_parcels()
+    _user = request.user
+    is_data_shared = comp.intervention.is_shared_with(_user)
+
+    # Order states according to surface
+    before_states = comp.before_states.all().prefetch_related("biotope_type").order_by("-surface")
+    after_states = comp.after_states.all().prefetch_related("biotope_type").order_by("-surface")
+    actions = comp.actions.all().prefetch_related("action_type")
+
+    # Precalculate logical errors between before- and after-states
+    # Sum() returns None in case of no states, so we catch that and replace it with 0 for easier handling
+    sum_before_states = comp.get_surface_before_states()
+    sum_after_states = comp.get_surface_after_states()
+    diff_states = abs(sum_before_states - sum_after_states)
+
+    request = comp.set_status_messages(request)
+
+    last_checked = comp.intervention.get_last_checked_action()
+    last_checked_tooltip = ""
+    if last_checked:
+        last_checked_tooltip = DATA_CHECKED_PREVIOUSLY_TEMPLATE.format(last_checked.get_timestamp_str_formatted(), last_checked.user)
+
+    requesting_user_is_only_shared_user = comp.is_only_shared_with(_user)
+    if requesting_user_is_only_shared_user:
+        messages.info(
+            request,
+            DO_NOT_FORGET_TO_SHARE
+        )
+
+    context = {
+        "obj": comp,
+        "last_checked": last_checked,
+        "last_checked_tooltip": last_checked_tooltip,
+        "geom_form": geom_form,
+        "parcels": parcels,
+        "has_access": is_data_shared,
+        "actions": actions,
+        "before_states": before_states,
+        "after_states": after_states,
+        "sum_before_states": sum_before_states,
+        "sum_after_states": sum_after_states,
+        "diff_states": diff_states,
+        "is_default_member": _user.in_group(DEFAULT_GROUP),
+        "is_zb_member": _user.in_group(ZB_GROUP),
+        "is_ets_member": _user.in_group(ETS_GROUP),
+        "LANIS_LINK": comp.get_LANIS_link(),
+        TAB_TITLE_IDENTIFIER: f"{comp.identifier} - {comp.title}",
+        "has_finished_deadlines": comp.get_finished_deadlines().exists(),
+    }
+    context = BaseContext(request, context).context
+    return render(request, template, context)
+
+
+@login_required_modal
+@login_required
+@default_group_required
+@shared_access_required(Compensation, "id")
+def remove_view(request: HttpRequest, id: str):
+    """ Renders a modal view for removing the compensation
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The compensation's id
+
+    Returns:
+
+    """
+    comp = get_object_or_404(Compensation, id=id)
+    form = RemoveModalForm(request.POST or None, instance=comp, request=request)
+    return form.process_request(
+        request=request,
+        msg_success=COMPENSATION_REMOVED_TEMPLATE.format(comp.identifier),
+        redirect_url=reverse("compensation:index"),
+    )
 
-    def _user_has_permission(self, user):
-        return user.is_default_user()

compensation/views/compensation/deadline.py

@@ -5,21 +5,45 @@ 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_CLS = Compensation
-    _REDIRECT_URL = _COMPENSATION_DETAIL_URL_NAME
+    model = Compensation
+    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 EditCompensationDeadlineView(AbstractEditDeadlineView):
-    _MODEL_CLS = Compensation
-    _REDIRECT_URL = _COMPENSATION_DETAIL_URL_NAME
+    model = Compensation
+    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 RemoveCompensationDeadlineView(AbstractRemoveDeadlineView):
-    _MODEL_CLS = Compensation
-    _REDIRECT_URL = _COMPENSATION_DETAIL_URL_NAME
+    model = Compensation
+    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/document.py

@@ -5,33 +5,62 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from compensation.forms.modals.document import NewCompensationDocumentModalForm, EditCompensationDocumentModalForm, \
-    RemoveCompensationDocumentModalForm
+from django.contrib.auth.decorators import login_required
+from django.utils.decorators import method_decorator
+
+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_CLS = Compensation
-    _FORM_CLS = NewCompensationDocumentModalForm
-    _REDIRECT_URL = "compensation:detail"
+    model = Compensation
+    form = NewCompensationDocumentModalForm
+    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_CLS = Compensation
-    _DOCUMENT_CLS = CompensationDocument
+    model = Compensation
+    document_model = 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_CLS = Compensation
-    _DOCUMENT_CLS = CompensationDocument
-    _FORM_CLS = RemoveCompensationDocumentModalForm
-    _REDIRECT_URL = "compensation:detail"
+    model = Compensation
+    document_model = CompensationDocument
+
+    @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 EditCompensationDocumentView(AbstractEditDocumentView):
-    _MODEL_CLS = Compensation
-    _DOCUMENT_CLS = CompensationDocument
-    _FORM_CLS = EditCompensationDocumentModalForm
-    _REDIRECT_URL = "compensation:detail"
+    model = Compensation
+    document_model = CompensationDocument
+    form = EditDocumentModalForm
+    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,11 +5,20 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib.auth.mixins import LoginRequiredMixin
+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.log import AbstractLogView
 
 
-class CompensationLogView(LoginRequiredMixin, AbstractLogView):
-    _MODEL_CLS = Compensation
+class CompensationLogView(AbstractLogView):
+    model = 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/report.py

@@ -5,48 +5,76 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
+from django.http import HttpRequest
+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.sub_settings.django_settings import BASE_URL
-from konova.utils.qrcode import QrCode
-from konova.views.report import BaseReportView
+from konova.contexts import BaseContext
+from konova.forms import SimpleGeomForm
+from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
+from konova.utils.generators import generate_qr_code
 
 
-class BaseCompensationReportView(BaseReportView):
-    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")
+def report_view(request: HttpRequest, id: str):
+    """ Renders the public report view
 
-        return {
-            "before_states": before_states,
-            "after_states": after_states,
-            "actions": actions,
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The id of the intervention
+
+    Returns:
+
+    """
+    # Reuse the compensation report template since compensations are structurally identical
+    template = "compensation/report/compensation/report.html"
+    comp = get_object_or_404(Compensation, id=id)
+
+    tab_title = _("Report {}").format(comp.identifier)
+    # If intervention is not recorded (yet or currently) we need to render another template without any data
+    if not comp.is_ready_for_publish():
+        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()
 
-class CompensationReportView(BaseCompensationReportView):
-    _MODEL = Compensation
-    _TEMPLATE = "compensation/report/compensation/report.html"
+    qrcode_url = request.build_absolute_uri(reverse("compensation:report", args=(id,)))
+    qrcode_img = generate_qr_code(qrcode_url, 10)
+    qrcode_lanis_url = comp.get_LANIS_link()
+    qrcode_img_lanis = generate_qr_code(qrcode_lanis_url, 7)
 
-    def _get_report_context(self, obj):
-        report_url = BASE_URL + reverse("compensation:report", args=(obj.id,))
-        qrcode_report = QrCode(report_url, 10)
-        qrcode_lanis = QrCode(obj.get_LANIS_link(), 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")
 
-        report_context = {
-            "qrcode": {
-                "img": qrcode_report.get_img(),
-                "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
-            "tables_scrollable": False,
-        }
-        report_context.update(self._get_compensation_report_context(obj))
-        return report_context
+    context = {
+        "obj": comp,
+        "qrcode": {
+            "img": qrcode_img,
+            "url": qrcode_url,
+        },
+        "qrcode_lanis": {
+            "img": qrcode_img_lanis,
+            "url": qrcode_lanis_url,
+        },
+        "has_access": False,  # disables action buttons during rendering
+        "before_states": before_states,
+        "after_states": after_states,
+        "geom_form": geom_form,
+        "parcels": parcels,
+        "actions": actions,
+        "tables_scrollable": False,
+        TAB_TITLE_IDENTIFIER: tab_title,
+    }
+    context = BaseContext(request, context).context
+    return render(request, template, context)

compensation/views/compensation/resubmission.py

@@ -5,12 +5,22 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from compensation.forms.modals.resubmission import CompensationResubmissionModalForm
+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.resubmission import AbstractResubmissionView
 
 
 class CompensationResubmissionView(AbstractResubmissionView):
-    _MODEL_CLS = Compensation
-    _FORM_CLS = CompensationResubmissionModalForm
-    _REDIRECT_URL = "compensation:detail"
+    model = Compensation
+    redirect_url_base = "compensation:detail"
+    form_action_url_base = "compensation:resubmission-create"
+
+    @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,21 +5,46 @@ 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_CLS = Compensation
-    _REDIRECT_URL = "compensation:detail"
+    model = Compensation
+    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_CLS = Compensation
-    _REDIRECT_URL = "compensation:detail"
+    model = Compensation
+    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_CLS = Compensation
-    _REDIRECT_URL = "compensation:detail"
+    model = Compensation
+    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,22 +5,46 @@ 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_CLS = EcoAccount
-    _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)
+    @method_decorator(shared_access_required(EcoAccount, "id"))
+    def dispatch(self, request, *args, **kwargs):
+        return super().dispatch(request, *args, **kwargs)
 
 
 class EditEcoAccountActionView(AbstractEditCompensationActionView):
-    _MODEL_CLS = EcoAccount
-    _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)
+    @method_decorator(shared_access_required(EcoAccount, "id"))
+    def dispatch(self, request, *args, **kwargs):
+        return super().dispatch(request, *args, **kwargs)
 
 
 class RemoveEcoAccountActionView(AbstractRemoveCompensationActionView):
-    _MODEL_CLS = EcoAccount
-    _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)
+    @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,22 +5,45 @@ 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_CLS = EcoAccount
-    _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)
+    @method_decorator(shared_access_required(EcoAccount, "id"))
+    def dispatch(self, request, *args, **kwargs):
+        return super().dispatch(request, *args, **kwargs)
 
 
 class EditEcoAccountDeadlineView(AbstractEditDeadlineView):
-    _MODEL_CLS = EcoAccount
-    _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)
+    @method_decorator(shared_access_required(EcoAccount, "id"))
+    def dispatch(self, request, *args, **kwargs):
+        return super().dispatch(request, *args, **kwargs)
 
 
 class RemoveEcoAccountDeadlineView(AbstractRemoveDeadlineView):
-    _MODEL_CLS = EcoAccount
-    _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)
+    @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,33 +5,54 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib.auth.mixins import LoginRequiredMixin
+from django.contrib.auth.decorators import login_required
 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(LoginRequiredMixin, AbstractNewDeductionView):
-    _MODEL_CLS = EcoAccount
-    _REDIRECT_URL = _ECO_ACCOUNT_DETAIl_URL_NAME
+class NewEcoAccountDeductionView(AbstractNewDeductionView):
+    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)
 
     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):
-        # Deductions can be created on recorded as well as on non-recorded entries
-        return None
+
+class EditEcoAccountDeductionView(AbstractEditDeductionView):
+    def _custom_check(self, obj):
+        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 EditEcoAccountDeductionView(LoginRequiredMixin, AbstractEditDeductionView):
-    _MODEL_CLS = EcoAccount
-    _REDIRECT_URL = _ECO_ACCOUNT_DETAIl_URL_NAME
+class RemoveEcoAccountDeductionView(AbstractRemoveDeductionView):
+    def _custom_check(self, obj):
+        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(LoginRequiredMixin, AbstractRemoveDeductionView):
-    _MODEL_CLS = EcoAccount
-    _REDIRECT_URL = _ECO_ACCOUNT_DETAIl_URL_NAME

compensation/views/eco_account/document.py

@@ -5,33 +5,65 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from compensation.forms.modals.document import NewEcoAccountDocumentModalForm, RemoveEcoAccountDocumentModalForm, \
-    EditEcoAccountDocumentModalForm
+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.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_CLS = EcoAccount
-    _FORM_CLS = NewEcoAccountDocumentModalForm
-    _REDIRECT_URL = "compensation:acc:detail"
+    model = EcoAccount
+    form = NewEcoAccountDocumentModalForm
+    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_CLS = EcoAccount
-    _DOCUMENT_CLS = EcoAccountDocument
+    model = EcoAccount
+    document_model = 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_CLS = EcoAccount
-    _DOCUMENT_CLS = EcoAccountDocument
-    _FORM_CLS = RemoveEcoAccountDocumentModalForm
-    _REDIRECT_URL = "compensation:acc:detail"
+    model = EcoAccount
+    document_model = EcoAccountDocument
+
+    @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 EditEcoAccountDocumentView(AbstractEditDocumentView):
-    _MODEL_CLS = EcoAccount
-    _DOCUMENT_CLS = EcoAccountDocument
-    _FORM_CLS = EditEcoAccountDocumentModalForm
-    _REDIRECT_URL = "compensation:acc:detail"
+    model = EcoAccount
+    document_model = EcoAccountDocument
+    form = EditDocumentModalForm
+    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

@@ -7,8 +7,8 @@ Created on: 19.08.22
 """
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
-from django.contrib.auth.mixins import LoginRequiredMixin
-from django.http import HttpRequest
+from django.db.models import Sum
+from django.http import HttpRequest, JsonResponse
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
@@ -17,52 +17,43 @@ from compensation.forms.eco_account import EditEcoAccountForm, NewEcoAccountForm
 from compensation.models import EcoAccount
 from compensation.tables.eco_account import EcoAccountTable
 from konova.contexts import BaseContext
-from konova.decorators import shared_access_required, default_group_required, login_required_modal
+from konova.decorators import shared_access_required, default_group_required, any_group_check, login_required_modal, \
+    uuid_required
 from konova.forms import SimpleGeomForm
-from konova.settings import ETS_GROUP
+from konova.settings import ETS_GROUP, DEFAULT_GROUP, ZB_GROUP
 from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.message_templates import CANCEL_ACC_RECORDED_OR_DEDUCTED, RECORDED_BLOCKS_EDIT, FORM_INVALID, \
-    IDENTIFIER_REPLACED, GEOMETRY_SIMPLIFIED, GEOMETRIES_IGNORED_TEMPLATE
-from konova.views.base import BaseIndexView, BaseIdentifierGeneratorView, BaseNewSpatialLocatedObjectFormView, \
-    BaseEditSpatialLocatedObjectFormView
-from konova.views.detail import BaseDetailView
-from konova.views.remove import BaseRemoveModalFormView
+    IDENTIFIER_REPLACED, DO_NOT_FORGET_TO_SHARE, GEOMETRY_SIMPLIFIED
 
 
-class EcoAccountIndexView(LoginRequiredMixin, BaseIndexView):
-    _INDEX_TABLE_CLS = EcoAccountTable
-    _TAB_TITLE = _("Eco-account - Overview")
+@login_required
+@any_group_check
+def index_view(request: HttpRequest):
+    """
+    Renders the index view for eco accounts
 
-    def _get_queryset(self):
-        qs = EcoAccount.objects.filter(
-            deleted=None,
-        ).order_by(
-            "-modified__timestamp"
-        )
-        return qs
+    Args:
+        request (HttpRequest): The incoming request
 
-
-class NewEcoAccountFormView(BaseNewSpatialLocatedObjectFormView):
-    _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):
-        # User has to be a default user
-        return user.is_default_user()
-
-
-class EditEcoAccountFormView(BaseEditSpatialLocatedObjectFormView):
-    _FORM_CLS = EditEcoAccountForm
-    _MODEL_CLS = EcoAccount
-    _TEMPLATE = "compensation/form/view.html"
-    _REDIRECT_URL = "compensation:acc:detail"
-
-    def _user_has_permission(self, user):
-        # User has to be a default user
-        return user.is_default_user()
+    Returns:
+        A rendered view
+    """
+    template = "generic_index.html"
+    eco_accounts = EcoAccount.objects.filter(
+        deleted=None,
+    ).order_by(
+        "-modified__timestamp"
+    )
+    table = EcoAccountTable(
+        request=request,
+        queryset=eco_accounts
+    )
+    context = {
+        "table": table,
+        TAB_TITLE_IDENTIFIER: _("Eco-account - Overview"),
+    }
+    context = BaseContext(request, context).context
+    return render(request, template, context)
 
 
 @login_required
@@ -93,19 +84,11 @@ def new_view(request: HttpRequest):
                     )
                 )
             messages.success(request, _("Eco-Account {} added").format(acc.identifier))
-            if geom_form.has_geometry_simplified():
+            if geom_form.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",)
@@ -121,9 +104,23 @@ def new_view(request: HttpRequest):
     return render(request, template, context)
 
 
-class EcoAccountIdentifierGeneratorView(LoginRequiredMixin, BaseIdentifierGeneratorView):
-    _MODEL_CLS = EcoAccount
-    _REDIRECT_URL = "compensation:acc:index"
+@login_required
+@default_group_required
+def new_id_view(request: HttpRequest):
+    """ JSON endpoint
+
+    Provides fetching of free identifiers for e.g. AJAX calls
+
+    """
+    tmp = EcoAccount()
+    identifier = tmp.generate_new_identifier()
+    while EcoAccount.objects.filter(identifier=identifier).exists():
+        identifier = tmp.generate_new_identifier()
+    return JsonResponse(
+        data={
+            "gen_data": identifier
+        }
+    )
 
 
 @login_required
@@ -159,19 +156,11 @@ def edit_view(request: HttpRequest, id: str):
             # 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():
+            if geom_form.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",)
@@ -187,78 +176,116 @@ def edit_view(request: HttpRequest, id: str):
     return render(request, template, context)
 
 
-class EcoAccountDetailView(BaseDetailView):
-    _MODEL_CLS = EcoAccount
-    _TEMPLATE = "compensation/detail/eco_account/view.html"
+@login_required
+@any_group_check
+@uuid_required
+def detail_view(request: HttpRequest, id: str):
+    """ Renders a detail view for a compensation
 
-    def _get_object(self, id: str):
-        """ Fetch object for detail view
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The compensation's id
 
-        Args:
-            id (str): The record's id'
+    Returns:
 
-        Returns:
+    """
+    template = "compensation/detail/eco_account/view.html"
+    acc = get_object_or_404(
+        EcoAccount.objects.prefetch_related(
+            "deadlines",
+        ).select_related(
+            'geometry',
+            'responsible',
+        ),
+        id=id,
+        deleted=None,
+    )
+    geom_form = SimpleGeomForm(instance=acc)
+    parcels = acc.get_underlying_parcels()
+    _user = request.user
+    is_data_shared = acc.is_shared_with(_user)
 
-        """
-        acc = get_object_or_404(
-            EcoAccount.objects.prefetch_related(
-                "deadlines",
-            ).select_related(
-                'geometry',
-                'responsible',
-            ),
-            id=id,
-            deleted=None,
+    # 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
         )
-        return acc
 
-    def _get_detail_context(self, obj: EcoAccount):
-        """ Generate object specific detail context for  view
-
-        Args:
-            obj (): The record
-
-        Returns:
-
-        """
-        # Order states according to surface
-        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 = {
-            "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,
-            "deductions": deductions,
-            "actions": actions,
-            "has_finished_deadlines": obj.get_finished_deadlines().exists(),
-        }
-        return context
+    context = {
+        "obj": acc,
+        "geom_form": geom_form,
+        "parcels": parcels,
+        "has_access": is_data_shared,
+        "before_states": before_states,
+        "after_states": after_states,
+        "sum_before_states": sum_before_states,
+        "sum_after_states": sum_after_states,
+        "diff_states": diff_states,
+        "available": available_relative,
+        "available_total": available_total,
+        "is_default_member": _user.in_group(DEFAULT_GROUP),
+        "is_zb_member": _user.in_group(ZB_GROUP),
+        "is_ets_member": _user.in_group(ETS_GROUP),
+        "LANIS_LINK": acc.get_LANIS_link(),
+        "deductions": deductions,
+        "actions": actions,
+        TAB_TITLE_IDENTIFIER: f"{acc.identifier} - {acc.title}",
+        "has_finished_deadlines": acc.get_finished_deadlines().exists(),
+    }
+    context = BaseContext(request, context).context
+    return render(request, template, context)
 
 
-class RemoveEcoAccountView(LoginRequiredMixin, BaseRemoveModalFormView):
-    _MODEL_CLS = EcoAccount
-    _FORM_CLS = RemoveEcoAccountModalForm
-    _REDIRECT_URL = "compensation:acc:index"
+@login_required_modal
+@login_required
+@default_group_required
+@shared_access_required(EcoAccount, "id")
+def remove_view(request: HttpRequest, id: str):
+    """ Renders a modal view for removing the eco account
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The account's id
+
+    Returns:
+
+    """
+    acc = get_object_or_404(EcoAccount, id=id)
+
+    # If the eco account has already been recorded OR there are already deductions, it can not be deleted by a regular
+    # default group user
+    if acc.recorded is not None or acc.deductions.exists():
+        user = request.user
+        if not user.in_group(ETS_GROUP):
+            messages.info(request, CANCEL_ACC_RECORDED_OR_DEDUCTED)
+            return redirect("compensation:acc:detail", id=id)
+
+    form = RemoveEcoAccountModalForm(request.POST or None, instance=acc, request=request)
+    return form.process_request(
+        request=request,
+        msg_success=_("Eco-account removed"),
+        redirect_url=reverse("compensation:acc:index"),
+    )
 
-    def _user_has_permission(self, user):
-        return user.is_default_user()

compensation/views/eco_account/log.py

@@ -5,11 +5,20 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib.auth.mixins import LoginRequiredMixin
+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.log import AbstractLogView
 
 
-class EcoAccountLogView(LoginRequiredMixin, AbstractLogView):
-    _MODEL_CLS = EcoAccount
+class EcoAccountLogView(AbstractLogView):
+    model = 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,12 +5,20 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib.auth.mixins import LoginRequiredMixin
+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, conservation_office_group_required, login_required_modal
 from konova.views.record import AbstractRecordView
 
 
-class EcoAccountRecordView(LoginRequiredMixin, AbstractRecordView):
-    _MODEL_CLS = EcoAccount
-    _REDIRECT_URL = "compensation:acc:detail"
+class EcoAccountRecordView(AbstractRecordView):
+    model = EcoAccount
+
+    @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/report.py

@@ -5,41 +5,83 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
+from django.http import HttpRequest
+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 compensation.views.compensation.report import BaseCompensationReportView
-from konova.sub_settings.django_settings import BASE_URL
-from konova.utils.qrcode import QrCode
+from konova.contexts import BaseContext
+from konova.forms import SimpleGeomForm
+from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
+from konova.utils.generators import generate_qr_code
 
 
-class EcoAccountReportView(BaseCompensationReportView):
-    _MODEL = EcoAccount
-    _TEMPLATE = "compensation/report/eco_account/report.html"
+def report_view(request: HttpRequest, id: str):
+    """ Renders the public report view
 
-    def _get_report_context(self, obj):
-        report_url = BASE_URL + reverse("compensation:acc:report", args=(obj.id,))
-        qrcode_report = QrCode(report_url, 10)
-        qrcode_lanis = QrCode(obj.get_LANIS_link(), 7)
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The id of the intervention
 
-        # Reduce amount of db fetched data to the bare minimum we need in the template (deduction's intervention id and identifier)
-        deductions = obj.deductions.all() \
-            .distinct("intervention") \
-            .select_related("intervention") \
-            .values_list("intervention__id", "intervention__identifier", "intervention__title", named=True)
+    Returns:
 
-        report_context = {
-            "qrcode": {
-                "img": qrcode_report.get_img(),
-                "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
-            "deductions": deductions,
-            "tables_scrollable": False,
+    """
+    # Reuse the compensation report template since EcoAccounts are structurally identical
+    template = "compensation/report/eco_account/report.html"
+    acc = get_object_or_404(EcoAccount, id=id)
+
+    tab_title = _("Report {}").format(acc.identifier)
+    # If intervention is not recorded (yet or currently) we need to render another template without any data
+    if not acc.is_ready_for_publish():
+        template = "report/unavailable.html"
+        context = {
+            TAB_TITLE_IDENTIFIER: tab_title,
         }
-        report_context.update(self._get_compensation_report_context(obj))
-        return report_context
+        context = BaseContext(request, context).context
+        return render(request, template, context)
+
+    # Prepare data for map viewer
+    geom_form = SimpleGeomForm(
+        instance=acc
+    )
+    parcels = acc.get_underlying_parcels()
+
+    qrcode_url = request.build_absolute_uri(reverse("compensation:acc:report", args=(id,)))
+    qrcode_img = generate_qr_code(qrcode_url, 10)
+    qrcode_lanis_url = acc.get_LANIS_link()
+    qrcode_img_lanis = generate_qr_code(qrcode_lanis_url, 7)
+
+    # Order states by surface
+    before_states = acc.before_states.all().order_by("-surface").select_related("biotope_type__parent")
+    after_states = acc.after_states.all().order_by("-surface").select_related("biotope_type__parent")
+    actions = acc.actions.all().prefetch_related("action_type__parent")
+
+    # Reduce amount of db fetched data to the bare minimum we need in the template (deduction's intervention id and identifier)
+    deductions = acc.deductions.all()\
+        .distinct("intervention")\
+        .select_related("intervention")\
+        .values_list("intervention__id", "intervention__identifier", "intervention__title", named=True)
+
+    context = {
+        "obj": acc,
+        "qrcode": {
+            "img": qrcode_img,
+            "url": qrcode_url,
+        },
+        "qrcode_lanis": {
+            "img": qrcode_img_lanis,
+            "url": qrcode_lanis_url,
+        },
+        "has_access": False,  # disables action buttons during rendering
+        "before_states": before_states,
+        "after_states": after_states,
+        "geom_form": geom_form,
+        "parcels": parcels,
+        "actions": actions,
+        "deductions": deductions,
+        "tables_scrollable": False,
+        TAB_TITLE_IDENTIFIER: tab_title,
+    }
+    context = BaseContext(request, context).context
+    return render(request, template, context)

compensation/views/eco_account/resubmission.py

@@ -5,12 +5,22 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from compensation.forms.modals.resubmission import EcoAccountResubmissionModalForm
+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.resubmission import AbstractResubmissionView
 
 
 class EcoAccountResubmissionView(AbstractResubmissionView):
-    _MODEL_CLS = EcoAccount
-    _FORM_CLS = EcoAccountResubmissionModalForm
-    _REDIRECT_URL = "compensation:acc:detail"
+    model = EcoAccount
+    redirect_url_base = "compensation:acc:detail"
+    form_action_url_base = "compensation:acc:resubmission-create"
+
+    @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,15 +5,29 @@ 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_CLS = EcoAccount
-    _REDIRECT_URL = "compensation:acc:detail"
+    model = EcoAccount
+    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_CLS = EcoAccount
-    _REDIRECT_URL = "compensation:acc:detail"
+    model = 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/state.py

@@ -5,21 +5,46 @@ 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_CLS = EcoAccount
-    _REDIRECT_URL = "compensation:acc:detail"
+    model = 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)
 
 
 class EditEcoAccountStateView(AbstractEditCompensationStateView):
-    _MODEL_CLS = EcoAccount
-    _REDIRECT_URL = "compensation:acc:detail"
+    model = 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)
 
 
 class RemoveEcoAccountStateView(AbstractRemoveCompensationStateView):
-    _MODEL_CLS = EcoAccount
-    _REDIRECT_URL = "compensation:acc:detail"
+    model = 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)

ema/forms.py

@@ -15,8 +15,7 @@ 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, EditDocumentModalForm, RemoveDocumentModalForm, \
-    ResubmissionModalForm
+from konova.forms.modals import NewDocumentModalForm
 from user.models import UserActionLogEntry
 
 
@@ -171,13 +170,4 @@ class EditEmaForm(NewEmaForm):
 
 
 class NewEmaDocumentModalForm(NewDocumentModalForm):
-    _DOCUMENT_CLS = EmaDocument
-
-class EditEmaDocumentModalForm(EditDocumentModalForm):
-    _DOCUMENT_CLS = EmaDocument
-
-class RemoveEmaDocumentModalForm(RemoveDocumentModalForm):
-    _DOCUMENT_CLS = EmaDocument
-
-class EmaResubmissionModalForm(ResubmissionModalForm):
-    _MODEL_CLS = Ema
+    document_model = EmaDocument

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

@@ -10,7 +10,7 @@
             </div>
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
-                    {% if is_default_member and is_entry_shared  %}
+                    {% if is_default_member and has_access  %}
                     <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'ema:new-action' obj.id %}" title="{% trans 'Add new action' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'seedling' %}
@@ -49,7 +49,7 @@
                     <hr>
                     {% endfor %}
                     {% for detail in action.action_type_details.all %}
-                        <span class="badge badge-pill rlp-r" title="{{ detail.parent.long_name }} > {{detail}}">{{ detail.parent.long_name }} > {{detail.long_name}}</span>
+                        <span class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</span>
                     {% empty %}
                         <span class="badge badge-pill rlp-r-outline" title="{% trans 'No action type details' %}">{% trans 'No action type details' %}</span>
                     {% endfor %}
@@ -61,7 +61,7 @@
                     </div>
                 </td>
                 <td class="align-middle float-right">
-                    {% if is_default_member and is_entry_shared  %}
+                    {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'ema:action-edit' obj.id action.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit action' %}">
                         {% fa5_icon 'edit' %}
                     </button>

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

@@ -11,7 +11,7 @@
             {% fa5_icon 'file-alt' %}
         </button>
     </a>
-    {% if is_entry_shared %}
+    {% if has_access %}
         <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>

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

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

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

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

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

@@ -10,7 +10,7 @@
             </div>
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
-                    {% if is_default_member and is_entry_shared  %}
+                    {% if is_default_member and has_access  %}
                     <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'ema:new-state' obj.id %}" title="{% trans 'Add new state after' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'layer-group' %}
@@ -49,14 +49,14 @@
                     <span>{{ state.biotope_type.parent.long_name }} {% fa5_icon 'angle-right' %} {{ state.biotope_type.long_name }} ({{state.biotope_type.short_name}})</span>
                     <br>
                     {% for detail in state.biotope_type_details.all %}
-                        <span class="badge badge-pill rlp-r" title="{{ detail.parent.short_name }} > {{detail}}">{{ detail.parent.short_name }} > {{ detail.long_name }}</span>
+                        <span class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</span>
                     {% empty %}
                         <span class="badge badge-pill rlp-r-outline" title="{% trans 'No biotope type details' %}">{% trans 'No biotope type details' %}</span>
                     {% endfor %}
                 </td>
                 <td>{{ state.surface|floatformat:2 }} m²</td>
                 <td class="align-middle float-right">
-                    {% if is_default_member and is_entry_shared  %}
+                    {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'ema:state-edit' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit state' %}">
                         {% fa5_icon 'edit' %}
                     </button>

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

@@ -10,7 +10,7 @@
             </div>
             <div class="col-sm-6">
                 <div class="d-flex justify-content-end">
-                    {% if is_default_member and is_entry_shared  %}
+                    {% if is_default_member and has_access  %}
                     <button class="btn btn-outline-default btn-modal" data-form-url="{% url 'ema:new-state' obj.id %}?before=true" title="{% trans 'Add new state before' %}">
                         {% fa5_icon 'plus' %}
                         {% fa5_icon 'layer-group' %}
@@ -49,14 +49,14 @@
                     <span>{{ state.biotope_type.parent.long_name }} {% fa5_icon 'angle-right' %} {{ state.biotope_type.long_name }} ({{state.biotope_type.short_name}})</span>
                     <br>
                     {% for detail in state.biotope_type_details.all %}
-                        <span class="badge badge-pill rlp-r" title="{{ detail.parent.short_name }} > {{detail}}">{{ detail.parent.short_name }} > {{ detail.long_name }}</span>
+                        <span class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</span>
                     {% empty %}
                         <span class="badge badge-pill rlp-r-outline" title="{% trans 'No biotope type details' %}">{% trans 'No biotope type details' %}</span>
                     {% endfor %}
                 </td>
                 <td>{{ state.surface|floatformat:2 }} m²</td>
                 <td class="align-middle float-right">
-                    {% if is_default_member and is_entry_shared  %}
+                    {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'ema:state-edit' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Edit state' %}">
                         {% fa5_icon 'edit' %}
                     </button>

ema/templates/ema/detail/view.html

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

ema/tests/test_workflow.py

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

ema/tests/unit/test_forms.py

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

ema/urls.py

@@ -10,26 +10,25 @@ from django.urls import path
 from ema.views.action import NewEmaActionView, EditEmaActionView, RemoveEmaActionView
 from ema.views.deadline import NewEmaDeadlineView, EditEmaDeadlineView, RemoveEmaDeadlineView
 from ema.views.document import NewEmaDocumentView, EditEmaDocumentView, RemoveEmaDocumentView, GetEmaDocumentView
-from ema.views.ema import EmaIndexView, EmaIdentifierGeneratorView, EmaDetailView, EditEmaFormView, NewEmaFormView, \
-    RemoveEmaView
+from ema.views.ema import index_view, new_view, new_id_view, detail_view, edit_view, remove_view
 from ema.views.log import EmaLogView
 from ema.views.record import EmaRecordView
-from ema.views.report import EmaReportView
+from ema.views.report import report_view
 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("", EmaIndexView.as_view(), name="index"),
-    path("new/", NewEmaFormView.as_view(), name="new"),
-    path("new/id", EmaIdentifierGeneratorView.as_view(), name="new-id"),
-    path("<id>", EmaDetailView.as_view(), name="detail"),
+    path("", index_view, name="index"),
+    path("new/", new_view, name="new"),
+    path("new/id", new_id_view, name="new-id"),
+    path("<id>", detail_view, name="detail"),
     path('<id>/log', EmaLogView.as_view(), name='log'),
-    path('<id>/edit', EditEmaFormView.as_view(), name='edit'),
-    path('<id>/remove', RemoveEmaView.as_view(), name='remove'),
+    path('<id>/edit', edit_view, name='edit'),
+    path('<id>/remove', remove_view, name='remove'),
     path('<id>/record', EmaRecordView.as_view(), name='record'),
-    path('<id>/report', EmaReportView.as_view(), name='report'),
+    path('<id>/report', report_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,31 +5,46 @@ 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_CLS = Ema
-    _REDIRECT_URL = _EMA_ACCOUNT_DETAIL_URL_NAME
+    model = 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)
 
-    def _user_has_permission(self, user):
-        return user.is_ets_user()
 
 class EditEmaActionView(AbstractEditCompensationActionView):
-    _MODEL_CLS = Ema
-    _REDIRECT_URL = _EMA_ACCOUNT_DETAIL_URL_NAME
+    model = Ema
+    redirect_url = "ema:detail"
 
-    def _user_has_permission(self, user):
-        return user.is_ets_user()
+    @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)
 
 
 class RemoveEmaActionView(AbstractRemoveCompensationActionView):
-    _MODEL_CLS = Ema
-    _REDIRECT_URL = _EMA_ACCOUNT_DETAIL_URL_NAME
+    model = Ema
+    redirect_url = "ema:detail"
 
-    def _user_has_permission(self, user):
-        return user.is_ets_user()
+    @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/deadline.py

@@ -5,30 +5,46 @@ 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_CLS = Ema
-    _REDIRECT_URL = _EMA_DETAIL_URL_NAME
+    model = Ema
+    redirect_url = "ema:detail"
 
-    def _user_has_permission(self, user):
-        return user.is_ets_user()
+    @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)
 
 
 class EditEmaDeadlineView(AbstractEditDeadlineView):
-    _MODEL_CLS = Ema
-    _REDIRECT_URL = _EMA_DETAIL_URL_NAME
+    model = Ema
+    redirect_url = "ema:detail"
 
-    def _user_has_permission(self, user):
-        return user.is_ets_user()
+    @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)
 
 
 class RemoveEmaDeadlineView(AbstractRemoveDeadlineView):
-    _MODEL_CLS = Ema
-    _REDIRECT_URL = _EMA_DETAIL_URL_NAME
+    model = 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)
 
-    def _user_has_permission(self, user):
-        return user.is_ets_user()

ema/views/document.py

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

@@ -5,112 +5,255 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib.auth.mixins import LoginRequiredMixin
-from django.shortcuts import get_object_or_404
+from django.contrib import messages
+from django.contrib.auth.decorators import login_required
+from django.db.models import Sum
+from django.http import HttpRequest, JsonResponse
+from django.shortcuts import get_object_or_404, redirect, render
+from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
 from ema.forms import NewEmaForm, EditEmaForm
 from ema.models import Ema
 from ema.tables import EmaTable
-from konova.views.base import BaseIndexView, BaseIdentifierGeneratorView, BaseNewSpatialLocatedObjectFormView, \
-    BaseEditSpatialLocatedObjectFormView
-from konova.views.detail import BaseDetailView
-from konova.views.remove import BaseRemoveModalFormView
+from konova.contexts import BaseContext
+from konova.decorators import shared_access_required, conservation_office_group_required, login_required_modal, \
+    uuid_required
+from konova.forms import SimpleGeomForm
+from konova.forms.modals import RemoveModalForm
+from konova.settings import DEFAULT_GROUP, ZB_GROUP, ETS_GROUP
+from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
+from konova.utils.message_templates import RECORDED_BLOCKS_EDIT, IDENTIFIER_REPLACED, FORM_INVALID, \
+    DO_NOT_FORGET_TO_SHARE, GEOMETRY_SIMPLIFIED
 
 
-class EmaIndexView(LoginRequiredMixin, BaseIndexView):
-    _TAB_TITLE = _("EMAs - Overview")
-    _INDEX_TABLE_CLS = EmaTable
+@login_required
+def index_view(request: HttpRequest):
+    """ Renders the index view for EMAs
 
-    def _get_queryset(self):
-        qs = Ema.objects.filter(
-            deleted=None,
-        ).order_by(
-            "-modified__timestamp"
-        )
-        return qs
+    Args:
+        request (HttpRequest): The incoming request
+
+    Returns:
+
+    """
+    template = "generic_index.html"
+    emas = Ema.objects.filter(
+        deleted=None,
+    ).order_by(
+        "-modified__timestamp"
+    )
+
+    table = EmaTable(
+        request,
+        queryset=emas
+    )
+    context = {
+        "table": table,
+        TAB_TITLE_IDENTIFIER: _("EMAs - Overview"),
+    }
+    context = BaseContext(request, context).context
+    return render(request, template, context)
 
 
-class NewEmaFormView(BaseNewSpatialLocatedObjectFormView):
-    _FORM_CLS = NewEmaForm
-    _MODEL_CLS = Ema
-    _TEMPLATE = "ema/form/view.html"
-    _TAB_TITLE = _("New EMA")
-    _REDIRECT_URL = "ema:detail"
+@login_required
+@conservation_office_group_required
+def new_view(request: HttpRequest):
+    """
+    Renders a view for a new eco account creation
 
-    def _user_has_permission(self, user):
-        # User has to be an ets user
-        return user.is_ets_user()
+    Args:
+        request (HttpRequest): The incoming request
+
+    Returns:
+
+    """
+    template = "ema/form/view.html"
+    data_form = NewEmaForm(request.POST or None)
+    geom_form = SimpleGeomForm(request.POST or None, read_only=False)
+    if request.method == "POST":
+        if data_form.is_valid() and geom_form.is_valid():
+            generated_identifier = data_form.cleaned_data.get("identifier", None)
+            ema = data_form.save(request.user, geom_form)
+            if generated_identifier != ema.identifier:
+                messages.info(
+                    request,
+                    IDENTIFIER_REPLACED.format(
+                        generated_identifier,
+                        ema.identifier
+                    )
+                )
+            messages.success(request, _("EMA {} added").format(ema.identifier))
+            if geom_form.geometry_simplified:
+                messages.info(
+                    request,
+                    GEOMETRY_SIMPLIFIED
+                )
+
+            return redirect("ema:detail", id=ema.id)
+        else:
+            messages.error(request, FORM_INVALID, extra_tags="danger",)
+    else:
+        # For clarification: nothing in this case
+        pass
+    context = {
+        "form": data_form,
+        "geom_form": geom_form,
+        TAB_TITLE_IDENTIFIER: _("New EMA"),
+    }
+    context = BaseContext(request, context).context
+    return render(request, template, context)
 
 
-class EditEmaFormView(BaseEditSpatialLocatedObjectFormView):
-    _MODEL_CLS = Ema
-    _FORM_CLS = EditEmaForm
-    _TEMPLATE = "ema/form/view.html"
-    _REDIRECT_URL = "ema:detail"
-    _TAB_TITLE = _("Edit {}")
+@login_required
+@conservation_office_group_required
+def new_id_view(request: HttpRequest):
+    """ JSON endpoint
 
-    def _user_has_permission(self, user):
-        # User has to be an ets user
-        return user.is_ets_user()
+    Provides fetching of free identifiers for e.g. AJAX calls
 
-
-class EmaIdentifierGeneratorView(LoginRequiredMixin, BaseIdentifierGeneratorView):
-    _MODEL_CLS = Ema
-    _REDIRECT_URL = "ema:index"
-
-    def _user_has_permission(self, user):
-        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:
-            id (str): The record's id'
-
-        Returns:
-
-        """
-        ema = get_object_or_404(Ema, id=id, deleted=None)
-        return ema
-
-    def _get_detail_context(self, obj: Ema):
-        """ Generate object specific detail context for  view
-
-        Args:
-            obj (): The record
-
-        Returns:
-
-        """
-        # Order states according to surface
-        before_states = obj.before_states.all().order_by("-surface")
-        after_states = obj.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 = obj.get_surface_before_states()
-        sum_after_states = obj.get_surface_after_states()
-        diff_states = abs(sum_before_states - sum_after_states)
-
-        context = {
-            "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(),
+    """
+    tmp = Ema()
+    identifier = tmp.generate_new_identifier()
+    while Ema.objects.filter(identifier=identifier).exists():
+        identifier = tmp.generate_new_identifier()
+    return JsonResponse(
+        data={
+            "gen_data": identifier
         }
-        return context
+    )
 
-class RemoveEmaView(LoginRequiredMixin, BaseRemoveModalFormView):
-    _MODEL_CLS = Ema
-    _REDIRECT_URL = "ema:index"
 
-    def _user_has_permission(self, user):
-        return user.is_ets_user()
+@login_required
+@uuid_required
+def detail_view(request: HttpRequest, id: str):
+    """ Renders the detail view of an EMA
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The EMA id
+
+    Returns:
+
+    """
+    template = "ema/detail/view.html"
+    ema = get_object_or_404(Ema, id=id, deleted=None)
+
+    geom_form = SimpleGeomForm(instance=ema)
+    parcels = ema.get_underlying_parcels()
+    _user = request.user
+    is_data_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,
+        "has_access": is_data_shared,
+        "before_states": before_states,
+        "after_states": after_states,
+        "sum_before_states": sum_before_states,
+        "sum_after_states": sum_after_states,
+        "diff_states": diff_states,
+        "is_default_member": _user.in_group(DEFAULT_GROUP),
+        "is_zb_member": _user.in_group(ZB_GROUP),
+        "is_ets_member": _user.in_group(ETS_GROUP),
+        "LANIS_LINK": ema.get_LANIS_link(),
+        TAB_TITLE_IDENTIFIER: f"{ema.identifier} - {ema.title}",
+        "has_finished_deadlines": ema.get_finished_deadlines().exists(),
+    }
+    context = BaseContext(request, context).context
+    return render(request, template, context)
+
+
+@login_required
+@conservation_office_group_required
+@shared_access_required(Ema, "id")
+def edit_view(request: HttpRequest, id: str):
+    """
+    Renders a view for editing compensations
+
+    Args:
+        request (HttpRequest): The incoming request
+
+    Returns:
+
+    """
+    template = "compensation/form/view.html"
+    # Get object from db
+    ema = get_object_or_404(Ema, id=id)
+    if ema.is_recorded:
+        messages.info(
+            request,
+            RECORDED_BLOCKS_EDIT
+        )
+        return redirect("ema:detail", id=id)
+
+    # Create forms, initialize with values from db/from POST request
+    data_form = EditEmaForm(request.POST or None, instance=ema)
+    geom_form = SimpleGeomForm(request.POST or None, read_only=False, instance=ema)
+    if request.method == "POST":
+        if data_form.is_valid() and geom_form.is_valid():
+            # The data form takes the geom form for processing, as well as the performing user
+            ema = data_form.save(request.user, geom_form)
+            messages.success(request, _("EMA {} edited").format(ema.identifier))
+            if geom_form.geometry_simplified:
+                messages.info(
+                    request,
+                    GEOMETRY_SIMPLIFIED
+                )
+            return redirect("ema:detail", id=ema.id)
+        else:
+            messages.error(request, FORM_INVALID, extra_tags="danger",)
+    else:
+        # For clarification: nothing in this case
+        pass
+    context = {
+        "form": data_form,
+        "geom_form": geom_form,
+        TAB_TITLE_IDENTIFIER: _("Edit {}").format(ema.identifier),
+    }
+    context = BaseContext(request, context).context
+    return render(request, template, context)
+
+
+@login_required_modal
+@login_required
+@conservation_office_group_required
+@shared_access_required(Ema, "id")
+def remove_view(request: HttpRequest, id: str):
+    """ Renders a modal view for removing the EMA
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The EMA's id
+
+    Returns:
+
+    """
+    ema = get_object_or_404(Ema, id=id)
+    form = RemoveModalForm(request.POST or None, instance=ema, request=request)
+    return form.process_request(
+        request=request,
+        msg_success=_("EMA removed"),
+        redirect_url=reverse("ema:index"),
+    )
+

ema/views/log.py

@@ -5,14 +5,20 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib.auth.mixins import LoginRequiredMixin
+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.log import AbstractLogView
 
 
-class EmaLogView(LoginRequiredMixin, AbstractLogView):
-    _MODEL_CLS = Ema
+class EmaLogView(AbstractLogView):
+    model = Ema
 
-    def _user_has_permission(self, user):
-        return user.is_ets_user()
+    @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/record.py

@@ -5,12 +5,20 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib.auth.mixins import LoginRequiredMixin
+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.record import AbstractRecordView
 
 
-class EmaRecordView(LoginRequiredMixin, AbstractRecordView):
-    _MODEL_CLS = Ema
-    _REDIRECT_URL = "ema:detail"
+class EmaRecordView(AbstractRecordView):
+    model = Ema
+
+    @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/report.py

@@ -5,36 +5,76 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
+from django.http import HttpRequest
+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.sub_settings.django_settings import BASE_URL
-from konova.utils.qrcode import QrCode
+from konova.contexts import BaseContext
+from konova.forms import SimpleGeomForm
+from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
+from konova.utils.generators import generate_qr_code
 
 
-class EmaReportView(BaseCompensationReportView):
-    _TEMPLATE = "ema/report/report.html"
-    _MODEL = Ema
+def report_view(request:HttpRequest, id: str):
+    """ Renders the public report view
 
-    def _get_report_context(self, obj):
-        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:
+        request (HttpRequest): The incoming request
+        id (str): The id of the intervention
 
-        generic_compensation_report_context = self._get_compensation_report_context(obj)
+    Returns:
 
-        report_context = {
-            "qrcode": {
-                "img": qrcode_report.get_img(),
-                "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
-            "tables_scrollable": False,
+    """
+    # Reuse the compensation report template since EMAs are structurally identical
+    template = "ema/report/report.html"
+    ema = get_object_or_404(Ema, id=id)
+
+    tab_title = _("Report {}").format(ema.identifier)
+    # If intervention is not recorded (yet or currently) we need to render another template without any data
+    if not ema.is_ready_for_publish():
+        template = "report/unavailable.html"
+        context = {
+            TAB_TITLE_IDENTIFIER: tab_title,
         }
-        report_context.update(generic_compensation_report_context)
-        return report_context
+        context = BaseContext(request, context).context
+        return render(request, template, context)
+
+    # Prepare data for map viewer
+    geom_form = SimpleGeomForm(
+        instance=ema,
+    )
+    parcels = ema.get_underlying_parcels()
+
+    qrcode_url = request.build_absolute_uri(reverse("ema:report", args=(id,)))
+    qrcode_img = generate_qr_code(qrcode_url, 10)
+    qrcode_lanis_url = ema.get_LANIS_link()
+    qrcode_img_lanis = generate_qr_code(qrcode_lanis_url, 7)
+
+    # Order states by surface
+    before_states = ema.before_states.all().order_by("-surface").prefetch_related("biotope_type")
+    after_states = ema.after_states.all().order_by("-surface").prefetch_related("biotope_type")
+    actions = ema.actions.all().prefetch_related("action_type")
+
+    context = {
+        "obj": ema,
+        "qrcode": {
+            "img": qrcode_img,
+            "url": qrcode_url
+        },
+        "qrcode_lanis": {
+            "img": qrcode_img_lanis,
+            "url": qrcode_lanis_url
+        },
+        "has_access": False,  # disables action buttons during rendering
+        "before_states": before_states,
+        "after_states": after_states,
+        "geom_form": geom_form,
+        "parcels": parcels,
+        "actions": actions,
+        "tables_scrollable": False,
+        TAB_TITLE_IDENTIFIER: tab_title,
+    }
+    context = BaseContext(request, context).context
+    return render(request, template, context)

ema/views/resubmission.py

@@ -5,16 +5,22 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from ema.forms import EmaResubmissionModalForm
+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.resubmission import AbstractResubmissionView
 
 
 class EmaResubmissionView(AbstractResubmissionView):
-    _MODEL_CLS = Ema
-    _FORM_CLS = EmaResubmissionModalForm
-    _REDIRECT_URL = "ema:detail"
-    action_url = "ema:resubmission-create"
+    model = Ema
+    redirect_url_base = "ema:detail"
+    form_action_url_base = "ema:resubmission-create"
 
-    def _user_has_permission(self, user):
-        return user.is_ets_user()
+    @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/share.py

@@ -5,17 +5,29 @@ 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_CLS = Ema
-    _REDIRECT_URL = "ema:detail"
+    model = Ema
+    redirect_url = "ema:detail"
+
+    @method_decorator(login_required)
+    def dispatch(self, request, *args, **kwargs):
+        return super().dispatch(request, *args, **kwargs)
+
 
 class EmaShareFormView(AbstractShareFormView):
-    _MODEL_CLS = Ema
-    _REDIRECT_URL = "ema:detail"
+    model = Ema
 
-    def _user_has_permission(self, user):
-        return user.is_ets_user()
+    @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/state.py

@@ -5,30 +5,46 @@ 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_CLS = Ema
-    _REDIRECT_URL = "ema:detail"
+    model = Ema
+    redirect_url = "ema:detail"
 
-    def _user_has_permission(self, user):
-        return user.is_ets_user()
+    @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)
 
 
 class EditEmaStateView(AbstractEditCompensationStateView):
-    _MODEL_CLS = Ema
-    _REDIRECT_URL = "ema:detail"
+    model = Ema
+    redirect_url = "ema:detail"
 
-    def _user_has_permission(self, user):
-        return user.is_ets_user()
+    @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)
 
 
 class RemoveEmaStateView(AbstractRemoveCompensationStateView):
-    _MODEL_CLS = Ema
-    _REDIRECT_URL = "ema:detail"
+    model = Ema
+    redirect_url = "ema:detail"
 
-    def _user_has_permission(self, user):
-        return user.is_ets_user()
+    @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)

intervention/forms/modals/deduction.py

@@ -172,8 +172,7 @@ class EditEcoAccountDeductionModalForm(NewEcoAccountDeductionModalForm):
     deduction = None
 
     def __init__(self, *args, **kwargs):
-        deduction_id = kwargs.pop("deduction_id", None)
-        self.deduction = EcoAccountDeduction.objects.get(id=deduction_id)
+        self.deduction = kwargs.pop("deduction", None)
         super().__init__(*args, **kwargs)
         self.form_title = _("Edit Deduction")
         form_data = {
@@ -253,20 +252,19 @@ class RemoveEcoAccountDeductionModalForm(RemoveModalForm):
     Can be used for anything, where removing shall be confirmed by the user a second time.
 
     """
-    _DEDUCTION_OBJ = None
+    deduction = None
 
     def __init__(self, *args, **kwargs):
-        deduction_id = kwargs.pop("deduction_id", None)
-        deduction = EcoAccountDeduction.objects.get(id=deduction_id)
-        self._DEDUCTION_OBJ = deduction
+        deduction = kwargs.pop("deduction", None)
+        self.deduction = deduction
         super().__init__(*args, **kwargs)
 
     def save(self):
         with transaction.atomic():
-            self._DEDUCTION_OBJ.intervention.mark_as_edited(self.user, edit_comment=DEDUCTION_REMOVED)
-            self._DEDUCTION_OBJ.account.mark_as_edited(self.user, edit_comment=DEDUCTION_REMOVED)
-            self._DEDUCTION_OBJ.delete()
+            self.deduction.intervention.mark_as_edited(self.user, edit_comment=DEDUCTION_REMOVED)
+            self.deduction.account.mark_as_edited(self.user, edit_comment=DEDUCTION_REMOVED)
+            self.deduction.delete()
 
     def check_for_recorded_instance(self):
-        if self._DEDUCTION_OBJ.intervention.is_recorded:
+        if self.deduction.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, EditDocumentModalForm, RemoveDocumentModalForm
+from konova.forms.modals import NewDocumentModalForm
 
 
 class NewInterventionDocumentModalForm(NewDocumentModalForm):
-    _DOCUMENT_CLS = InterventionDocument
+    document_model = InterventionDocument
 
     def save(self, *args, **kwargs):
         """ Extension of regular NewDocumentModalForm
@@ -28,31 +28,3 @@ 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/resubmission.py

@@ -1,11 +0,0 @@
-"""
-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,10 +7,9 @@ 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, Revocation
+from intervention.models import RevocationDocument
 from konova.forms.modals import BaseModalForm, RemoveModalForm
 from konova.utils import validators
 from konova.utils.message_templates import REVOCATION_ADDED, REVOCATION_EDITED
@@ -76,8 +75,7 @@ class EditRevocationModalForm(NewRevocationModalForm):
     revocation = None
 
     def __init__(self, *args, **kwargs):
-        revocation_id = kwargs.pop("revocation_id", None)
-        self.revocation = get_object_or_404(Revocation, id=revocation_id)
+        self.revocation = kwargs.pop("revocation", None)
         super().__init__(*args, **kwargs)
         self.form_title = _("Edit revocation")
         try:
@@ -106,8 +104,8 @@ class RemoveRevocationModalForm(RemoveModalForm):
     revocation = None
 
     def __init__(self, *args, **kwargs):
-        revocation_id = kwargs.pop("revocation_id", None)
-        self.revocation = get_object_or_404(Revocation, id=revocation_id)
+        revocation = kwargs.pop("revocation", None)
+        self.revocation = revocation
         super().__init__(*args, **kwargs)
 
     def save(self):

intervention/settings.py

@@ -5,8 +5,6 @@ Contact: michel.peltriaux@sgdnord.rlp.de
 Created on: 30.11.20
 
 """
-from konova.sub_settings.django_settings import env
-
 INTERVENTION_IDENTIFIER_LENGTH = 6
 INTERVENTION_IDENTIFIER_TEMPLATE = "EIV-{}"
 
@@ -16,7 +14,7 @@ INTERVENTION_LANIS_LAYER_NAME_UNRECORDED_OLD_ENTRY = "eiv_unrecorded_old_entries
 
 # EGON connection settings via rabbitmq
 # NEEDED FOR BACKWARDS COMPATIBILITY
-EGON_RABBITMQ_HOST = env("EGON_RABBITMQ_HOST")
-EGON_RABBITMQ_PORT = env("EGON_RABBITMQ_PORT")
-EGON_RABBITMQ_USER = env("EGON_RABBITMQ_USER")
-EGON_RABBITMQ_PW = env("EGON_RABBITMQ_PW")
+EGON_RABBITMQ_HOST = "CHANGE_ME"
+EGON_RABBITMQ_PORT = "CHANGE_ME"
+EGON_RABBITMQ_USER = "CHANGE_ME"
+EGON_RABBITMQ_PW = "CHANGE_ME"

intervention/templates/intervention/detail/includes/compensations.html

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

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

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

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

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

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

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

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

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

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

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