diff --git a/compensation/templates/compensation/report/compensation/report.html b/compensation/templates/compensation/report/compensation/report.html
index 25130f72..66205739 100644
--- a/compensation/templates/compensation/report/compensation/report.html
+++ b/compensation/templates/compensation/report/compensation/report.html
@@ -41,14 +41,7 @@
{% include 'konova/includes/parcels.html' %}
-
-
{% trans 'Open in browser' %}
- {{ qrcode|safe }}
-
-
-
{% trans 'View in LANIS' %}
- {{ qrcode_lanis|safe }}
-
+ {% include 'konova/includes/report/qrcodes.html' %}
diff --git a/compensation/templates/compensation/report/eco_account/report.html b/compensation/templates/compensation/report/eco_account/report.html
index 44496ea8..823a30fb 100644
--- a/compensation/templates/compensation/report/eco_account/report.html
+++ b/compensation/templates/compensation/report/eco_account/report.html
@@ -54,14 +54,7 @@
{% include 'konova/includes/parcels.html' %}
-
-
{% trans 'Open in browser' %}
- {{ qrcode|safe }}
-
-
-
{% trans 'View in LANIS' %}
- {{ qrcode_lanis|safe }}
-
+ {% include 'konova/includes/report/qrcodes.html' %}
diff --git a/compensation/views/compensation.py b/compensation/views/compensation.py
index 6dcf442b..4068e6bb 100644
--- a/compensation/views/compensation.py
+++ b/compensation/views/compensation.py
@@ -596,14 +596,12 @@ def report_view(request: HttpRequest, id: str):
instance=comp
)
parcels = comp.get_underlying_parcels()
- qrcode_img = generate_qr_code(
- request.build_absolute_uri(reverse("compensation:report", args=(id,))),
- 10
- )
- qrcode_img_lanis = generate_qr_code(
- comp.get_LANIS_link(),
- 7
- )
+
+ qrcode_url = request.build_absolute_uri(reverse("compensation:report", args=(id,)))
+ qrcode_img = generate_qr_code(qrcode_url, 10)
+ qrcode_lanis_url = comp.get_LANIS_link()
+ qrcode_img_lanis = generate_qr_code(qrcode_lanis_url, 7)
+
# Order states by surface
before_states = comp.before_states.all().order_by("-surface").prefetch_related("biotope_type")
after_states = comp.after_states.all().order_by("-surface").prefetch_related("biotope_type")
@@ -611,8 +609,14 @@ def report_view(request: HttpRequest, id: str):
context = {
"obj": comp,
- "qrcode": qrcode_img,
- "qrcode_lanis": qrcode_img_lanis,
+ "qrcode": {
+ "img": qrcode_img,
+ "url": qrcode_url,
+ },
+ "qrcode_lanis": {
+ "img": qrcode_img_lanis,
+ "url": qrcode_lanis_url,
+ },
"has_access": False, # disables action buttons during rendering
"before_states": before_states,
"after_states": after_states,
diff --git a/compensation/views/eco_account.py b/compensation/views/eco_account.py
index 85b13714..68a5536a 100644
--- a/compensation/views/eco_account.py
+++ b/compensation/views/eco_account.py
@@ -731,18 +731,16 @@ def report_view(request:HttpRequest, id: str):
instance=acc
)
parcels = acc.get_underlying_parcels()
- qrcode_img = generate_qr_code(
- request.build_absolute_uri(reverse("ema:report", args=(id,))),
- 10
- )
- qrcode_img_lanis = generate_qr_code(
- acc.get_LANIS_link(),
- 7
- )
+
+ qrcode_url = request.build_absolute_uri(reverse("ema:report", args=(id,)))
+ qrcode_img = generate_qr_code(qrcode_url, 10)
+ qrcode_lanis_url = acc.get_LANIS_link()
+ qrcode_img_lanis = generate_qr_code(qrcode_lanis_url, 7)
+
# Order states by surface
before_states = acc.before_states.all().order_by("-surface").select_related("biotope_type__parent")
after_states = acc.after_states.all().order_by("-surface").select_related("biotope_type__parent")
- actions = acc.actions.all().select_related("action_type__parent")
+ actions = acc.actions.all().prefetch_related("action_type__parent")
# Reduce amount of db fetched data to the bare minimum we need in the template (deduction's intervention id and identifier)
deductions = acc.deductions.all()\
@@ -752,8 +750,14 @@ def report_view(request:HttpRequest, id: str):
context = {
"obj": acc,
- "qrcode": qrcode_img,
- "qrcode_lanis": qrcode_img_lanis,
+ "qrcode": {
+ "img": qrcode_img,
+ "url": qrcode_url,
+ },
+ "qrcode_lanis": {
+ "img": qrcode_img_lanis,
+ "url": qrcode_lanis_url,
+ },
"has_access": False, # disables action buttons during rendering
"before_states": before_states,
"after_states": after_states,
diff --git a/ema/templates/ema/report/report.html b/ema/templates/ema/report/report.html
index 86252c0a..40b11084 100644
--- a/ema/templates/ema/report/report.html
+++ b/ema/templates/ema/report/report.html
@@ -41,14 +41,7 @@
{% include 'konova/includes/parcels.html' %}
-
-
{% trans 'Open in browser' %}
- {{ qrcode|safe }}
-
-
-
{% trans 'View in LANIS' %}
- {{ qrcode_lanis|safe }}
-
+ {% include 'konova/includes/report/qrcodes.html' %}
diff --git a/ema/views.py b/ema/views.py
index c145511f..debd31da 100644
--- a/ema/views.py
+++ b/ema/views.py
@@ -563,14 +563,12 @@ def report_view(request:HttpRequest, id: str):
instance=ema,
)
parcels = ema.get_underlying_parcels()
- qrcode_img = generate_qr_code(
- request.build_absolute_uri(reverse("ema:report", args=(id,))),
- 10
- )
- qrcode_img_lanis = generate_qr_code(
- ema.get_LANIS_link(),
- 7
- )
+
+ qrcode_url = request.build_absolute_uri(reverse("ema:report", args=(id,)))
+ qrcode_img = generate_qr_code(qrcode_url, 10)
+ qrcode_lanis_url = ema.get_LANIS_link()
+ qrcode_img_lanis = generate_qr_code(qrcode_lanis_url, 7)
+
# Order states by surface
before_states = ema.before_states.all().order_by("-surface").prefetch_related("biotope_type")
after_states = ema.after_states.all().order_by("-surface").prefetch_related("biotope_type")
@@ -578,8 +576,14 @@ def report_view(request:HttpRequest, id: str):
context = {
"obj": ema,
- "qrcode": qrcode_img,
- "qrcode_lanis": qrcode_img_lanis,
+ "qrcode": {
+ "img": qrcode_img,
+ "url": qrcode_url
+ },
+ "qrcode_lanis": {
+ "img": qrcode_img_lanis,
+ "url": qrcode_lanis_url
+ },
"has_access": False, # disables action buttons during rendering
"before_states": before_states,
"after_states": after_states,
diff --git a/intervention/templates/intervention/report/report.html b/intervention/templates/intervention/report/report.html
index ccc2f226..e6f13c35 100644
--- a/intervention/templates/intervention/report/report.html
+++ b/intervention/templates/intervention/report/report.html
@@ -100,14 +100,7 @@
{% include 'konova/includes/parcels.html' %}
-
-
{% trans 'Open in browser' %}
- {{ qrcode|safe }}
-
-
-
{% trans 'View in LANIS' %}
- {{ qrcode_lanis|safe }}
-
+ {% include 'konova/includes/report/qrcodes.html' %}
diff --git a/intervention/views.py b/intervention/views.py
index 3004a79f..b2b78eee 100644
--- a/intervention/views.py
+++ b/intervention/views.py
@@ -693,19 +693,22 @@ def report_view(request:HttpRequest, id: str):
distinct_deductions = intervention.deductions.all().distinct(
"account"
)
- qrcode_img = generate_qr_code(
- request.build_absolute_uri(reverse("intervention:report", args=(id,))),
- 10
- )
- qrcode_img_lanis = generate_qr_code(
- intervention.get_LANIS_link(),
- 7
- )
+ qrcode_url = request.build_absolute_uri(reverse("intervention:report", args=(id,)))
+ qrcode_img = generate_qr_code(qrcode_url, 10)
+ qrcode_lanis_url = intervention.get_LANIS_link()
+ qrcode_img_lanis = generate_qr_code(qrcode_lanis_url, 7)
+
context = {
"obj": intervention,
"deductions": distinct_deductions,
- "qrcode": qrcode_img,
- "qrcode_lanis": qrcode_img_lanis,
+ "qrcode": {
+ "img": qrcode_img,
+ "url": qrcode_url,
+ },
+ "qrcode_lanis": {
+ "img": qrcode_img_lanis,
+ "url": qrcode_lanis_url,
+ },
"geom_form": geom_form,
"parcels": parcels,
TAB_TITLE_IDENTIFIER: tab_title,
diff --git a/konova/templates/konova/includes/report/qrcodes.html b/konova/templates/konova/includes/report/qrcodes.html
new file mode 100644
index 00000000..5b52d0c1
--- /dev/null
+++ b/konova/templates/konova/includes/report/qrcodes.html
@@ -0,0 +1,19 @@
+{% load i18n %}
+
+
+
+
\ No newline at end of file