# BaseModalFormView refactoring

* extends BaseModalFormView to hold general logic for processing GET and POST requests for BaseModalForm endpoints
* refactors uuid check to use a specific parameter instead of kwargs
* fixes css bug where modal form input elements would not be visible
* refactors check view for intervention from function to class
* refactors DeductionViews to inherit from extended BaseModalFormView

intervention/forms/modals/deduction.py

@@ -172,7 +172,8 @@ class EditEcoAccountDeductionModalForm(NewEcoAccountDeductionModalForm):
     deduction = None
 
     def __init__(self, *args, **kwargs):
-        self.deduction = kwargs.pop("deduction", None)
+        deduction_id = kwargs.pop("deduction_id", None)
+        self.deduction = EcoAccountDeduction.objects.get(id=deduction_id)
         super().__init__(*args, **kwargs)
         self.form_title = _("Edit Deduction")
         form_data = {
@@ -252,19 +253,20 @@ class RemoveEcoAccountDeductionModalForm(RemoveModalForm):
     Can be used for anything, where removing shall be confirmed by the user a second time.
 
     """
-    deduction = None
+    _DEDUCTION_OBJ = None
 
     def __init__(self, *args, **kwargs):
-        deduction = kwargs.pop("deduction", None)
-        self.deduction = deduction
+        deduction_id = kwargs.pop("deduction_id", None)
+        deduction = EcoAccountDeduction.objects.get(id=deduction_id)
+        self._DEDUCTION_OBJ = deduction
         super().__init__(*args, **kwargs)
 
     def save(self):
         with transaction.atomic():
-            self.deduction.intervention.mark_as_edited(self.user, edit_comment=DEDUCTION_REMOVED)
-            self.deduction.account.mark_as_edited(self.user, edit_comment=DEDUCTION_REMOVED)
-            self.deduction.delete()
+            self._DEDUCTION_OBJ.intervention.mark_as_edited(self.user, edit_comment=DEDUCTION_REMOVED)
+            self._DEDUCTION_OBJ.account.mark_as_edited(self.user, edit_comment=DEDUCTION_REMOVED)
+            self._DEDUCTION_OBJ.delete()
 
     def check_for_recorded_instance(self):
-        if self.deduction.intervention.is_recorded:
+        if self._DEDUCTION_OBJ.intervention.is_recorded:
             self.block_form()

intervention/urls.py

@@ -8,7 +8,7 @@ Created on: 30.11.20
 from django.urls import path
 
 from intervention.autocomplete.intervention import InterventionAutocomplete
-from intervention.views.check import check_view
+from intervention.views.check import InterventionCheckView
 from intervention.views.compensation import remove_compensation_view
 from intervention.views.deduction import NewInterventionDeductionView, EditInterventionDeductionView, \
     RemoveInterventionDeductionView
@@ -36,7 +36,7 @@ urlpatterns = [
     path('<id>/remove', remove_view, name='remove'),
     path('<id>/share/<token>', InterventionShareByTokenView.as_view(), name='share-token'),
     path('<id>/share', InterventionShareFormView.as_view(), name='share-form'),
-    path('<id>/check', check_view, name='check'),
+    path('<id>/check', InterventionCheckView.as_view(), name='check'),
     path('<id>/record', InterventionRecordView.as_view(), name='record'),
     path('<id>/report', InterventionReportView.as_view(), name='report'),
     path('<id>/resub', InterventionResubmissionView.as_view(), name='resubmission-create'),

intervention/views/check.py

@@ -5,35 +5,26 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
 Created on: 19.08.22
 
 """
-from django.contrib.auth.decorators import login_required
-from django.http import HttpRequest
-from django.shortcuts import get_object_or_404
+from django.contrib.auth.mixins import LoginRequiredMixin
 from django.utils.translation import gettext_lazy as _
 
 from intervention.forms.modals.check import CheckModalForm
 from intervention.models import Intervention
-from konova.decorators import registration_office_group_required, shared_access_required
 from konova.utils.message_templates import INTERVENTION_INVALID
+from konova.views.base import BaseModalFormView
 
 
-@login_required
-@registration_office_group_required
-@shared_access_required(Intervention, "id")
-def check_view(request: HttpRequest, id: str):
-    """ Renders check form for an intervention
+class InterventionCheckView(LoginRequiredMixin, BaseModalFormView):
+    _MODEL_CLS = Intervention
+    _FORM_CLS = CheckModalForm
+    _MSG_SUCCESS = _("Check performed")
+    _MSG_ERROR = INTERVENTION_INVALID
+    _REDIRECT_URL = "intervention:detail"
 
-    Args:
-        request (HttpRequest): The incoming request
-        id (str): Intervention's id
-
-    Returns:
-
-    """
-    intervention = get_object_or_404(Intervention, id=id)
-    form = CheckModalForm(request.POST or None, instance=intervention, request=request)
-    return form.process_request(
-        request,
-        msg_success=_("Check performed"),
-        msg_error=INTERVENTION_INVALID
-    )
+    def _user_has_permission(self, user):
+        return user.is_zb_user()
 
+    def _get_redirect_url(self, *args, **kwargs):
+        redirect_url = super()._get_redirect_url(*args, **kwargs)
+        redirect_url += "#related_data"
+        return redirect_url

intervention/views/deduction.py

@@ -8,19 +8,24 @@ Created on: 19.08.22
 from django.contrib.auth.mixins import LoginRequiredMixin
 
 from intervention.models import Intervention
+from konova.utils.message_templates import DEDUCTION_ADDED, DEDUCTION_EDITED, DEDUCTION_REMOVED
 from konova.views.deduction import AbstractNewDeductionView, AbstractEditDeductionView, AbstractRemoveDeductionView
 
+_INTERVENTION_DETAIL_URL_NAME = "intervention:detail"
 
 class NewInterventionDeductionView(LoginRequiredMixin, AbstractNewDeductionView):
-    _MODEL = Intervention
-    _REDIRECT_URL = "intervention:detail"
+    _MODEL_CLS = Intervention
+    _MSG_SUCCESS = DEDUCTION_ADDED
+    _REDIRECT_URL = _INTERVENTION_DETAIL_URL_NAME
 
 
 class EditInterventionDeductionView(LoginRequiredMixin, AbstractEditDeductionView):
-    _MODEL = Intervention
-    _REDIRECT_URL = "intervention:detail"
+    _MODEL_CLS = Intervention
+    _MSG_SUCCESS = DEDUCTION_EDITED
+    _REDIRECT_URL = _INTERVENTION_DETAIL_URL_NAME
 
 
 class RemoveInterventionDeductionView(LoginRequiredMixin, AbstractRemoveDeductionView):
-    _MODEL = Intervention
-    _REDIRECT_URL = "intervention:detail"
+    _MODEL_CLS = Intervention
+    _MSG_SUCCESS = DEDUCTION_REMOVED
+    _REDIRECT_URL = _INTERVENTION_DETAIL_URL_NAME