Compensation forms refactoring

* splits compensation/forms.py and /modalForms.py into individual files inside new packages
    * general forms stay in new files in compensation/forms
    * modal forms stay in new files in compensation/forms/modals

compensation/views/compensation.py

@@ -5,10 +5,12 @@ from django.http import HttpRequest, JsonResponse
 from django.shortcuts import render
 from django.utils.translation import gettext_lazy as _
 
-from compensation.forms.forms import NewCompensationForm, EditCompensationForm
-from compensation.forms.modalForms import NewStateModalForm, NewDeadlineModalForm, NewActionModalForm, \
-    NewCompensationDocumentModalForm, RemoveCompensationActionModalForm, RemoveCompensationStateModalForm, \
-    EditCompensationStateModalForm, EditCompensationActionModalForm, EditDeadlineModalForm
+from compensation.forms.compensation import NewCompensationForm, EditCompensationForm
+from compensation.forms.modals.state import NewCompensationStateModalForm, RemoveCompensationStateModalForm, EditCompensationStateModalForm
+from compensation.forms.modals.document import NewCompensationDocumentModalForm
+from compensation.forms.modals.compensation_action import NewCompensationActionModalForm, \
+    EditCompensationActionModalForm, RemoveCompensationActionModalForm
+from compensation.forms.modals.deadline import NewDeadlineModalForm, EditDeadlineModalForm
 from compensation.models import Compensation, CompensationState, CompensationAction, CompensationDocument
 from compensation.tables import CompensationTable
 from intervention.models import Intervention
@@ -21,7 +23,7 @@ from konova.models import Deadline
 from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.documents import get_document, remove_document
 from konova.utils.generators import generate_qr_code
-from konova.utils.message_templates import FORM_INVALID, IDENTIFIER_REPLACED, DATA_UNSHARED_EXPLANATION, \
+from konova.utils.message_templates import FORM_INVALID, IDENTIFIER_REPLACED, \
     CHECKED_RECORDED_RESET, COMPENSATION_ADDED_TEMPLATE, COMPENSATION_REMOVED_TEMPLATE, DOCUMENT_ADDED, \
     COMPENSATION_STATE_REMOVED, COMPENSATION_STATE_ADDED, COMPENSATION_ACTION_REMOVED, COMPENSATION_ACTION_ADDED, \
     DEADLINE_ADDED, DEADLINE_REMOVED, DOCUMENT_EDITED, COMPENSATION_STATE_EDITED, COMPENSATION_ACTION_EDITED, \
@@ -402,7 +404,7 @@ def state_new_view(request: HttpRequest, id: str):
 
     """
     comp = get_object_or_404(Compensation, id=id)
-    form = NewStateModalForm(request.POST or None, instance=comp, request=request)
+    form = NewCompensationStateModalForm(request.POST or None, instance=comp, request=request)
     return form.process_request(
         request,
         msg_success=COMPENSATION_STATE_ADDED,
@@ -424,7 +426,7 @@ def action_new_view(request: HttpRequest, id: str):
 
     """
     comp = get_object_or_404(Compensation, id=id)
-    form = NewActionModalForm(request.POST or None, instance=comp, request=request)
+    form = NewCompensationActionModalForm(request.POST or None, instance=comp, request=request)
     return form.process_request(
         request,
         msg_success=COMPENSATION_ACTION_ADDED,

compensation/views/eco_account.py

@@ -14,10 +14,13 @@ from django.core.exceptions import ObjectDoesNotExist
 from django.http import HttpRequest, Http404, JsonResponse
 from django.shortcuts import render, get_object_or_404, redirect
 
-from compensation.forms.forms import NewEcoAccountForm, EditEcoAccountForm
-from compensation.forms.modalForms import NewStateModalForm, NewActionModalForm, NewDeadlineModalForm, \
-    NewEcoAccountDocumentModalForm, RemoveCompensationActionModalForm, RemoveCompensationStateModalForm, \
-    EditCompensationStateModalForm, EditCompensationActionModalForm, EditDeadlineModalForm
+from compensation.forms.eco_account import NewEcoAccountForm, EditEcoAccountForm
+from compensation.forms.modals.compensation_action import NewCompensationActionModalForm, \
+    RemoveCompensationActionModalForm, EditCompensationActionModalForm
+from compensation.forms.modals.deadline import EditDeadlineModalForm, NewDeadlineModalForm
+from compensation.forms.modals.document import NewEcoAccountDocumentModalForm
+from compensation.forms.modals.state import NewCompensationStateModalForm, RemoveCompensationStateModalForm, \
+    EditCompensationStateModalForm
 from compensation.models import EcoAccount, EcoAccountDocument, CompensationState, CompensationAction
 from compensation.tables import EcoAccountTable
 from intervention.forms.modalForms import NewDeductionModalForm, ShareModalForm, RemoveEcoAccountDeductionModalForm, \
@@ -401,7 +404,7 @@ def state_new_view(request: HttpRequest, id: str):
 
     """
     acc = get_object_or_404(EcoAccount, id=id)
-    form = NewStateModalForm(request.POST or None, instance=acc, request=request)
+    form = NewCompensationStateModalForm(request.POST or None, instance=acc, request=request)
     return form.process_request(
         request,
         msg_success=COMPENSATION_STATE_ADDED,
@@ -423,7 +426,7 @@ def action_new_view(request: HttpRequest, id: str):
 
     """
     acc = get_object_or_404(EcoAccount, id=id)
-    form = NewActionModalForm(request.POST or None, instance=acc, request=request)
+    form = NewCompensationActionModalForm(request.POST or None, instance=acc, request=request)
     return form.process_request(
         request,
         msg_success=COMPENSATION_ACTION_ADDED,

compensation/views/payment.py

@@ -6,12 +6,11 @@ Created on: 09.08.21
 
 """
 from django.urls import reverse
-from django.utils.translation import gettext_lazy as _
 from django.contrib.auth.decorators import login_required
 from django.http import HttpRequest
 from django.shortcuts import get_object_or_404
 
-from compensation.forms.modalForms import NewPaymentForm, RemovePaymentModalForm, EditPaymentModalForm
+from compensation.forms.modals.payment import NewPaymentForm, RemovePaymentModalForm, EditPaymentModalForm
 from compensation.models import Payment
 from intervention.models import Intervention
 from konova.decorators import default_group_required, shared_access_required