diff --git a/compensation/forms.py b/compensation/forms.py
index 9b443de..ea446d1 100644
--- a/compensation/forms.py
+++ b/compensation/forms.py
@@ -6,14 +6,18 @@ Created on: 04.12.20
"""
from django import forms
+from django.contrib import messages
from django.db import transaction
+from django.http import HttpRequest
+from django.shortcuts import redirect, render
from django.utils.translation import gettext_lazy as _
from compensation.models import Payment, CompensationState
-from konova.enums import UserActionLogEntryEnum
+from konova.contexts import BaseContext
from konova.forms import BaseForm, BaseModalForm
from konova.models import Deadline, DeadlineType
-from user.models import UserActionLogEntry
+from konova.utils.message_templates import FORM_INVALID
+from user.models import UserActionLogEntry, UserAction
class NewCompensationForm(BaseForm):
@@ -61,7 +65,7 @@ class NewPaymentForm(BaseModalForm):
with transaction.atomic():
action = UserActionLogEntry.objects.create(
user=self.user,
- action=UserActionLogEntryEnum.CREATED.value,
+ action=UserAction.CREATED,
)
pay = Payment.objects.create(
created=action,
@@ -106,6 +110,45 @@ class NewStateModalForm(BaseModalForm):
self.instance.after_states.add(state)
return state
+ def process_request(self, request: HttpRequest, msg_success: str = _("Object removed"), msg_error: str = FORM_INVALID, redirect_url: str = None):
+ """ Generic processing of request
+
+ Wraps the request processing logic, so we don't need the same code everywhere a RemoveModalForm is being used
+
+ Args:
+ request (HttpRequest): The incoming request
+ msg_success (str): The message in case of successful removing
+ msg_error (str): The message in case of an error
+
+ Returns:
+
+ """
+ redirect_url = redirect_url if redirect_url is not None else request.META.get("HTTP_REFERER", "home")
+ template = self.template
+ if request.method == "POST":
+ if self.is_valid():
+ is_before_state = bool(request.GET.get("before", False))
+ self.save(is_before_state=is_before_state)
+ messages.success(
+ request,
+ msg_success
+ )
+ return redirect(redirect_url)
+ else:
+ messages.info(
+ request,
+ msg_error
+ )
+ return redirect(redirect_url)
+ elif request.method == "GET":
+ context = {
+ "form": self,
+ }
+ context = BaseContext(request, context).context
+ return render(request, template, context)
+ else:
+ raise NotImplementedError
+
class NewDeadlineModalForm(BaseModalForm):
type = forms.ChoiceField(
@@ -150,7 +193,7 @@ class NewDeadlineModalForm(BaseModalForm):
with transaction.atomic():
action = UserActionLogEntry.objects.create(
user=self.user,
- action=UserActionLogEntryEnum.CREATED.value
+ action=UserAction.CREATED.value
)
deadline = Deadline.objects.create(
type=self.cleaned_data["type"],
diff --git a/compensation/models.py b/compensation/models.py
index 0031bd9..4d54af4 100644
--- a/compensation/models.py
+++ b/compensation/models.py
@@ -14,11 +14,10 @@ from django.utils.timezone import now
from compensation.settings import COMPENSATION_IDENTIFIER_LENGTH, COMPENSATION_IDENTIFIER_TEMPLATE
from intervention.models import Intervention, ResponsibilityData
-from konova.enums import UserActionLogEntryEnum
from konova.models import BaseObject, BaseResource, Geometry, UuidModel
from konova.utils.generators import generate_random_string
from organisation.models import Organisation
-from user.models import UserActionLogEntry
+from user.models import UserActionLogEntry, UserAction
class Payment(BaseResource):
@@ -156,11 +155,9 @@ class Compensation(AbstractCompensation):
action = UserActionLogEntry.objects.create(
user=_user,
timestamp=_now,
- action=UserActionLogEntryEnum.DELETED.value
+ action=UserAction.DELETED
)
self.deleted = action
- #self.deleted_on = _now
- #self.deleted_by = _user
self.save()
def save(self, *args, **kwargs):
diff --git a/compensation/templates/compensation/detail/includes/deadlines.html b/compensation/templates/compensation/detail/includes/deadlines.html
index 7cdcd38..5764edd 100644
--- a/compensation/templates/compensation/detail/includes/deadlines.html
+++ b/compensation/templates/compensation/detail/includes/deadlines.html
@@ -57,10 +57,5 @@
{% endfor %}
- {% if sum_before_states > sum_after_states %}
-
- {% trans 'Missing surfaces: ' %}{{ diff_states|floatformat:2 }} m²
-
- {% endif %}
\ No newline at end of file
diff --git a/compensation/templates/compensation/detail/includes/states-after.html b/compensation/templates/compensation/detail/includes/states-after.html
index 5c93f54..d937409 100644
--- a/compensation/templates/compensation/detail/includes/states-after.html
+++ b/compensation/templates/compensation/detail/includes/states-after.html
@@ -21,6 +21,11 @@
+ {% if sum_before_states > sum_after_states %}
+
+ {% trans 'Missing surfaces: ' %}{{ diff_states|floatformat:2 }} m²
+
+ {% endif %}
@@ -36,7 +41,7 @@
- {% for state in comp.after_states.all %}
+ {% for state in after_states %}
|
{{ state.biotope_type }}
@@ -53,10 +58,5 @@
{% endfor %}
|
- {% if sum_before_states > sum_after_states %}
-
- {% trans 'Missing surfaces: ' %}{{ diff_states|floatformat:2 }} m²
-
- {% endif %}
+ {% if sum_before_states < sum_after_states %}
+
+ {% trans 'Missing surfaces: ' %}{{ diff_states|floatformat:2 }} m²
+
+ {% endif %}
@@ -36,7 +41,7 @@
- {% for state in comp.before_states.all %}
+ {% for state in before_states %}
|
{{ state.biotope_type }}
@@ -53,10 +58,5 @@
{% endfor %}
|
- {% if sum_before_states < sum_after_states %}
-
- {% trans 'Missing surfaces: ' %}{{ diff_states|floatformat:2 }} m²
-
- {% endif %}