From 6945b1711759392b820398b308508951b9c05bec Mon Sep 17 00:00:00 2001
From: mpeltriaux <Michel.Peltriaux@sgdnord.rlp.de>
Date: Thu, 8 Feb 2024 07:31:19 +0100
Subject: [PATCH] # Optimizations and fixes

* drops identifier handling on all edit-forms (identifier editing has been disabled on the frontend for a while now)
* updates test cases
* updates form caption for checking and recording action (less intimidating)
* optimizes district column width
* fixes bug on frontend parcel fetching on detail view
* adds extended tooltip for title column on index tables
* retraslates 'Law' to 'Rechtsgrundlage'
---
 compensation/forms/compensation.py            |   2 --
 compensation/forms/eco_account.py             |   2 --
 compensation/models/compensation.py           |   1 -
 .../tests/compensation/test_workflow.py       |  14 +++++++---
 .../tests/ecoaccount/test_workflow.py         |   3 ++-
 ema/forms.py                                  |   2 --
 ema/tests/test_workflow.py                    |   3 ++-
 ema/tests/unit/test_forms.py                  |   2 +-
 intervention/forms/intervention.py            |   2 --
 intervention/forms/modals/check.py            |   2 +-
 intervention/tables.py                        |   5 ++++
 intervention/views/intervention.py            |   2 +-
 konova/forms/modals/record_form.py            |   2 +-
 konova/models/geometry.py                     |   3 +++
 konova/tests/test_views.py                    |   8 +-----
 konova/tests/unit/test_forms.py               |   2 +-
 konova/utils/tables.py                        |   4 +++
 konova/views/geometry.py                      |  25 +++++++++---------
 locale/de/LC_MESSAGES/django.mo               | Bin 45416 -> 45363 bytes
 locale/de/LC_MESSAGES/django.po               |   8 +++---
 20 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/compensation/forms/compensation.py b/compensation/forms/compensation.py
index cc3fa57..bb1532d 100644
--- a/compensation/forms/compensation.py
+++ b/compensation/forms/compensation.py
@@ -213,7 +213,6 @@ class EditCompensationForm(NewCompensationForm):
             action = UserActionLogEntry.get_edited_action(user)
 
             # Fetch data from cleaned POST values
-            identifier = self.cleaned_data.get("identifier", None)
             title = self.cleaned_data.get("title", None)
             intervention = self.cleaned_data.get("intervention", None)
             is_cef = self.cleaned_data.get("is_cef", None)
@@ -221,7 +220,6 @@ class EditCompensationForm(NewCompensationForm):
             is_pik = self.cleaned_data.get("is_pik", None)
             comment = self.cleaned_data.get("comment", None)
 
-            self.instance.identifier = identifier
             self.instance.title = title
             self.instance.intervention = intervention
             self.instance.is_cef = is_cef
diff --git a/compensation/forms/eco_account.py b/compensation/forms/eco_account.py
index 0352383..4244302 100644
--- a/compensation/forms/eco_account.py
+++ b/compensation/forms/eco_account.py
@@ -192,7 +192,6 @@ class EditEcoAccountForm(NewEcoAccountForm):
     def save(self, user: User, geom_form: SimpleGeomForm):
         with transaction.atomic():
             # Fetch data from cleaned POST values
-            identifier = self.cleaned_data.get("identifier", None)
             title = self.cleaned_data.get("title", None)
             registration_date = self.cleaned_data.get("registration_date", None)
             handler_type = self.cleaned_data.get("handler_type", None)
@@ -219,7 +218,6 @@ class EditEcoAccountForm(NewEcoAccountForm):
             self.instance.legal.save()
 
             # Update main oject data
-            self.instance.identifier = identifier
             self.instance.title = title
             self.instance.deductable_surface = surface
             self.instance.comment = comment
diff --git a/compensation/models/compensation.py b/compensation/models/compensation.py
index eaf8ccb..49accd4 100644
--- a/compensation/models/compensation.py
+++ b/compensation/models/compensation.py
@@ -315,7 +315,6 @@ class Compensation(AbstractCompensation, CEFMixin, CoherenceMixin, PikMixin):
     def get_detail_url_absolute(self):
         return BASE_URL + self.get_detail_url()
 
-
     def save(self, *args, **kwargs):
         if self.identifier is None or len(self.identifier) == 0:
             # Create new identifier is none was given
diff --git a/compensation/tests/compensation/test_workflow.py b/compensation/tests/compensation/test_workflow.py
index ee520a5..3f02448 100644
--- a/compensation/tests/compensation/test_workflow.py
+++ b/compensation/tests/compensation/test_workflow.py
@@ -125,10 +125,16 @@ class CompensationWorkflowTestCase(BaseWorkflowTestCase):
         self.compensation = self.fill_out_compensation(self.compensation)
         pre_edit_log_count = self.compensation.log.count()
 
+        self.assertTrue(self.compensation.is_shared_with(self.superuser))
+
+        old_identifier = self.compensation.identifier
         new_title = self.create_dummy_string()
         new_identifier = self.create_dummy_string()
         new_comment = self.create_dummy_string()
-        new_geometry = MultiPolygon(srid=4326)  # Create an empty geometry
+        new_geometry = MultiPolygon(
+            self.compensation.geometry.geom.buffer(10),
+            srid=self.compensation.geometry.geom.srid
+        )  # Create a geometry which differs from the stored one
         geojson = self.create_geojson(new_geometry)
 
         check_on_elements = {
@@ -151,19 +157,21 @@ class CompensationWorkflowTestCase(BaseWorkflowTestCase):
 
         check_on_elements = {
             self.compensation.title: new_title,
-            self.compensation.identifier: new_identifier,
             self.compensation.comment: new_comment,
         }
 
         for k, v in check_on_elements.items():
             self.assertEqual(k, v)
 
-        self.assert_equal_geometries(self.compensation.geometry.geom, new_geometry)
+        # Expect identifier to not be editable
+        self.assertEqual(self.compensation.identifier, old_identifier, msg="Identifier was editable!")
 
         # Expect logs to be set
         self.assertEqual(pre_edit_log_count + 1, self.compensation.log.count())
         self.assertEqual(self.compensation.log.first().action, UserAction.EDITED)
 
+        self.assert_equal_geometries(self.compensation.geometry.geom, new_geometry)
+
     def test_checkability(self):
         """
         This tests if the checkability of the compensation (which is defined by the linked intervention's checked
diff --git a/compensation/tests/ecoaccount/test_workflow.py b/compensation/tests/ecoaccount/test_workflow.py
index 3bfaffe..85f7db5 100644
--- a/compensation/tests/ecoaccount/test_workflow.py
+++ b/compensation/tests/ecoaccount/test_workflow.py
@@ -82,6 +82,7 @@ class EcoAccountWorkflowTestCase(BaseWorkflowTestCase):
         url = reverse("compensation:acc:edit", args=(self.eco_account.id,))
         pre_edit_log_count = self.eco_account.log.count()
 
+        old_identifier = self.eco_account.identifier
         new_title = self.create_dummy_string()
         new_identifier = self.create_dummy_string()
         new_comment = self.create_dummy_string()
@@ -114,7 +115,6 @@ class EcoAccountWorkflowTestCase(BaseWorkflowTestCase):
 
         check_on_elements = {
             self.eco_account.title: new_title,
-            self.eco_account.identifier: new_identifier,
             self.eco_account.deductable_surface: test_deductable_surface,
             self.eco_account.deductable_rest: test_deductable_surface - deductions_surface,
             self.eco_account.comment: new_comment,
@@ -123,6 +123,7 @@ class EcoAccountWorkflowTestCase(BaseWorkflowTestCase):
         for k, v in check_on_elements.items():
             self.assertEqual(k, v)
 
+        self.assertEqual(self.eco_account.identifier, old_identifier)
         self.assert_equal_geometries(self.eco_account.geometry.geom, new_geometry)
 
         # Expect logs to be set
diff --git a/ema/forms.py b/ema/forms.py
index d6b77a4..26bbc2d 100644
--- a/ema/forms.py
+++ b/ema/forms.py
@@ -133,7 +133,6 @@ class EditEmaForm(NewEmaForm):
     def save(self, user: User, geom_form: SimpleGeomForm):
         with transaction.atomic():
             # Fetch data from cleaned POST values
-            identifier = self.cleaned_data.get("identifier", None)
             title = self.cleaned_data.get("title", None)
             handler_type = self.cleaned_data.get("handler_type", None)
             handler_detail = self.cleaned_data.get("handler_detail", None)
@@ -154,7 +153,6 @@ class EditEmaForm(NewEmaForm):
             self.instance.responsible.save()
 
             # Update main oject data
-            self.instance.identifier = identifier
             self.instance.title = title
             self.instance.comment = comment
             self.instance.is_pik = is_pik
diff --git a/ema/tests/test_workflow.py b/ema/tests/test_workflow.py
index 3e5bd29..c622811 100644
--- a/ema/tests/test_workflow.py
+++ b/ema/tests/test_workflow.py
@@ -80,6 +80,7 @@ class EmaWorkflowTestCase(BaseWorkflowTestCase):
         self.ema = self.fill_out_ema(self.ema)
         pre_edit_log_count = self.ema.log.count()
 
+        old_identifier = self.ema.identifier
         new_title = self.create_dummy_string()
         new_identifier = self.create_dummy_string()
         new_comment = self.create_dummy_string()
@@ -106,13 +107,13 @@ class EmaWorkflowTestCase(BaseWorkflowTestCase):
 
         check_on_elements = {
             self.ema.title: new_title,
-            self.ema.identifier: new_identifier,
             self.ema.comment: new_comment,
         }
 
         for k, v in check_on_elements.items():
             self.assertEqual(k, v)
 
+        self.assertEqual(self.ema.identifier, old_identifier)
         self.assert_equal_geometries(self.ema.geometry.geom, new_geometry)
 
         # Expect logs to be set
diff --git a/ema/tests/unit/test_forms.py b/ema/tests/unit/test_forms.py
index ff87b9f..d66fd14 100644
--- a/ema/tests/unit/test_forms.py
+++ b/ema/tests/unit/test_forms.py
@@ -130,7 +130,7 @@ class EditEmaFormTestCase(BaseTestCase):
         self.assertIsNotNone(obj.responsible.handler)
         self.assertEqual(obj.responsible.conservation_office, data["conservation_office"])
         self.assertEqual(obj.responsible.conservation_file_number, data["conservation_file_number"])
-        self.assertEqual(obj.identifier, data["identifier"])
+        self.assertNotEqual(obj.identifier, data["identifier"], msg="Identifier editable via form!")
         self.assertEqual(obj.comment, data["comment"])
 
         last_log = obj.log.first()
diff --git a/intervention/forms/intervention.py b/intervention/forms/intervention.py
index 72986ad..629bfe2 100644
--- a/intervention/forms/intervention.py
+++ b/intervention/forms/intervention.py
@@ -345,7 +345,6 @@ class EditInterventionForm(NewInterventionForm):
 
         """
         with transaction.atomic():
-            identifier = self.cleaned_data.get("identifier", None)
             title = self.cleaned_data.get("title", None)
             process_type = self.cleaned_data.get("type", None)
             laws = self.cleaned_data.get("laws", None)
@@ -379,7 +378,6 @@ class EditInterventionForm(NewInterventionForm):
 
             self.instance.log.add(user_action)
 
-            self.instance.identifier = identifier
             self.instance.title = title
             self.instance.comment = comment
             self.instance.modified = user_action
diff --git a/intervention/forms/modals/check.py b/intervention/forms/modals/check.py
index cc06e63..6111134 100644
--- a/intervention/forms/modals/check.py
+++ b/intervention/forms/modals/check.py
@@ -33,7 +33,7 @@ class CheckModalForm(BaseModalForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.form_title = _("Run check")
-        self.form_caption = _("I, {} {}, confirm that all necessary control steps have been performed by myself.").format(self.user.first_name, self.user.last_name)
+        self.form_caption = _("The necessary control steps have been performed:").format(self.user.first_name, self.user.last_name)
         self.valid = False
 
     def _are_deductions_valid(self):
diff --git a/intervention/tables.py b/intervention/tables.py
index 39cae2a..76d4018 100644
--- a/intervention/tables.py
+++ b/intervention/tables.py
@@ -33,6 +33,11 @@ class InterventionTable(BaseTable, TableRenderMixin, TableOrderMixin):
         verbose_name=_("Parcel gmrkng"),
         orderable=False,
         accessor="geometry",
+        attrs={
+            "th": {
+                "class": "w-25",
+            }
+        }
     )
     c = tables.Column(
         verbose_name=_("Checked"),
diff --git a/intervention/views/intervention.py b/intervention/views/intervention.py
index e04f628..3371167 100644
--- a/intervention/views/intervention.py
+++ b/intervention/views/intervention.py
@@ -39,7 +39,7 @@ def index_view(request: HttpRequest):
     """
     template = "generic_index.html"
 
-    # Filtering by user access is performed in table filter inside of InterventionTableFilter class
+    # Filtering by user access is performed in table filter inside InterventionTableFilter class
     interventions = Intervention.objects.filter(
         deleted=None,  # not deleted
     ).select_related(
diff --git a/konova/forms/modals/record_form.py b/konova/forms/modals/record_form.py
index 812b697..b27111a 100644
--- a/konova/forms/modals/record_form.py
+++ b/konova/forms/modals/record_form.py
@@ -27,7 +27,7 @@ class RecordModalForm(BaseModalForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.form_title = _("Record data")
-        self.form_caption = _("I, {} {}, confirm that all necessary control steps have been performed by myself.").format(self.user.first_name, self.user.last_name)
+        self.form_caption = _("The necessary control steps have been performed:").format(self.user.first_name, self.user.last_name)
         # Disable automatic w-100 setting for this type of modal form. Looks kinda strange
         self.fields["confirm"].widget.attrs["class"] = ""
 
diff --git a/konova/models/geometry.py b/konova/models/geometry.py
index d87e557..938c852 100644
--- a/konova/models/geometry.py
+++ b/konova/models/geometry.py
@@ -370,6 +370,9 @@ class Geometry(BaseResource):
         Returns:
             complexity_factor (float): The estimated complexity
         """
+        if self.geom.empty:
+            return 0
+
         geom_envelope = self.geom.envelope
         diff = geom_envelope - self.geom
         complexity_factor = 1 - self.geom.area / diff.area
diff --git a/konova/tests/test_views.py b/konova/tests/test_views.py
index c540e78..860b361 100644
--- a/konova/tests/test_views.py
+++ b/konova/tests/test_views.py
@@ -146,7 +146,6 @@ class BaseTestCase(TestCase):
         geometry = Geometry.objects.create()
         # Finally create main object, holding the other objects
         intervention = Intervention.objects.create(
-            identifier="TEST",
             title="Test_title",
             responsible=responsibility_data,
             legal=legal_data,
@@ -174,7 +173,6 @@ class BaseTestCase(TestCase):
         geometry = Geometry.objects.create()
         # Finally create main object, holding the other objects
         compensation = Compensation.objects.create(
-            identifier="TEST",
             title="Test_title",
             intervention=interv,
             created=action,
@@ -200,10 +198,8 @@ class BaseTestCase(TestCase):
         responsible_data.handler = handler
         responsible_data.save()
 
-        identifier = EcoAccount().generate_new_identifier()
         # Finally create main object, holding the other objects
         eco_account = EcoAccount.objects.create(
-            identifier=identifier,
             title="Test_title",
             deductable_surface=500,
             legal=lega_data,
@@ -230,7 +226,6 @@ class BaseTestCase(TestCase):
         responsible_data.save()
         # Finally create main object, holding the other objects
         ema = Ema.objects.create(
-            identifier="TEST",
             title="Test_title",
             responsible=responsible_data,
             created=action,
@@ -474,7 +469,7 @@ class BaseTestCase(TestCase):
         eco_account.save()
         return eco_account
 
-    def assert_equal_geometries(self, geom1: MultiPolygon, geom2: MultiPolygon):
+    def assert_equal_geometries(self, geom1: MultiPolygon, geom2: MultiPolygon, tolerance = 0.001):
         """ Assert for geometries to be equal
 
         Transforms the geometries to matching srids before checking
@@ -491,7 +486,6 @@ class BaseTestCase(TestCase):
             self.assertTrue(True)
             return
 
-        tolerance = 0.001
         if geom1.srid != geom2.srid:
             # Due to prior possible transformation of any of these geometries, we need to make sure there exists a
             # transformation from one coordinate system into the other, which is valid
diff --git a/konova/tests/unit/test_forms.py b/konova/tests/unit/test_forms.py
index 3cbb437..190a756 100644
--- a/konova/tests/unit/test_forms.py
+++ b/konova/tests/unit/test_forms.py
@@ -152,7 +152,7 @@ class RecordModalFormTestCase(BaseTestCase):
         )
         self.assertEqual(form.form_title, str(_("Record data")))
         self.assertEqual(form.form_caption, str(
-            _("I, {} {}, confirm that all necessary control steps have been performed by myself.").format(
+            _("The necessary control steps have been performed:").format(
             self.user.first_name,
             self.user.last_name
             )
diff --git a/konova/utils/tables.py b/konova/utils/tables.py
index d64c766..4878548 100644
--- a/konova/utils/tables.py
+++ b/konova/utils/tables.py
@@ -173,9 +173,13 @@ class TableRenderMixin:
         Returns:
 
         """
+        value_orig = value
         max_length = 75
         if len(value) > max_length:
             value = f"{value[:max_length]}..."
+        value = format_html(
+            f'<div title="{value_orig}">{value}</div>'
+        )
         return value
 
     def render_d(self, value, record: GeoReferencedMixin):
diff --git a/konova/views/geometry.py b/konova/views/geometry.py
index 0a58a3c..767762f 100644
--- a/konova/views/geometry.py
+++ b/konova/views/geometry.py
@@ -33,9 +33,6 @@ class GeomParcelsView(LoginRequiredMixin, View):
         Returns:
             A rendered piece of HTML
         """
-        # HTTP code 286 states that the HTMX should stop polling for updates
-        # https://htmx.org/docs/#polling
-        status_code = 286
         template = "konova/includes/parcels/parcel_table_frame.html"
 
         geom = get_object_or_404(Geometry, id=id)
@@ -49,22 +46,26 @@ class GeomParcelsView(LoginRequiredMixin, View):
 
         waiting_too_long = self._check_waiting_too_long(geom)
 
-        parcels_are_currently_calculated = (
-                geometry_exists and
-                not parcels_are_available and
-                geom_parcel_update_started and
-                not geom_parcel_update_finished
-        )
-
-        if not parcels_are_available and waiting_too_long:
-            # Trigger calculation again - process may have failed in the background
+        if geometry_exists and not parcels_are_available and waiting_too_long:
+            # Trigger calculation again - process may have failed silently
             celery_update_parcels.delay(geom.id)
             parcels_are_currently_calculated = True
+        else:
+            parcels_are_currently_calculated = (
+                    geometry_exists and
+                    not parcels_are_available and
+                    geom_parcel_update_started and
+                    not geom_parcel_update_finished
+            )
 
         if parcels_are_currently_calculated:
             # Parcels are being calculated right now. Change the status code, so polling stays active for fetching
             # results after the calculation
             status_code = 200
+        else:
+            # HTTP code 286 states that the HTMX should stop polling for updates
+            # https://htmx.org/docs/#polling
+            status_code = 286
 
         if parcels_are_available or not geometry_exists:
             # Default case: Parcels are calculated or there is no geometry at all
diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo
index ff48ee9b246e525b380b8e45bd5bad366e374a04..1db23bbc18df338c482d750c6dbcfbc6c146d82e 100644
GIT binary patch
delta 9263
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
AQvd(}

delta 9266
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

diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index c34cf2d..cd34fbe 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -321,7 +321,7 @@ msgstr ""
 #: intervention/templates/intervention/detail/view.html:39
 #: intervention/templates/intervention/report/report.html:20
 msgid "Law"
-msgstr "Gesetz"
+msgstr "Rechtsgrundlage"
 
 #: analysis/templates/analysis/reports/includes/old_data/amount.html:17
 #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:33
@@ -1452,11 +1452,9 @@ msgstr "Prüfung vornehmen"
 #: intervention/forms/modals/check.py:36 konova/forms/modals/record_form.py:30
 #: konova/tests/unit/test_forms.py:155
 msgid ""
-"I, {} {}, confirm that all necessary control steps have been performed by "
-"myself."
+"The necessary control steps have been performed:"
 msgstr ""
-"Ich, {} {}, bestätige, dass die notwendigen Kontrollschritte durchgeführt "
-"wurden:"
+"Die notwendigen Kontrollschritte wurden durchgeführt:"
 
 #: intervention/forms/modals/deduction.py:33
 msgid "Only recorded accounts can be selected for deductions"