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
This commit is contained in:
@@ -10,8 +10,8 @@ from django.db import transaction
|
||||
from django.urls import reverse, reverse_lazy
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
|
||||
from compensation.forms.forms import AbstractCompensationForm, CompensationResponsibleFormMixin, \
|
||||
PikCompensationFormMixin
|
||||
from compensation.forms.mixins import CompensationResponsibleFormMixin, PikCompensationFormMixin
|
||||
from compensation.forms.compensation import AbstractCompensationForm
|
||||
from ema.models import Ema, EmaDocument
|
||||
from intervention.models import Responsibility, Handler
|
||||
from konova.forms import SimpleGeomForm
|
||||
|
||||
12
ema/views.py
12
ema/views.py
@@ -6,9 +6,11 @@ from django.shortcuts import render, get_object_or_404, redirect
|
||||
from django.urls import reverse
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
|
||||
from compensation.forms.modalForms import NewStateModalForm, NewActionModalForm, NewDeadlineModalForm, \
|
||||
RemoveCompensationActionModalForm, RemoveCompensationStateModalForm, EditCompensationStateModalForm, \
|
||||
EditCompensationActionModalForm, EditDeadlineModalForm
|
||||
from compensation.forms.modals.compensation_action import NewCompensationActionModalForm, \
|
||||
EditCompensationActionModalForm, RemoveCompensationActionModalForm
|
||||
from compensation.forms.modals.deadline import NewDeadlineModalForm, EditDeadlineModalForm
|
||||
from compensation.forms.modals.state import NewCompensationStateModalForm, RemoveCompensationStateModalForm, \
|
||||
EditCompensationStateModalForm
|
||||
from compensation.models import CompensationAction, CompensationState
|
||||
from ema.forms import NewEmaForm, EditEmaForm, NewEmaDocumentModalForm
|
||||
from ema.tables import EmaTable
|
||||
@@ -303,7 +305,7 @@ def state_new_view(request: HttpRequest, id: str):
|
||||
|
||||
"""
|
||||
ema = get_object_or_404(Ema, id=id)
|
||||
form = NewStateModalForm(request.POST or None, instance=ema, request=request)
|
||||
form = NewCompensationStateModalForm(request.POST or None, instance=ema, request=request)
|
||||
return form.process_request(
|
||||
request,
|
||||
msg_success=COMPENSATION_STATE_ADDED,
|
||||
@@ -325,7 +327,7 @@ def action_new_view(request: HttpRequest, id: str):
|
||||
|
||||
"""
|
||||
ema = get_object_or_404(Ema, id=id)
|
||||
form = NewActionModalForm(request.POST or None, instance=ema, request=request)
|
||||
form = NewCompensationActionModalForm(request.POST or None, instance=ema, request=request)
|
||||
return form.process_request(
|
||||
request,
|
||||
msg_success=COMPENSATION_ACTION_ADDED,
|
||||
|
||||
Reference in New Issue
Block a user