{% trans 'Open in browser' %}
diff --git a/compensation/views/compensation.py b/compensation/views/compensation.py
index bfd7ba62..71efb5ee 100644
--- a/compensation/views/compensation.py
+++ b/compensation/views/compensation.py
@@ -453,6 +453,7 @@ def report_view(request: HttpRequest, id: str):
geom_form = SimpleGeomForm(
instance=comp
)
+ parcels = comp.get_underlying_parcels()
qrcode_img = generate_qr_code(
request.build_absolute_uri(reverse("compensation:report", args=(id,))),
10
@@ -474,6 +475,7 @@ def report_view(request: HttpRequest, id: str):
"before_states": before_states,
"after_states": after_states,
"geom_form": geom_form,
+ "parcels": parcels,
"actions": actions,
}
context = BaseContext(request, context).context
diff --git a/compensation/views/eco_account.py b/compensation/views/eco_account.py
index 118a9f6e..0895823e 100644
--- a/compensation/views/eco_account.py
+++ b/compensation/views/eco_account.py
@@ -555,6 +555,7 @@ def report_view(request:HttpRequest, id: str):
geom_form = SimpleGeomForm(
instance=acc
)
+ parcels = acc.get_underlying_parcels()
qrcode_img = generate_qr_code(
request.build_absolute_uri(reverse("ema:report", args=(id,))),
10
@@ -582,6 +583,7 @@ def report_view(request:HttpRequest, id: str):
"before_states": before_states,
"after_states": after_states,
"geom_form": geom_form,
+ "parcels": parcels,
"actions": actions,
"deductions": deductions,
}
diff --git a/ema/templates/ema/detail/view.html b/ema/templates/ema/detail/view.html
index 230363b4..8ed7aa26 100644
--- a/ema/templates/ema/detail/view.html
+++ b/ema/templates/ema/detail/view.html
@@ -2,7 +2,13 @@
{% load i18n l10n static fontawesome_5 humanize %}
{% block head %}
-
+ {% comment %}
+ dal documentation (django-autocomplete-light) states using form.media for adding needed scripts.
+ This does not work properly with modal forms, as the scripts are not loaded properly inside the modal.
+ Therefore the script linkages from form.media have been extracted and put inside dal/scripts.html to ensure
+ these scripts are loaded when needed.
+ {% endcomment %}
+ {% include 'dal/scripts.html' %}
{% endblock %}
{% block body %}
diff --git a/ema/templates/ema/report/report.html b/ema/templates/ema/report/report.html
index 38dd7f23..10ec7aa1 100644
--- a/ema/templates/ema/report/report.html
+++ b/ema/templates/ema/report/report.html
@@ -41,6 +41,9 @@
{% include 'map/geom_form.html' %}
+
+ {% include 'konova/includes/parcels.html' %}
+
{% trans 'Open in browser' %}
diff --git a/ema/views.py b/ema/views.py
index fc94686b..0ae886e4 100644
--- a/ema/views.py
+++ b/ema/views.py
@@ -466,6 +466,7 @@ def report_view(request:HttpRequest, id: str):
geom_form = SimpleGeomForm(
instance=ema,
)
+ parcels = ema.get_underlying_parcels()
qrcode_img = generate_qr_code(
request.build_absolute_uri(reverse("ema:report", args=(id,))),
10
@@ -487,6 +488,7 @@ def report_view(request:HttpRequest, id: str):
"before_states": before_states,
"after_states": after_states,
"geom_form": geom_form,
+ "parcels": parcels,
"actions": actions,
}
context = BaseContext(request, context).context
diff --git a/intervention/templates/intervention/report/report.html b/intervention/templates/intervention/report/report.html
index 25e6aac6..ac6c29ea 100644
--- a/intervention/templates/intervention/report/report.html
+++ b/intervention/templates/intervention/report/report.html
@@ -100,6 +100,9 @@
{% include 'map/geom_form.html' %}
+
+ {% include 'konova/includes/parcels.html' %}
+
{% trans 'Open in browser' %}
diff --git a/intervention/views.py b/intervention/views.py
index d18dce23..fc1625da 100644
--- a/intervention/views.py
+++ b/intervention/views.py
@@ -547,6 +547,7 @@ def report_view(request:HttpRequest, id: str):
geom_form = SimpleGeomForm(
instance=intervention
)
+ parcels = intervention.get_underlying_parcels()
distinct_deductions = intervention.deductions.all().distinct(
"account"
@@ -565,6 +566,7 @@ def report_view(request:HttpRequest, id: str):
"qrcode": qrcode_img,
"qrcode_lanis": qrcode_img_lanis,
"geom_form": geom_form,
+ "parcels": parcels,
}
context = BaseContext(request, context).context
return render(request, template, context)
diff --git a/konova/contexts.py b/konova/contexts.py
index b415889b..470161c9 100644
--- a/konova/contexts.py
+++ b/konova/contexts.py
@@ -15,18 +15,17 @@ class BaseContext:
"""
Holds all base data which is needed for every context rendering
"""
- context = {
- "base_title": BASE_TITLE,
- "base_frontend_title": BASE_FRONTEND_TITLE,
- "language": LANGUAGE_CODE,
- "user": None,
- "current_role": None,
- "help_link": HELP_LINK,
- }
+ context = None
def __init__(self, request: HttpRequest, additional_context: dict = {}):
- self.context["language"] = request.LANGUAGE_CODE
- self.context["user"] = request.user
+ self.context = {
+ "base_title": BASE_TITLE,
+ "base_frontend_title": BASE_FRONTEND_TITLE,
+ "language": request.LANGUAGE_CODE,
+ "user": request.user,
+ "current_role": None,
+ "help_link": HELP_LINK
+ }
# Add additional context, derived from given parameters
self.context.update(additional_context)