| {% trans 'Is CEF compensation' %} |
@@ -66,6 +76,11 @@
{% fa5_icon 'star' 'far' %}
+ {% if last_checked %}
+
+ {% fa5_icon 'star' 'fas' %}
+
+ {% endif %}
{% else %}
{% fa5_icon 'star' %}
@@ -104,7 +119,7 @@
| {% trans 'Shared with' %} |
- {% for team in obj.intervention.teams.all %}
+ {% for team in obj.intervention.shared_teams %}
{% include 'user/includes/team_data_modal_button.html' %}
{% endfor %}
@@ -119,7 +134,9 @@
- {% include 'map/geom_form.html' %}
+
+ {% include 'map/geom_form.html' %}
+
{% include 'konova/includes/parcels/parcels.html' %}
diff --git a/compensation/templates/compensation/detail/eco_account/view.html b/compensation/templates/compensation/detail/eco_account/view.html
index 0eb354fe..432315a8 100644
--- a/compensation/templates/compensation/detail/eco_account/view.html
+++ b/compensation/templates/compensation/detail/eco_account/view.html
@@ -70,6 +70,16 @@
{% trans 'Action handler' %} |
{{obj.responsible.handler|default_if_none:""}} |
|
+
+ | {% trans 'Is PIK' %} |
+
+ {% if obj.is_pik %}
+ {% trans 'Yes' %}
+ {% else %}
+ {% trans 'No' %}
+ {% endif %}
+ |
+
| {% trans 'Last modified' %} |
@@ -87,7 +97,7 @@
|
| {% trans 'Shared with' %} |
- {% for team in obj.teams.all %}
+ {% for team in obj.shared_teams %}
{% include 'user/includes/team_data_modal_button.html' %}
{% endfor %}
@@ -101,7 +111,9 @@
- {% include 'map/geom_form.html' %}
+
+ {% include 'map/geom_form.html' %}
+
{% include 'konova/includes/parcels/parcels.html' %}
diff --git a/compensation/templates/compensation/report/compensation/report.html b/compensation/templates/compensation/report/compensation/report.html
index 7088ff07..2be278aa 100644
--- a/compensation/templates/compensation/report/compensation/report.html
+++ b/compensation/templates/compensation/report/compensation/report.html
@@ -20,6 +20,36 @@
|
+
+ | {% trans 'Is PIK' %} |
+
+ {% if obj.is_pik %}
+ {% trans 'Yes' %}
+ {% else %}
+ {% trans 'No' %}
+ {% endif %}
+ |
+
+
+ | {% trans 'Is CEF' %} |
+
+ {% if obj.is_cef %}
+ {% trans 'Yes' %}
+ {% else %}
+ {% trans 'No' %}
+ {% endif %}
+ |
+
+
+ | {% trans 'Is coherence keeping' %} |
+
+ {% if obj.is_coherence_keeping %}
+ {% trans 'Yes' %}
+ {% else %}
+ {% trans 'No' %}
+ {% endif %}
+ |
+
| {% trans 'Last modified' %} |
@@ -35,7 +65,9 @@
- {% include 'map/geom_form.html' %}
+
+ {% include 'map/geom_form.html' %}
+
{% include 'konova/includes/parcels/parcels.html' %}
diff --git a/compensation/templates/compensation/report/eco_account/report.html b/compensation/templates/compensation/report/eco_account/report.html
index a3632ee2..e2147f69 100644
--- a/compensation/templates/compensation/report/eco_account/report.html
+++ b/compensation/templates/compensation/report/eco_account/report.html
@@ -20,6 +20,16 @@
{% trans 'Conservation office file number' %} |
{{obj.responsible.conservation_file_number|default_if_none:""}} |
|
+
+ | {% trans 'Is PIK' %} |
+
+ {% if obj.is_pik %}
+ {% trans 'Yes' %}
+ {% else %}
+ {% trans 'No' %}
+ {% endif %}
+ |
+
| {% trans 'Deductions for' %} |
@@ -48,7 +58,9 @@
- {% include 'map/geom_form.html' %}
+
+ {% include 'map/geom_form.html' %}
+
{% include 'konova/includes/parcels/parcels.html' %}
diff --git a/compensation/tests/compensation/test_workflow.py b/compensation/tests/compensation/test_workflow.py
index 570045f2..bba12334 100644
--- a/compensation/tests/compensation/test_workflow.py
+++ b/compensation/tests/compensation/test_workflow.py
@@ -50,10 +50,11 @@ class CompensationWorkflowTestCase(BaseWorkflowTestCase):
test_id = self.create_dummy_string()
test_title = self.create_dummy_string()
test_geom = self.create_dummy_geometry()
+ geom_json = self.create_geojson(test_geom)
post_data = {
"identifier": test_id,
"title": test_title,
- "geom": test_geom.geojson,
+ "geom": geom_json,
"intervention": self.intervention.id,
}
pre_creation_intervention_log_count = self.intervention.log.count()
@@ -88,10 +89,11 @@ class CompensationWorkflowTestCase(BaseWorkflowTestCase):
test_id = self.create_dummy_string()
test_title = self.create_dummy_string()
test_geom = self.create_dummy_geometry()
+ geom_json = self.create_geojson(test_geom)
post_data = {
"identifier": test_id,
"title": test_title,
- "geom": test_geom.geojson,
+ "geom": geom_json,
}
pre_creation_intervention_log_count = self.intervention.log.count()
@@ -126,6 +128,7 @@ class CompensationWorkflowTestCase(BaseWorkflowTestCase):
new_identifier = self.create_dummy_string()
new_comment = self.create_dummy_string()
new_geometry = MultiPolygon(srid=4326) # Create an empty geometry
+ geojson = self.create_geojson(new_geometry)
check_on_elements = {
self.compensation.title: new_title,
@@ -140,7 +143,7 @@ class CompensationWorkflowTestCase(BaseWorkflowTestCase):
"title": new_title,
"intervention": self.intervention.id, # just keep the intervention as it is
"comment": new_comment,
- "geom": new_geometry.geojson,
+ "geom": geojson,
}
self.client_user.post(url, post_data)
self.compensation.refresh_from_db()
diff --git a/compensation/tests/ecoaccount/test_workflow.py b/compensation/tests/ecoaccount/test_workflow.py
index bd6894ae..d1a3cf09 100644
--- a/compensation/tests/ecoaccount/test_workflow.py
+++ b/compensation/tests/ecoaccount/test_workflow.py
@@ -40,12 +40,13 @@ class EcoAccountWorkflowTestCase(BaseWorkflowTestCase):
test_id = self.create_dummy_string()
test_title = self.create_dummy_string()
test_geom = self.create_dummy_geometry()
+ geom_json = self.create_geojson(test_geom)
test_deductable_surface = 1000
test_conservation_office = self.get_conservation_office_code()
post_data = {
"identifier": test_id,
"title": test_title,
- "geom": test_geom.geojson,
+ "geom": geom_json,
"deductable_surface": test_deductable_surface,
"conservation_office": test_conservation_office.id
}
diff --git a/compensation/views/compensation.py b/compensation/views/compensation.py
index c3d3e2b5..31087ed7 100644
--- a/compensation/views/compensation.py
+++ b/compensation/views/compensation.py
@@ -23,7 +23,7 @@ from konova.utils.message_templates import FORM_INVALID, IDENTIFIER_REPLACED, DA
CHECKED_RECORDED_RESET, COMPENSATION_ADDED_TEMPLATE, COMPENSATION_REMOVED_TEMPLATE, DOCUMENT_ADDED, \
COMPENSATION_STATE_REMOVED, COMPENSATION_STATE_ADDED, COMPENSATION_ACTION_REMOVED, COMPENSATION_ACTION_ADDED, \
DEADLINE_ADDED, DEADLINE_REMOVED, DOCUMENT_EDITED, COMPENSATION_STATE_EDITED, COMPENSATION_ACTION_EDITED, \
- DEADLINE_EDITED, RECORDED_BLOCKS_EDIT, PARAMS_INVALID
+ DEADLINE_EDITED, RECORDED_BLOCKS_EDIT, PARAMS_INVALID, DATA_CHECKED_PREVIOUSLY_TEMPLATE
from konova.utils.user_checks import in_group
@@ -217,8 +217,15 @@ def detail_view(request: HttpRequest, id: str):
request = comp.set_status_messages(request)
+ last_checked = comp.intervention.get_last_checked_action()
+ last_checked_tooltip = ""
+ if last_checked:
+ last_checked_tooltip = DATA_CHECKED_PREVIOUSLY_TEMPLATE.format(last_checked.get_timestamp_str_formatted(), last_checked.user)
+
context = {
"obj": comp,
+ "last_checked": last_checked,
+ "last_checked_tooltip": last_checked_tooltip,
"geom_form": geom_form,
"parcels": parcels,
"has_access": is_data_shared,
diff --git a/ema/forms.py b/ema/forms.py
index 91b8de19..a7e82c4f 100644
--- a/ema/forms.py
+++ b/ema/forms.py
@@ -12,14 +12,15 @@ from django.db import transaction
from django.urls import reverse, reverse_lazy
from django.utils.translation import gettext_lazy as _
-from compensation.forms.forms import AbstractCompensationForm, CompensationResponsibleFormMixin
+from compensation.forms.forms import AbstractCompensationForm, CompensationResponsibleFormMixin, \
+ PikCompensationFormMixin
from ema.models import Ema, EmaDocument
from intervention.models import Responsibility, Handler
from konova.forms import SimpleGeomForm, NewDocumentModalForm
from user.models import UserActionLogEntry
-class NewEmaForm(AbstractCompensationForm, CompensationResponsibleFormMixin):
+class NewEmaForm(AbstractCompensationForm, CompensationResponsibleFormMixin, PikCompensationFormMixin):
""" Form for creating new EMA objects.
Inherits basic form fields from AbstractCompensationForm and additional from CompensationResponsibleFormMixin.
@@ -31,6 +32,7 @@ class NewEmaForm(AbstractCompensationForm, CompensationResponsibleFormMixin):
"title",
"conservation_office",
"conservation_file_number",
+ "is_pik",
"handler_type",
"handler_detail",
"comment",
@@ -58,6 +60,7 @@ class NewEmaForm(AbstractCompensationForm, CompensationResponsibleFormMixin):
handler_detail = self.cleaned_data.get("handler_detail", 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
@@ -83,6 +86,7 @@ class NewEmaForm(AbstractCompensationForm, CompensationResponsibleFormMixin):
created=action,
geometry=geometry,
comment=comment,
+ is_pik=is_pik,
)
# Add the creating user to the list of shared users
@@ -116,6 +120,7 @@ class EditEmaForm(NewEmaForm):
"conservation_office": self.instance.responsible.conservation_office,
"conservation_file_number": self.instance.responsible.conservation_file_number,
"comment": self.instance.comment,
+ "is_pik": self.instance.is_pik,
}
disabled_fields = []
self.load_initial_data(
@@ -133,6 +138,7 @@ class EditEmaForm(NewEmaForm):
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)
@@ -152,6 +158,7 @@ class EditEmaForm(NewEmaForm):
self.instance.title = title
self.instance.geometry = geometry
self.instance.comment = comment
+ self.instance.is_pik = is_pik
self.instance.modified = action
self.instance.save()
diff --git a/ema/migrations/0004_ema_is_pik.py b/ema/migrations/0004_ema_is_pik.py
new file mode 100644
index 00000000..534155a7
--- /dev/null
+++ b/ema/migrations/0004_ema_is_pik.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.1.3 on 2022-05-31 10:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('ema', '0003_ema_teams'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='ema',
+ name='is_pik',
+ field=models.BooleanField(blank=True, default=False, help_text="Flag if compensation is a 'Produktonsintegrierte Kompensation'", null=True),
+ ),
+ ]
diff --git a/ema/models/ema.py b/ema/models/ema.py
index 983bdbd7..abec7c43 100644
--- a/ema/models/ema.py
+++ b/ema/models/ema.py
@@ -13,15 +13,14 @@ from django.db.models import QuerySet
from django.http import HttpRequest
from django.urls import reverse
-from compensation.models import AbstractCompensation
+from compensation.models import AbstractCompensation, PikMixin
from ema.managers import EmaManager
from ema.utils.quality import EmaQualityChecker
from konova.models import AbstractDocument, generate_document_file_upload_path, RecordableObjectMixin, ShareableObjectMixin
-from konova.settings import DEFAULT_SRID_RLP, LANIS_LINK_TEMPLATE
from konova.utils.message_templates import DATA_UNSHARED_EXPLANATION, DOCUMENT_REMOVED_TEMPLATE
-class Ema(AbstractCompensation, ShareableObjectMixin, RecordableObjectMixin):
+class Ema(AbstractCompensation, ShareableObjectMixin, RecordableObjectMixin, PikMixin):
"""
EMA = Ersatzzahlungsmaßnahme
(compensation actions from payments)
diff --git a/ema/tables.py b/ema/tables.py
index 38d8a8c0..d26a31dc 100644
--- a/ema/tables.py
+++ b/ema/tables.py
@@ -115,7 +115,6 @@ class EmaTable(BaseTable, TableRenderMixin):
)
return html
-
def render_r(self, value, record: Ema):
""" Renders the registered column for a EMA
@@ -130,9 +129,7 @@ class EmaTable(BaseTable, TableRenderMixin):
recorded = value is not None
tooltip = _("Not recorded yet")
if recorded:
- value = value.timestamp
- value = localtime(value)
- on = value.strftime(DEFAULT_DATE_TIME_FORMAT)
+ on = value.get_timestamp_str_formatted()
tooltip = _("Recorded on {} by {}").format(on, record.recorded.user)
html += self.render_bookmark(
tooltip=tooltip,
diff --git a/ema/templates/ema/detail/view.html b/ema/templates/ema/detail/view.html
index 31d26e0b..16f31378 100644
--- a/ema/templates/ema/detail/view.html
+++ b/ema/templates/ema/detail/view.html
@@ -56,6 +56,16 @@
{% trans 'Action handler' %} |
{{obj.responsible.handler|default_if_none:""}} |
|
+
+ | {% trans 'Is PIK' %} |
+
+ {% if obj.is_pik %}
+ {% trans 'Yes' %}
+ {% else %}
+ {% trans 'No' %}
+ {% endif %}
+ |
+
| {% trans 'Last modified' %} |
@@ -73,11 +83,11 @@
|
| {% trans 'Shared with' %} |
- {% for team in obj.teams.all %}
+ {% for team in obj.shared_teams %}
{% include 'user/includes/team_data_modal_button.html' %}
{% endfor %}
- {% for user in obj.users.all %}
+ {% for user in obj.user.all %}
{% include 'user/includes/contact_modal_button.html' %}
{% endfor %}
|
@@ -87,7 +97,9 @@
- {% include 'map/geom_form.html' %}
+
+ {% include 'map/geom_form.html' %}
+
{% include 'konova/includes/parcels/parcels.html' %}
diff --git a/ema/templates/ema/report/report.html b/ema/templates/ema/report/report.html
index 43b64865..fd166596 100644
--- a/ema/templates/ema/report/report.html
+++ b/ema/templates/ema/report/report.html
@@ -20,6 +20,16 @@
{% trans 'Conservation office file number' %} |
{{obj.responsible.conservation_file_number|default_if_none:""}} |
+
+ | {% trans 'Is PIK' %} |
+
+ {% if obj.is_pik %}
+ {% trans 'Yes' %}
+ {% else %}
+ {% trans 'No' %}
+ {% endif %}
+ |
+
| {% trans 'Last modified' %} |
@@ -35,7 +45,9 @@
- {% include 'map/geom_form.html' %}
+
+ {% include 'map/geom_form.html' %}
+
{% include 'konova/includes/parcels/parcels.html' %}
diff --git a/ema/tests/test_workflow.py b/ema/tests/test_workflow.py
index ecc3f195..4391fdc6 100644
--- a/ema/tests/test_workflow.py
+++ b/ema/tests/test_workflow.py
@@ -41,11 +41,12 @@ class EmaWorkflowTestCase(BaseWorkflowTestCase):
test_id = self.create_dummy_string()
test_title = self.create_dummy_string()
test_geom = self.create_dummy_geometry()
+ geom_json = self.create_geojson(test_geom)
test_conservation_office = self.get_conservation_office_code()
post_data = {
"identifier": test_id,
"title": test_title,
- "geom": test_geom.geojson,
+ "geom": geom_json,
"conservation_office": test_conservation_office.id
}
self.client_user.post(new_url, post_data)
diff --git a/intervention/forms/forms.py b/intervention/forms/forms.py
index b83c4fba..b85ba101 100644
--- a/intervention/forms/forms.py
+++ b/intervention/forms/forms.py
@@ -216,6 +216,10 @@ class NewInterventionForm(BaseForm):
identifier = tmp_intervention.generate_new_identifier()
self.initialize_form_field("identifier", identifier)
+ def is_valid(self):
+ super_valid_result = super().is_valid()
+ return super_valid_result
+
def save(self, user: User, geom_form: SimpleGeomForm):
with transaction.atomic():
# Fetch data from cleaned POST values
diff --git a/intervention/inputs.py b/intervention/inputs.py
index 34fe0434..a08c0b74 100644
--- a/intervention/inputs.py
+++ b/intervention/inputs.py
@@ -1,6 +1,6 @@
from django import forms
from codelist.models import KonovaCode
-from codelist.settings import CODELIST_COMPENSATION_ACTION_ID
+from codelist.settings import CODELIST_COMPENSATION_ACTION_ID, CODELIST_BIOTOPES_ID
class DummyFilterInput(forms.HiddenInput):
@@ -38,7 +38,17 @@ class TreeCheckboxSelectMultiple(forms.CheckboxSelectMultiple):
""" Provides multiple selection of parent-child data
"""
- template_name = "konova/widgets/checkbox-tree-select.html"
+ template_name = "konova/widgets/tree/checkbox/checkbox-tree-select.html"
+
+ class meta:
+ abstract = True
+
+
+class TreeRadioSelect(forms.RadioSelect):
+ """ Provides single selection of parent-child data
+
+ """
+ template_name = "konova/widgets/tree/radio/radio-tree-select.html"
class meta:
abstract = True
@@ -68,6 +78,30 @@ class KonovaCodeTreeCheckboxSelectMultiple(TreeCheckboxSelectMultiple):
return context
+class KonovaCodeTreeRadioSelect(TreeRadioSelect):
+ """ Provides single selection of KonovaCode
+
+ """
+ filter = None
+
+ def __init__(self, *args, **kwargs):
+ self.code_list = kwargs.pop("code_list", None)
+ self.filter = kwargs.pop("filter", {})
+ super().__init__(*args, **kwargs)
+
+ def get_context(self, name, value, attrs):
+ context = super().get_context(name, value, attrs)
+ codes = KonovaCode.objects.filter(
+ **self.filter,
+ )
+ codes = [
+ parent_code.add_children()
+ for parent_code in codes
+ ]
+ context["codes"] = codes
+ return context
+
+
class CompensationActionTreeCheckboxSelectMultiple(KonovaCodeTreeCheckboxSelectMultiple):
""" Provides multiple selection of CompensationActions
@@ -79,4 +113,31 @@ class CompensationActionTreeCheckboxSelectMultiple(KonovaCodeTreeCheckboxSelectM
self.filter = {
"code_lists__in": [CODELIST_COMPENSATION_ACTION_ID],
"parent": None,
- }
\ No newline at end of file
+ }
+
+
+class CompensationStateTreeRadioSelect(KonovaCodeTreeRadioSelect):
+ """ Provides single selection of CompensationState
+
+ """
+ filter = None
+
+ def __init__(self, *args, **kwargs):
+ super().__init__(*args, **kwargs)
+ self.filter = {
+ "code_lists__in": [CODELIST_BIOTOPES_ID],
+ "parent": None,
+ "is_archived": False,
+ }
+
+ def get_context(self, name, value, attrs):
+ context = super().get_context(name, value, attrs)
+ codes = KonovaCode.objects.filter(
+ **self.filter,
+ )
+ codes = [
+ parent_code.add_children("short_name")
+ for parent_code in codes
+ ]
+ context["codes"] = codes
+ return context
\ No newline at end of file
diff --git a/intervention/tables.py b/intervention/tables.py
index 8f312099..cff9391c 100644
--- a/intervention/tables.py
+++ b/intervention/tables.py
@@ -9,12 +9,11 @@ from django.http import HttpRequest
from django.template.loader import render_to_string
from django.urls import reverse
from django.utils.html import format_html
-from django.utils.timezone import localtime
from django.utils.translation import gettext_lazy as _
from intervention.filters import InterventionTableFilter
from intervention.models import Intervention
-from konova.sub_settings.django_settings import DEFAULT_DATE_TIME_FORMAT, DEFAULT_DATE_FORMAT
+from konova.utils.message_templates import DATA_CHECKED_ON_TEMPLATE, DATA_IS_UNCHECKED, DATA_CHECKED_PREVIOUSLY_TEMPLATE
from konova.utils.tables import BaseTable, TableRenderMixin
import django_tables2 as tables
@@ -108,16 +107,21 @@ class InterventionTable(BaseTable, TableRenderMixin):
"""
html = ""
checked = value is not None
- tooltip = _("Not checked yet")
+ previously_checked = record.get_last_checked_action()
+ tooltip = DATA_IS_UNCHECKED
if checked:
- value = value.timestamp
- value = localtime(value)
- checked_on = value.strftime(DEFAULT_DATE_TIME_FORMAT)
- tooltip = _("Checked on {} by {}").format(checked_on, record.checked.user)
+ checked_on = value.get_timestamp_str_formatted()
+ tooltip = DATA_CHECKED_ON_TEMPLATE.format(checked_on, record.checked.user)
html += self.render_checked_star(
tooltip=tooltip,
icn_filled=checked,
)
+ if previously_checked and not checked:
+ checked_on = previously_checked.get_timestamp_str_formatted()
+ tooltip = DATA_CHECKED_PREVIOUSLY_TEMPLATE.format(checked_on, previously_checked.user)
+ html += self.render_previously_checked_star(
+ tooltip=tooltip,
+ )
return format_html(html)
def render_d(self, value, record: Intervention):
@@ -156,9 +160,7 @@ class InterventionTable(BaseTable, TableRenderMixin):
checked = value is not None
tooltip = _("Not recorded yet")
if checked:
- value = value.timestamp
- value = localtime(value)
- on = value.strftime(DEFAULT_DATE_TIME_FORMAT)
+ on = value.get_timestamp_str_formatted()
tooltip = _("Recorded on {} by {}").format(on, record.recorded.user)
html += self.render_bookmark(
tooltip=tooltip,
diff --git a/intervention/templates/intervention/detail/view.html b/intervention/templates/intervention/detail/view.html
index 2d9628cd..1a596bb0 100644
--- a/intervention/templates/intervention/detail/view.html
+++ b/intervention/templates/intervention/detail/view.html
@@ -70,6 +70,11 @@
{% fa5_icon 'star' 'far' %}
+ {% if last_checked %}
+
+ {% fa5_icon 'star' 'fas' %}
+
+ {% endif %}
{% else %}
{% fa5_icon 'star' %}
@@ -120,7 +125,7 @@
| {% trans 'Shared with' %} |
- {% for team in obj.teams.all %}
+ {% for team in obj.shared_teams %}
{% include 'user/includes/team_data_modal_button.html' %}
{% endfor %}
@@ -134,7 +139,9 @@
- {% include 'map/geom_form.html' %}
+
+ {% include 'map/geom_form.html' %}
+
{% include 'konova/includes/parcels/parcels.html' %}
diff --git a/intervention/templates/intervention/report/report.html b/intervention/templates/intervention/report/report.html
index 6e238fa2..1c1016d0 100644
--- a/intervention/templates/intervention/report/report.html
+++ b/intervention/templates/intervention/report/report.html
@@ -94,7 +94,9 @@
- {% include 'map/geom_form.html' %}
+
+ {% include 'map/geom_form.html' %}
+
{% include 'konova/includes/parcels/parcels.html' %}
diff --git a/intervention/tests/test_workflow.py b/intervention/tests/test_workflow.py
index 66770977..9124c3e8 100644
--- a/intervention/tests/test_workflow.py
+++ b/intervention/tests/test_workflow.py
@@ -46,6 +46,7 @@ class InterventionWorkflowTestCase(BaseWorkflowTestCase):
test_id = self.create_dummy_string()
test_title = self.create_dummy_string()
test_geom = self.create_dummy_geometry()
+ geom_json = self.create_geojson(test_geom)
new_url = reverse("intervention:new", args=())
@@ -59,7 +60,7 @@ class InterventionWorkflowTestCase(BaseWorkflowTestCase):
post_data = {
"identifier": test_id,
"title": test_title,
- "geom": test_geom.geojson,
+ "geom": geom_json,
}
response = self.client_user.post(
new_url,
diff --git a/intervention/views.py b/intervention/views.py
index f882f214..36577202 100644
--- a/intervention/views.py
+++ b/intervention/views.py
@@ -19,7 +19,7 @@ from konova.utils.generators import generate_qr_code
from konova.utils.message_templates import INTERVENTION_INVALID, FORM_INVALID, IDENTIFIER_REPLACED, \
CHECKED_RECORDED_RESET, DEDUCTION_REMOVED, DEDUCTION_ADDED, REVOCATION_ADDED, REVOCATION_REMOVED, \
COMPENSATION_REMOVED_TEMPLATE, DOCUMENT_ADDED, DEDUCTION_EDITED, REVOCATION_EDITED, DOCUMENT_EDITED, \
- RECORDED_BLOCKS_EDIT
+ RECORDED_BLOCKS_EDIT, DATA_CHECKED_PREVIOUSLY_TEMPLATE
from konova.utils.user_checks import in_group
@@ -265,15 +265,18 @@ def detail_view(request: HttpRequest, id: str):
geom_form = SimpleGeomForm(
instance=intervention,
)
-
- parcels = intervention.get_underlying_parcels()
+ last_checked = intervention.get_last_checked_action()
+ last_checked_tooltip = ""
+ if last_checked:
+ last_checked_tooltip = DATA_CHECKED_PREVIOUSLY_TEMPLATE.format(last_checked.get_timestamp_str_formatted(), last_checked.user)
context = {
"obj": intervention,
+ "last_checked": last_checked,
+ "last_checked_tooltip": last_checked_tooltip,
"compensations": compensations,
"has_access": is_data_shared,
"geom_form": geom_form,
- "parcels": parcels,
"is_default_member": in_group(_user, DEFAULT_GROUP),
"is_zb_member": in_group(_user, ZB_GROUP),
"is_ets_member": in_group(_user, ETS_GROUP),
diff --git a/konova/admin.py b/konova/admin.py
index 213120ea..b30f4b14 100644
--- a/konova/admin.py
+++ b/konova/admin.py
@@ -98,6 +98,18 @@ class DeadlineAdmin(admin.ModelAdmin):
]
+class DeletableObjectMixinAdmin(admin.ModelAdmin):
+ class Meta:
+ abstract = True
+
+ def restore_deleted_data(self, request, queryset):
+ queryset = queryset.filter(
+ deleted__isnull=False
+ )
+ for entry in queryset:
+ entry.deleted.delete()
+
+
class BaseResourceAdmin(admin.ModelAdmin):
fields = [
"created",
@@ -109,7 +121,7 @@ class BaseResourceAdmin(admin.ModelAdmin):
]
-class BaseObjectAdmin(BaseResourceAdmin):
+class BaseObjectAdmin(BaseResourceAdmin, DeletableObjectMixinAdmin):
search_fields = [
"identifier",
"title",
@@ -126,13 +138,6 @@ class BaseObjectAdmin(BaseResourceAdmin):
"deleted",
]
- def restore_deleted_data(self, request, queryset):
- queryset = queryset.filter(
- deleted__isnull=False
- )
- for entry in queryset:
- entry.deleted.delete()
-
# Outcommented for a cleaner admin backend on production
diff --git a/konova/autocompletes.py b/konova/autocompletes.py
index e6036f02..fbd92f75 100644
--- a/konova/autocompletes.py
+++ b/konova/autocompletes.py
@@ -96,7 +96,9 @@ class ShareTeamAutocomplete(Select2QuerySetView):
def get_queryset(self):
if self.request.user.is_anonymous:
return Team.objects.none()
- qs = Team.objects.all()
+ qs = Team.objects.filter(
+ deleted__isnull=True
+ )
if self.q:
# Due to privacy concerns only a full username match will return the proper user entry
qs = qs.filter(
@@ -108,6 +110,29 @@ class ShareTeamAutocomplete(Select2QuerySetView):
return qs
+class TeamAdminAutocomplete(Select2QuerySetView):
+ """ Autocomplete for share with teams
+
+ """
+ def get_queryset(self):
+ if self.request.user.is_anonymous:
+ return User.objects.none()
+ qs = User.objects.filter(
+ id__in=self.forwarded.get("members", [])
+ ).exclude(
+ id__in=self.forwarded.get("admins", [])
+ )
+ if self.q:
+ # Due to privacy concerns only a full username match will return the proper user entry
+ qs = qs.filter(
+ name__icontains=self.q
+ )
+ qs = qs.order_by(
+ "username"
+ )
+ return qs
+
+
class KonovaCodeAutocomplete(Select2GroupQuerySetView):
"""
Provides simple autocomplete functionality for codes
diff --git a/konova/filters/mixins.py b/konova/filters/mixins.py
index beb44dac..cfd9cc4c 100644
--- a/konova/filters/mixins.py
+++ b/konova/filters/mixins.py
@@ -305,7 +305,7 @@ class ShareableTableFilterMixin(django_filters.FilterSet):
if not value:
return queryset.filter(
Q(users__in=[self.user]) | # requesting user has access
- Q(teams__users__in=[self.user])
+ Q(teams__in=self.user.shared_teams)
).distinct()
else:
return queryset
diff --git a/konova/forms.py b/konova/forms.py
index a1e14478..0a341e0c 100644
--- a/konova/forms.py
+++ b/konova/forms.py
@@ -5,18 +5,20 @@ Contact: michel.peltriaux@sgdnord.rlp.de
Created on: 16.11.20
"""
-
+import json
from abc import abstractmethod
from bootstrap_modal_forms.forms import BSModalForm
from bootstrap_modal_forms.utils import is_ajax
from django import forms
from django.contrib import messages
+from django.contrib.gis import gdal
from django.db.models.fields.files import FieldFile
+from konova.sub_settings.lanis_settings import DEFAULT_SRID_RLP
from user.models import User
-from django.contrib.gis.forms import OSMWidget, MultiPolygonField
-from django.contrib.gis.geos import MultiPolygon
+from django.contrib.gis.forms import MultiPolygonField
+from django.contrib.gis.geos import MultiPolygon, Polygon
from django.db import transaction
from django.http import HttpRequest, HttpResponseRedirect
from django.shortcuts import render
@@ -272,41 +274,85 @@ class SimpleGeomForm(BaseForm):
""" A geometry form for rendering geometry read-only using a widget
"""
+ read_only = True
geom = MultiPolygonField(
- srid=DEFAULT_SRID,
+ srid=DEFAULT_SRID_RLP,
label=_("Geometry"),
help_text=_(""),
label_suffix="",
required=False,
disabled=False,
- widget=OSMWidget(
- attrs={
- "map_width": 600,
- "map_height": 400,
- # default_zoom defines the nearest possible zoom level from which the JS automatically
- # zooms out if geometry requires a larger view port. So define a larger range for smaller geometries
- "default_zoom": 25,
- }
- )
)
def __init__(self, *args, **kwargs):
- read_only = kwargs.pop("read_only", True)
+ self.read_only = kwargs.pop("read_only", True)
super().__init__(*args, **kwargs)
# Initialize geometry
try:
geom = self.instance.geometry.geom
self.empty = geom.empty
+
+ if self.empty:
+ raise AttributeError
+
+ geojson = self.instance.geometry.as_feature_collection(srid=DEFAULT_SRID_RLP)
+ geom = json.dumps(geojson)
except AttributeError:
# If no geometry exists for this form, we simply set the value to None and zoom to the maximum level
- geom = None
+ geom = ""
self.empty = True
- self.fields["geom"].widget.attrs["default_zoom"] = 1
self.initialize_form_field("geom", geom)
- if read_only:
- self.fields["geom"].disabled = True
+
+ def is_valid(self):
+ super().is_valid()
+ is_valid = True
+
+ # Get geojson from form
+ geom = self.data["geom"]
+ if geom is None or len(geom) == 0:
+ # empty geometry is a valid geometry
+ return is_valid
+ geom = json.loads(geom)
+
+ # Write submitted data back into form field to make sure invalid geometry
+ # will be rendered again on failed submit
+ self.initialize_form_field("geom", self.data["geom"])
+
+ # Read geojson into gdal geometry
+ # HINT: This can be simplified if the geojson format holds data in epsg:4326 (GDAL provides direct creation for
+ # this case)
+ features = []
+ features_json = geom.get("features", [])
+ for feature in features_json:
+ g = gdal.OGRGeometry(json.dumps(feature.get("geometry", feature)), srs=DEFAULT_SRID_RLP)
+ if g.geom_type not in ["Polygon", "MultiPolygon"]:
+ self.add_error("geom", _("Only surfaces allowed. Points or lines must be buffered."))
+ is_valid = False
+ return is_valid
+
+ polygon = Polygon.from_ewkt(g.ewkt)
+ is_valid = polygon.valid
+ if not is_valid:
+ self.add_error("geom", polygon.valid_reason)
+ return is_valid
+
+ features.append(polygon)
+ form_geom = MultiPolygon(srid=DEFAULT_SRID_RLP)
+ for feature in features:
+ form_geom = form_geom.union(feature)
+
+ # Make sure to convert into a MultiPolygon. Relevant if a single Polygon is provided.
+ if form_geom.geom_type != "MultiPolygon":
+ form_geom = MultiPolygon(form_geom, srid=DEFAULT_SRID_RLP)
+
+ # Write unioned Multipolygon into cleaned data
+ if self.cleaned_data is None:
+ self.cleaned_data = {}
+ self.cleaned_data["geom"] = form_geom.ewkt
+
+ return is_valid
def save(self, action: UserActionLogEntry):
""" Saves the form's geometry
diff --git a/konova/migrations/0010_auto_20220420_1034.py b/konova/migrations/0010_auto_20220420_1034.py
new file mode 100644
index 00000000..c916ff54
--- /dev/null
+++ b/konova/migrations/0010_auto_20220420_1034.py
@@ -0,0 +1,17 @@
+# Generated by Django 3.1.3 on 2022-04-20 08:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('konova', '0009_auto_20220411_1004'),
+ ]
+
+ operations = [
+ migrations.AddConstraint(
+ model_name='parcel',
+ constraint=models.UniqueConstraint(fields=('district', 'municipal', 'parcel_group', 'flr', 'flrstck_nnr', 'flrstck_zhlr'), name='Unique parcel constraint'),
+ ),
+ ]
diff --git a/konova/migrations/0011_auto_20220420_1101.py b/konova/migrations/0011_auto_20220420_1101.py
new file mode 100644
index 00000000..b402818e
--- /dev/null
+++ b/konova/migrations/0011_auto_20220420_1101.py
@@ -0,0 +1,25 @@
+# Generated by Django 3.1.3 on 2022-04-20 09:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('konova', '0010_auto_20220420_1034'),
+ ]
+
+ operations = [
+ migrations.AddConstraint(
+ model_name='district',
+ constraint=models.UniqueConstraint(fields=('key', 'name'), name='Unique district constraint'),
+ ),
+ migrations.AddConstraint(
+ model_name='municipal',
+ constraint=models.UniqueConstraint(fields=('key', 'name', 'district'), name='Unique municipal constraint'),
+ ),
+ migrations.AddConstraint(
+ model_name='parcelgroup',
+ constraint=models.UniqueConstraint(fields=('key', 'name', 'municipal'), name='Unique parcel group constraint'),
+ ),
+ ]
diff --git a/konova/models/geometry.py b/konova/models/geometry.py
index 283f8508..b996feb7 100644
--- a/konova/models/geometry.py
+++ b/konova/models/geometry.py
@@ -5,11 +5,15 @@ Contact: michel.peltriaux@sgdnord.rlp.de
Created on: 15.11.21
"""
+import json
+
from django.contrib.gis.db.models import MultiPolygonField
-from django.db import models
+from django.contrib.gis.geos import Polygon
+from django.db import models, transaction
from django.utils import timezone
from konova.models import BaseResource, UuidModel
+from konova.sub_settings.lanis_settings import DEFAULT_SRID_RLP
from konova.utils.wfs.spatial import ParcelWFSFetcher
@@ -96,6 +100,7 @@ class Geometry(BaseResource):
objs += set_objs
return objs
+ @transaction.atomic
def update_parcels(self):
""" Updates underlying parcel information
@@ -152,6 +157,7 @@ class Geometry(BaseResource):
underlying_parcels.append(parcel_obj)
# Update the linked parcels
+ self.parcels.clear()
self.parcels.set(underlying_parcels)
# Set the calculated_on intermediate field, so this related data will be found on lookups
@@ -172,7 +178,6 @@ class Geometry(BaseResource):
Returns:
parcels (QuerySet): The related parcels as queryset
"""
-
parcels = self.parcels.filter(
parcelintersection__calculated_on__isnull=False,
).prefetch_related(
@@ -184,6 +189,44 @@ class Geometry(BaseResource):
return parcels
+ def count_underlying_parcels(self):
+ """ Getter for number of underlying parcels
+
+ Returns:
+
+ """
+ num_parcels = self.parcels.filter(
+ parcelintersection__calculated_on__isnull=False,
+ ).count()
+ return num_parcels
+
+ def as_feature_collection(self, srid=DEFAULT_SRID_RLP):
+ """ Returns a FeatureCollection structure holding all polygons of the MultiPolygon as single features
+
+ This method is used to convert a single MultiPolygon into multiple Polygons, which can be used as separated
+ features in the NETGIS map client.
+
+ Args:
+ srid (int): The spatial reference system identifier to be transformed to
+
+ Returns:
+ geojson (dict): The FeatureCollection json (as dict)
+ """
+ geom = self.geom
+ geom.transform(ct=srid)
+
+ polygons = []
+ for coords in geom.coords:
+ p = Polygon(coords[0], srid=geom.srid)
+ polygons.append(p)
+ geojson = {
+ "type": "FeatureCollection",
+ "features": [
+ json.loads(x.geojson) for x in polygons
+ ]
+ }
+ return geojson
+
class GeometryConflict(UuidModel):
"""
diff --git a/konova/models/object.py b/konova/models/object.py
index a1cff71b..b468932a 100644
--- a/konova/models/object.py
+++ b/konova/models/object.py
@@ -87,25 +87,15 @@ class BaseResource(UuidModel):
super().delete()
-class BaseObject(BaseResource):
- """
- A basic object model, which specifies BaseResource.
+class DeletableObjectMixin(models.Model):
+ """ Wraps deleted field and related functionality
- Mainly used for intervention, compensation, ecoaccount
"""
- identifier = models.CharField(max_length=1000, null=True, blank=True)
- title = models.CharField(max_length=1000, null=True, blank=True)
deleted = models.ForeignKey("user.UserActionLogEntry", on_delete=models.SET_NULL, null=True, blank=True, related_name='+')
- comment = models.TextField(null=True, blank=True)
- log = models.ManyToManyField("user.UserActionLogEntry", blank=True, help_text="Keeps all user actions of an object", editable=False)
class Meta:
abstract = True
- @abstractmethod
- def set_status_messages(self, request: HttpRequest):
- raise NotImplementedError
-
def mark_as_deleted(self, user, send_mail: bool = True):
""" Mark an entry as deleted
@@ -140,6 +130,25 @@ class BaseObject(BaseResource):
self.save()
+
+class BaseObject(BaseResource, DeletableObjectMixin):
+ """
+ A basic object model, which specifies BaseResource.
+
+ Mainly used for intervention, compensation, ecoaccount
+ """
+ identifier = models.CharField(max_length=1000, null=True, blank=True)
+ title = models.CharField(max_length=1000, null=True, blank=True)
+ comment = models.TextField(null=True, blank=True)
+ log = models.ManyToManyField("user.UserActionLogEntry", blank=True, help_text="Keeps all user actions of an object", editable=False)
+
+ class Meta:
+ abstract = True
+
+ @abstractmethod
+ def set_status_messages(self, request: HttpRequest):
+ raise NotImplementedError
+
def mark_as_edited(self, performing_user, request: HttpRequest = None, edit_comment: str = None):
""" In case the object or a related object changed the log history needs to be updated
@@ -408,6 +417,20 @@ class CheckableObjectMixin(models.Model):
self.log.add(action)
return action
+ def get_last_checked_action(self):
+ """ Getter for the most recent checked action on the log
+
+ Returns:
+ previously_checked (UserActionLogEntry): The most recent checked action
+ """
+ from user.models import UserAction
+ previously_checked = self.log.filter(
+ action=UserAction.CHECKED
+ ).order_by(
+ "-timestamp"
+ ).first()
+ return previously_checked
+
class ShareableObjectMixin(models.Model):
# Users having access on this object
@@ -470,8 +493,8 @@ class ShareableObjectMixin(models.Model):
Returns:
"""
- directly_shared = self.users.filter(id=user.id).exists()
- team_shared = self.teams.filter(
+ directly_shared = self.shared_users.filter(id=user.id).exists()
+ team_shared = self.shared_teams.filter(
users__in=[user]
).exists()
is_shared = directly_shared or team_shared
@@ -608,7 +631,9 @@ class ShareableObjectMixin(models.Model):
Returns:
teams (QuerySet)
"""
- return self.teams.all()
+ return self.teams.filter(
+ deleted__isnull=True
+ )
@abstractmethod
def get_share_url(self):
@@ -652,10 +677,21 @@ class GeoReferencedMixin(models.Model):
Returns:
parcels (Iterable): An empty list or a Queryset
"""
+ result = []
if self.geometry is not None:
- return self.geometry.get_underlying_parcels()
- else:
- return []
+ result = self.geometry.get_underlying_parcels()
+ return result
+
+ def count_underlying_parcels(self):
+ """ Getter for number of underlying parcels
+
+ Returns:
+
+ """
+ result = 0
+ if self.geometry is not None:
+ result = self.geometry.count_underlying_parcels()
+ return result
def set_geometry_conflict_message(self, request: HttpRequest):
if self.geometry is None:
diff --git a/konova/models/parcel.py b/konova/models/parcel.py
index f74b7af9..cc91e006 100644
--- a/konova/models/parcel.py
+++ b/konova/models/parcel.py
@@ -39,7 +39,17 @@ class District(UuidModel, AdministrativeSpatialReference):
""" The model District refers to "Kreis"
"""
- pass
+
+ class Meta:
+ constraints = [
+ models.UniqueConstraint(
+ fields=[
+ "key",
+ "name",
+ ],
+ name="Unique district constraint"
+ )
+ ]
class Municipal(UuidModel, AdministrativeSpatialReference):
@@ -53,6 +63,18 @@ class Municipal(UuidModel, AdministrativeSpatialReference):
blank=True,
)
+ class Meta:
+ constraints = [
+ models.UniqueConstraint(
+ fields=[
+ "key",
+ "name",
+ "district",
+ ],
+ name="Unique municipal constraint"
+ )
+ ]
+
class ParcelGroup(UuidModel, AdministrativeSpatialReference):
""" The model ParcelGroup refers to "Gemarkung", which is defined as a loose group of parcels
@@ -65,6 +87,18 @@ class ParcelGroup(UuidModel, AdministrativeSpatialReference):
blank=True,
)
+ class Meta:
+ constraints = [
+ models.UniqueConstraint(
+ fields=[
+ "key",
+ "name",
+ "municipal",
+ ],
+ name="Unique parcel group constraint"
+ )
+ ]
+
class Parcel(UuidModel):
""" The Parcel model holds administrative data on covered properties.
@@ -106,6 +140,21 @@ class Parcel(UuidModel):
)
updated_on = models.DateTimeField(auto_now_add=True)
+ class Meta:
+ constraints = [
+ models.UniqueConstraint(
+ fields=[
+ "district",
+ "municipal",
+ "parcel_group",
+ "flr",
+ "flrstck_nnr",
+ "flrstck_zhlr",
+ ],
+ name="Unique parcel constraint"
+ )
+ ]
+
def __str__(self):
return f"{self.parcel_group} | {self.flr} | {self.flrstck_zhlr} | {self.flrstck_nnr}"
diff --git a/konova/static/css/konova.css b/konova/static/css/konova.css
index 7e7f3fd1..ed797046 100644
--- a/konova/static/css/konova.css
+++ b/konova/static/css/konova.css
@@ -262,4 +262,13 @@ Similar to bootstraps 'shadow-lg'
padding-left: 2em;
}
- */
\ No newline at end of file
+ */
+.collapse-icn > i{
+ transition: all 0.3s ease;
+}
+.collapsed .collapse-icn > i{
+ transform: rotate(-90deg);
+}
+.tree-label.badge{
+ font-size: 90%;
+}
\ No newline at end of file
diff --git a/konova/sub_settings/django_settings.py b/konova/sub_settings/django_settings.py
index cbbf7fc5..54c35bee 100644
--- a/konova/sub_settings/django_settings.py
+++ b/konova/sub_settings/django_settings.py
@@ -46,8 +46,8 @@ ALLOWED_HOSTS = [
LOGIN_URL = "/login/"
# Session settings
-#SESSION_COOKIE_AGE = 30 * 60 # 30 minutes
-#SESSION_SAVE_EVERY_REQUEST = True
+SESSION_COOKIE_AGE = 60 * 60 # 60 minutes
+SESSION_SAVE_EVERY_REQUEST = True
# Application definition
@@ -192,6 +192,8 @@ STATIC_URL = '/static/'
STATIC_ROOT = os.path.join(BASE_DIR, "static")
STATICFILES_DIRS = [
os.path.join(BASE_DIR, 'konova/static'),
+ os.path.join(BASE_DIR, 'templates/map/client'), # NETGIS map client files
+ os.path.join(BASE_DIR, 'templates/map/client/libs'), # NETGIS map client files
]
# DJANGO DEBUG TOOLBAR
diff --git a/konova/templates/konova/includes/comment_card.html b/konova/templates/konova/includes/comment_card.html
index a84f378e..d9ea59bc 100644
--- a/konova/templates/konova/includes/comment_card.html
+++ b/konova/templates/konova/includes/comment_card.html
@@ -6,7 +6,7 @@
{% if obj.comment %}
- | | |