Refactoring

* renames model ResponsibilityData into Responsibility
* renames model LegalData into Legal
* moves form->object saving logic into model
* refactors NewDocumentForm into special types for intervention, compensation, eco account and ema
*

ema/forms.py

@@ -13,9 +13,9 @@ from django.urls import reverse, reverse_lazy
 from django.utils.translation import gettext_lazy as _
 
 from compensation.forms.forms import AbstractCompensationForm, CompensationResponsibleFormMixin
-from ema.models import Ema
-from intervention.models import ResponsibilityData
-from konova.forms import SimpleGeomForm
+from ema.models import Ema, EmaDocument
+from intervention.models import Responsibility
+from konova.forms import SimpleGeomForm, NewDocumentForm
 from user.models import UserActionLogEntry, UserAction
 
 
@@ -66,7 +66,7 @@ class NewEmaForm(AbstractCompensationForm, CompensationResponsibleFormMixin):
             # Process the geometry form
             geometry = geom_form.save(action)
 
-            responsible = ResponsibilityData.objects.create(
+            responsible = Responsibility.objects.create(
                 handler=handler,
                 conservation_file_number=conservation_file_number,
                 conservation_office=conservation_office,
@@ -154,3 +154,7 @@ class EditEmaForm(NewEmaForm):
             # Add the log entry to the main objects log list
             self.instance.log.add(action)
         return self.instance
+
+
+class NewEmaDocumentForm(NewDocumentForm):
+    document_model = EmaDocument

ema/tests/test_views.py

@@ -11,7 +11,7 @@ from django.test.client import Client
 
 from compensation.tests.test_views import CompensationViewTestCase
 from ema.models import Ema
-from intervention.models import ResponsibilityData
+from intervention.models import Responsibility
 from konova.models import Geometry
 from konova.settings import DEFAULT_GROUP, ETS_GROUP
 from user.models import UserActionLogEntry, UserAction
@@ -66,7 +66,7 @@ class EmaViewTestCase(CompensationViewTestCase):
             action=UserAction.CREATED,
         )
         # Create responsible data object
-        responsibility_data = ResponsibilityData.objects.create()
+        responsibility_data = Responsibility.objects.create()
         geometry = Geometry.objects.create()
         cls.ema = Ema.objects.create(
             identifier="TEST",

ema/views.py

@@ -8,7 +8,7 @@ from django.utils.translation import gettext_lazy as _
 
 from compensation.forms.modalForms import NewStateModalForm, NewActionModalForm, NewDeadlineModalForm
 from compensation.models import CompensationAction, CompensationState
-from ema.forms import NewEmaForm, EditEmaForm
+from ema.forms import NewEmaForm, EditEmaForm, NewEmaDocumentForm
 from ema.tables import EmaTable
 from intervention.forms.modalForms import ShareInterventionModalForm
 from konova.contexts import BaseContext
@@ -343,7 +343,7 @@ def document_new_view(request: HttpRequest, id: str):
 
     """
     ema = get_object_or_404(Ema, id=id)
-    form = NewDocumentForm(request.POST or None, request.FILES or None, instance=ema, user=request.user)
+    form = NewEmaDocumentForm(request.POST or None, request.FILES or None, instance=ema, user=request.user)
     return form.process_request(
         request,
         msg_success=_("Document added")