#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/views/compensation_views.py

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

compensation/views/eco_account_views.py

@@ -5,14 +5,16 @@ Contact: michel.peltriaux@sgdnord.rlp.de
 Created on: 09.08.21
 
 """
+from django.contrib import messages
 from django.db.models import Sum
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 from django.contrib.auth.decorators import login_required
 from django.core.exceptions import ObjectDoesNotExist
-from django.http import HttpRequest, Http404
-from django.shortcuts import render, get_object_or_404
+from django.http import HttpRequest, Http404, JsonResponse
+from django.shortcuts import render, get_object_or_404, redirect
 
+from compensation.forms.forms import NewEcoAccountForm
 from compensation.forms.modalForms import NewStateModalForm, NewActionModalForm, NewDeadlineModalForm
 from compensation.models import EcoAccount, EcoAccountDocument
 from compensation.tables import EcoAccountTable
@@ -22,6 +24,7 @@ from konova.decorators import any_group_check, default_group_required, conservat
 from konova.forms import RemoveModalForm, SimpleGeomForm, NewDocumentForm, RecordModalForm
 from konova.settings import DEFAULT_GROUP, ZB_GROUP, ETS_GROUP
 from konova.utils.documents import get_document, remove_document
+from konova.utils.message_templates import IDENTIFIER_REPLACED, FORM_INVALID
 from konova.utils.user_checks import in_group
 
 
@@ -56,8 +59,62 @@ def index_view(request: HttpRequest):
 @login_required
 @default_group_required
 def new_view(request: HttpRequest):
-    # ToDo
-    pass
+    """
+    Renders a view for a new eco account creation
+
+    Args:
+        request (HttpRequest): The incoming request
+
+    Returns:
+
+    """
+    template = "compensation/new/view.html"
+    data_form = NewEcoAccountForm(request.POST or None)
+    geom_form = SimpleGeomForm(request.POST or None, read_only=False)
+    if request.method == "POST":
+        if data_form.is_valid() and geom_form.is_valid():
+            generated_identifier = data_form.cleaned_data.get("identifier", None)
+            acc = data_form.save(request.user, geom_form)
+            if generated_identifier != acc.identifier:
+                messages.info(
+                    request,
+                    IDENTIFIER_REPLACED.format(
+                        generated_identifier,
+                        acc.identifier
+                    )
+                )
+            messages.success(request, _("Eco-Account {} added").format(acc.identifier))
+            return redirect("compensation:acc-open", id=acc.id)
+        else:
+            messages.error(request, FORM_INVALID)
+    else:
+        # For clarification: nothing in this case
+        pass
+    context = {
+        "form": data_form,
+        "geom_form": geom_form,
+        "url": reverse("compensation:acc-new-id")
+    }
+    context = BaseContext(request, context).context
+    return render(request, template, context)
+
+
+@login_required
+def new_id_view(request: HttpRequest):
+    """ JSON endpoint
+
+    Provides fetching of free identifiers for e.g. AJAX calls
+
+    """
+    tmp = EcoAccount()
+    identifier = tmp.generate_new_identifier()
+    while EcoAccount.objects.filter(identifier=identifier).exists():
+        identifier = tmp.generate_new_identifier()
+    return JsonResponse(
+        data={
+            "identifier": identifier
+        }
+    )
 
 
 @login_required
@@ -96,7 +153,7 @@ def open_view(request: HttpRequest, id: str):
     diff_states = abs(sum_before_states - sum_after_states)
 
     # Calculate rest of available surface for deductions
-    available = acc.get_available_rest(as_percentage=True)
+    available_total, available_relative = acc.get_available_rest()
 
     deductions = acc.deductions.filter(
         intervention__deleted=None,
@@ -111,7 +168,8 @@ def open_view(request: HttpRequest, id: str):
         "sum_before_states": sum_before_states,
         "sum_after_states": sum_after_states,
         "diff_states": diff_states,
-        "available": available,
+        "available": available_relative,
+        "available_total": available_total,
         "is_default_member": in_group(_user, DEFAULT_GROUP),
         "is_zb_member": in_group(_user, ZB_GROUP),
         "is_ets_member": in_group(_user, ETS_GROUP),