Resubmission class view

* adds AbstractResubmissionView to konova app
    * implemented for all major data types
    * replaces function based views

compensation/urls/compensation.py

@@ -9,7 +9,7 @@ from django.urls import path
 
 from compensation.views.compensation.document import edit_document_view, new_document_view, remove_document_view, \
     get_document_view
-from compensation.views.compensation.resubmission import create_resubmission_view
+from compensation.views.compensation.resubmission import CompensationResubmissionView
 from compensation.views.compensation.report import report_view
 from compensation.views.compensation.deadline import deadline_new_view, deadline_edit_view, deadline_remove_view
 from compensation.views.compensation.action import action_edit_view, action_new_view, action_remove_view
@@ -41,7 +41,7 @@ urlpatterns = [
     path('<id>/deadline/<deadline_id>/edit', deadline_edit_view, name='deadline-edit'),
     path('<id>/deadline/<deadline_id>/remove', deadline_remove_view, name='deadline-remove'),
     path('<id>/report', report_view, name='report'),
-    path('<id>/resub', create_resubmission_view, name='resubmission-create'),
+    path('<id>/resub', CompensationResubmissionView.as_view(), name='resubmission-create'),
 
     # Documents
     path('<id>/document/new/', new_document_view, name='new-doc'),

compensation/urls/eco_account.py

@@ -13,7 +13,7 @@ from compensation.views.eco_account.eco_account import index_view, new_view, new
 from compensation.views.eco_account.log import EcoAccountLogView
 from compensation.views.eco_account.record import record_view
 from compensation.views.eco_account.report import report_view
-from compensation.views.eco_account.resubmission import create_resubmission_view
+from compensation.views.eco_account.resubmission import EcoAccountResubmissionView
 from compensation.views.eco_account.state import state_new_view, state_remove_view, state_edit_view
 from compensation.views.eco_account.action import action_edit_view, action_new_view, action_remove_view
 from compensation.views.eco_account.deadline import deadline_new_view, deadline_edit_view, deadline_remove_view
@@ -33,7 +33,7 @@ urlpatterns = [
     path('<id>/report', report_view, name='report'),
     path('<id>/edit', edit_view, name='edit'),
     path('<id>/remove', remove_view, name='remove'),
-    path('<id>/resub', create_resubmission_view, name='resubmission-create'),
+    path('<id>/resub', EcoAccountResubmissionView.as_view(), name='resubmission-create'),
 
     path('<id>/state/new', state_new_view, name='new-state'),
     path('<id>/state/<state_id>/edit', state_edit_view, name='state-edit'),

compensation/views/compensation/resubmission.py

@@ -6,34 +6,20 @@ 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.urls import reverse
-from django.utils.translation import gettext_lazy as _
+from django.utils.decorators import method_decorator
 
 from compensation.models import Compensation
 from konova.decorators import shared_access_required, default_group_required
-from konova.forms.modals import ResubmissionModalForm
+from konova.views.resubmission import AbstractResubmissionView
 
 
-@login_required
-@default_group_required
-@shared_access_required(Compensation, "id")
-def create_resubmission_view(request: HttpRequest, id: str):
-    """ Renders resubmission form for a compensation
+class CompensationResubmissionView(AbstractResubmissionView):
+    model = Compensation
+    redirect_url_base = "compensation:detail"
+    form_action_url_base = "compensation:resubmission-create"
 
-    Args:
-        request (HttpRequest): The incoming request
-        id (str): Compensation's id
-
-    Returns:
-
-    """
-    com = get_object_or_404(Compensation, id=id)
-    form = ResubmissionModalForm(request.POST or None, instance=com, request=request)
-    form.action_url = reverse("compensation:resubmission-create", args=(id,))
-    return form.process_request(
-        request,
-        msg_success=_("Resubmission set"),
-        redirect_url=reverse("compensation:detail", args=(id,))
-    )
+    @method_decorator(login_required)
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(Compensation, "id"))
+    def dispatch(self, request, *args, **kwargs):
+        return super().dispatch(request, *args, **kwargs)

compensation/views/eco_account/resubmission.py

@@ -6,34 +6,20 @@ 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.urls import reverse
-from django.utils.translation import gettext_lazy as _
+from django.utils.decorators import method_decorator
 
 from compensation.models import EcoAccount
 from konova.decorators import shared_access_required, default_group_required
-from konova.forms.modals import ResubmissionModalForm
+from konova.views.resubmission import AbstractResubmissionView
 
 
-@login_required
-@default_group_required
-@shared_access_required(EcoAccount, "id")
-def create_resubmission_view(request: HttpRequest, id: str):
-    """ Renders resubmission form for an eco account
+class EcoAccountResubmissionView(AbstractResubmissionView):
+    model = EcoAccount
+    redirect_url_base = "compensation:acc:detail"
+    form_action_url_base = "compensation:acc:resubmission-create"
 
-    Args:
-        request (HttpRequest): The incoming request
-        id (str): EcoAccount's id
-
-    Returns:
-
-    """
-    acc = get_object_or_404(EcoAccount, id=id)
-    form = ResubmissionModalForm(request.POST or None, instance=acc, request=request)
-    form.action_url = reverse("compensation:acc:resubmission-create", args=(id,))
-    return form.process_request(
-        request,
-        msg_success=_("Resubmission set"),
-        redirect_url=reverse("compensation:acc:detail", args=(id,))
-    )
+    @method_decorator(login_required)
+    @method_decorator(default_group_required)
+    @method_decorator(shared_access_required(EcoAccount, "id"))
+    def dispatch(self, request, *args, **kwargs):
+        return super().dispatch(request, *args, **kwargs)