Fixes and improvements

* moves diff_states message back to table top for direct presentation in compensation/detail/view.html
* removes diff_states rendering in deadline card in compensation/detail/view.html
* fixes before_state adding based on GET parameter
* refactors UserActionlogEntryEnum into a UserAction TextChoice (Django 3.x)
* adds ordering of compensation states depending on surface value
* refactors ServerMessageImportance from enum into TextChoice (Django 3.x)
* adds/updates translations

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"],