Merge branch 'master' into 132_Old_entries

# Conflicts: # konova/management/commands/update_all_parcels.py # konova/urls.py # user/admin.py
2022-06-01 13:12:35 +02:00
parent 06af30fc49 5cf4dbf2a4
commit dd5cbbef10
160 changed files with 62451 additions and 794 deletions
--- a/compensation/forms/forms.py
+++ b/compensation/forms/forms.py
@@ -160,7 +160,23 @@ class CoherenceCompensationFormMixin(forms.Form):
    )


-class NewCompensationForm(AbstractCompensationForm, CEFCompensationFormMixin, CoherenceCompensationFormMixin):
+class PikCompensationFormMixin(forms.Form):
+    """ A form mixin, providing PIK compensation field
+
+    """
+    is_pik = forms.BooleanField(
+        label_suffix="",
+        label=_("Is PIK"),
+        help_text=_("Optionally: Whether this compensation is a compensation integrated in production?"),
+        required=False,
+        widget=forms.CheckboxInput()
+    )
+
+
+class NewCompensationForm(AbstractCompensationForm,
+                          CEFCompensationFormMixin,
+                          CoherenceCompensationFormMixin,
+                          PikCompensationFormMixin):
    """ Form for creating new compensations.

    Can be initialized with an intervention id for preselecting the related intervention.
@@ -191,6 +207,7 @@ class NewCompensationForm(AbstractCompensationForm, CEFCompensationFormMixin, Co
        "identifier",
        "title",
        "intervention",
+        "is_pik",
        "is_cef",
        "is_coherence_keeping",
        "comment",
@@ -234,6 +251,7 @@ class NewCompensationForm(AbstractCompensationForm, CEFCompensationFormMixin, Co
        intervention = self.cleaned_data.get("intervention", None)
        is_cef = self.cleaned_data.get("is_cef", None)
        is_coherence_keeping = self.cleaned_data.get("is_coherence_keeping", None)
+        is_pik = self.cleaned_data.get("is_pik", None)
        comment = self.cleaned_data.get("comment", None)

        # Create log entry
@@ -249,6 +267,7 @@ class NewCompensationForm(AbstractCompensationForm, CEFCompensationFormMixin, Co
            created=action,
            is_cef=is_cef,
            is_coherence_keeping=is_coherence_keeping,
+            is_pik=is_pik,
            geometry=geometry,
            comment=comment,
        )
@@ -281,6 +300,7 @@ class EditCompensationForm(NewCompensationForm):
            "intervention": self.instance.intervention,
            "is_cef": self.instance.is_cef,
            "is_coherence_keeping": self.instance.is_coherence_keeping,
+            "is_pik": self.instance.is_pik,
            "comment": self.instance.comment,
        }
        disabled_fields = []
@@ -297,6 +317,7 @@ class EditCompensationForm(NewCompensationForm):
            intervention = self.cleaned_data.get("intervention", None)
            is_cef = self.cleaned_data.get("is_cef", None)
            is_coherence_keeping = self.cleaned_data.get("is_coherence_keeping", None)
+            is_pik = self.cleaned_data.get("is_pik", None)
            comment = self.cleaned_data.get("comment", None)

            # Create log entry
@@ -313,6 +334,7 @@ class EditCompensationForm(NewCompensationForm):
            self.instance.is_cef = is_cef
            self.instance.is_coherence_keeping = is_coherence_keeping
            self.instance.comment = comment
+            self.instance.is_pik = is_pik
            self.instance.modified = action
            self.instance.save()

@@ -322,7 +344,7 @@ class EditCompensationForm(NewCompensationForm):
        return self.instance


-class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMixin):
+class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMixin, PikCompensationFormMixin):
    """ Form for creating eco accounts

    Inherits from basic AbstractCompensationForm and further form fields from CompensationResponsibleFormMixin
@@ -363,6 +385,7 @@ class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMix
        "registration_date",
        "surface",
        "conservation_file_number",
+        "is_pik",
        "handler_type",
        "handler_detail",
        "comment",
@@ -392,6 +415,7 @@ class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMix
            surface = self.cleaned_data.get("surface", None)
            conservation_office = self.cleaned_data.get("conservation_office", None)
            conservation_file_number = self.cleaned_data.get("conservation_file_number", None)
+            is_pik = self.cleaned_data.get("is_pik", None)
            comment = self.cleaned_data.get("comment", None)

            # Create log entry
@@ -423,6 +447,7 @@ class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMix
                created=action,
                geometry=geometry,
                comment=comment,
+                is_pik=is_pik,
                legal=legal
            )
            acc.share_with_user(user)
@@ -458,6 +483,7 @@ class EditEcoAccountForm(NewEcoAccountForm):
            "registration_date": reg_date,
            "conservation_office": self.instance.responsible.conservation_office,
            "conservation_file_number": self.instance.responsible.conservation_file_number,
+            "is_pik": self.instance.is_pik,
            "comment": self.instance.comment,
        }
        disabled_fields = []
@@ -478,6 +504,7 @@ class EditEcoAccountForm(NewEcoAccountForm):
            conservation_office = self.cleaned_data.get("conservation_office", None)
            conservation_file_number = self.cleaned_data.get("conservation_file_number", None)
            comment = self.cleaned_data.get("comment", None)
+            is_pik = self.cleaned_data.get("is_pik", None)

            # Create log entry
            action = UserActionLogEntry.get_edited_action(user)
@@ -503,6 +530,7 @@ class EditEcoAccountForm(NewEcoAccountForm):
            self.instance.deductable_surface = surface
            self.instance.geometry = geometry
            self.instance.comment = comment
+            self.instance.is_pik = is_pik
            self.instance.modified = action
            self.instance.save()

--- a/compensation/forms/modalForms.py
+++ b/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()