compensation/forms/compensation.py

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

compensation/urls/compensation.py

@@ -17,20 +17,19 @@ from compensation.views.compensation.action import NewCompensationActionView, Ed
     RemoveCompensationActionView
 from compensation.views.compensation.state import NewCompensationStateView, EditCompensationStateView, \
     RemoveCompensationStateView
-from compensation.views.compensation.compensation import \
+from compensation.views.compensation.compensation import new_view, edit_view, \
-    remove_view, CompensationIndexView, CompensationIdentifierGeneratorView, CompensationDetailView, \
+    remove_view, CompensationIndexView, CompensationIdentifierGeneratorView, CompensationDetailView
-    NewCompensationFormView, EditCompensationFormView
 from compensation.views.compensation.log import CompensationLogView
 
 urlpatterns = [
     # Main compensation
     path("", CompensationIndexView.as_view(), name="index"),
     path('new/id', CompensationIdentifierGeneratorView.as_view(), name='new-id'),
-    path('new/<intervention_id>', NewCompensationFormView.as_view(), name='new'),
+    path('new/<intervention_id>', new_view, name='new'),
-    path('new', NewCompensationFormView.as_view(), name='new'),
+    path('new', new_view, name='new'),
     path('<id>', CompensationDetailView.as_view(), name='detail'),
     path('<id>/log', CompensationLogView.as_view(), name='log'),
-    path('<id>/edit', EditCompensationFormView.as_view(), name='edit'),
+    path('<id>/edit', edit_view, name='edit'),
     path('<id>/remove', remove_view, name='remove'),
 
     path('<id>/state/new', NewCompensationStateView.as_view(), name='new-state'),

compensation/urls/eco_account.py

@@ -8,9 +8,8 @@ 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 remove_view, \
+from compensation.views.eco_account.eco_account import new_view, edit_view, remove_view, \
-    EcoAccountIndexView, EcoAccountIdentifierGeneratorView, EcoAccountDetailView, NewEcoAccountFormView, \
+    EcoAccountIndexView, EcoAccountIdentifierGeneratorView, EcoAccountDetailView
-    EditEcoAccountFormView
 from compensation.views.eco_account.log import EcoAccountLogView
 from compensation.views.eco_account.record import EcoAccountRecordView
 from compensation.views.eco_account.report import EcoAccountReportView
@@ -30,13 +29,13 @@ from compensation.views.eco_account.deduction import NewEcoAccountDeductionView,
 app_name = "acc"
 urlpatterns = [
     path("", EcoAccountIndexView.as_view(), name="index"),
-    path('new/', NewEcoAccountFormView.as_view(), name='new'),
+    path('new/', new_view, name='new'),
     path('new/id', EcoAccountIdentifierGeneratorView.as_view(), name='new-id'),
     path('<id>', EcoAccountDetailView.as_view(), name='detail'),
     path('<id>/log', EcoAccountLogView.as_view(), name='log'),
     path('<id>/record', EcoAccountRecordView.as_view(), name='record'),
     path('<id>/report', EcoAccountReportView.as_view(), name='report'),
-    path('<id>/edit', EditEcoAccountFormView.as_view(), name='edit'),
+    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

@@ -18,12 +18,15 @@ from compensation.forms.compensation import EditCompensationForm, NewCompensatio
 from compensation.models import Compensation
 from compensation.tables.compensation import CompensationTable
 from intervention.models import Intervention
+from konova.contexts import BaseContext
 from konova.decorators import shared_access_required, default_group_required, login_required_modal
+from konova.forms import SimpleGeomForm
 from konova.forms.modals import RemoveModalForm
+from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.message_templates import COMPENSATION_REMOVED_TEMPLATE, DATA_CHECKED_PREVIOUSLY_TEMPLATE, \
-    RECORDED_BLOCKS_EDIT, PARAMS_INVALID
+    RECORDED_BLOCKS_EDIT, CHECK_STATE_RESET, FORM_INVALID, PARAMS_INVALID, IDENTIFIER_REPLACED, \
-from konova.views.base import BaseIndexView, BaseIdentifierGeneratorView, BaseNewSpatialLocatedObjectFormView, \
+    COMPENSATION_ADDED_TEMPLATE, GEOMETRY_SIMPLIFIED, GEOMETRIES_IGNORED_TEMPLATE
-    BaseEditSpatialLocatedObjectFormView
+from konova.views.base import BaseIndexView, BaseIdentifierGeneratorView
 from konova.views.detail import BaseDetailView
 
 
@@ -41,55 +44,74 @@ class CompensationIndexView(LoginRequiredMixin, BaseIndexView):
         return qs
 
 
-class NewCompensationFormView(BaseNewSpatialLocatedObjectFormView):
+@login_required
-    _FORM_CLS = NewCompensationForm
+@default_group_required
-    _MODEL_CLS = Compensation
+@shared_access_required(Intervention, "intervention_id")
-    _TEMPLATE = "compensation/form/view.html"
+def new_view(request: HttpRequest, intervention_id: str = None):
-    _TAB_TITLE = _("New Compensation")
+    """
-    _REDIRECT_URL = "compensation:detail"
+    Renders a view for a new compensation creation
 
-    def _user_has_shared_access(self, user, **kwargs):
+    Args:
-        # On a new compensation make sure the intervention (if call came directly through an intervention's detail
+        request (HttpRequest): The incoming request
-        # view) is shared with the user
-        intervention_id = kwargs.get("intervention_id", None)
-        if not intervention_id:
-            return True
-        else:
-            intervention = get_object_or_404(Intervention, id=intervention_id)
-            return intervention.is_shared_with(user)
 
-    def _user_has_permission(self, user):
+    Returns:
-        # User has to be an ets user
-        return user.is_default_user()
 
-    def dispatch(self, request, *args, **kwargs):
+    """
-        # Make sure there is an existing intervention based on the given id
+    template = "compensation/form/view.html"
-        # Compensations can not exist without an intervention
+    if intervention_id is not None:
-        intervention_id = kwargs.get("intervention_id", None)
+        try:
-        if intervention_id:
+            intervention = Intervention.objects.get(id=intervention_id)
-            try:
+        except ObjectDoesNotExist:
-                intervention = Intervention.objects.get(id=intervention_id)
+            messages.error(request, PARAMS_INVALID)
-                if intervention.is_recorded:
+            return redirect("home")
-                    messages.info(
+        if intervention.is_recorded:
-                        request,
+            messages.info(
-                        RECORDED_BLOCKS_EDIT
+                request,
+                RECORDED_BLOCKS_EDIT
+            )
+            return redirect("intervention:detail", id=intervention_id)
+
+    data_form = NewCompensationForm(request.POST or None, intervention_id=intervention_id)
+    geom_form = SimpleGeomForm(request.POST or None, read_only=False)
+    if request.method == "POST":
+        if data_form.is_valid() and geom_form.is_valid():
+            generated_identifier = data_form.cleaned_data.get("identifier", None)
+            comp = data_form.save(request.user, geom_form)
+            if generated_identifier != comp.identifier:
+                messages.info(
+                    request,
+                    IDENTIFIER_REPLACED.format(
+                        generated_identifier,
+                        comp.identifier
                     )
-                    return redirect("intervention:detail", id=intervention_id)
+                )
-            except ObjectDoesNotExist:
+            messages.success(request, COMPENSATION_ADDED_TEMPLATE.format(comp.identifier))
-                messages.error(request, PARAMS_INVALID, extra_tags="danger")
+            if geom_form.has_geometry_simplified():
-                return redirect("home")
+                messages.info(
-        return super().dispatch(request, *args, **kwargs)
+                    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)
+                )
 
-class EditCompensationFormView(BaseEditSpatialLocatedObjectFormView):
+            return redirect("compensation:detail", id=comp.id)
-    _MODEL_CLS = Compensation
+        else:
-    _FORM_CLS = EditCompensationForm
+            messages.error(request, FORM_INVALID, extra_tags="danger",)
-    _TEMPLATE = "compensation/form/view.html"
+    else:
-    _REDIRECT_URL = "compensation:detail"
+        # For clarification: nothing in this case
-
+        pass
-    def _user_has_permission(self, user):
+    context = {
-        # User has to be a default user
+        "form": data_form,
-        return user.is_default_user()
+        "geom_form": geom_form,
+        TAB_TITLE_IDENTIFIER: _("New compensation"),
+    }
+    context = BaseContext(request, context).context
+    return render(request, template, context)
 
 
 class CompensationIdentifierGeneratorView(LoginRequiredMixin, BaseIdentifierGeneratorView):
@@ -97,6 +119,71 @@ class CompensationIdentifierGeneratorView(LoginRequiredMixin, BaseIdentifierGene
     _REDIRECT_URL = "compensation:index"
 
 
+@login_required
+@default_group_required
+@shared_access_required(Compensation, "id")
+def edit_view(request: HttpRequest, id: str):
+    """
+    Renders a view for editing compensations
+
+    Args:
+        request (HttpRequest): The incoming request
+
+    Returns:
+
+    """
+    template = "compensation/form/view.html"
+    # Get object from db
+    comp = get_object_or_404(Compensation, id=id)
+    if comp.is_recorded:
+        messages.info(
+            request,
+            RECORDED_BLOCKS_EDIT
+        )
+        return redirect("compensation:detail", id=id)
+
+    # Create forms, initialize with values from db/from POST request
+    data_form = EditCompensationForm(request.POST or None, instance=comp)
+    geom_form = SimpleGeomForm(request.POST or None, read_only=False, instance=comp)
+    if request.method == "POST":
+        if data_form.is_valid() and geom_form.is_valid():
+            # Preserve state of intervention checked to determine whether the user must be informed or not
+            # about a change of the check state
+            intervention_is_checked = comp.intervention.checked is not None
+
+            # The data form takes the geom form for processing, as well as the performing user
+            comp = data_form.save(request.user, geom_form)
+            if intervention_is_checked:
+                messages.info(request, CHECK_STATE_RESET)
+            messages.success(request, _("Compensation {} edited").format(comp.identifier))
+            if geom_form.has_geometry_simplified():
+                messages.info(
+                    request,
+                    GEOMETRY_SIMPLIFIED
+                )
+
+            num_ignored_geometries = geom_form.get_num_geometries_ignored()
+            if num_ignored_geometries > 0:
+                messages.info(
+                    request,
+                    GEOMETRIES_IGNORED_TEMPLATE.format(num_ignored_geometries)
+                )
+
+            return redirect("compensation:detail", id=comp.id)
+        else:
+            messages.error(request, FORM_INVALID, extra_tags="danger",)
+    else:
+        # For clarification: nothing in this case
+        pass
+    context = {
+        "form": data_form,
+        "geom_form": geom_form,
+        TAB_TITLE_IDENTIFIER: _("Edit {}").format(comp.identifier),
+    }
+    context = BaseContext(request, context).context
+    return render(request, template, context)
+
+
 class CompensationDetailView(BaseDetailView):
     _MODEL_CLS = Compensation
     _TEMPLATE = "compensation/detail/compensation/view.html"

compensation/views/eco_account/eco_account.py

@@ -23,8 +23,7 @@ from konova.settings import ETS_GROUP
 from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.message_templates import CANCEL_ACC_RECORDED_OR_DEDUCTED, RECORDED_BLOCKS_EDIT, FORM_INVALID, \
     IDENTIFIER_REPLACED, GEOMETRY_SIMPLIFIED, GEOMETRIES_IGNORED_TEMPLATE
-from konova.views.base import BaseIndexView, BaseIdentifierGeneratorView, BaseNewSpatialLocatedObjectFormView, \
+from konova.views.base import BaseIndexView, BaseIdentifierGeneratorView
-    BaseEditSpatialLocatedObjectFormView
 from konova.views.detail import BaseDetailView
 
 
@@ -41,29 +40,6 @@ class EcoAccountIndexView(LoginRequiredMixin, BaseIndexView):
         return qs
 
 
-class NewEcoAccountFormView(BaseNewSpatialLocatedObjectFormView):
-    _FORM_CLS = NewEcoAccountForm
-    _MODEL_CLS = EcoAccount
-    _TEMPLATE = "compensation/form/view.html"
-    _TAB_TITLE = _("New Eco-Account")
-    _REDIRECT_URL = "compensation:acc:detail"
-
-    def _user_has_permission(self, user):
-        # User has to be a default user
-        return user.is_default_user()
-
-
-class EditEcoAccountFormView(BaseEditSpatialLocatedObjectFormView):
-    _FORM_CLS = EditEcoAccountForm
-    _MODEL_CLS = EcoAccount
-    _TEMPLATE = "compensation/form/view.html"
-    _REDIRECT_URL = "compensation:acc:detail"
-
-    def _user_has_permission(self, user):
-        # User has to be a default user
-        return user.is_default_user()
-
-
 @login_required
 @default_group_required
 def new_view(request: HttpRequest):

ema/urls.py

@@ -10,8 +10,8 @@ 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 remove_view, EmaIndexView, \
+from ema.views.ema import new_view, edit_view, remove_view, EmaIndexView, \
-    EmaIdentifierGeneratorView, EmaDetailView, EditEmaFormView, NewEmaFormView
+    EmaIdentifierGeneratorView, EmaDetailView
 from ema.views.log import EmaLogView
 from ema.views.record import EmaRecordView
 from ema.views.report import EmaReportView
@@ -22,11 +22,11 @@ from ema.views.state import NewEmaStateView, EditEmaStateView, RemoveEmaStateVie
 app_name = "ema"
 urlpatterns = [
     path("", EmaIndexView.as_view(), name="index"),
-    path("new/", NewEmaFormView.as_view(), name="new"),
+    path("new/", new_view, name="new"),
     path("new/id", EmaIdentifierGeneratorView.as_view(), name="new-id"),
     path("<id>", EmaDetailView.as_view(), name="detail"),
     path('<id>/log', EmaLogView.as_view(), name='log'),
-    path('<id>/edit', EditEmaFormView.as_view(), name='edit'),
+    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'),

ema/views/ema.py

@@ -5,20 +5,25 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
+from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.http import HttpRequest
-from django.shortcuts import get_object_or_404
+from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
 from ema.forms import NewEmaForm, EditEmaForm
 from ema.models import Ema
 from ema.tables import EmaTable
+from konova.contexts import BaseContext
 from konova.decorators import shared_access_required, conservation_office_group_required, login_required_modal
+from konova.forms import SimpleGeomForm
 from konova.forms.modals import RemoveModalForm
-from konova.views.base import BaseIndexView, BaseIdentifierGeneratorView, BaseNewSpatialLocatedObjectFormView, \
+from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
-    BaseEditSpatialLocatedObjectFormView
+from konova.utils.message_templates import RECORDED_BLOCKS_EDIT, IDENTIFIER_REPLACED, FORM_INVALID, \
+    GEOMETRY_SIMPLIFIED, GEOMETRIES_IGNORED_TEMPLATE
+from konova.views.base import BaseIndexView, BaseIdentifierGeneratorView
 from konova.views.detail import BaseDetailView
 
 
@@ -35,28 +40,59 @@ class EmaIndexView(LoginRequiredMixin, BaseIndexView):
         return qs
 
 
-class NewEmaFormView(BaseNewSpatialLocatedObjectFormView):
+@login_required
-    _FORM_CLS = NewEmaForm
+@conservation_office_group_required
-    _MODEL_CLS = Ema
+def new_view(request: HttpRequest):
-    _TEMPLATE = "ema/form/view.html"
+    """
-    _TAB_TITLE = _("New EMA")
+    Renders a view for a new eco account creation
-    _REDIRECT_URL = "ema:detail"
 
-    def _user_has_permission(self, user):
+    Args:
-        # User has to be an ets user
+        request (HttpRequest): The incoming request
-        return user.is_ets_user()
 
+    Returns:
 
-class EditEmaFormView(BaseEditSpatialLocatedObjectFormView):
+    """
-    _MODEL_CLS = Ema
+    template = "ema/form/view.html"
-    _FORM_CLS = EditEmaForm
+    data_form = NewEmaForm(request.POST or None)
-    _TEMPLATE = "ema/form/view.html"
+    geom_form = SimpleGeomForm(request.POST or None, read_only=False)
-    _REDIRECT_URL = "ema:detail"
+    if request.method == "POST":
-    _TAB_TITLE = _("Edit {}")
+        if data_form.is_valid() and geom_form.is_valid():
+            generated_identifier = data_form.cleaned_data.get("identifier", None)
+            ema = data_form.save(request.user, geom_form)
+            if generated_identifier != ema.identifier:
+                messages.info(
+                    request,
+                    IDENTIFIER_REPLACED.format(
+                        generated_identifier,
+                        ema.identifier
+                    )
+                )
+            messages.success(request, _("EMA {} added").format(ema.identifier))
+            if geom_form.has_geometry_simplified():
+                messages.info(
+                    request,
+                    GEOMETRY_SIMPLIFIED
+                )
+            num_ignored_geometries = geom_form.get_num_geometries_ignored()
+            if num_ignored_geometries > 0:
+                messages.info(
+                    request,
+                    GEOMETRIES_IGNORED_TEMPLATE.format(num_ignored_geometries)
+                )
 
-    def _user_has_permission(self, user):
+            return redirect("ema:detail", id=ema.id)
-        # User has to be an ets user
+        else:
-        return user.is_ets_user()
+            messages.error(request, FORM_INVALID, extra_tags="danger",)
+    else:
+        # For clarification: nothing in this case
+        pass
+    context = {
+        "form": data_form,
+        "geom_form": geom_form,
+        TAB_TITLE_IDENTIFIER: _("New EMA"),
+    }
+    context = BaseContext(request, context).context
+    return render(request, template, context)
 
 
 class EmaIdentifierGeneratorView(LoginRequiredMixin, BaseIdentifierGeneratorView):
@@ -113,6 +149,65 @@ class EmaDetailView(BaseDetailView):
         return context
 
 
+@login_required
+@conservation_office_group_required
+@shared_access_required(Ema, "id")
+def edit_view(request: HttpRequest, id: str):
+    """
+    Renders a view for editing compensations
+
+    Args:
+        request (HttpRequest): The incoming request
+
+    Returns:
+
+    """
+    template = "compensation/form/view.html"
+    # Get object from db
+    ema = get_object_or_404(Ema, id=id)
+    if ema.is_recorded:
+        messages.info(
+            request,
+            RECORDED_BLOCKS_EDIT
+        )
+        return redirect("ema:detail", id=id)
+
+    # Create forms, initialize with values from db/from POST request
+    data_form = EditEmaForm(request.POST or None, instance=ema)
+    geom_form = SimpleGeomForm(request.POST or None, read_only=False, instance=ema)
+    if request.method == "POST":
+        if data_form.is_valid() and geom_form.is_valid():
+            # The data form takes the geom form for processing, as well as the performing user
+            ema = data_form.save(request.user, geom_form)
+            messages.success(request, _("EMA {} edited").format(ema.identifier))
+            if geom_form.has_geometry_simplified():
+                messages.info(
+                    request,
+                    GEOMETRY_SIMPLIFIED
+                )
+
+            num_ignored_geometries = geom_form.get_num_geometries_ignored()
+            if num_ignored_geometries > 0:
+                messages.info(
+                    request,
+                    GEOMETRIES_IGNORED_TEMPLATE.format(num_ignored_geometries)
+                )
+
+            return redirect("ema:detail", id=ema.id)
+        else:
+            messages.error(request, FORM_INVALID, extra_tags="danger",)
+    else:
+        # For clarification: nothing in this case
+        pass
+    context = {
+        "form": data_form,
+        "geom_form": geom_form,
+        TAB_TITLE_IDENTIFIER: _("Edit {}").format(ema.identifier),
+    }
+    context = BaseContext(request, context).context
+    return render(request, template, context)
+
+
 @login_required_modal
 @login_required
 @conservation_office_group_required

intervention/urls.py

@@ -14,9 +14,8 @@ from intervention.views.deduction import NewInterventionDeductionView, EditInter
     RemoveInterventionDeductionView
 from intervention.views.document import NewInterventionDocumentView, GetInterventionDocumentView, \
     RemoveInterventionDocumentView, EditInterventionDocumentView
-from intervention.views.intervention import remove_view, \
+from intervention.views.intervention import new_view, edit_view, remove_view, \
-    InterventionIndexView, InterventionIdentifierGeneratorView, InterventionDetailView, NewInterventionFormView, \
+    InterventionIndexView, InterventionIdentifierGeneratorView, InterventionDetailView
-    EditInterventionFormView
 from intervention.views.log import InterventionLogView
 from intervention.views.record import InterventionRecordView
 from intervention.views.report import InterventionReportView
@@ -28,11 +27,11 @@ from intervention.views.share import InterventionShareFormView, InterventionShar
 app_name = "intervention"
 urlpatterns = [
     path("", InterventionIndexView.as_view(), name="index"),
-    path('new/', NewInterventionFormView.as_view(), name='new'),
+    path('new/', new_view, name='new'),
     path('new/id', InterventionIdentifierGeneratorView.as_view(), name='new-id'),
     path('<id>', InterventionDetailView.as_view(), name='detail'),
     path('<id>/log', InterventionLogView.as_view(), name='log'),
-    path('<id>/edit', EditInterventionFormView.as_view(), name='edit'),
+    path('<id>/edit', edit_view, name='edit'),
     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'),

intervention/views/intervention.py

@@ -8,7 +8,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.http import HttpRequest
+from django.http import JsonResponse, HttpRequest
 from django.shortcuts import get_object_or_404, render, redirect
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
@@ -17,14 +17,16 @@ from intervention.forms.intervention import EditInterventionForm, NewInterventio
 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, login_required_modal
+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 DATA_CHECKED_PREVIOUSLY_TEMPLATE, RECORDED_BLOCKS_EDIT, \
-    CHECK_STATE_RESET, FORM_INVALID, GEOMETRY_SIMPLIFIED, GEOMETRIES_IGNORED_TEMPLATE
+    CHECK_STATE_RESET, FORM_INVALID, IDENTIFIER_REPLACED, DO_NOT_FORGET_TO_SHARE, GEOMETRY_SIMPLIFIED, \
-from konova.views.base import BaseIndexView, BaseIdentifierGeneratorView, BaseNewSpatialLocatedObjectFormView, \
+    GEOMETRIES_IGNORED_TEMPLATE
-    BaseEditSpatialLocatedObjectFormView
+from konova.views.base import BaseIndexView, BaseIdentifierGeneratorView
 from konova.views.detail import BaseDetailView
 
 
@@ -43,20 +45,60 @@ class InterventionIndexView(LoginRequiredMixin, BaseIndexView):
         return qs
 
 
-class NewInterventionFormView(BaseNewSpatialLocatedObjectFormView):
+@login_required
-    _MODEL_CLS = Intervention
+@default_group_required
-    _FORM_CLS = NewInterventionForm
+def new_view(request: HttpRequest):
-    _TEMPLATE = "intervention/form/view.html"
+    """
-    _REDIRECT_URL = "intervention:detail"
+    Renders a view for a new intervention creation
-    _TAB_TITLE = _("New intervention")
 
+    Args:
+        request (HttpRequest): The incoming request
 
-class EditInterventionFormView(BaseEditSpatialLocatedObjectFormView):
+    Returns:
-    _MODEL_CLS = Intervention
+
-    _FORM_CLS = EditInterventionForm
+    """
-    _TEMPLATE = "intervention/form/view.html"
+    template = "intervention/form/view.html"
-    _REDIRECT_URL = "intervention:detail"
+    data_form = NewInterventionForm(request.POST or None)
-    _TAB_TITLE = _("Edit {}")
+    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)
+            if generated_identifier != intervention.identifier:
+                messages.info(
+                    request,
+                    IDENTIFIER_REPLACED.format(
+                        generated_identifier,
+                        intervention.identifier
+                    )
+                )
+            messages.success(request, _("Intervention {} added").format(intervention.identifier))
+            if geom_form.has_geometry_simplified():
+                messages.info(
+                    request,
+                    GEOMETRY_SIMPLIFIED
+                )
+
+            num_ignored_geometries = geom_form.get_num_geometries_ignored()
+            if num_ignored_geometries > 0:
+                messages.info(
+                    request,
+                    GEOMETRIES_IGNORED_TEMPLATE.format(num_ignored_geometries)
+                )
+
+            return redirect("intervention:detail", id=intervention.id)
+        else:
+            messages.error(request, FORM_INVALID, extra_tags="danger",)
+    else:
+        # For clarification: nothing in this case
+        pass
+    context = {
+        "form": data_form,
+        "geom_form": geom_form,
+        TAB_TITLE_IDENTIFIER: _("New intervention"),
+    }
+    context = BaseContext(request, context).context
+    return render(request, template, context)
 
 
 class InterventionIdentifierGeneratorView(LoginRequiredMixin, BaseIdentifierGeneratorView):

konova/forms/base_form.py

@@ -25,7 +25,6 @@ class BaseForm(forms.Form):
     cancel_redirect = None
     form_caption = None
     instance = None  # The data holding model object
-    user = None  # The performing user
     request = None
     form_attrs = {}  # Holds additional attributes, that can be used in the template
     has_required_fields = False  # Automatically set. Triggers hint rendering in templates
@@ -34,7 +33,6 @@ class BaseForm(forms.Form):
 
     def __init__(self, *args, **kwargs):
         self.instance = kwargs.pop("instance", None)
-        self.user = kwargs.pop("user", None)
         super().__init__(*args, **kwargs)
         if self.request is not None:
             self.user = self.request.user
@@ -48,7 +46,7 @@ class BaseForm(forms.Form):
         self.__check_valid_label_input_ratio()
 
     @abstractmethod
-    def save(self, *arg, **kwargs):
+    def save(self):
         # To be implemented in subclasses!
         pass
 

konova/static/css/konova.css

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

konova/views/base.py

@@ -6,19 +6,15 @@ Created on: 15.10.25
 from abc import abstractmethod
 
 from django.contrib import messages
-from django.contrib.auth.mixins import LoginRequiredMixin
 from django.http import HttpRequest, JsonResponse
-from django.shortcuts import render, redirect, get_object_or_404
+from django.shortcuts import render, redirect
 from django.urls import reverse
 from django.views import View
-from django.utils.translation import gettext_lazy as _
 
 from konova.contexts import BaseContext
-from konova.forms import BaseForm, SimpleGeomForm
 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, IDENTIFIER_REPLACED, \
+from konova.utils.message_templates import MISSING_GROUP_PERMISSION, DATA_UNSHARED
-    GEOMETRY_SIMPLIFIED, GEOMETRIES_IGNORED_TEMPLATE, RECORDED_BLOCKS_EDIT, CHECK_STATE_RESET, FORM_INVALID
 
 
 class BaseView(View):
@@ -143,183 +139,3 @@ class BaseIdentifierGeneratorView(BaseView):
     def _user_has_shared_access(self, user, **kwargs):
         # No specific constraints for shared access
         return True
-
-
-class BaseFormView(BaseView):
-    _MODEL_CLS = None
-    _FORM_CLS = None
-
-    class Meta:
-        abstract = True
-
-    def _get_additional_context(self, **kwargs):
-        """
-
-        Args:
-            **kwargs ():
-
-        Returns:
-
-        """
-        return {}
-
-
-class BaseSpatialLocatedObjectFormView(LoginRequiredMixin, BaseFormView):
-    _GEOMETRY_FORM_CLS = SimpleGeomForm
-
-    class Meta:
-        abstract = True
-
-
-class BaseNewSpatialLocatedObjectFormView(BaseSpatialLocatedObjectFormView):
-
-    def _user_has_permission(self, user):
-        # User has to have default privilege to call this endpoint
-        return user.is_default_user()
-
-    def _user_has_shared_access(self, user, **kwargs):
-        # There is no shared access control since nothing exists yet
-        return True
-
-    def get(self, request: HttpRequest, **kwargs):
-        form: BaseForm = self._FORM_CLS(None, **kwargs, user=request.user)
-        geom_form: SimpleGeomForm = self._GEOMETRY_FORM_CLS(None, user=request.user, read_only=False)
-
-        context = self._get_additional_context()
-        context = BaseContext(request, additional_context=context).context
-        context.update(
-            {
-                "form": form,
-                "geom_form": geom_form,
-                TAB_TITLE_IDENTIFIER: self._TAB_TITLE,
-            }
-        )
-        return render(request, self._TEMPLATE, context)
-
-    def post(self, request: HttpRequest, **kwargs):
-        form: BaseForm = self._FORM_CLS(request.POST or None, **kwargs, user=request.user)
-        geom_form: SimpleGeomForm = self._GEOMETRY_FORM_CLS(request.POST or None, user=request.user, read_only=False)
-
-        if form.is_valid() and geom_form.is_valid():
-            obj = form.save(request.user, geom_form)
-            obj_redirect_url = reverse(self._REDIRECT_URL, args=(obj.id,))
-
-            generated_identifier = form.cleaned_data.get("identifier", None)
-
-            if generated_identifier != obj.identifier:
-                messages.info(
-                    request,
-                    IDENTIFIER_REPLACED.format(
-                        generated_identifier,
-                        obj.identifier
-                    )
-                )
-            messages.success(request, _("{} added").format(obj.identifier))
-            if geom_form.has_geometry_simplified():
-                messages.info(
-                    request,
-                    GEOMETRY_SIMPLIFIED
-                )
-
-            num_ignored_geometries = geom_form.get_num_geometries_ignored()
-            if num_ignored_geometries > 0:
-                messages.info(
-                    request,
-                    GEOMETRIES_IGNORED_TEMPLATE.format(num_ignored_geometries)
-                )
-
-            return redirect(obj_redirect_url)
-        else:
-            context = self._get_additional_context()
-            messages.error(request, FORM_INVALID, extra_tags="danger",)
-
-        context = BaseContext(request, additional_context=context).context
-        context.update(
-            {
-                "form": form,
-                "geom_form": geom_form,
-                TAB_TITLE_IDENTIFIER: self._TAB_TITLE,
-            }
-        )
-        return render(request, self._TEMPLATE, context)
-
-
-class BaseEditSpatialLocatedObjectFormView(BaseSpatialLocatedObjectFormView):
-    _TAB_TITLE = _("Edit {}")
-
-    def get(self, request: HttpRequest, id: str):
-        obj = get_object_or_404(
-            self._MODEL_CLS,
-            id=id
-        )
-        obj_redirect_url = reverse(self._REDIRECT_URL, args=(obj.id,))
-
-        if obj.is_recorded:
-            messages.info(
-                request,
-                RECORDED_BLOCKS_EDIT
-            )
-            return redirect(obj_redirect_url)
-
-        form: BaseForm = self._FORM_CLS(None, instance=obj, user=request.user)
-        geom_form: SimpleGeomForm = self._GEOMETRY_FORM_CLS(None, instance=obj, read_only=False)
-
-        context = self._get_additional_context()
-        context = BaseContext(request, additional_context=context).context
-        context.update(
-            {
-                "form": form,
-                "geom_form": geom_form,
-                TAB_TITLE_IDENTIFIER: self._TAB_TITLE.format(obj.identifier),
-            }
-        )
-        return render(request, self._TEMPLATE, context)
-
-    def post(self, request: HttpRequest, id: str):
-        obj = get_object_or_404(
-            self._MODEL_CLS,
-            id=id
-        )
-        obj_redirect_url = reverse(self._REDIRECT_URL, args=(obj.id,))
-
-        form: BaseForm = self._FORM_CLS(request.POST or None, instance=obj, user=request.user)
-        geom_form: SimpleGeomForm = self._GEOMETRY_FORM_CLS(request.POST or None, instance=obj, read_only=False)
-
-        if form.is_valid() and geom_form.is_valid():
-            obj = form.save(request.user, geom_form)
-            messages.success(request, _("{} edited").format(obj.identifier))
-
-            if geom_form.has_geometry_simplified():
-                messages.info(
-                    request,
-                    GEOMETRY_SIMPLIFIED
-                )
-
-            num_ignored_geometries = geom_form.get_num_geometries_ignored()
-            if num_ignored_geometries > 0:
-                messages.info(
-                    request,
-                    GEOMETRIES_IGNORED_TEMPLATE.format(num_ignored_geometries)
-                )
-
-            return redirect(obj_redirect_url)
-        else:
-            context = self._get_additional_context()
-            messages.error(request, FORM_INVALID, extra_tags="danger",)
-
-        context = BaseContext(request, additional_context=context).context
-        context.update(
-            {
-                "form": form,
-                "geom_form": geom_form,
-                TAB_TITLE_IDENTIFIER: self._TAB_TITLE.format(obj.identifier),
-            }
-        )
-        return render(request, self._TEMPLATE, context)
-
-    def _user_has_shared_access(self, user, **kwargs):
-        obj = get_object_or_404(self._MODEL_CLS, id=kwargs.get('id', None))
-        return obj.is_shared_with(user)
-
-    def _user_has_permission(self, user):
-        return user.is_default_user()

locale/de/LC_MESSAGES/django.po

@@ -45,7 +45,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-10-19 13:56+0200\n"
+"POT-Creation-Date: 2025-10-15 09:11+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -448,19 +448,11 @@ msgid "Select the intervention for which this compensation compensates"
 msgstr "Wählen Sie den Eingriff, für den diese Kompensation bestimmt ist"
 
 #: compensation/forms/compensation.py:114
-#: compensation/views/compensation/compensation.py:161
+#: compensation/views/compensation/compensation.py:120
 msgid "New compensation"
 msgstr "Neue Kompensation"
 
-#: compensation/forms/compensation.py:179
+#: compensation/forms/compensation.py:190
-msgid ""
-"This intervention is currently recorded. You cannot add further "
-"compensations as long as it is recorded."
-msgstr ""
-"Dieser Eingriff ist derzeit verzeichnet. "
-"Sie können keine weiteren Kompensationen hinzufügen, so lange er verzeichnet ist."
-
-#: compensation/forms/compensation.py:202
 msgid "Edit compensation"
 msgstr "Bearbeite Kompensation"
 
@@ -483,7 +475,7 @@ msgid "When did the parties agree on this?"
 msgstr "Wann wurde dieses Ökokonto offiziell vereinbart?"
 
 #: compensation/forms/eco_account.py:72
-#: compensation/views/eco_account/eco_account.py:93
+#: compensation/views/eco_account/eco_account.py:101
 msgid "New Eco-Account"
 msgstr "Neues Ökokonto"
 
@@ -1296,45 +1288,44 @@ msgstr ""
 msgid "Responsible data"
 msgstr "Daten zu den verantwortlichen Stellen"
 
-#: compensation/views/compensation/compensation.py:35
+#: compensation/views/compensation/compensation.py:58
 msgid "Compensations - Overview"
 msgstr "Kompensationen - Übersicht"
 
-#: compensation/views/compensation/compensation.py:52
+#: compensation/views/compensation/compensation.py:181
-#, fuzzy
-#| msgid "New compensation"
-msgid "New Compensation"
-msgstr "Neue Kompensation"
-
-#: compensation/views/compensation/compensation.py:208
 #: konova/utils/message_templates.py:40
 msgid "Compensation {} edited"
 msgstr "Kompensation {} bearbeitet"
 
-#: compensation/views/compensation/compensation.py:231
+#: compensation/views/compensation/compensation.py:196
-#: compensation/views/eco_account/eco_account.py:159 ema/views/ema.py:59
+#: compensation/views/eco_account/eco_account.py:173 ema/views/ema.py:238
-#: intervention/views/intervention.py:59 intervention/views/intervention.py:179
+#: intervention/views/intervention.py:253
-#: konova/views/base.py:239
 msgid "Edit {}"
 msgstr "Bearbeite {}"
 
-#: compensation/views/eco_account/eco_account.py:32
+#: compensation/views/compensation/report.py:35
+#: compensation/views/eco_account/report.py:36 ema/views/report.py:35
+#: intervention/views/report.py:35
+msgid "Report {}"
+msgstr "Bericht {}"
+
+#: compensation/views/eco_account/eco_account.py:53
 msgid "Eco-account - Overview"
 msgstr "Ökokonten - Übersicht"
 
-#: compensation/views/eco_account/eco_account.py:70
+#: compensation/views/eco_account/eco_account.py:86
 msgid "Eco-Account {} added"
 msgstr "Ökokonto {} hinzugefügt"
 
-#: compensation/views/eco_account/eco_account.py:136
+#: compensation/views/eco_account/eco_account.py:158
 msgid "Eco-Account {} edited"
 msgstr "Ökokonto {} bearbeitet"
 
-#: compensation/views/eco_account/eco_account.py:260
+#: compensation/views/eco_account/eco_account.py:288
 msgid "Eco-account removed"
 msgstr "Ökokonto entfernt"
 
-#: ema/forms.py:42 ema/tests/unit/test_forms.py:27 ema/views/ema.py:42
+#: ema/forms.py:42 ema/tests/unit/test_forms.py:27 ema/views/ema.py:108
 msgid "New EMA"
 msgstr "Neue EMA hinzufügen"
 
@@ -1362,11 +1353,19 @@ msgstr ""
 msgid "Payment funded compensation"
 msgstr "Ersatzzahlungsmaßnahme"
 
-#: ema/views/ema.py:26
+#: ema/views/ema.py:53
 msgid "EMAs - Overview"
 msgstr "EMAs - Übersicht"
 
-#: ema/views/ema.py:138
+#: ema/views/ema.py:86
+msgid "EMA {} added"
+msgstr "EMA {} hinzugefügt"
+
+#: ema/views/ema.py:223
+msgid "EMA {} edited"
+msgstr "EMA {} bearbeitet"
+
+#: ema/views/ema.py:262
 msgid "EMA removed"
 msgstr "EMA entfernt"
 
@@ -1430,7 +1429,7 @@ msgstr "Datum Bestandskraft bzw. Rechtskraft"
 
 #: intervention/forms/intervention.py:216
 #: intervention/tests/unit/test_forms.py:36
-#: intervention/views/intervention.py:51
+#: intervention/views/intervention.py:105
 msgid "New intervention"
 msgstr "Neuer Eingriff"
 
@@ -1666,15 +1665,19 @@ msgstr ""
 msgid "Check performed"
 msgstr "Prüfung durchgeführt"
 
-#: intervention/views/intervention.py:33
+#: intervention/views/intervention.py:57
 msgid "Interventions - Overview"
 msgstr "Eingriffe - Übersicht"
 
-#: intervention/views/intervention.py:154
+#: intervention/views/intervention.py:90
+msgid "Intervention {} added"
+msgstr "Eingriff {} hinzugefügt"
+
+#: intervention/views/intervention.py:236
 msgid "Intervention {} edited"
 msgstr "Eingriff {} bearbeitet"
 
-#: intervention/views/intervention.py:204
+#: intervention/views/intervention.py:278
 msgid "{} removed"
 msgstr "{} entfernt"
 
@@ -1686,7 +1689,7 @@ msgstr "Hierfür müssen Sie Mitarbeiter sein!"
 msgid "You need to be administrator to perform this action!"
 msgstr "Hierfür müssen Sie Administrator sein!"
 
-#: konova/decorators.py:65 konova/utils/general.py:40
+#: konova/decorators.py:65
 msgid ""
 "+++ Attention: You are not part of any group. You won't be able to create, "
 "edit or do anything. Please contact an administrator. +++"
@@ -1798,7 +1801,7 @@ msgstr "Sucht nach Einträgen, an denen diese Person gearbeitet hat"
 msgid "Save"
 msgstr "Speichern"
 
-#: konova/forms/base_form.py:74
+#: konova/forms/base_form.py:72
 msgid "Not editable"
 msgstr "Nicht editierbar"
 
@@ -1807,7 +1810,7 @@ msgstr "Nicht editierbar"
 msgid "Geometry"
 msgstr "Geometrie"
 
-#: konova/forms/geometry_form.py:101
+#: konova/forms/geometry_form.py:100
 msgid "Only surfaces allowed. Points or lines must be buffered."
 msgstr ""
 "Nur Flächen erlaubt. Punkte oder Linien müssen zu Flächen gepuffert werden."
@@ -2265,9 +2268,8 @@ msgid ""
 "too small to be valid). These parts have been removed. Please check the "
 "stored geometry."
 msgstr ""
-"Die Geometrie enthielt {} invalide Bestandteile (z.B. unaussagekräftige "
+"Die Geometrie enthielt {} invalide Bestandteile (z.B. unaussagekräftige Kleinstflächen)."
-"Kleinstflächen).Diese Bestandteile wurden automatisch entfernt. Bitte "
+"Diese Bestandteile wurden automatisch entfernt. Bitte überprüfen Sie die angepasste Geometrie."
-"überprüfen Sie die angepasste Geometrie."
 
 #: konova/utils/message_templates.py:89
 msgid "This intervention has {} revocations"
@@ -2308,15 +2310,7 @@ msgstr ""
 "Dieses Datum ist unrealistisch. Geben Sie bitte das korrekte Datum ein "
 "(>1950)."
 
-#: konova/views/base.py:209
+#: konova/views/home.py:75 templates/navbars/navbar.html:16
-msgid "{} added"
-msgstr "{} hinzugefügt"
-
-#: konova/views/base.py:281
-msgid "{} edited"
-msgstr "{} bearbeitet"
-
-#: konova/views/home.py:72 templates/navbars/navbar.html:16
 msgid "Home"
 msgstr "Home"
 
@@ -2336,10 +2330,6 @@ msgstr "{} verzeichnet"
 msgid "Errors found:"
 msgstr "Fehler gefunden:"
 
-#: konova/views/report.py:21
-msgid "Report {}"
-msgstr "Bericht {}"
-
 #: konova/views/resubmission.py:39
 msgid "Resubmission set"
 msgstr "Wiedervorlage gesetzt"
@@ -3066,7 +3056,7 @@ msgid "Manage teams"
 msgstr ""
 
 #: user/templates/user/index.html:53 user/templates/user/team/index.html:19
-#: user/views/views.py:134
+#: user/views/views.py:135
 msgid "Teams"
 msgstr ""
 
@@ -3126,40 +3116,34 @@ msgstr "Läuft ab am"
 msgid "User API token"
 msgstr "API Nutzer Token"
 
-#: user/views/views.py:31
+#: user/views/views.py:33
 msgid "User settings"
 msgstr "Einstellungen"
 
-#: user/views/views.py:44
+#: user/views/views.py:59
-msgid "User notifications"
-msgstr "Benachrichtigungen"
-
-#: user/views/views.py:64
 msgid "Notifications edited"
 msgstr "Benachrichtigungen bearbeitet"
 
-#: user/views/views.py:152
+#: user/views/views.py:71
+msgid "User notifications"
+msgstr "Benachrichtigungen"
+
+#: user/views/views.py:147
 msgid "New team added"
 msgstr "Neues Team hinzugefügt"
 
-#: user/views/views.py:167
+#: user/views/views.py:162
 msgid "Team edited"
 msgstr "Team bearbeitet"
 
-#: user/views/views.py:182
+#: user/views/views.py:177
 msgid "Team removed"
 msgstr "Team gelöscht"
 
-#: user/views/views.py:197
+#: user/views/views.py:192
 msgid "You are not a member of this team"
 msgstr "Sie sind kein Mitglied dieses Teams"
 
-#: user/views/views.py:204
+#: user/views/views.py:199
 msgid "Left Team"
 msgstr "Team verlassen"
-
-#~ msgid "EMA {} added"
-#~ msgstr "EMA {} hinzugefügt"
-
-#~ msgid "EMA {} edited"
-#~ msgstr "EMA {} bearbeitet"