Merge branch 'master' into 138_New_map_client

# Conflicts:
#	konova/models/geometry.py
#	konova/urls.py
#	locale/de/LC_MESSAGES/django.mo
#	locale/de/LC_MESSAGES/django.po

compensation/forms/modalForms.py

@@ -17,7 +17,8 @@ from codelist.models import KonovaCode
 from codelist.settings import CODELIST_BIOTOPES_ID, CODELIST_COMPENSATION_ACTION_ID, CODELIST_BIOTOPES_EXTRA_CODES_ID, \
     CODELIST_COMPENSATION_ACTION_DETAIL_ID
 from compensation.models import CompensationDocument, EcoAccountDocument
-from intervention.inputs import CompensationActionTreeCheckboxSelectMultiple
+from intervention.inputs import CompensationActionTreeCheckboxSelectMultiple, \
+    CompensationStateTreeRadioSelect
 from konova.contexts import BaseContext
 from konova.forms import BaseModalForm, NewDocumentModalForm, RemoveModalForm
 from konova.models import DeadlineType
@@ -128,6 +129,7 @@ class EditPaymentModalForm(NewPaymentForm):
         payment.comment = self.cleaned_data.get("comment", None)
         payment.save()
         self.instance.mark_as_edited(self.user, self.request, edit_comment=PAYMENT_EDITED)
+        self.instance.send_data_to_egon()
         return payment
 
 
@@ -155,22 +157,12 @@ class NewStateModalForm(BaseModalForm):
     What has been on this area before changes/compensations have been applied and what will be the result ('after')?
 
     """
-    biotope_type = forms.ModelChoiceField(
+    biotope_type = forms.ChoiceField(
         label=_("Biotope Type"),
         label_suffix="",
         required=True,
         help_text=_("Select the biotope type"),
-        queryset=KonovaCode.objects.filter(
-            is_archived=False,
-            is_leaf=True,
-            code_lists__in=[CODELIST_BIOTOPES_ID],
-        ),
-        widget=autocomplete.ModelSelect2(
-            url="codes-biotope-autocomplete",
-            attrs={
-                "data-placeholder": _("Biotope Type"),
-            }
-        ),
+        widget=CompensationStateTreeRadioSelect(),
     )
     biotope_extra = forms.ModelMultipleChoiceField(
         label=_("Biotope additional type"),
@@ -208,6 +200,16 @@ class NewStateModalForm(BaseModalForm):
         super().__init__(*args, **kwargs)
         self.form_title = _("New state")
         self.form_caption = _("Insert data for the new state")
+        choices = KonovaCode.objects.filter(
+            code_lists__in=[CODELIST_BIOTOPES_ID],
+            is_archived=False,
+            is_leaf=True,
+        ).values_list("id", flat=True)
+        choices = [
+            (choice, choice)
+            for choice in choices
+        ]
+        self.fields["biotope_type"].choices = choices
 
     def save(self, is_before_state: bool = False):
         state = self.instance.add_state(self, is_before_state)
@@ -270,8 +272,9 @@ class EditCompensationStateModalForm(NewStateModalForm):
         self.state = kwargs.pop("state", None)
         super().__init__(*args, **kwargs)
         self.form_title = _("Edit state")
+        biotope_type_id = self.state.biotope_type.id if self.state.biotope_type else None
         form_data = {
-            "biotope_type": self.state.biotope_type,
+            "biotope_type": biotope_type_id,
             "biotope_extra": self.state.biotope_type_details.all(),
             "surface": self.state.surface,
         }
@@ -279,7 +282,8 @@ class EditCompensationStateModalForm(NewStateModalForm):
 
     def save(self, is_before_state: bool = False):
         state = self.state
-        state.biotope_type = self.cleaned_data.get("biotope_type", None)
+        biotope_type_id = self.cleaned_data.get("biotope_type", None)
+        state.biotope_type = KonovaCode.objects.get(id=biotope_type_id)
         state.biotope_type_details.set(self.cleaned_data.get("biotope_extra", []))
         state.surface = self.cleaned_data.get("surface", None)
         state.save()

compensation/models/compensation.py

@@ -8,6 +8,8 @@ Created on: 16.11.21
 import shutil
 
 from django.contrib import messages
+
+from codelist.models import KonovaCode
 from user.models import User, Team
 from django.db import models, transaction
 from django.db.models import QuerySet, Sum
@@ -142,8 +144,10 @@ class AbstractCompensation(BaseObject, GeoReferencedMixin):
         """
         form_data = form.cleaned_data
         with transaction.atomic():
+            biotope_type_id = form_data["biotope_type"]
+            code = KonovaCode.objects.get(id=biotope_type_id)
             state = CompensationState.objects.create(
-                biotope_type=form_data["biotope_type"],
+                biotope_type=code,
                 surface=form_data["surface"],
             )
             state_additional_types = form_data["biotope_extra"]

compensation/templates/compensation/detail/compensation/view.html

@@ -124,7 +124,7 @@
                     </div>
                 </div>
                 <div class="row">
-                    {% include 'konova/includes/parcels.html' %}
+                    {% include 'konova/includes/parcels/parcels.html' %}
                 </div>
                 <div class="row">
                     {% include 'konova/includes/comment_card.html' %}

compensation/templates/compensation/detail/eco_account/view.html

@@ -106,7 +106,7 @@
                 </div>
             </div>
             <div class="row">
-                {% include 'konova/includes/parcels.html' %}
+                {% include 'konova/includes/parcels/parcels.html' %}
             </div>
             <div class="row">
                 {% include 'konova/includes/comment_card.html' %}

compensation/templates/compensation/report/compensation/report.html

@@ -40,7 +40,7 @@
             </div>
         </div>
         <div class="row">
-            {% include 'konova/includes/parcels.html' %}
+            {% include 'konova/includes/parcels/parcels.html' %}
         </div>
         <div class="row">
             {% include 'konova/includes/report/qrcodes.html' %}

compensation/templates/compensation/report/eco_account/report.html

@@ -53,7 +53,7 @@
             </div>
         </div>
         <div class="row">
-            {% include 'konova/includes/parcels.html' %}
+            {% include 'konova/includes/parcels/parcels.html' %}
         </div>
         <div class="row">
             {% include 'konova/includes/report/qrcodes.html' %}