#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

intervention/forms/forms.py

@@ -190,7 +190,7 @@ class NewInterventionForm(BaseForm):
         self.cancel_redirect = reverse("intervention:index")
 
         tmp_intervention = Intervention()
-        identifier = tmp_intervention._generate_new_identifier()
+        identifier = tmp_intervention.generate_new_identifier()
         self.initialize_form_field("identifier", identifier)
 
     def save(self, user: User, geom_form: SimpleGeomForm):

intervention/models.py

@@ -274,11 +274,11 @@ class Intervention(BaseObject):
         """
         if self.identifier is None or len(self.identifier) == 0:
             # No identifier given
-            self.identifier = self._generate_new_identifier()
+            self.identifier = self.generate_new_identifier()
 
         # Before saving, make sure the set identifier is not used, yet
         while Intervention.objects.filter(identifier=self.identifier).exists():
-            self.identifier = self._generate_new_identifier()
+            self.identifier = self.generate_new_identifier()
         super().save(*args, **kwargs)
 
     def delete(self, using=None, keep_parents=False):

intervention/views.py

@@ -97,9 +97,9 @@ def new_id_view(request: HttpRequest):
 
     """
     tmp_intervention = Intervention()
-    identifier = tmp_intervention._generate_new_identifier()
+    identifier = tmp_intervention.generate_new_identifier()
     while Intervention.objects.filter(identifier=identifier).exists():
-        identifier = tmp_intervention._generate_new_identifier()
+        identifier = tmp_intervention.generate_new_identifier()
     return JsonResponse(
         data={
             "identifier": identifier