#7 New Form

* adds NewCompensationForm content and functionality
* renames CODELIST_COMPENSATION_COMBINATION_ID into CODELIST_COMPENSATION_FUNDING_ID for more clarity
* reorganizes compensation forms into compensation/forms/forms.py and forms/modalForms.py
* adds new compensation html template in compensation/templates/compensation/new
* adds new default message template in message_templates.py: IDENTIFIER_REPLACED
* adds/updates translations

konova/autocompletes.py

@@ -10,7 +10,8 @@ from django.db.models import Q
 
 from codelist.models import KonovaCode
 from codelist.settings import CODELIST_COMPENSATION_ACTION_ID, CODELIST_BIOTOPES_ID, CODELIST_LAW_ID, \
-    CODELIST_REGISTRATION_OFFICE_ID, CODELIST_CONSERVATION_OFFICE_ID, CODELIST_PROCESS_TYPE_ID
+    CODELIST_REGISTRATION_OFFICE_ID, CODELIST_CONSERVATION_OFFICE_ID, CODELIST_PROCESS_TYPE_ID, \
+    CODELIST_COMPENSATION_FUNDING_ID
 from compensation.models import EcoAccount
 from intervention.models import Intervention
 from organisation.models import Organisation
@@ -45,12 +46,18 @@ class NonOfficialOrganisationAutocomplete(Select2QuerySetView):
 
 
 class EcoAccountAutocomplete(Select2QuerySetView):
+    """ Autocomplete for ecoAccount entries
+
+    Only returns entries that are accessible for the requesting user and already are recorded
+
+    """
     def get_queryset(self):
         if self.request.user.is_anonymous:
             return EcoAccount.objects.none()
         qs = EcoAccount.objects.filter(
             deleted=None,
             recorded__isnull=False,
+            users__in=[self.request.user],
         )
         if self.q:
             qs = qs.filter(
@@ -63,6 +70,11 @@ class EcoAccountAutocomplete(Select2QuerySetView):
 
 
 class InterventionAutocomplete(Select2QuerySetView):
+    """ Autocomplete for intervention entries
+
+    Only returns entries that are accessible for the requesting user
+
+    """
     def get_queryset(self):
         if self.request.user.is_anonymous:
             return Intervention.objects.none()
@@ -128,6 +140,15 @@ class CompensationActionCodeAutocomplete(KonovaCodeAutocomplete):
         super().__init__(*args, **kwargs)
 
 
+class CompensationFundingCodeAutocomplete(KonovaCodeAutocomplete):
+    """
+    Due to limitations of the django dal package, we need to subclass for each code list
+    """
+    def __init__(self, *args, **kwargs):
+        self.c = CODELIST_COMPENSATION_FUNDING_ID
+        super().__init__(*args, **kwargs)
+
+
 class BiotopeCodeAutocomplete(KonovaCodeAutocomplete):
     """
     Due to limitations of the django dal package, we need to subclass for each code list

konova/urls.py

@@ -19,7 +19,8 @@ from django.urls import path, include
 
 from konova.autocompletes import OrganisationAutocomplete, NonOfficialOrganisationAutocomplete, EcoAccountAutocomplete, \
     InterventionAutocomplete, CompensationActionCodeAutocomplete, BiotopeCodeAutocomplete, LawCodeAutocomplete, \
-    RegistrationOfficeCodeAutocomplete, ConservationOfficeCodeAutocomplete, ProcessTypeCodeAutocomplete
+    RegistrationOfficeCodeAutocomplete, ConservationOfficeCodeAutocomplete, ProcessTypeCodeAutocomplete, \
+    CompensationFundingCodeAutocomplete
 from konova.settings import SSO_SERVER, SSO_PUBLIC_KEY, SSO_PRIVATE_KEY, DEBUG
 from konova.sso.sso import KonovaSSOClient
 from konova.views import logout_view, home_view, remove_deadline_view
@@ -46,7 +47,8 @@ urlpatterns = [
     path("atcmplt/orgs/other", NonOfficialOrganisationAutocomplete.as_view(), name="other-orgs-autocomplete"),
     path("atcmplt/eco-accounts", EcoAccountAutocomplete.as_view(), name="accounts-autocomplete"),
     path("atcmplt/interventions", InterventionAutocomplete.as_view(), name="interventions-autocomplete"),
-    path("atcmplt/codes/compensation-action", CompensationActionCodeAutocomplete.as_view(), name="codes-compensation-action-autocomplete"),
+    path("atcmplt/codes/comp/action", CompensationActionCodeAutocomplete.as_view(), name="codes-compensation-action-autocomplete"),
+    path("atcmplt/codes/comp/funding", CompensationFundingCodeAutocomplete.as_view(), name="codes-compensation-funding-autocomplete"),
     path("atcmplt/codes/biotope", BiotopeCodeAutocomplete.as_view(), name="codes-biotope-autocomplete"),
     path("atcmplt/codes/law", LawCodeAutocomplete.as_view(), name="codes-law-autocomplete"),
     path("atcmplt/codes/prc-type", ProcessTypeCodeAutocomplete.as_view(), name="codes-process-type-autocomplete"),

konova/utils/message_templates.py

@@ -10,3 +10,4 @@ from django.utils.translation import gettext_lazy as _
 
 FORM_INVALID = _("There was an error on this form.")
 INTERVENTION_INVALID = _("There are errors in this intervention.")
+IDENTIFIER_REPLACED = _("The identifier '{}' had to be changed to '{}' since another entry has been added in the meanwhile, which uses this identifier")