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

Dockerfile

@@ -1,36 +0,0 @@
-# Nutze ein schlankes Python-Image
-FROM python:3.11-slim-bullseye
-
-ENV PYTHONUNBUFFERED 1
-
-WORKDIR /konova
-
-# Installiere System-Abhängigkeiten
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    gdal-bin redis-server nginx \
-    && rm -rf /var/lib/apt/lists/*  # Platz sparen
-
-# Erstelle benötigte Verzeichnisse & setze Berechtigungen
-RUN mkdir -p /var/log/nginx /var/log/gunicorn /var/lib/nginx /tmp/nginx_client_body \
-    && touch /var/log/nginx/access.log /var/log/nginx/error.log \
-    && chown -R root:root /var/log/nginx /var/lib/nginx /tmp/nginx_client_body
-
-# Kopiere und installiere Python-Abhängigkeiten
-COPY ./requirements.txt /konova/
-RUN pip install --upgrade pip && pip install --no-cache-dir -r requirements.txt
-
-# Entferne Standard-Nginx-Site und ersetze sie durch eigene Config
-RUN rm -rf /etc/nginx/sites-enabled/default
-COPY ./nginx.conf /etc/nginx/conf.d
-
-# Kopiere restliche Projektdateien
-COPY . /konova/
-
-# Sammle statische Dateien
-RUN python manage.py collectstatic --noinput
-
-# Exponiere Ports
-#EXPOSE 80 6379 8000
-
-# Setze Entrypoint
-ENTRYPOINT ["/konova/docker-entrypoint.sh"]

README.md

@@ -4,7 +4,6 @@ the database postgresql and the css library bootstrap as well as the icon packag
 fontawesome for a modern look, following best practices from the industry.
 
 ## Background processes
-### !!! For non-docker run
 Konova uses celery for background processing. To start the worker you need to run
 ```shell
 $ celery -A konova worker -l INFO
@@ -19,58 +18,3 @@ Technical documention is provided in the projects git wiki.
 A user documentation is not available (and not needed, yet). 
 
 
-# Docker 
-To run the docker-compose as expected, you need to take the following steps:
-
-1. Create a database containing docker, using an appropriate Dockerfile, e.g. the following
-```
-version: '3.3'
-services:
-  postgis:
-    image: postgis/postgis
-    restart: always
-    container_name: postgis-docker
-    ports: 
-      - 5433:5432
-    volumes:
-      - db-volume:/var/lib/postgresql/data
-    environment:
-      - POSTGRES_PASSWORD=postgres
-      - POSTGRES_USER=postgres
-    networks:
-      - db-network-bridge
-
-networks:
-  db-network-bridge:
-    driver: "bridge"
-
-volumes:
-  db-volume:
-```
-This Dockerfile creates a Docker container running postgresql and postgis, creates the default superuser postgres, 
-creates a named volume for persisting the database and creates a new network bridge, which **must be used by any other
-container, which wants to write/read on this database**. 
-
-2. Make sure the name of the network bridge above matches the network in the konova docker-compose.yml  
-3. Get into the running postgis container (`docker exec -it postgis-docker bash`) and create new databases, users and so on. Make sure the database `konova` exists now!
-4. Replace all `CHANGE_ME_xy` values inside of konova/docker-compose.yml for your installation. Make sure the `SSO_HOST` holds the proper SSO host, e.g. for the arnova project `arnova.example.org` (Arnova must be installed and the webserver configured as well, of course)
-5. Take a look on konova/settings.py and konova/sub_settings/django_settings.py. Again: Replace all occurences of `CHANGE_ME` with proper values for your installation.
-   1. Make sure you have the proper host strings added to `ALLOWED_HOSTS` inside of django_settings.py.  
-6. Build and run the docker setup using `docker-compose build` and `docker-compose start` from the main directory of this project (where the docker-compose.yml lives)
-7. Run migrations! To do so, get into the konova service container (`docker exec -it konova-docker bash`) and run the needed commands (`python manage.py makemigrations LIST_OF_ALL_MIGRATABLE_APPS`, then `python manage.py migrate`)
-8. Run the setup command `python manage.py setup` and follow the instructions on the CLI
-9. To enable **SMTP** mail support, make sure your host machine (the one where the docker container run) has the postfix service configured properly. Make sure the `mynetworks` variable is xtended using the docker network bridge ip, created in the postgis container and used by the konova services.
-   1. **Hint**: You can find out this easily by trying to perform a test mail in the running konova web application (which will fail, of course). Then take a look to the latest entries in `/var/log/mail.log` on your host machine. The failed IP will be displayed there.
-   2. **Please note**: This installation guide is based on SMTP using postfix! 
-   3. Restart the postfix service on your host machine to reload the new configuration (`service postfix restart`)
-10. Finally, make sure your host machine webserver passes incoming requests properly to the docker nginx webserver of konova. A proper nginx config for the host machine may look like this:
-```
-server {
-    server_name konova.domain.org;
-
-    location / {
-        proxy_pass http://localhost:KONOVA_NGINX_DOCKER_PORT/;
-        proxy_set_header Host $host;
-    }
-}
-```

analysis/urls.py

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

analysis/views.py

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

api/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/create/test_api_create.py

@@ -71,7 +71,7 @@ class APIV1CreateTestCase(BaseAPIV1TestCase):
         # Expect this first request to fail, since user has no shared access on the intervention, we want to create
         # a compensation for
         response = self._run_create_request(url, post_body)
-        self.assertEqual(response.status_code, 400, msg=response.content)
+        self.assertEqual(response.status_code, 500, msg=response.content)
         content = json.loads(response.content)
         self.assertGreater(len(content.get("errors", [])), 0, msg=response.content)
 

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/urls/urls.py

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

api/utils/serializer/serializer.py

@@ -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.lookup["users__in"] = [user]
-        self.shared_lookup = Q(
-            Q(users__in=[user]) |
-            Q(teams__in=list(user.shared_teams))
-        )
 
     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(
+        entries = self.model.objects.filter(**self.lookup).order_by("id")
-            **self.lookup
-        ).filter(
-            self.shared_lookup
-        ).order_by(
-            "id"
-        ).distinct()
         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)
+        if geometry.srid != DEFAULT_SRID_RLP:
-        geometry = Geometry.cast_to_multipolygon(geometry)
+            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(
+        del self.lookup["users__in"]
-            Q(intervention__users__in=[user]) |
+        self.lookup["intervention__users__in"] = [user]
-            Q(intervention__teams__in=user.shared_teams)
-        )
 
     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(
+        self.lookup["intervention__users__in"] = [user]
-            Q(intervention__users__in=[user]) |
-            Q(intervention__teams__in=user.shared_teams)
-        )
 
     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_COMPENSATION_ACTION_DETAIL_ID, CODELIST_BIOTOPES_EXTRA_CODES_ID, CODELIST_HANDLER_ID
-    CODELIST_BIOTOPES_EXTRA_CODES_FULL_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/method_views.py

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

api/views/v1/views.py

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

api/views/views.py

@@ -50,18 +50,13 @@ 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:
+            if ksp_user != token_user.username:
-                bearer_token = request.headers.get("authorization", None)
-                if not bearer_token:
-                    raise PermissionError("No token provided")
-                token = bearer_token.split(" ")[1]
-
-            token_user = APIUserToken.get_user_from_token(token)
-            if ksp_user and ksp_user != token_user.username:
                 raise PermissionError(f"Invalid token for {ksp_user}")
+            else:
                 self.user = token_user
 
             request.user = self.user
@@ -81,7 +76,9 @@ class AbstractAPIView(View):
         Returns:
 
         """
-        content = [f"{error.__class__.__name__}: {str(error)}"]
+        content = [error.__str__()]
+        if hasattr(error, "messages"):
+            content = error.messages
         return JsonResponse(
             {
                 "errors": content

codelist/autocomplete/biotope.py

@@ -9,8 +9,7 @@ import collections
 
 from django.core.exceptions import ImproperlyConfigured
 
-from codelist.settings import CODELIST_BIOTOPES_ID, \
+from codelist.settings import CODELIST_BIOTOPES_ID, CODELIST_BIOTOPES_EXTRA_CODES_ID
-    CODELIST_BIOTOPES_EXTRA_CODES_FULL_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,
@@ -82,8 +81,8 @@ class Command(BaseKonovaCommand):
                 atom_id = element.find("atomid").text
                 selectable = element.find("selectable").text.lower()
                 selectable = bool_map.get(selectable, False)
-                short_name = element.find("shortname").text or ""
+                short_name = element.find("shortname").text
-                long_name = element.find("longname").text or ""
+                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 = ""
-
+        if self.parent and self.parent.long_name and with_parent:
-        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.long_name
-                    ret_val += self.parent.short_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 += long_name
+            ret_val += f" ({self.short_name})"
-
-            if short_name and short_name != long_name:
-                ret_val += f" ({short_name})"
-        else:
-            ret_val += str(long_name or short_name)
-
         return ret_val
 
     @property
@@ -89,8 +75,7 @@ class KonovaCode(models.Model):
             return self
 
         children = KonovaCode.objects.filter(
-            parent=self,
+            parent=self
-            is_archived=False,
         ).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_ID = 975  # CLZusatzbezeichnung
-CODELIST_BIOTOPES_EXTRA_CODES_FULL_ID = 288  # CLBiotoptypZusatzcode
 CODELIST_LAW_ID = 1048  # CLVerfahrensrecht
 CODELIST_PROCESS_TYPE_ID = 44382  # CLVerfahrenstyp
 

compensation/admin.py

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

compensation/forms/eco_account.py

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

compensation/forms/modals/state.py

@@ -14,8 +14,7 @@ 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, \
+from codelist.settings import CODELIST_BIOTOPES_ID, CODELIST_BIOTOPES_EXTRA_CODES_ID
-    CODELIST_BIOTOPES_EXTRA_CODES_FULL_ID
 from intervention.inputs import CompensationStateTreeRadioSelect
 from konova.contexts import BaseContext
 from konova.forms.modals import RemoveModalForm, BaseModalForm
@@ -44,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",

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, \
+from codelist.settings import CODELIST_BIOTOPES_ID, CODELIST_BIOTOPES_EXTRA_CODES_ID
-    CODELIST_BIOTOPES_EXTRA_CODES_FULL_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

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

@@ -7,32 +7,30 @@ Created on: 24.08.21
 """
 from django.urls import path
 
-from compensation.views.compensation.detail import DetailCompensationView
 from compensation.views.compensation.document import EditCompensationDocumentView, NewCompensationDocumentView, \
     GetCompensationDocumentView, RemoveCompensationDocumentView
-from compensation.views.compensation.remove import RemoveCompensationView
 from compensation.views.compensation.resubmission import CompensationResubmissionView
-from compensation.views.compensation.report import CompensationPublicReportView
+from compensation.views.compensation.report import 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 IndexCompensationView, CompensationIdentifierGeneratorView, \
+from compensation.views.compensation.compensation import index_view, new_view, new_id_view, detail_view, edit_view, \
-    EditCompensationView, NewCompensationView
+    remove_view
 from compensation.views.compensation.log import CompensationLogView
 
 urlpatterns = [
     # Main compensation
-    path("", IndexCompensationView.as_view(), name="index"),
+    path("", index_view, name="index"),
-    path('new/id', CompensationIdentifierGeneratorView.as_view(), name='new-id'),
+    path('new/id', new_id_view, name='new-id'),
-    path('new/<intervention_id>', NewCompensationView.as_view(), name='new'),
+    path('new/<intervention_id>', new_view, name='new'),
-    path('new', NewCompensationView.as_view(), name='new'),
+    path('new', new_view, name='new'),
-    path('<id>', DetailCompensationView.as_view(), name='detail'),
+    path('<id>', detail_view, name='detail'),
     path('<id>/log', CompensationLogView.as_view(), name='log'),
-    path('<id>/edit', EditCompensationView.as_view(), name='edit'),
+    path('<id>/edit', edit_view, name='edit'),
-    path('<id>/remove', RemoveCompensationView.as_view(), name='remove'),
+    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'),
@@ -45,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', CompensationPublicReportView.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,13 +8,11 @@ Created on: 24.08.21
 from django.urls import path
 
 from compensation.autocomplete.eco_account import EcoAccountAutocomplete
-from compensation.views.eco_account.detail import DetailEcoAccountView
+from compensation.views.eco_account.eco_account import index_view, new_view, new_id_view, edit_view, remove_view, \
-from compensation.views.eco_account.eco_account import IndexEcoAccountView, EcoAccountIdentifierGeneratorView, \
+    detail_view
-    NewEcoAccountView, EditEcoAccountView
 from compensation.views.eco_account.log import EcoAccountLogView
 from compensation.views.eco_account.record import EcoAccountRecordView
-from compensation.views.eco_account.remove import RemoveEcoAccountView
+from compensation.views.eco_account.report import report_view
-from compensation.views.eco_account.report import EcoAccountPublicReportView
 from compensation.views.eco_account.resubmission import EcoAccountResubmissionView
 from compensation.views.eco_account.state import NewEcoAccountStateView, EditEcoAccountStateView, \
     RemoveEcoAccountStateView
@@ -30,15 +28,15 @@ from compensation.views.eco_account.deduction import NewEcoAccountDeductionView,
 
 app_name = "acc"
 urlpatterns = [
-    path("", IndexEcoAccountView.as_view(), name="index"),
+    path("", index_view, name="index"),
-    path('new/', NewEcoAccountView.as_view(), name='new'),
+    path('new/', new_view, name='new'),
-    path('new/id', EcoAccountIdentifierGeneratorView.as_view(), name='new-id'),
+    path('new/id', new_id_view, name='new-id'),
-    path('<id>', DetailEcoAccountView.as_view(), name='detail'),
+    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', EcoAccountPublicReportView.as_view(), name='report'),
+    path('<id>/report', report_view, name='report'),
-    path('<id>/edit', EditEcoAccountView.as_view(), name='edit'),
+    path('<id>/edit', edit_view, name='edit'),
-    path('<id>/remove', RemoveEcoAccountView.as_view(), name='remove'),
+    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/urls/payment.py

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

compensation/views/compensation/compensation.py

@@ -6,29 +6,33 @@ Created on: 19.08.22
 
 """
 from django.contrib import messages
-from django.contrib.auth.mixins import LoginRequiredMixin
+from django.contrib.auth.decorators import login_required
-from django.http import HttpRequest, HttpResponse
+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.utils.decorators import method_decorator
+from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
-from django.views import View
 
 from compensation.forms.compensation import EditCompensationForm, NewCompensationForm
 from compensation.models import Compensation
 from compensation.tables.compensation import CompensationTable
 from intervention.models import Intervention
 from konova.contexts import BaseContext
-from konova.decorators import shared_access_required, default_group_required
+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 RECORDED_BLOCKS_EDIT, CHECK_STATE_RESET, FORM_INVALID, PARAMS_INVALID, \
+from konova.utils.message_templates import COMPENSATION_REMOVED_TEMPLATE, DATA_CHECKED_PREVIOUSLY_TEMPLATE, \
-    IDENTIFIER_REPLACED, COMPENSATION_ADDED_TEMPLATE, GEOMETRY_SIMPLIFIED, GEOMETRIES_IGNORED_TEMPLATE
+    RECORDED_BLOCKS_EDIT, CHECK_STATE_RESET, FORM_INVALID, PARAMS_INVALID, IDENTIFIER_REPLACED, \
-from konova.views.identifier import AbstractIdentifierGeneratorView
+    COMPENSATION_ADDED_TEMPLATE, DO_NOT_FORGET_TO_SHARE, GEOMETRY_SIMPLIFIED
-from konova.views.index import AbstractIndexView
 
 
-class IndexCompensationView(AbstractIndexView):
+@login_required
-    def get(self, request, *args, **kwargs) -> HttpResponse:
+@any_group_check
+def index_view(request: HttpRequest):
     """
     Renders the index view for compensation
 
@@ -38,6 +42,7 @@ class IndexCompensationView(AbstractIndexView):
     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
@@ -53,56 +58,13 @@ class IndexCompensationView(AbstractIndexView):
         TAB_TITLE_IDENTIFIER: _("Compensations - Overview"),
     }
     context = BaseContext(request, context).context
-        return render(request, self._TEMPLATE, context)
+    return render(request, template, context)
 
 
-class NewCompensationView(LoginRequiredMixin, View):
+@login_required
-    _TEMPLATE = "compensation/form/view.html"
+@default_group_required
-
+@shared_access_required(Intervention, "intervention_id")
-    @method_decorator(default_group_required)
+def new_view(request: HttpRequest, intervention_id: str = None):
-    @method_decorator(shared_access_required(Intervention, "intervention_id"))
-    def get(self, request: HttpRequest, intervention_id: str = None, *args, **kwargs) -> HttpResponse:
-        """
-        Renders a view for new compensation
-
-        A compensation creation may be called directly from the parent-intervention object. If so - we may take
-        the intervention's id and directly link the compensation to it.
-
-        Args:
-            request (HttpRequest): The incoming request
-            intervention_id (str): The intervention identifier
-
-        Returns:
-
-        """
-        if intervention_id:
-            # If the parent-intervention is recorded, we are not allowed to change anything on it's data.
-            # Not even adding new child elements like compensations!
-            intervention = get_object_or_404(Intervention, id=intervention_id)
-            recording_state_blocks_actions = intervention.is_recorded
-            if recording_state_blocks_actions:
-                messages.info(
-                    request,
-                    RECORDED_BLOCKS_EDIT
-                )
-                return redirect("intervention:detail", id=intervention_id)
-
-        data_form = NewCompensationForm(request.POST or None, intervention_id=intervention_id)
-        geom_form = SimpleGeomForm(request.POST or None, read_only=False)
-
-        context = {
-            "form": data_form,
-            "geom_form": geom_form,
-            TAB_TITLE_IDENTIFIER: _("New compensation"),
-        }
-        context = BaseContext(request, context).context
-
-        return render(request, self._TEMPLATE, context)
-
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(Intervention, "intervention_id"))
-    def post(self, request: HttpRequest, intervention_id: str = None, *args, **kwargs) -> HttpResponse:
-
     """
     Renders a view for a new compensation creation
 
@@ -112,12 +74,14 @@ class NewCompensationView(LoginRequiredMixin, View):
     Returns:
 
     """
-        if intervention_id:
+    template = "compensation/form/view.html"
-            # If the parent-intervention is recorded, we are not allowed to change anything on it's data.
+    if intervention_id is not None:
-            # Not even adding new child elements like compensations!
+        try:
-            intervention = get_object_or_404(Intervention, id=intervention_id)
+            intervention = Intervention.objects.get(id=intervention_id)
-            recording_state_blocks_actions = intervention.is_recorded
+        except ObjectDoesNotExist:
-            if recording_state_blocks_actions:
+            messages.error(request, PARAMS_INVALID)
+            return redirect("home")
+        if intervention.is_recorded:
             messages.info(
                 request,
                 RECORDED_BLOCKS_EDIT
@@ -126,7 +90,7 @@ class NewCompensationView(LoginRequiredMixin, View):
 
     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)
@@ -139,77 +103,49 @@ class NewCompensationView(LoginRequiredMixin, View):
                     )
                 )
             messages.success(request, COMPENSATION_ADDED_TEMPLATE.format(comp.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:detail", id=comp.id)
         else:
             messages.error(request, FORM_INVALID, extra_tags="danger",)
-
+    else:
+        # For clarification: nothing in this case
+        pass
     context = {
         "form": data_form,
         "geom_form": geom_form,
         TAB_TITLE_IDENTIFIER: _("New compensation"),
     }
     context = BaseContext(request, context).context
-
+    return render(request, template, context)
-        return render(request, self._TEMPLATE, context)
 
 
-class CompensationIdentifierGeneratorView(AbstractIdentifierGeneratorView):
+@login_required
-    _MODEL = Compensation
+@default_group_required
+def new_id_view(request: HttpRequest):
+    """ JSON endpoint
 
-
+    Provides fetching of free identifiers for e.g. AJAX calls
-class EditCompensationView(LoginRequiredMixin, View):
-    _TEMPLATE = "compensation/form/view.html"
-
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(Compensation, "id"))
-    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
 
     """
-        Renders a view for editing compensations
+    tmp = Compensation()
-
+    identifier = tmp.generate_new_identifier()
-        Args:
+    while Compensation.objects.filter(identifier=identifier).exists():
-            request (HttpRequest): The incoming request
+        identifier = tmp.generate_new_identifier()
-
+    return JsonResponse(
-        Returns:
+        data={
-
+            "gen_data": identifier
-        """
-        # Get object from db
-        comp = get_object_or_404(Compensation, id=id)
-        if comp.is_recorded:
-            messages.info(
-                request,
-                RECORDED_BLOCKS_EDIT
-            )
-            return redirect("compensation:detail", id=id)
-
-        # Create forms, initialize with values from db/from POST request
-        data_form = EditCompensationForm(request.POST or None, instance=comp)
-        geom_form = SimpleGeomForm(request.POST or None, read_only=False, instance=comp)
-
-        context = {
-            "form": data_form,
-            "geom_form": geom_form,
-            TAB_TITLE_IDENTIFIER: _("Edit {}").format(comp.identifier),
         }
-        context = BaseContext(request, context).context
+    )
 
-        return render(request, self._TEMPLATE, context)
-
-    @method_decorator(default_group_required)
-    @method_decorator(shared_access_required(Compensation, "id"))
-    def post(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
 
+@login_required
+@default_group_required
+@shared_access_required(Compensation, "id")
+def edit_view(request: HttpRequest, id: str):
     """
     Renders a view for editing compensations
 
@@ -219,6 +155,7 @@ class EditCompensationView(LoginRequiredMixin, View):
     Returns:
 
     """
+    template = "compensation/form/view.html"
     # Get object from db
     comp = get_object_or_404(Compensation, id=id)
     if comp.is_recorded:
@@ -231,35 +168,134 @@ class EditCompensationView(LoginRequiredMixin, View):
     # 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.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: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"),
+    )
 
-        return render(request, self._TEMPLATE, context)

compensation/views/compensation/detail.py

@@ -1,97 +0,0 @@
-"""
-Author: Michel Peltriaux
-Created on: 14.12.25
-
-"""
-from django.contrib import messages
-from django.http import HttpRequest, HttpResponse
-from django.shortcuts import render, get_object_or_404
-
-from compensation.models import Compensation
-from konova.contexts import BaseContext
-from konova.forms import SimpleGeomForm
-from konova.settings import ETS_GROUP, ZB_GROUP, DEFAULT_GROUP
-from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
-from konova.utils.message_templates import DO_NOT_FORGET_TO_SHARE, DATA_CHECKED_PREVIOUSLY_TEMPLATE
-from konova.views.detail import AbstractDetailView
-
-
-class DetailCompensationView(AbstractDetailView):
-    _TEMPLATE = "compensation/detail/compensation/view.html"
-
-    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
-
-        """ Renders a detail view for a compensation
-
-        Args:
-            request (HttpRequest): The incoming request
-            id (str): The compensation's id
-
-        Returns:
-
-        """
-        comp = get_object_or_404(
-            Compensation.objects.select_related(
-                "modified",
-                "created",
-                "geometry"
-            ),
-            id=id,
-            deleted=None,
-            intervention__deleted=None,
-        )
-        geom_form = SimpleGeomForm(instance=comp)
-        parcels = comp.get_underlying_parcels()
-        _user = request.user
-        is_data_shared = comp.intervention.is_shared_with(_user)
-
-        # Order states according to surface
-        before_states = comp.before_states.all().prefetch_related("biotope_type").order_by("-surface")
-        after_states = comp.after_states.all().prefetch_related("biotope_type").order_by("-surface")
-        actions = comp.actions.all().prefetch_related("action_type")
-
-        # Precalculate logical errors between before- and after-states
-        # Sum() returns None in case of no states, so we catch that and replace it with 0 for easier handling
-        sum_before_states = comp.get_surface_before_states()
-        sum_after_states = comp.get_surface_after_states()
-        diff_states = abs(sum_before_states - sum_after_states)
-
-        request = comp.set_status_messages(request)
-
-        last_checked = comp.intervention.get_last_checked_action()
-        last_checked_tooltip = ""
-        if last_checked:
-            last_checked_tooltip = DATA_CHECKED_PREVIOUSLY_TEMPLATE.format(
-                last_checked.get_timestamp_str_formatted(),
-                last_checked.user
-            )
-
-        requesting_user_is_only_shared_user = comp.is_only_shared_with(_user)
-        if requesting_user_is_only_shared_user:
-            messages.info(
-                request,
-                DO_NOT_FORGET_TO_SHARE
-            )
-
-        context = {
-            "obj": comp,
-            "last_checked": last_checked,
-            "last_checked_tooltip": last_checked_tooltip,
-            "geom_form": geom_form,
-            "parcels": parcels,
-            "is_entry_shared": is_data_shared,
-            "actions": actions,
-            "before_states": before_states,
-            "after_states": after_states,
-            "sum_before_states": sum_before_states,
-            "sum_after_states": sum_after_states,
-            "diff_states": diff_states,
-            "is_default_member": _user.in_group(DEFAULT_GROUP),
-            "is_zb_member": _user.in_group(ZB_GROUP),
-            "is_ets_member": _user.in_group(ETS_GROUP),
-            "LANIS_LINK": comp.get_LANIS_link(),
-            TAB_TITLE_IDENTIFIER: f"{comp.identifier} - {comp.title}",
-            "has_finished_deadlines": comp.get_finished_deadlines().exists(),
-        }
-        context = BaseContext(request, context).context
-        return render(request, self._TEMPLATE, context)

compensation/views/compensation/remove.py

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

compensation/views/compensation/report.py

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

compensation/views/eco_account/detail.py

@@ -1,97 +0,0 @@
-"""
-Author: Michel Peltriaux
-Created on: 14.12.25
-
-"""
-from django.contrib import messages
-from django.http import HttpRequest, HttpResponse
-from django.shortcuts import render, get_object_or_404
-
-from compensation.models import EcoAccount
-from konova.contexts import BaseContext
-from konova.forms import SimpleGeomForm
-from konova.settings import ETS_GROUP, ZB_GROUP, DEFAULT_GROUP
-from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
-from konova.utils.message_templates import DO_NOT_FORGET_TO_SHARE
-from konova.views.detail import AbstractDetailView
-
-
-class DetailEcoAccountView(AbstractDetailView):
-    _TEMPLATE = "compensation/detail/eco_account/view.html"
-
-    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
-        """ Renders a detail view for a compensation
-
-        Args:
-            request (HttpRequest): The incoming request
-            id (str): The compensation's id
-
-        Returns:
-
-        """
-        acc = get_object_or_404(
-            EcoAccount.objects.prefetch_related(
-                "deadlines",
-            ).select_related(
-                'geometry',
-                'responsible',
-            ),
-            id=id,
-            deleted=None,
-        )
-        geom_form = SimpleGeomForm(instance=acc)
-        parcels = acc.get_underlying_parcels()
-        _user = request.user
-        is_data_shared = acc.is_shared_with(_user)
-
-        # Order states according to surface
-        before_states = acc.before_states.order_by("-surface")
-        after_states = acc.after_states.order_by("-surface")
-
-        # Precalculate logical errors between before- and after-states
-        # Sum() returns None in case of no states, so we catch that and replace it with 0 for easier handling
-        sum_before_states = acc.get_surface_before_states()
-        sum_after_states = acc.get_surface_after_states()
-        diff_states = abs(sum_before_states - sum_after_states)
-        # Calculate rest of available surface for deductions
-        available_total = acc.deductable_rest
-        available_relative = acc.get_deductable_rest_relative()
-
-        # Prefetch related data to decrease the amount of db connections
-        deductions = acc.deductions.filter(
-            intervention__deleted=None,
-        )
-        actions = acc.actions.all()
-
-        request = acc.set_status_messages(request)
-
-        requesting_user_is_only_shared_user = acc.is_only_shared_with(_user)
-        if requesting_user_is_only_shared_user:
-            messages.info(
-                request,
-                DO_NOT_FORGET_TO_SHARE
-            )
-
-        context = {
-            "obj": acc,
-            "geom_form": geom_form,
-            "parcels": parcels,
-            "is_entry_shared": is_data_shared,
-            "before_states": before_states,
-            "after_states": after_states,
-            "sum_before_states": sum_before_states,
-            "sum_after_states": sum_after_states,
-            "diff_states": diff_states,
-            "available": available_relative,
-            "available_total": available_total,
-            "is_default_member": _user.in_group(DEFAULT_GROUP),
-            "is_zb_member": _user.in_group(ZB_GROUP),
-            "is_ets_member": _user.in_group(ETS_GROUP),
-            "LANIS_LINK": acc.get_LANIS_link(),
-            "deductions": deductions,
-            "actions": actions,
-            TAB_TITLE_IDENTIFIER: f"{acc.identifier} - {acc.title}",
-            "has_finished_deadlines": acc.get_finished_deadlines().exists(),
-        }
-        context = BaseContext(request, context).context
-        return render(request, self._TEMPLATE, context)

compensation/views/eco_account/eco_account.py

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

compensation/views/eco_account/remove.py

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

compensation/views/eco_account/report.py

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

compensation/views/payment.py

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

docker-compose.yml

@@ -1,23 +0,0 @@
-version: '3.3'
-
-services:
-  konova:
-    external_links:
-      - postgis:db
-      - arnova-nginx-server:arnova
-    build: .
-    image: "ksp/konova:1.8"
-    container_name: "konova-docker"
-    command: ./docker-entrypoint.sh
-    restart: always
-    volumes:
-      - /data/apps/konova/uploaded_files:/konova_uploaded_files
-    ports:
-      - "1337:80"
-
-# Instead of an own, new network, we need to connect to the existing one, which is provided by the postgis container
-# NOTE: THIS NETWORK MUST EXIST
-networks:
-  default:
-    external:
-      name: postgis_nat_it_backend

docker-entrypoint.sh

@@ -1,27 +0,0 @@
-#!/bin/bash
-
-set -e  # Beende Skript bei Fehlern
-set -o pipefail  # Fehler in Pipelines nicht ignorieren
-
-# Starte Redis
-redis-server --daemonize yes
-
-# Starte Celery Worker im Hintergrund
-celery -A konova worker --loglevel=info &
-
-# Starte Nginx als Hintergrundprozess
-nginx -g "daemon off;" &
-
-# Setze Gunicorn Worker-Anzahl (Standard: (2*CPUs)+1)
-WORKERS=${GUNICORN_WORKERS:-$((2 * $(nproc) + 1))}
-
-# Stelle sicher, dass Logs existieren
-mkdir -p /var/log/gunicorn
-touch /var/log/gunicorn/access.log /var/log/gunicorn/error.log
-
-# Starte Gunicorn als Hauptprozess
-exec gunicorn --workers="$WORKERS" konova.wsgi:application \
-    --bind=0.0.0.0:8000 \
-    --access-logfile /var/log/gunicorn/access.log \
-    --error-logfile /var/log/gunicorn/error.log \
-    --access-logformat '%({x-real-ip}i)s via %(h)s %(l)s %(u)s %(t)s "%(r)s" %(s)s %(b)s "%(f)s" "%(a)s"'

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

ema/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_views.py

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

ema/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

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

@@ -1,76 +0,0 @@
-"""
-Author: Michel Peltriaux
-Created on: 14.12.25
-
-"""
-from django.contrib import messages
-from django.http import HttpResponse, HttpRequest
-from django.shortcuts import get_object_or_404, render
-
-from ema.models import Ema
-from konova.contexts import BaseContext
-from konova.forms import SimpleGeomForm
-from konova.settings import DEFAULT_GROUP, ZB_GROUP, ETS_GROUP
-from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
-from konova.utils.message_templates import DO_NOT_FORGET_TO_SHARE
-from konova.views.detail import AbstractDetailView
-
-
-class DetailEmaView(AbstractDetailView):
-    _TEMPLATE = "ema/detail/view.html"
-
-    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
-        """ Renders the detail view of an EMA
-
-        Args:
-            request (HttpRequest): The incoming request
-            id (str): The EMA id
-
-        Returns:
-
-        """
-        ema = get_object_or_404(Ema, id=id, deleted=None)
-
-        geom_form = SimpleGeomForm(instance=ema)
-        parcels = ema.get_underlying_parcels()
-        _user = request.user
-        is_entry_shared = ema.is_shared_with(_user)
-
-        # Order states according to surface
-        before_states = ema.before_states.all().order_by("-surface")
-        after_states = ema.after_states.all().order_by("-surface")
-
-        # Precalculate logical errors between before- and after-states
-        # Sum() returns None in case of no states, so we catch that and replace it with 0 for easier handling
-        sum_before_states = ema.get_surface_before_states()
-        sum_after_states = ema.get_surface_after_states()
-        diff_states = abs(sum_before_states - sum_after_states)
-
-        ema.set_status_messages(request)
-
-        requesting_user_is_only_shared_user = ema.is_only_shared_with(_user)
-        if requesting_user_is_only_shared_user:
-            messages.info(
-                request,
-                DO_NOT_FORGET_TO_SHARE
-            )
-
-        context = {
-            "obj": ema,
-            "geom_form": geom_form,
-            "parcels": parcels,
-            "is_entry_shared": is_entry_shared,
-            "before_states": before_states,
-            "after_states": after_states,
-            "sum_before_states": sum_before_states,
-            "sum_after_states": sum_after_states,
-            "diff_states": diff_states,
-            "is_default_member": _user.in_group(DEFAULT_GROUP),
-            "is_zb_member": _user.in_group(ZB_GROUP),
-            "is_ets_member": _user.in_group(ETS_GROUP),
-            "LANIS_LINK": ema.get_LANIS_link(),
-            TAB_TITLE_IDENTIFIER: f"{ema.identifier} - {ema.title}",
-            "has_finished_deadlines": ema.get_finished_deadlines().exists(),
-        }
-        context = BaseContext(request, context).context
-        return render(request, self._TEMPLATE, context)

ema/views/ema.py

@@ -7,28 +7,28 @@ Created on: 19.08.22
 """
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
-from django.contrib.auth.mixins import LoginRequiredMixin
+from django.db.models import Sum
-from django.http import HttpRequest, HttpResponse
+from django.http import HttpRequest, JsonResponse
 from django.shortcuts import get_object_or_404, redirect, render
-from django.utils.decorators import method_decorator
+from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
-from django.views.generic.base import View
 
 from ema.forms import NewEmaForm, EditEmaForm
 from ema.models import Ema
 from ema.tables import EmaTable
 from konova.contexts import BaseContext
-from konova.decorators import shared_access_required, conservation_office_group_required
+from konova.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, \
-    GEOMETRY_SIMPLIFIED, GEOMETRIES_IGNORED_TEMPLATE
+    DO_NOT_FORGET_TO_SHARE, GEOMETRY_SIMPLIFIED
-from konova.views.identifier import AbstractIdentifierGeneratorView
-from konova.views.index import AbstractIndexView
 
 
-class IndexEmaView(AbstractIndexView):
+@login_required
-    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
+def index_view(request: HttpRequest):
     """ Renders the index view for EMAs
 
     Args:
@@ -37,6 +37,7 @@ class IndexEmaView(AbstractIndexView):
     Returns:
 
     """
+    template = "generic_index.html"
     emas = Ema.objects.filter(
         deleted=None,
     ).order_by(
@@ -52,51 +53,25 @@ class IndexEmaView(AbstractIndexView):
         TAB_TITLE_IDENTIFIER: _("EMAs - Overview"),
     }
     context = BaseContext(request, context).context
-        return render(request, self._TEMPLATE, context)
+    return render(request, template, context)
 
-class NewEmaView(LoginRequiredMixin, View):
-    _TEMPLATE = "ema/form/view.html"
 
-    @method_decorator(conservation_office_group_required)
+@login_required
-    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
+@conservation_office_group_required
-        """ GET endpoint
+def new_view(request: HttpRequest):
-
+    """
-        Renders form for new EMA
+    Renders a view for a new eco account creation
 
     Args:
         request (HttpRequest): The incoming request
-            *args ():
-            **kwargs ():
-
-        Returns:
-
-        """
-        data_form = NewEmaForm(request.POST or None)
-        geom_form = SimpleGeomForm(request.POST or None, read_only=False)
-        context = {
-            "form": data_form,
-            "geom_form": geom_form,
-            TAB_TITLE_IDENTIFIER: _("New EMA"),
-        }
-        context = BaseContext(request, context).context
-        return render(request, self._TEMPLATE, context)
-
-    @method_decorator(conservation_office_group_required)
-    def post(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
-        """ POST endpoint
-
-        Processes submitted form
-
-        Args:
-            request (HttpRequest): The incoming request
-            *args ():
-            **kwargs ():
 
     Returns:
 
     """
+    template = "ema/form/view.html"
     data_form = NewEmaForm(request.POST or None)
     geom_form = SimpleGeomForm(request.POST or None, read_only=False)
+    if request.method == "POST":
         if data_form.is_valid() and geom_form.is_valid():
             generated_identifier = data_form.cleaned_data.get("identifier", None)
             ema = data_form.save(request.user, geom_form)
@@ -109,90 +84,120 @@ class NewEmaView(LoginRequiredMixin, View):
                     )
                 )
             messages.success(request, _("EMA {} added").format(ema.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("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, self._TEMPLATE, context)
+    return render(request, template, context)
 
-class EmaIdentifierGeneratorView(AbstractIdentifierGeneratorView):
-    _MODEL = Ema
 
-    @method_decorator(conservation_office_group_required)
+@login_required
-    def get(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
+@conservation_office_group_required
-        return super().get(request, *args, **kwargs)
+def new_id_view(request: HttpRequest):
+    """ JSON endpoint
 
-class EditEmaView(LoginRequiredMixin, View):
+    Provides fetching of free identifiers for e.g. AJAX calls
-    _TEMPLATE = "compensation/form/view.html"
 
-    @method_decorator(conservation_office_group_required)
+    """
-    @method_decorator(shared_access_required(Ema, "id"))
+    tmp = Ema()
-    def get(self, request: HttpRequest, id: str, *args, **kwargs) -> HttpResponse:
+    identifier = tmp.generate_new_identifier()
-        """ GET endpoint
+    while Ema.objects.filter(identifier=identifier).exists():
+        identifier = tmp.generate_new_identifier()
+    return JsonResponse(
+        data={
+            "gen_data": identifier
+        }
+    )
 
-        Renders form
+
+@login_required
+@uuid_required
+def detail_view(request: HttpRequest, id: str):
+    """ Renders the detail view of an EMA
 
     Args:
         request (HttpRequest): The incoming request
-            id (str): The ema identifier
+        id (str): The EMA id
-            *args ():
-            **kwargs ():
 
     Returns:
 
     """
-        # Get object from db
+    template = "ema/detail/view.html"
-        ema = get_object_or_404(Ema, id=id)
+    ema = get_object_or_404(Ema, id=id, deleted=None)
-        if ema.is_recorded:
+
+    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,
-                RECORDED_BLOCKS_EDIT
+            DO_NOT_FORGET_TO_SHARE
         )
-            return redirect("ema:detail", id=id)
 
-        # Create forms, initialize with values from db/from POST request
-        data_form = EditEmaForm(instance=ema)
-        geom_form = SimpleGeomForm(read_only=False, instance=ema)
     context = {
-            "form": data_form,
+        "obj": ema,
         "geom_form": geom_form,
-            TAB_TITLE_IDENTIFIER: _("Edit {}").format(ema.identifier),
+        "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, self._TEMPLATE, context)
+    return render(request, template, context)
 
-    @method_decorator(conservation_office_group_required)
-    @method_decorator(shared_access_required(Ema, "id"))
-    def post(self, request: HttpRequest, id:str, *args, **kwargs) -> HttpResponse:
-        """ POST endpoint
 
-        Process submitted forms
+@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
-            id (str): The id of the ema
-            *args ():
-            **kwargs ():
 
     Returns:
 
     """
+    template = "compensation/form/view.html"
     # Get object from db
     ema = get_object_or_404(Ema, id=id)
     if ema.is_recorded:
@@ -205,28 +210,50 @@ class EditEmaView(LoginRequiredMixin, View):
     # 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.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("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, self._TEMPLATE, 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

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

ema/views/remove.py

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

ema/views/report.py

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

intervention/admin.py

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

intervention/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_HOST = "CHANGE_ME"
-EGON_RABBITMQ_PORT = env("EGON_RABBITMQ_PORT")
+EGON_RABBITMQ_PORT = "CHANGE_ME"
-EGON_RABBITMQ_USER = env("EGON_RABBITMQ_USER")
+EGON_RABBITMQ_USER = "CHANGE_ME"
-EGON_RABBITMQ_PW = env("EGON_RABBITMQ_PW")
+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 %}
                 </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 %}
                     </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>

intervention/templates/intervention/detail/view.html

@@ -129,7 +129,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 %}

intervention/tests/test_workflow.py

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

intervention/tests/unit/test_forms.py

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

intervention/urls.py

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

intervention/views/check.py

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

intervention/views/compensation.py

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

intervention/views/detail.py

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

intervention/views/intervention.py

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

intervention/views/remove.py

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

intervention/views/report.py

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

intervention/views/revocation.py

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

konova/celery.py

@@ -1,7 +1,6 @@
 import os
 
 from celery import Celery
-from konova.sub_settings.django_settings import env
 
 # Set the default Django settings module for the 'celery' program.
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'konova.settings')
@@ -18,7 +17,7 @@ app.config_from_object('django.conf:settings', namespace='CELERY')
 app.autodiscover_tasks()
 
 # Declare redis as broker
-app.conf.broker_url = f'redis://{env("REDIS_HOST")}:{env.int("REDIS_PORT")}/0'
+app.conf.broker_url = 'redis://localhost:6379/0'
 
 
 @app.task(bind=True)

konova/decorators.py

@@ -11,7 +11,7 @@ from uuid import UUID
 
 from bootstrap_modal_forms.mixins import is_ajax
 from django.contrib import messages
-from django.core.exceptions import BadRequest
+from django.http import Http404
 from django.shortcuts import redirect, get_object_or_404, render
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
@@ -185,7 +185,7 @@ def uuid_required(function):
         try:
             uuid = UUID(uuid)
         except ValueError:
-            raise BadRequest(
+            raise Http404(
                 "Invalid UUID"
             )
         return function(request, *args, **kwargs)

konova/filters/mixins/user_log.py

@@ -1,55 +0,0 @@
-"""
-Author: Michel Peltriaux
-Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany
-Contact: ksp-servicestelle@sgdnord.rlp.de
-Created on: 19.08.24
-
-"""
-import django_filters
-from django import forms
-from django.db.models import QuerySet, Q
-from django.utils.translation import gettext_lazy as _
-
-
-class UserLoggedTableFilterMixin(django_filters.FilterSet):
-    ul = django_filters.CharFilter(
-        method="filter_user_log",
-        label=_(""),
-        label_suffix=_(""),
-        widget=forms.TextInput(
-            attrs={
-                "placeholder": _("Logged user"),
-                "title": _("Search for entries where this person has been participated according to log history"),
-                "class": "form-control",
-            }
-        ),
-    )
-
-    class Meta:
-        abstract = True
-
-    def filter_user_log(self, queryset, name, value) -> QuerySet:
-        """ Filters queryset depending on value of input
-
-        Args:
-            queryset (QuerySet): Incoming (prefiltered) queryset
-            name (str): Name of input field
-            value (str): Value of input field
-
-        Returns:
-
-        """
-        value = value.replace(",", " ")
-        value = value.strip()
-        values = value.split(" ")
-
-        q = Q()
-        for val in values:
-            q &= (
-                    Q(log__user__username__icontains=val) |
-                    Q(log__user__first_name__icontains=val) |
-                    Q(log__user__last_name__icontains=val)
-            )
-
-        queryset = queryset.filter(q)
-        return queryset