Merge pull request 'master' (#357) from master into django_4

Reviewed-on: SGD-Nord/konova#357

compensation/forms/eco_account.py

@@ -175,7 +175,7 @@ class EditEcoAccountForm(NewEcoAccountForm):
     def is_valid(self):
         valid = super().is_valid()
 
-        deductable_surface = self.cleaned_data.get("surface")
+        deductable_surface = self.cleaned_data.get("surface") or 0.0
         deduction_surface_sum = self.instance.get_deductions_surface()
         if deductable_surface < deduction_surface_sum:
             self.add_error(

compensation/models/compensation.py

@@ -9,8 +9,10 @@ import shutil
 
 from django.contrib import messages
 
+from analysis.settings import LKOMPVZVO_PUBLISH_DATE
 from codelist.models import KonovaCode
-from compensation.settings import COMPENSATION_IDENTIFIER_TEMPLATE, COMPENSATION_IDENTIFIER_LENGTH
+from compensation.settings import COMPENSATION_IDENTIFIER_TEMPLATE, COMPENSATION_IDENTIFIER_LENGTH, \
+    COMPENSATION_LANIS_LAYER_NAME_RECORDED, COMPENSATION_LANIS_LAYER_NAME_UNRECORDED, COMPENSATION_LANIS_LAYER_NAME_UNRECORDED_OLD_ENTRY
 from user.models import User, Team
 from django.db import models, transaction
 from django.db.models import QuerySet, Sum
@@ -478,6 +480,28 @@ class Compensation(AbstractCompensation, CEFMixin, CoherenceMixin, PikMixin):
         """
         return self.intervention.is_recorded
 
+    def get_lanis_layer_name(self):
+        """ Getter for specific LANIS/WFS object layer
+
+        Returns:
+
+        """
+        retval = None
+        if self.is_recorded:
+            retval = COMPENSATION_LANIS_LAYER_NAME_RECORDED
+        else:
+            try:
+                is_old_entry = self.intervention.legal.binding_date < LKOMPVZVO_PUBLISH_DATE
+            except TypeError:
+                is_old_entry = False
+
+            if is_old_entry:
+                retval = COMPENSATION_LANIS_LAYER_NAME_UNRECORDED_OLD_ENTRY
+            else:
+                retval = COMPENSATION_LANIS_LAYER_NAME_UNRECORDED
+
+        return retval
+
 
 class CompensationDocument(AbstractDocument):
     """

compensation/models/eco_account.py

@@ -9,13 +9,12 @@ import shutil
 
 from django.urls import reverse
 
-from compensation.settings import ECO_ACCOUNT_IDENTIFIER_TEMPLATE, ECO_ACCOUNT_IDENTIFIER_LENGTH
+from compensation.settings import ECO_ACCOUNT_IDENTIFIER_TEMPLATE, ECO_ACCOUNT_IDENTIFIER_LENGTH, \
+    ECO_ACCOUNT_LANIS_LAYER_NAME_RECORDED, ECO_ACCOUNT_LANIS_LAYER_NAME_UNRECORDED
 from konova.utils.message_templates import DEDUCTION_REMOVED, DOCUMENT_REMOVED_TEMPLATE
-from django.core.exceptions import ValidationError
 from django.core.validators import MinValueValidator
 from django.db import models
 from django.db.models import Sum, QuerySet
-from django.utils.translation import gettext_lazy as _
 
 from compensation.managers import EcoAccountManager, EcoAccountDeductionManager
 from compensation.models.compensation import AbstractCompensation, PikMixin
@@ -192,6 +191,19 @@ class EcoAccount(AbstractCompensation, ShareableObjectMixin, RecordableObjectMix
             ret_val = 0
         return ret_val
 
+    def get_lanis_layer_name(self):
+        """ Getter for specific LANIS/WFS object layer
+
+        Returns:
+
+        """
+        retval = None
+        if self.is_recorded:
+            retval = ECO_ACCOUNT_LANIS_LAYER_NAME_RECORDED
+        else:
+            retval = ECO_ACCOUNT_LANIS_LAYER_NAME_UNRECORDED
+
+        return retval
 
 class EcoAccountDocument(AbstractDocument):
     """

compensation/settings.py

@@ -7,6 +7,11 @@ Created on: 18.12.20
 """
 COMPENSATION_IDENTIFIER_LENGTH = 6
 COMPENSATION_IDENTIFIER_TEMPLATE = "KOM-{}"
+COMPENSATION_LANIS_LAYER_NAME_RECORDED = "kom_recorded"
+COMPENSATION_LANIS_LAYER_NAME_UNRECORDED = "kom_unrecorded"
+COMPENSATION_LANIS_LAYER_NAME_UNRECORDED_OLD_ENTRY = "kom_unrecorded_old_entries"
 
 ECO_ACCOUNT_IDENTIFIER_LENGTH = 6
-ECO_ACCOUNT_IDENTIFIER_TEMPLATE = "OEK-{}"
+ECO_ACCOUNT_IDENTIFIER_TEMPLATE = "OEK-{}"
+ECO_ACCOUNT_LANIS_LAYER_NAME_RECORDED = "oek_recorded"
+ECO_ACCOUNT_LANIS_LAYER_NAME_UNRECORDED = "oek_unrecorded"