Merge pull request '# CSS bugfix' (#492) from fix_css_map_menu_bar_overlap into master

Reviewed-on: #492

compensation/urls/compensation.py

@@ -10,21 +10,21 @@ from django.urls import path
 from compensation.views.compensation.document import EditCompensationDocumentView, NewCompensationDocumentView, \
     GetCompensationDocumentView, RemoveCompensationDocumentView
 from compensation.views.compensation.resubmission import CompensationResubmissionView
-from compensation.views.compensation.report import CompensationReportView
+from compensation.views.compensation.report import report_view
 from compensation.views.compensation.deadline import NewCompensationDeadlineView, EditCompensationDeadlineView, \
     RemoveCompensationDeadlineView
 from compensation.views.compensation.action import NewCompensationActionView, EditCompensationActionView, \
     RemoveCompensationActionView
 from compensation.views.compensation.state import NewCompensationStateView, EditCompensationStateView, \
     RemoveCompensationStateView
-from compensation.views.compensation.compensation import new_view, detail_view, edit_view, \
+from compensation.views.compensation.compensation import index_view, new_view, new_id_view, detail_view, edit_view, \
-    remove_view, CompensationIndexView, CompensationIdentifierGeneratorView
+    remove_view
 from compensation.views.compensation.log import CompensationLogView
 
 urlpatterns = [
     # Main compensation
-    path("", CompensationIndexView.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>', new_view, name='new'),
     path('new', new_view, name='new'),
     path('<id>', detail_view, name='detail'),
@@ -43,7 +43,7 @@ urlpatterns = [
     path('<id>/deadline/new', NewCompensationDeadlineView.as_view(), name="new-deadline"),
     path('<id>/deadline/<deadline_id>/edit', EditCompensationDeadlineView.as_view(), name='deadline-edit'),
     path('<id>/deadline/<deadline_id>/remove', RemoveCompensationDeadlineView.as_view(), name='deadline-remove'),
-    path('<id>/report', CompensationReportView.as_view(), name='report'),
+    path('<id>/report', report_view, name='report'),
     path('<id>/resub', CompensationResubmissionView.as_view(), name='resubmission-create'),
 
     # Documents

compensation/urls/eco_account.py

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

compensation/views/compensation/compensation.py

@@ -7,8 +7,8 @@ Created on: 19.08.22
 """
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
-from django.contrib.auth.mixins import LoginRequiredMixin
 from django.core.exceptions import ObjectDoesNotExist
+from django.db.models import Sum
 from django.http import HttpRequest, JsonResponse
 from django.shortcuts import get_object_or_404, render, redirect
 from django.urls import reverse
@@ -28,21 +28,37 @@ from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.message_templates import COMPENSATION_REMOVED_TEMPLATE, DATA_CHECKED_PREVIOUSLY_TEMPLATE, \
     RECORDED_BLOCKS_EDIT, CHECK_STATE_RESET, FORM_INVALID, PARAMS_INVALID, IDENTIFIER_REPLACED, \
     COMPENSATION_ADDED_TEMPLATE, DO_NOT_FORGET_TO_SHARE, GEOMETRY_SIMPLIFIED, GEOMETRIES_IGNORED_TEMPLATE
-from konova.views.base import BaseIndexView, BaseIdentifierGeneratorView
 
 
-class CompensationIndexView(LoginRequiredMixin, BaseIndexView):
+@login_required
-    _TAB_TITLE = _("Compensations - Overview")
+@any_group_check
-    _INDEX_TABLE_CLS = CompensationTable
+def index_view(request: HttpRequest):
+    """
+    Renders the index view for compensation
 
-    def _get_queryset(self):
+    Args:
-        qs = Compensation.objects.filter(
+        request (HttpRequest): The incoming request
-            deleted=None,  # only show those which are not deleted individually
+
-            intervention__deleted=None,  # and don't show the ones whose intervention has been deleted
+    Returns:
-        ).order_by(
+        A rendered view
-            "-modified__timestamp"
+    """
-        )
+    template = "generic_index.html"
-        return qs
+    compensations = Compensation.objects.filter(
+        deleted=None,  # only show those which are not deleted individually
+        intervention__deleted=None,  # and don't show the ones whose intervention has been deleted
+    ).order_by(
+        "-modified__timestamp"
+    )
+    table = CompensationTable(
+        request=request,
+        queryset=compensations
+    )
+    context = {
+        "table": table,
+        TAB_TITLE_IDENTIFIER: _("Compensations - Overview"),
+    }
+    context = BaseContext(request, context).context
+    return render(request, template, context)
 
 
 @login_required
@@ -115,9 +131,23 @@ def new_view(request: HttpRequest, intervention_id: str = None):
     return render(request, template, context)
 
 
-class CompensationIdentifierGeneratorView(LoginRequiredMixin, BaseIdentifierGeneratorView):
+@login_required
-    _MODEL_CLS = Compensation
+@default_group_required
-    _REDIRECT_URL = "compensation:index"
+def new_id_view(request: HttpRequest):
+    """ JSON endpoint
+
+    Provides fetching of free identifiers for e.g. AJAX calls
+
+    """
+    tmp = Compensation()
+    identifier = tmp.generate_new_identifier()
+    while Compensation.objects.filter(identifier=identifier).exists():
+        identifier = tmp.generate_new_identifier()
+    return JsonResponse(
+        data={
+            "gen_data": identifier
+        }
+    )
 
 
 @login_required

compensation/views/compensation/report.py

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

compensation/views/eco_account/deduction.py

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

compensation/views/eco_account/eco_account.py

@@ -7,7 +7,7 @@ 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, JsonResponse
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
@@ -24,20 +24,36 @@ from konova.settings import ETS_GROUP, DEFAULT_GROUP, ZB_GROUP
 from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.message_templates import CANCEL_ACC_RECORDED_OR_DEDUCTED, RECORDED_BLOCKS_EDIT, FORM_INVALID, \
     IDENTIFIER_REPLACED, DO_NOT_FORGET_TO_SHARE, GEOMETRY_SIMPLIFIED, GEOMETRIES_IGNORED_TEMPLATE
-from konova.views.base import BaseIndexView, BaseIdentifierGeneratorView
 
 
-class EcoAccountIndexView(LoginRequiredMixin, BaseIndexView):
+@login_required
-    _INDEX_TABLE_CLS = EcoAccountTable
+@any_group_check
-    _TAB_TITLE = _("Eco-account - Overview")
+def index_view(request: HttpRequest):
+    """
+    Renders the index view for eco accounts
 
-    def _get_queryset(self):
+    Args:
-        qs = EcoAccount.objects.filter(
+        request (HttpRequest): The incoming request
-            deleted=None,
+
-        ).order_by(
+    Returns:
-            "-modified__timestamp"
+        A rendered view
-        )
+    """
-        return qs
+    template = "generic_index.html"
+    eco_accounts = EcoAccount.objects.filter(
+        deleted=None,
+    ).order_by(
+        "-modified__timestamp"
+    )
+    table = EcoAccountTable(
+        request=request,
+        queryset=eco_accounts
+    )
+    context = {
+        "table": table,
+        TAB_TITLE_IDENTIFIER: _("Eco-account - Overview"),
+    }
+    context = BaseContext(request, context).context
+    return render(request, template, context)
 
 
 @login_required
@@ -96,9 +112,23 @@ def new_view(request: HttpRequest):
     return render(request, template, context)
 
 
-class EcoAccountIdentifierGeneratorView(LoginRequiredMixin, BaseIdentifierGeneratorView):
+@login_required
-    _MODEL_CLS = EcoAccount
+@default_group_required
-    _REDIRECT_URL = "compensation:acc:index"
+def new_id_view(request: HttpRequest):
+    """ JSON endpoint
+
+    Provides fetching of free identifiers for e.g. AJAX calls
+
+    """
+    tmp = EcoAccount()
+    identifier = tmp.generate_new_identifier()
+    while EcoAccount.objects.filter(identifier=identifier).exists():
+        identifier = tmp.generate_new_identifier()
+    return JsonResponse(
+        data={
+            "gen_data": identifier
+        }
+    )
 
 
 @login_required

compensation/views/eco_account/report.py

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

ema/urls.py

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

ema/views/ema.py

@@ -7,7 +7,7 @@ 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, JsonResponse
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
@@ -24,21 +24,36 @@ from konova.forms.modals import RemoveModalForm
 from konova.settings import DEFAULT_GROUP, ZB_GROUP, ETS_GROUP
 from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.message_templates import RECORDED_BLOCKS_EDIT, IDENTIFIER_REPLACED, FORM_INVALID, \
-    DO_NOT_FORGET_TO_SHARE, GEOMETRY_SIMPLIFIED, GEOMETRIES_IGNORED_TEMPLATE, MISSING_GROUP_PERMISSION
+    DO_NOT_FORGET_TO_SHARE, GEOMETRY_SIMPLIFIED, GEOMETRIES_IGNORED_TEMPLATE
-from konova.views.base import BaseIndexView, BaseIdentifierGeneratorView
 
 
-class EmaIndexView(LoginRequiredMixin, BaseIndexView):
+@login_required
-    _TAB_TITLE = _("EMAs - Overview")
+def index_view(request: HttpRequest):
-    _INDEX_TABLE_CLS = EmaTable
+    """ Renders the index view for EMAs
 
-    def _get_queryset(self):
+    Args:
-        qs = Ema.objects.filter(
+        request (HttpRequest): The incoming request
-            deleted=None,
+
-        ).order_by(
+    Returns:
-            "-modified__timestamp"
+
-        )
+    """
-        return qs
+    template = "generic_index.html"
+    emas = Ema.objects.filter(
+        deleted=None,
+    ).order_by(
+        "-modified__timestamp"
+    )
+
+    table = EmaTable(
+        request,
+        queryset=emas
+    )
+    context = {
+        "table": table,
+        TAB_TITLE_IDENTIFIER: _("EMAs - Overview"),
+    }
+    context = BaseContext(request, context).context
+    return render(request, template, context)
 
 
 @login_required
@@ -96,12 +111,23 @@ def new_view(request: HttpRequest):
     return render(request, template, context)
 
 
-class EmaIdentifierGeneratorView(LoginRequiredMixin, BaseIdentifierGeneratorView):
+@login_required
-    _MODEL_CLS = Ema
+@conservation_office_group_required
-    _REDIRECT_URL = "ema:index"
+def new_id_view(request: HttpRequest):
+    """ JSON endpoint
 
-    def _user_has_permission(self, user):
+    Provides fetching of free identifiers for e.g. AJAX calls
-        return user.is_ets_user()
+
+    """
+    tmp = Ema()
+    identifier = tmp.generate_new_identifier()
+    while Ema.objects.filter(identifier=identifier).exists():
+        identifier = tmp.generate_new_identifier()
+    return JsonResponse(
+        data={
+            "gen_data": identifier
+        }
+    )
 
 
 @login_required

ema/views/report.py

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

intervention/urls.py

@@ -14,11 +14,10 @@ from intervention.views.deduction import NewInterventionDeductionView, EditInter
     RemoveInterventionDeductionView
 from intervention.views.document import NewInterventionDocumentView, GetInterventionDocumentView, \
     RemoveInterventionDocumentView, EditInterventionDocumentView
-from intervention.views.intervention import new_view, detail_view, edit_view, remove_view, \
+from intervention.views.intervention import index_view, new_view, new_id_view, detail_view, edit_view, remove_view
-    InterventionIndexView, InterventionIdentifierGeneratorView
 from intervention.views.log import InterventionLogView
 from intervention.views.record import InterventionRecordView
-from intervention.views.report import InterventionReportView
+from intervention.views.report import report_view
 from intervention.views.resubmission import InterventionResubmissionView
 from intervention.views.revocation import new_revocation_view, edit_revocation_view, remove_revocation_view, \
     get_revocation_view
@@ -26,9 +25,9 @@ from intervention.views.share import InterventionShareFormView, InterventionShar
 
 app_name = "intervention"
 urlpatterns = [
-    path("", InterventionIndexView.as_view(), name="index"),
+    path("", index_view, name="index"),
     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>', detail_view, name='detail'),
     path('<id>/log', InterventionLogView.as_view(), name='log'),
     path('<id>/edit', edit_view, name='edit'),
@@ -37,7 +36,7 @@ urlpatterns = [
     path('<id>/share', InterventionShareFormView.as_view(), name='share-form'),
     path('<id>/check', check_view, name='check'),
     path('<id>/record', InterventionRecordView.as_view(), name='record'),
-    path('<id>/report', InterventionReportView.as_view(), name='report'),
+    path('<id>/report', report_view, name='report'),
     path('<id>/resub', InterventionResubmissionView.as_view(), name='resubmission-create'),
 
     # Compensations

intervention/views/deduction.py

@@ -5,22 +5,51 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib.auth.mixins import LoginRequiredMixin
+from django.contrib.auth.decorators import login_required
+from django.utils.decorators import method_decorator
 
 from intervention.models import Intervention
+from konova.decorators import default_group_required, shared_access_required
 from konova.views.deduction import AbstractNewDeductionView, AbstractEditDeductionView, AbstractRemoveDeductionView
 
 
-class NewInterventionDeductionView(LoginRequiredMixin, AbstractNewDeductionView):
+class NewInterventionDeductionView(AbstractNewDeductionView):
-    _MODEL = Intervention
+    def _custom_check(self, obj):
-    _REDIRECT_URL = "intervention:detail"
+        pass
+
+    model = Intervention
+    redirect_url = "intervention:detail"
+
+    @method_decorator(login_required)
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def dispatch(self, request, *args, **kwargs):
+        return super().dispatch(request, *args, **kwargs)
 
 
-class EditInterventionDeductionView(LoginRequiredMixin, AbstractEditDeductionView):
+class EditInterventionDeductionView(AbstractEditDeductionView):
-    _MODEL = Intervention
+    def _custom_check(self, obj):
-    _REDIRECT_URL = "intervention:detail"
+        pass
+
+    model = Intervention
+    redirect_url = "intervention:detail"
+
+    @method_decorator(login_required)
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def dispatch(self, request, *args, **kwargs):
+        return super().dispatch(request, *args, **kwargs)
 
 
-class RemoveInterventionDeductionView(LoginRequiredMixin, AbstractRemoveDeductionView):
+class RemoveInterventionDeductionView(AbstractRemoveDeductionView):
-    _MODEL = Intervention
+    def _custom_check(self, obj):
-    _REDIRECT_URL = "intervention:detail"
+        pass
+
+    model = Intervention
+    redirect_url = "intervention:detail"
+
+    @method_decorator(login_required)
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Intervention, "id"))
+    def dispatch(self, request, *args, **kwargs):
+        return super().dispatch(request, *args, **kwargs)

intervention/views/intervention.py

@@ -7,7 +7,6 @@ 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.shortcuts import get_object_or_404, render, redirect
 from django.urls import reverse
@@ -26,22 +25,40 @@ from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.message_templates import DATA_CHECKED_PREVIOUSLY_TEMPLATE, RECORDED_BLOCKS_EDIT, \
     CHECK_STATE_RESET, FORM_INVALID, IDENTIFIER_REPLACED, DO_NOT_FORGET_TO_SHARE, GEOMETRY_SIMPLIFIED, \
     GEOMETRIES_IGNORED_TEMPLATE
-from konova.views.base import BaseIndexView, BaseIdentifierGeneratorView
 
 
-class InterventionIndexView(LoginRequiredMixin, BaseIndexView):
+@login_required
-    _INDEX_TABLE_CLS = InterventionTable
+@any_group_check
-    _TAB_TITLE = _("Interventions - Overview")
+def index_view(request: HttpRequest):
+    """
+    Renders the index view for Interventions
 
-    def _get_queryset(self):
+    Args:
-        qs = Intervention.objects.filter(
+        request (HttpRequest): The incoming request
-            deleted=None,
+
-        ).select_related(
+    Returns:
-            "legal"
+        A rendered view
-        ).order_by(
+    """
-            "-modified__timestamp"
+    template = "generic_index.html"
-        )
+
-        return qs
+    # Filtering by user access is performed in table filter inside InterventionTableFilter class
+    interventions = Intervention.objects.filter(
+        deleted=None,  # not deleted
+    ).select_related(
+        "legal"
+    ).order_by(
+        "-modified__timestamp"
+    )
+    table = InterventionTable(
+        request=request,
+        queryset=interventions
+    )
+    context = {
+        "table": table,
+        TAB_TITLE_IDENTIFIER: _("Interventions - Overview"),
+    }
+    context = BaseContext(request, context).context
+    return render(request, template, context)
 
 
 @login_required
@@ -100,9 +117,23 @@ def new_view(request: HttpRequest):
     return render(request, template, context)
 
 
-class InterventionIdentifierGeneratorView(LoginRequiredMixin, BaseIdentifierGeneratorView):
+@login_required
-    _MODEL_CLS = Intervention
+@default_group_required
-    _REDIRECT_URL = "intervention:index"
+def new_id_view(request: HttpRequest):
+    """ JSON endpoint
+
+    Provides fetching of free identifiers for e.g. AJAX calls
+
+    """
+    tmp_intervention = Intervention()
+    identifier = tmp_intervention.generate_new_identifier()
+    while Intervention.objects.filter(identifier=identifier).exists():
+        identifier = tmp_intervention.generate_new_identifier()
+    return JsonResponse(
+        data={
+            "gen_data": identifier
+        }
+    )
 
 
 @login_required

intervention/views/report.py

@@ -5,41 +5,72 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
+from django.http import HttpRequest
+from django.shortcuts import get_object_or_404, render
 from django.urls import reverse
+from django.utils.translation import gettext_lazy as _
 
 from intervention.models import Intervention
-from konova.sub_settings.django_settings import BASE_URL
+from konova.contexts import BaseContext
-from konova.utils.qrcode import QrCode
+from konova.decorators import uuid_required
-from konova.views.report import BaseReportView
+from konova.forms import SimpleGeomForm
+from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
+from konova.utils.generators import generate_qr_code
 
 
-class InterventionReportView(BaseReportView):
+@uuid_required
-    _TEMPLATE = 'intervention/report/report.html'
+def report_view(request: HttpRequest, id: str):
-    _MODEL = Intervention
+    """ Renders the public report view
 
-    def _get_report_context(self, obj: Intervention):
+    Args:
-        """ Returns the specific context needed for an intervention report
+        request (HttpRequest): The incoming request
+        id (str): The id of the intervention
 
-        Args:
+    Returns:
-            obj (Intervention): The object for the report
 
-        Returns:
+    """
-            dict: The object specific context for rendering the report
+    template = "intervention/report/report.html"
-        """
+    intervention = get_object_or_404(Intervention, id=id)
-        distinct_deductions = obj.deductions.all().distinct("account")
-        report_url = BASE_URL + reverse("intervention:report", args=(obj.id,))
-        qrcode_report = QrCode(report_url, 10)
-        qrcode_lanis = QrCode(obj.get_LANIS_link(), 7)
 
-        return {
+    tab_title = _("Report {}").format(intervention.identifier)
-            "deductions": distinct_deductions,
+    # If intervention is not recorded (yet or currently) we need to render another template without any data
-            "qrcode": {
+    if not intervention.is_ready_for_publish():
-                "img": qrcode_report.get_img(),
+        template = "report/unavailable.html"
-                "url": qrcode_report.get_content(),
+        context = {
-            },
+            TAB_TITLE_IDENTIFIER: tab_title,
-            "qrcode_lanis": {
-                "img": qrcode_lanis.get_img(),
-                "url": qrcode_lanis.get_content(),
-            },
-            "tables_scrollable": False,
         }
+        context = BaseContext(request, context).context
+        return render(request, template, context)
+
+    # Prepare data for map viewer
+    geom_form = SimpleGeomForm(
+        instance=intervention
+    )
+    parcels = intervention.get_underlying_parcels()
+
+    distinct_deductions = intervention.deductions.all().distinct(
+        "account"
+    )
+    qrcode_url = request.build_absolute_uri(reverse("intervention:report", args=(id,)))
+    qrcode_img = generate_qr_code(qrcode_url, 10)
+    qrcode_lanis_url = intervention.get_LANIS_link()
+    qrcode_img_lanis = generate_qr_code(qrcode_lanis_url, 7)
+
+    context = {
+        "obj": intervention,
+        "deductions": distinct_deductions,
+        "qrcode": {
+            "img": qrcode_img,
+            "url": qrcode_url,
+        },
+        "qrcode_lanis": {
+            "img": qrcode_img_lanis,
+            "url": qrcode_lanis_url,
+        },
+        "geom_form": geom_form,
+        "parcels": parcels,
+        "tables_scrollable": False,
+        TAB_TITLE_IDENTIFIER: tab_title,
+    }
+    context = BaseContext(request, context).context
+    return render(request, template, context)

konova/static/css/konova.css

@@ -288,4 +288,8 @@ Overwrites netgis.css attributes
     Overwrites gradient used on default css of netgis map client
      */
     background: var(--rlp-red) !important;
+}
+
+.netgis-menu{
+    z-index: 1 !important;
 }

konova/utils/general.py

@@ -5,9 +5,6 @@ Contact: michel.peltriaux@sgdnord.rlp.de
 Created on: 17.09.21
 
 """
-from django.contrib import messages
-from django.utils.translation import gettext_lazy as _
-from django.http import HttpRequest
 
 
 def format_german_float(num) -> str:
@@ -22,19 +19,3 @@ def format_german_float(num) -> str:
         num (str): The number as german Gleitkommazahl
     """
     return format(num, "0,.2f").replace(",", "X").replace(".", ",").replace("X", ".")
-
-
-def check_user_is_in_any_group(request: HttpRequest):
-    """
-    Checks for any group membership. Adds a message in case of having none.
-
-    """
-    user = request.user
-    # Inform user about missing group privileges!
-    groups = user.groups.all()
-    if not groups:
-        messages.info(
-            request,
-            _("+++ Attention: You are not part of any group. You won't be able to create, edit or do anything. Please contact an administrator. +++")
-        )
-    return request

konova/utils/generators.py

@@ -7,6 +7,10 @@ Created on: 09.11.20
 """
 import random
 import string
+import qrcode
+import qrcode.image.svg
+
+from io import BytesIO
 
 
 def generate_token() -> str:
@@ -38,3 +42,23 @@ def generate_random_string(length: int, use_numbers: bool = False, use_letters_l
     ret_val = "".join(random.choice(elements) for i in range(length))
     return ret_val
 
+
+def generate_qr_code(content: str, size: int = 20) -> str:
+    """ Generates a qr code from given content
+
+    Args:
+        content (str): The content for the qr code
+        size (int): The image size
+
+    Returns:
+        qrcode_svg (str): The qr code as svg
+    """
+    qrcode_factory = qrcode.image.svg.SvgImage
+    qrcode_img = qrcode.make(
+        content,
+        image_factory=qrcode_factory,
+        box_size=size
+    )
+    stream = BytesIO()
+    qrcode_img.save(stream)
+    return stream.getvalue().decode()

konova/utils/qrcode.py

@@ -1,47 +0,0 @@
-"""
-Author: Michel Peltriaux
-Created on: 17.10.25
-
-"""
-from io import BytesIO
-
-import qrcode
-import qrcode.image.svg as svg
-
-
-class QrCode:
-    """ A wrapping class for creating a qr code with content
-
-    """
-    _content = None
-    _img = None
-
-    def __init__(self, content: str, size: int):
-        self._content = content
-        self._img = self._generate_qr_code(content, size)
-
-    def _generate_qr_code(self, content: str, size: int = 20) -> str:
-        """ Generates a qr code from given content
-
-        Args:
-            content (str): The content for the qr code
-            size (int): The image size
-
-        Returns:
-            qrcode_svg (str): The qr code as svg
-        """
-        img_factory = svg.SvgImage
-        qrcode_img = qrcode.make(
-            content,
-            image_factory=img_factory,
-            box_size=size
-        )
-        stream = BytesIO()
-        qrcode_img.save(stream)
-        return stream.getvalue().decode()
-
-    def get_img(self):
-        return self._img
-
-    def get_content(self):
-        return self._content

konova/views/base.py

@@ -1,141 +0,0 @@
-"""
-Author: Michel Peltriaux
-Created on: 15.10.25
-
-"""
-from abc import abstractmethod
-
-from django.contrib import messages
-from django.http import HttpRequest, JsonResponse
-from django.shortcuts import render, redirect
-from django.urls import reverse
-from django.views import View
-
-from konova.contexts import BaseContext
-from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
-from konova.utils.general import check_user_is_in_any_group
-from konova.utils.message_templates import MISSING_GROUP_PERMISSION, DATA_UNSHARED
-
-
-class BaseView(View):
-    _TEMPLATE: str = "CHANGE_ME"
-    _TAB_TITLE: str = "CHANGE_ME"
-    _REDIRECT_URL: str = "CHANGE_ME"
-    _REDIRECT_URL_ERROR: str = "home"
-
-    class Meta:
-        abstract = True
-
-    def dispatch(self, request, *args, **kwargs):
-        if not self._user_has_permission(request.user):
-            messages.info(request, MISSING_GROUP_PERMISSION)
-            return redirect(reverse(self._REDIRECT_URL_ERROR))
-        if not self._user_has_shared_access(request.user, **kwargs):
-            messages.info(request, DATA_UNSHARED)
-            return redirect(reverse(self._REDIRECT_URL_ERROR))
-        return super().dispatch(request, *args, **kwargs)
-
-    def _user_has_permission(self, user):
-        """ Has to be implemented properly by inheriting classes
-
-        Args:
-            user ():
-
-        Returns:
-
-        """
-        return False
-
-    def _user_has_shared_access(self, user, **kwargs):
-        """ Has to be implemented properly by inheriting classes
-
-        Args:
-            user ():
-
-        Returns:
-
-        """
-        return False
-
-
-class BaseModalFormView(BaseView):
-    _TEMPLATE = "modal/modal_form.html"
-    _TAB_TITLE = None
-
-    class Meta:
-        abstract = True
-
-
-class BaseIndexView(BaseView):
-    """ Base class for index views
-
-    """
-    _TEMPLATE = "generic_index.html"
-    _INDEX_TABLE_CLS = None
-    _REDIRECT_URL = "home"
-
-    class Meta:
-        abstract = True
-
-    def dispatch(self, request, *args, **kwargs):
-        request = check_user_is_in_any_group(request)
-        return super().dispatch(request, *args, **kwargs)
-
-    def get(self, request: HttpRequest):
-        qs = self._get_queryset()
-        table = self._INDEX_TABLE_CLS(
-            request=request,
-            queryset=qs
-        )
-        context = {
-            "table": table,
-            TAB_TITLE_IDENTIFIER: self._TAB_TITLE,
-        }
-        context = BaseContext(request, context).context
-        return render(request, self._TEMPLATE, context)
-
-    @abstractmethod
-    def _get_queryset(self):
-        raise NotImplementedError
-
-    def _user_has_permission(self, user):
-        # No specific permissions needed for opening base index view
-        return True
-
-    def _user_has_shared_access(self, user, **kwargs):
-        # No specific constraints for shared access of index views
-        return True
-
-
-class BaseIdentifierGeneratorView(BaseView):
-    _MODEL_CLS = None
-    _REDIRECT_URL: str = "home"
-
-    class Meta:
-        abstract = True
-
-    def get(self, request: HttpRequest):
-        tmp_obj = self._MODEL_CLS()
-        identifier = tmp_obj.generate_new_identifier()
-        while self._MODEL_CLS.objects.filter(identifier=identifier).exists():
-            identifier = tmp_obj.generate_new_identifier()
-        return JsonResponse(
-            data={
-                "gen_data": identifier
-            }
-        )
-
-    def _user_has_permission(self, user):
-        """ Should be overwritten in inheriting classes!
-
-        Args:
-            user ():
-
-        Returns:
-
-        """
-        return user.is_default_user()
-
-    def _user_has_shared_access(self, user, **kwargs):
-        # No specific constraints for shared access
-        return True

konova/views/deduction.py

@@ -6,60 +6,30 @@ Created on: 22.08.22
 
 """
 from django.core.exceptions import ObjectDoesNotExist
-from django.http import Http404, HttpRequest
+from django.http import Http404
 from django.shortcuts import get_object_or_404
 from django.urls import reverse
+from django.views import View
 
 from intervention.forms.modals.deduction import NewEcoAccountDeductionModalForm, EditEcoAccountDeductionModalForm, \
     RemoveEcoAccountDeductionModalForm
 from konova.utils.message_templates import DEDUCTION_ADDED, DEDUCTION_EDITED, DEDUCTION_REMOVED, DEDUCTION_UNKNOWN
-from konova.views.base import BaseModalFormView
 
 
-class AbstractDeductionView(BaseModalFormView):
+class AbstractDeductionView(View):
-    _MODEL = None
+    model = None
-    _REDIRECT_URL = None
+    redirect_url = None
 
     def _custom_check(self, obj):
         """
         Can be used by inheriting classes to provide custom checks before further processing
 
         """
-        pass
+        raise NotImplementedError("Must be implemented in subclasses")
-
-    def _user_has_permission(self, user) -> bool:
-        """
-
-        Args:
-            user ():
-
-        Returns:
-
-        """
-        return user.is_default_user()
-
-    def _user_has_shared_access(self, user, **kwargs) -> bool:
-        """ A user has shared access on
-
-        Args:
-            user (User): The performing user
-            kwargs (dict): Parameters
-
-        Returns:
-            bool: True if the user has access to the requested object, False otherwise
-        """
-        ret_val: bool = False
-        try:
-            obj = self._MODEL.objects.get(
-                id=kwargs.get("id")
-            )
-            ret_val = obj.is_shared_with(user)
-        except ObjectDoesNotExist:
-            ret_val = False
-        return ret_val
 
 
 class AbstractNewDeductionView(AbstractDeductionView):
+
     class Meta:
         abstract = True
 
@@ -73,13 +43,13 @@ class AbstractNewDeductionView(AbstractDeductionView):
         Returns:
 
         """
-        obj = get_object_or_404(self._MODEL, id=id)
+        obj = get_object_or_404(self.model, id=id)
         self._custom_check(obj)
         form = NewEcoAccountDeductionModalForm(request.POST or None, instance=obj, request=request)
         return form.process_request(
             request,
             msg_success=DEDUCTION_ADDED,
-            redirect_url=reverse(self._REDIRECT_URL, args=(id,)) + "#related_data",
+            redirect_url=reverse(self.redirect_url, args=(id,)) + "#related_data",
         )
 
     def post(self, request, id: str):
@@ -87,6 +57,10 @@ class AbstractNewDeductionView(AbstractDeductionView):
 
 
 class AbstractEditDeductionView(AbstractDeductionView):
+
+    def _custom_check(self, obj):
+        pass
+
     class Meta:
         abstract = True
 
@@ -101,7 +75,7 @@ class AbstractEditDeductionView(AbstractDeductionView):
         Returns:
 
         """
-        obj = get_object_or_404(self._MODEL, id=id)
+        obj = get_object_or_404(self.model, id=id)
         self._custom_check(obj)
         try:
             eco_deduction = obj.deductions.get(id=deduction_id)
@@ -113,7 +87,7 @@ class AbstractEditDeductionView(AbstractDeductionView):
         return form.process_request(
             request=request,
             msg_success=DEDUCTION_EDITED,
-            redirect_url=reverse(self._REDIRECT_URL, args=(id,)) + "#related_data"
+            redirect_url=reverse(self.redirect_url, args=(id,)) + "#related_data"
         )
 
     def post(self, request, id: str, deduction_id: str):
@@ -121,6 +95,10 @@ class AbstractEditDeductionView(AbstractDeductionView):
 
 
 class AbstractRemoveDeductionView(AbstractDeductionView):
+
+    def _custom_check(self, obj):
+        pass
+
     class Meta:
         abstract = True
 
@@ -135,7 +113,7 @@ class AbstractRemoveDeductionView(AbstractDeductionView):
         Returns:
 
         """
-        obj = get_object_or_404(self._MODEL, id=id)
+        obj = get_object_or_404(self.model, id=id)
         self._custom_check(obj)
         try:
             eco_deduction = obj.deductions.get(id=deduction_id)
@@ -146,7 +124,7 @@ class AbstractRemoveDeductionView(AbstractDeductionView):
         return form.process_request(
             request=request,
             msg_success=DEDUCTION_REMOVED,
-            redirect_url=reverse(self._REDIRECT_URL, args=(id,)) + "#related_data"
+            redirect_url=reverse(self.redirect_url, args=(id,)) + "#related_data"
         )
 
     def post(self, request, id: str, deduction_id: str):

konova/views/report.py

@@ -1,106 +0,0 @@
-"""
-Author: Michel Peltriaux
-Created on: 17.10.25
-
-"""
-from abc import abstractmethod
-from uuid import UUID
-
-from django.http import HttpRequest, Http404
-from django.shortcuts import get_object_or_404, render
-from django.utils.translation import gettext_lazy as _
-
-from konova.contexts import BaseContext
-from konova.forms import SimpleGeomForm
-from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
-from konova.views.base import BaseView
-
-
-class BaseReportView(BaseView):
-    _TEMPLATE = None
-    _TAB_TITLE = _("Report {}")
-    _MODEL = None
-
-    class Meta:
-        abstract = True
-
-    def dispatch(self, request, *args, **kwargs):
-        # If the given id is not a uuid we act as the result was not found
-        try:
-            UUID(kwargs.get('id'))
-        except ValueError:
-            raise Http404()
-        return super().dispatch(request, *args, **kwargs)
-
-    def _return_unpublishable_content_response(self, request: HttpRequest, tab_title: str):
-        """ Handles HttpResponse return in case the object is not ready for publish
-
-        Args:
-            request ():
-            tab_title ():
-
-        Returns:
-
-        """
-        template = "report/unavailable.html"
-        context = {
-            TAB_TITLE_IDENTIFIER: tab_title,
-        }
-        context = BaseContext(request, context).context
-        return render(request, template, context)
-
-    def get(self, request: HttpRequest, id: str):
-        """ Renders the public report view
-
-        Args:
-            request (HttpRequest): The incoming request
-            id (str): The id of the intervention
-
-        Returns:
-
-        """
-        obj = get_object_or_404(self._MODEL, id=id)
-        tab_title = self._TAB_TITLE.format(obj.identifier)
-
-        # If object is not recorded we need to render another template without any data
-        if not obj.is_ready_for_publish():
-            return self._return_unpublishable_content_response(request, tab_title)
-
-        # First get specific report context for different types of objects due to inheritance
-        report_context = self._get_report_context(obj)
-
-        # Then generate and add default report context (the same for all models)
-        geom_form = SimpleGeomForm(instance=obj)
-        parcels = obj.get_underlying_parcels()
-        report_context.update(
-            {
-                TAB_TITLE_IDENTIFIER: tab_title,
-                "parcels": parcels,
-                "geom_form": geom_form,
-                "obj": obj
-            }
-        )
-
-        # Then generate the general context based on the report specific data
-        context = BaseContext(request, report_context).context
-        return render(request, self._TEMPLATE, context)
-
-    @abstractmethod
-    def _get_report_context(self, obj):
-        """ Returns the specific context needed for this report view
-
-        Args:
-            obj (RecordableObjectMixin): The object for the report
-
-        Returns:
-            dict: The object specific context for rendering the report
-        """
-        raise NotImplementedError
-
-    def _user_has_permission(self, user):
-        # Reports do not need specific permissions to be callable
-        return True
-
-    def _user_has_shared_access(self, user, **kwargs):
-        # Reports do not need specific share states to be callable
-        return True

templates/navbars/navbar.html

@@ -56,7 +56,7 @@
                     {% if user.is_staff or user.is_superuser %}
                     <a class="dropdown-item" target="_blank" href="{% url 'admin:index' %}">{% fa5_icon 'tools' %}  {% trans 'Admin' %}</a>
                     {% endif %}
-                    <a class="dropdown-item" href="{% url 'user:detail' %}">{% fa5_icon 'cogs' %}  {% trans 'Settings' %}</a>
+                    <a class="dropdown-item" href="{% url 'user:index' %}">{% fa5_icon 'cogs' %}  {% trans 'Settings' %}</a>
                     <a class="dropdown-item" href="{% url 'logout' %}">{% fa5_icon 'sign-out-alt' %}  {% trans 'Logout' %}</a>
                 </div>
             </li>

user/forms/user.py

@@ -38,7 +38,7 @@ class UserNotificationForm(BaseForm):
         self.form_title = _("Edit notifications")
         self.form_caption = _("")
         self.action_url = reverse("user:notifications")
-        self.cancel_redirect = reverse("user:detail")
+        self.cancel_redirect = reverse("user:index")
 
         # Insert all notifications into form field by creating choices as tuples
         notifications = UserNotification.objects.filter(

user/tests/test_views.py

@@ -26,7 +26,7 @@ class UserViewTestCase(BaseViewTestCase):
         self.team.users.add(self.superuser)
         self.team.admins.add(self.superuser)
         # Prepare urls
-        self.index_url = reverse("user:detail", args=())
+        self.index_url = reverse("user:index", args=())
         self.notification_url = reverse("user:notifications", args=())
         self.api_token_url = reverse("user:api-token", args=())
         self.contact_url = reverse("user:contact", args=(self.superuser.id,))

user/tests/unit/test_forms.py

@@ -233,7 +233,7 @@ class UserNotificationFormTestCase(BaseTestCase):
         self.assertEqual(form.form_title, str(_("Edit notifications")))
         self.assertEqual(form.form_caption, "")
         self.assertEqual(form.action_url, reverse("user:notifications"))
-        self.assertEqual(form.cancel_redirect, reverse("user:detail"))
+        self.assertEqual(form.cancel_redirect, reverse("user:index"))
 
     def test_save(self):
         selected_notification = UserNotification.objects.first()

user/urls.py

@@ -15,15 +15,15 @@ from user.views.views import *
 
 app_name = "user"
 urlpatterns = [
-    path("", UserDetailView.as_view(), name="detail"),
+    path("", index_view, name="index"),
     path("propagate/", PropagateUserView.as_view(), name="propagate"),
-    path("notifications/", NotificationsView.as_view(), name="notifications"),
+    path("notifications/", notifications_view, name="notifications"),
     path("token/api", APITokenView.as_view(), name="api-token"),
     path("token/api/new", new_api_token_view, name="api-token-new"),
-    path("contact/<id>", ContactView.as_view(), name="contact"),
+    path("contact/<id>", contact_view, name="contact"),
-    path("team/", TeamIndexView.as_view(), name="team-index"),
+    path("team/", index_team_view, name="team-index"),
     path("team/new", new_team_view, name="team-new"),
-    path("team/<id>", TeamDetailModalView.as_view(), name="team-data"),
+    path("team/<id>", data_team_view, name="team-data"),
     path("team/<id>/edit", edit_team_view, name="team-edit"),
     path("team/<id>/remove", remove_team_view, name="team-remove"),
     path("team/<id>/leave", leave_team_view, name="team-leave"),

user/views/views.py

@@ -1,10 +1,8 @@
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
-from django.contrib.auth.mixins import LoginRequiredMixin
 from django.urls import reverse
 
 from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
-from konova.views.base import BaseView, BaseModalFormView
 from user.forms.modals.team import NewTeamModalForm, EditTeamModalForm, RemoveTeamModalForm, LeaveTeamModalForm
 from user.forms.modals.user import UserContactForm
 from user.forms.team import TeamDataForm
@@ -15,132 +13,129 @@ from django.shortcuts import render, redirect, get_object_or_404
 from django.utils.translation import gettext_lazy as _
 
 from konova.contexts import BaseContext
-from konova.decorators import login_required_modal
+from konova.decorators import any_group_check, login_required_modal
 
 
-class UserBaseView(BaseView):
+@login_required
-    def _user_has_shared_access(self, user, **kwargs):
+@any_group_check
-        return True
+def index_view(request: HttpRequest):
+    """ Renders the user's data index view
 
-    def _user_has_permission(self, user):
+    Args:
-        return True
+        request ():
+
+    Returns:
+
+    """
+    template = "user/index.html"
+    context = {
+        "user": request.user,
+        TAB_TITLE_IDENTIFIER: _("User settings"),
+    }
+    context = BaseContext(request, context).context
+    return render(request, template, context)
 
 
-class UserDetailView(LoginRequiredMixin, UserBaseView):
+@login_required
-    _TEMPLATE = "user/index.html"
+@any_group_check
-    _TAB_TITLE = _("User settings")
+def notifications_view(request: HttpRequest):
+    """ Renders the notifications settings view
 
-    def get(self, request: HttpRequest):
+    Args:
-        context = {
+        request ():
-            "user": request.user,
-            TAB_TITLE_IDENTIFIER: self._TAB_TITLE,
-        }
-        context = BaseContext(request, context).context
-        return render(request, self._TEMPLATE, context)
 
+    Returns:
 
-class NotificationsView(LoginRequiredMixin, UserBaseView):
+    """
-    _TEMPLATE = "user/notifications.html"
+    template = "user/notifications.html"
-    _TAB_TITLE = _("User notifications")
+    user = request.user
 
-    def get(self, request: HttpRequest):
+    form = UserNotificationForm(user=user, data=request.POST or None)
-        user = request.user
+    if request.method == "POST":
-        form = UserNotificationForm(user=user, data=None)
-        context = {
-            "user": user,
-            "form": form,
-            TAB_TITLE_IDENTIFIER: self._TAB_TITLE,
-        }
-        context = BaseContext(request, context).context
-        return render(request, self._TEMPLATE, context)
-
-    def post(self, request: HttpRequest):
-        user = request.user
-        form = UserNotificationForm(user=user, data=request.POST)
         if form.is_valid():
             form.save()
             messages.success(
                 request,
                 _("Notifications edited")
             )
-            return redirect("user:detail")
+            return redirect("user:index")
-        context = {
+    elif request.method == "GET":
-            "user": user,
+        # Implicit
-            "form": form,
+        pass
-            TAB_TITLE_IDENTIFIER: self._TAB_TITLE,
+    else:
-        }
+        raise NotImplementedError
-        context = BaseContext(request, context).context
+
-        return render(request, self._TEMPLATE, context)
+    context = {
+        "user": user,
+        "form": form,
+        TAB_TITLE_IDENTIFIER: _("User notifications"),
+    }
+    context = BaseContext(request, context).context
+    return render(request, template, context)
 
 
-class ContactView(LoginRequiredMixin, BaseModalFormView):
+@login_required_modal
-    def get(self, request: HttpRequest, id: str):
+@login_required
-        """ Renders contact modal view of a users contact data
+def contact_view(request: HttpRequest, id: str):
+    """ Renders contact modal view of a users contact data
 
-        Args:
+    Args:
-            request (HttpRequest): The incoming request
+        request (HttpRequest): The incoming request
-            id (str): The user's id
+        id (str): The user's id
 
-        Returns:
+    Returns:
 
-        """
+    """
-        user = get_object_or_404(User, id=id)
+    user = get_object_or_404(User, id=id)
-        form = UserContactForm(request.POST or None, instance=user, request=request)
+    form = UserContactForm(request.POST or None, instance=user, request=request)
-        context = {
+    template = "modal/modal_form.html"
-            "form": form,
+    context = {
-        }
+        "form": form,
-        context = BaseContext(request, context).context
+    }
-        return render(request, self._TEMPLATE, context)
+    context = BaseContext(request, context).context
-
+    return render(
-    def _user_has_shared_access(self, user, **kwargs):
+        request,
-        # No specific constraints
+        template,
-        return True
+        context
-
+    )
-    def _user_has_permission(self, user):
-        # No specific constraints
-        return True
 
 
-class TeamDetailModalView(LoginRequiredMixin, BaseModalFormView):
+@login_required_modal
-    def get(self, request: HttpRequest, id: str):
+@login_required
-        """ Renders team data
+def data_team_view(request: HttpRequest, id: str):
+    """ Renders team data
 
-        Args:
+    Args:
-            request (HttpRequest): The incoming request
+        request (HttpRequest): The incoming request
-            id (str): The team's id
+        id (str): The team's id
 
-        Returns:
+    Returns:
 
-        """
+    """
-        team = get_object_or_404(Team, id=id)
+    team = get_object_or_404(Team, id=id)
-        form = TeamDataForm(request.POST or None, instance=team, request=request)
+    form = TeamDataForm(request.POST or None, instance=team, request=request)
-        context = {
+    template = "modal/modal_form.html"
-            "form": form,
+    context = {
-        }
+        "form": form,
-        context = BaseContext(request, context).context
+    }
-        return render(request, self._TEMPLATE, context)
+    context = BaseContext(request, context).context
-
+    return render(
-    def _user_has_shared_access(self, user, **kwargs):
+        request,
-        # No specific constraints
+        template,
-        return True
+        context
-
+    )
-    def _user_has_permission(self, user):
-        # No specific constraints
-        return True
 
 
-class TeamIndexView(LoginRequiredMixin, UserBaseView):
+@login_required
-    _TEMPLATE = "user/team/index.html"
+def index_team_view(request: HttpRequest):
-    _TAB_TITLE = _("Teams")
+    template = "user/team/index.html"
-
+    user = request.user
-    def get(self, request: HttpRequest):
+    context = {
-        user = request.user
+        "teams": user.shared_teams,
-        context = {
+        "tab_title": _("Teams"),
-            "teams": user.shared_teams,
+    }
-            "tab_title": self._TAB_TITLE,
+    context = BaseContext(request, context).context
-        }
+    return render(request, template, context)
-        context = BaseContext(request, context).context
-        return render(request, self._TEMPLATE, context)
 
 
 @login_required_modal