#7 New Form

* adds NewEcoAccountForm
* refactors NewCompensationForm into AbstractCompensationForm so main fields can be reused again
* fixes template bug in account detail view where the amount of deductions has been displayed instead of the available rest
* refactors _generate_new_identifier() into generate_new_identifier()
* refactors get_available_rest() into returning both, the total and relative amount
* improves saving of SimpleGeometryForm()
* adds/updates translations

compensation/forms/forms.py

@@ -13,18 +13,18 @@ from django.utils.translation import gettext_lazy as _
 from django import forms
 
 from codelist.models import KonovaCode
-from codelist.settings import CODELIST_COMPENSATION_FUNDING_ID
-from compensation.models import Compensation
+from codelist.settings import CODELIST_COMPENSATION_FUNDING_ID, CODELIST_CONSERVATION_OFFICE_ID
+from compensation.models import Compensation, EcoAccount
 from intervention.inputs import GenerateInput
-from intervention.models import Intervention
+from intervention.models import Intervention, ResponsibilityData
 from konova.forms import BaseForm, SimpleGeomForm
 from user.models import UserActionLogEntry, UserAction
 
 
-class NewCompensationForm(BaseForm):
-    """ Form for creating new compensations.
+class AbstractCompensationForm(BaseForm):
+    """ Abstract form for compensations
 
-    Can be initialized with an intervention id for preselecting the related intervention.
+    Holds all important form fields, which are used in compensation and eco account forms
 
     """
     identifier = forms.CharField(
@@ -35,7 +35,7 @@ class NewCompensationForm(BaseForm):
         widget=GenerateInput(
             attrs={
                 "class": "form-control",
-                "url": reverse_lazy("compensation:new-id"),
+                "url": None,  # Needs to be set in inheriting constructors
             }
         )
     )
@@ -51,21 +51,6 @@ class NewCompensationForm(BaseForm):
             }
         )
     )
-    intervention = forms.ModelChoiceField(
-        label=_("compensates intervention"),
-        label_suffix="",
-        help_text=_("Select the intervention for which this compensation compensates"),
-        queryset=Intervention.objects.filter(
-            deleted=None,
-        ),
-        widget=autocomplete.ModelSelect2(
-            url="interventions-autocomplete",
-            attrs={
-                "data-placeholder": _("Intervention"),
-                "data-minimum-input-length": 3,
-            }
-        ),
-    )
     fundings = forms.ModelMultipleChoiceField(
         label=_("Fundings"),
         label_suffix="",
@@ -96,6 +81,41 @@ class NewCompensationForm(BaseForm):
         )
     )
 
+    class Meta:
+        abstract = True
+
+
+class NewCompensationForm(AbstractCompensationForm):
+    """ Form for creating new compensations.
+
+    Can be initialized with an intervention id for preselecting the related intervention.
+
+    """
+    intervention = forms.ModelChoiceField(
+        label=_("compensates intervention"),
+        label_suffix="",
+        help_text=_("Select the intervention for which this compensation compensates"),
+        queryset=Intervention.objects.filter(
+            deleted=None,
+        ),
+        widget=autocomplete.ModelSelect2(
+            url="interventions-autocomplete",
+            attrs={
+                "data-placeholder": _("Intervention"),
+                "data-minimum-input-length": 3,
+            }
+        ),
+    )
+
+    # Define a field order for a nicer layout instead of running with the inheritance result
+    field_order = [
+        "identifier",
+        "title",
+        "intervention",
+        "fundings",
+        "comment",
+    ]
+
     def __init__(self, *args, **kwargs):
         intervention_id = kwargs.pop("intervention_id", None)
         super().__init__(*args, **kwargs)
@@ -114,8 +134,9 @@ class NewCompensationForm(BaseForm):
             self.cancel_redirect = reverse("compensation:index")
 
         tmp = Compensation()
-        identifier = tmp._generate_new_identifier()
+        identifier = tmp.generate_new_identifier()
         self.initialize_form_field("identifier", identifier)
+        self.fields["identifier"].widget.attrs["url"] = reverse_lazy("compensation:new-id")
 
     def save(self, user: User, geom_form: SimpleGeomForm):
         with transaction.atomic():
@@ -199,4 +220,125 @@ class EditCompensationForm(NewCompensationForm):
             self.instance.save()
 
             self.instance.log.add(action)
-        return self.instance
+        return self.instance
+
+
+class NewEcoAccountForm(AbstractCompensationForm):
+    conservation_office = forms.ModelChoiceField(
+        label=_("Conservation office"),
+        label_suffix="",
+        help_text=_("Select the responsible office"),
+        queryset=KonovaCode.objects.filter(
+            is_archived=False,
+            is_leaf=True,
+            code_lists__in=[CODELIST_CONSERVATION_OFFICE_ID],
+        ),
+        widget=autocomplete.ModelSelect2(
+            url="codes-conservation-office-autocomplete",
+            attrs={
+            }
+        ),
+    )
+    conservation_file_number = forms.CharField(
+        label=_("Conservation office file number"),
+        label_suffix="",
+        max_length=255,
+        required=False,
+        widget=forms.TextInput(
+            attrs={
+                "placeholder": _("ETS-123/ABC.456"),
+                "class": "form-control",
+            }
+        )
+    )
+    handler = forms.CharField(
+        label=_("Eco-account handler"),
+        label_suffix="",
+        max_length=255,
+        required=False,
+        help_text=_("Who handles the eco-account"),
+        widget=forms.TextInput(
+            attrs={
+                "placeholder": _("Company Mustermann"),
+                "class": "form-control",
+            }
+        )
+    )
+    surface = forms.DecimalField(
+        min_value=0.00,
+        decimal_places=2,
+        label=_("Available Surface"),
+        label_suffix="",
+        help_text=_("The amount that can be used for deductions"),
+        widget=forms.NumberInput(
+            attrs={
+                "class": "form-control",
+            }
+        )
+    )
+    field_order = [
+        "identifier",
+        "title",
+        "conservation_office",
+        "surface",
+        "conservation_file_number",
+        "handler",
+        "fundings",
+        "comment",
+    ]
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.form_title = _("New Eco-Account")
+
+        self.action_url = reverse("compensation:acc-new")
+        self.cancel_redirect = reverse("compensation:acc-index")
+
+        tmp = EcoAccount()
+        identifier = tmp.generate_new_identifier()
+        self.initialize_form_field("identifier", identifier)
+        self.fields["identifier"].widget.attrs["url"] = reverse_lazy("compensation:acc-new-id")
+        self.fields["title"].widget.attrs["placeholder"] = _("Eco-Account XY; Location ABC")
+
+    def save(self, user: User, geom_form: SimpleGeomForm):
+        with transaction.atomic():
+            # Fetch data from cleaned POST values
+            identifier = self.cleaned_data.get("identifier", None)
+            title = self.cleaned_data.get("title", None)
+            fundings = self.cleaned_data.get("fundings", None)
+            handler = self.cleaned_data.get("handler", None)
+            deductable_surface = self.cleaned_data.get("surface", None)
+            conservation_office = self.cleaned_data.get("conservation_office", None)
+            conservation_file_number = self.cleaned_data.get("conservation_file_number", None)
+            comment = self.cleaned_data.get("comment", None)
+
+            # Create log entry
+            action = UserActionLogEntry.objects.create(
+                user=user,
+                action=UserAction.CREATED,
+            )
+            # Process the geometry form
+            geometry = geom_form.save(action)
+
+            responsible = ResponsibilityData.objects.create(
+                handler=handler,
+                conservation_file_number=conservation_file_number,
+                conservation_office=conservation_office,
+            )
+
+            # Finally create main object
+            acc = EcoAccount.objects.create(
+                identifier=identifier,
+                title=title,
+                responsible=responsible,
+                deductable_surface=deductable_surface,
+                created=action,
+                geometry=geometry,
+                comment=comment,
+            )
+            acc.fundings.set(fundings)
+            acc.users.add(user)
+
+            # Add the log entry to the main objects log list
+            acc.log.add(action)
+        return acc