# NewIntervention view

* introduces BaseFormView and BaseNewSpatialLocatedObjectFormView
* refactors new intervention view from function to class

intervention/urls.py

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

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 JsonResponse, HttpRequest
+from django.http import 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,16 +17,13 @@ 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, any_group_check, login_required_modal, \
-    uuid_required
+from konova.decorators import default_group_required, shared_access_required, login_required_modal
 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, IDENTIFIER_REPLACED, DO_NOT_FORGET_TO_SHARE, GEOMETRY_SIMPLIFIED, \
-    GEOMETRIES_IGNORED_TEMPLATE
-from konova.views.base import BaseIndexView, BaseIdentifierGeneratorView
+    CHECK_STATE_RESET, FORM_INVALID, GEOMETRY_SIMPLIFIED, GEOMETRIES_IGNORED_TEMPLATE
+from konova.views.base import BaseIndexView, BaseIdentifierGeneratorView, BaseNewSpatialLocatedObjectFormView
 from konova.views.detail import BaseDetailView
 
 
@@ -45,60 +42,12 @@ class InterventionIndexView(LoginRequiredMixin, BaseIndexView):
         return qs
 
 
-@login_required
-@default_group_required
-def new_view(request: HttpRequest):
-    """
-    Renders a view for a new intervention creation
-
-    Args:
-        request (HttpRequest): The incoming request
-
-    Returns:
-
-    """
-    template = "intervention/form/view.html"
-    data_form = NewInterventionForm(request.POST or None)
-    geom_form = SimpleGeomForm(request.POST or None, read_only=False)
-    if request.method == "POST":
-        if data_form.is_valid() and geom_form.is_valid():
-            generated_identifier = data_form.cleaned_data.get("identifier", None)
-            intervention = data_form.save(request.user, geom_form)
-            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 NewInterventionFormView(BaseNewSpatialLocatedObjectFormView):
+    _MODEL_CLS = Intervention
+    _FORM_CLS = NewInterventionForm
+    _TEMPLATE = "intervention/form/view.html"
+    _REDIRECT_URL = "intervention:detail"
+    _TAB_TITLE = _("New intervention")
 
 
 class InterventionIdentifierGeneratorView(LoginRequiredMixin, BaseIdentifierGeneratorView):