From f26b26d1a10059da5254da4ccdd3b2902614d500 Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Mon, 12 Dec 2022 13:09:17 +0100 Subject: [PATCH 1/2] Public report enhancements * adds toggling of scrollable box table views * deactivates scrolling for public report view (so all entries can be seen if page is printed) --- .../compensation/detail/compensation/includes/actions.html | 2 +- .../compensation/detail/compensation/includes/deadlines.html | 2 +- .../compensation/detail/compensation/includes/documents.html | 2 +- .../compensation/detail/compensation/includes/states-after.html | 2 +- .../detail/compensation/includes/states-before.html | 2 +- .../compensation/detail/eco_account/includes/actions.html | 2 +- .../compensation/detail/eco_account/includes/deadlines.html | 2 +- .../compensation/detail/eco_account/includes/deductions.html | 2 +- .../compensation/detail/eco_account/includes/documents.html | 2 +- .../compensation/detail/eco_account/includes/states-after.html | 2 +- .../compensation/detail/eco_account/includes/states-before.html | 2 +- compensation/views/compensation/report.py | 1 + compensation/views/eco_account/report.py | 1 + ema/templates/ema/detail/includes/actions.html | 2 +- ema/templates/ema/detail/includes/deadlines.html | 2 +- ema/templates/ema/detail/includes/documents.html | 2 +- ema/templates/ema/detail/includes/states-after.html | 2 +- ema/templates/ema/detail/includes/states-before.html | 2 +- ema/views/report.py | 1 + .../templates/intervention/detail/includes/compensations.html | 2 +- .../templates/intervention/detail/includes/deductions.html | 2 +- .../templates/intervention/detail/includes/documents.html | 2 +- .../templates/intervention/detail/includes/payments.html | 2 +- .../templates/intervention/detail/includes/revocation.html | 2 +- intervention/templates/intervention/report/report.html | 2 +- intervention/views/report.py | 1 + konova/contexts.py | 1 + konova/static/css/konova.css | 2 +- templates/form/table/generic_table_form_body.html | 2 +- 29 files changed, 29 insertions(+), 24 deletions(-) diff --git a/compensation/templates/compensation/detail/compensation/includes/actions.html b/compensation/templates/compensation/detail/compensation/includes/actions.html index 3fa4769..e4ec5b6 100644 --- a/compensation/templates/compensation/detail/compensation/includes/actions.html +++ b/compensation/templates/compensation/detail/compensation/includes/actions.html @@ -21,7 +21,7 @@ -
+
diff --git a/compensation/templates/compensation/detail/compensation/includes/deadlines.html b/compensation/templates/compensation/detail/compensation/includes/deadlines.html index bc54e95..7f32880 100644 --- a/compensation/templates/compensation/detail/compensation/includes/deadlines.html +++ b/compensation/templates/compensation/detail/compensation/includes/deadlines.html @@ -25,7 +25,7 @@ {% trans 'Missing finished deadline ' %} {% endif %} -
+
diff --git a/compensation/templates/compensation/detail/compensation/includes/documents.html b/compensation/templates/compensation/detail/compensation/includes/documents.html index 573fd86..1733827 100644 --- a/compensation/templates/compensation/detail/compensation/includes/documents.html +++ b/compensation/templates/compensation/detail/compensation/includes/documents.html @@ -20,7 +20,7 @@ -
+
diff --git a/compensation/templates/compensation/detail/compensation/includes/states-after.html b/compensation/templates/compensation/detail/compensation/includes/states-after.html index 9c02978..dfda6ae 100644 --- a/compensation/templates/compensation/detail/compensation/includes/states-after.html +++ b/compensation/templates/compensation/detail/compensation/includes/states-after.html @@ -25,7 +25,7 @@ {% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m² {% endif %} -
+
diff --git a/compensation/templates/compensation/detail/compensation/includes/states-before.html b/compensation/templates/compensation/detail/compensation/includes/states-before.html index 9591738..ff3d267 100644 --- a/compensation/templates/compensation/detail/compensation/includes/states-before.html +++ b/compensation/templates/compensation/detail/compensation/includes/states-before.html @@ -25,7 +25,7 @@ {% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m² {% endif %} -
+
diff --git a/compensation/templates/compensation/detail/eco_account/includes/actions.html b/compensation/templates/compensation/detail/eco_account/includes/actions.html index 7a98653..52f8648 100644 --- a/compensation/templates/compensation/detail/eco_account/includes/actions.html +++ b/compensation/templates/compensation/detail/eco_account/includes/actions.html @@ -20,7 +20,7 @@ -
+
diff --git a/compensation/templates/compensation/detail/eco_account/includes/deadlines.html b/compensation/templates/compensation/detail/eco_account/includes/deadlines.html index c0b4daf..4a88b88 100644 --- a/compensation/templates/compensation/detail/eco_account/includes/deadlines.html +++ b/compensation/templates/compensation/detail/eco_account/includes/deadlines.html @@ -25,7 +25,7 @@ {% trans 'Missing finished deadline ' %} {% endif %} -
+
diff --git a/compensation/templates/compensation/detail/eco_account/includes/deductions.html b/compensation/templates/compensation/detail/eco_account/includes/deductions.html index b91fb21..03f6bf3 100644 --- a/compensation/templates/compensation/detail/eco_account/includes/deductions.html +++ b/compensation/templates/compensation/detail/eco_account/includes/deductions.html @@ -20,7 +20,7 @@ -
+
diff --git a/compensation/templates/compensation/detail/eco_account/includes/documents.html b/compensation/templates/compensation/detail/eco_account/includes/documents.html index 67881c9..bf61f13 100644 --- a/compensation/templates/compensation/detail/eco_account/includes/documents.html +++ b/compensation/templates/compensation/detail/eco_account/includes/documents.html @@ -20,7 +20,7 @@ -
+
diff --git a/compensation/templates/compensation/detail/eco_account/includes/states-after.html b/compensation/templates/compensation/detail/eco_account/includes/states-after.html index 05a05e3..d188f08 100644 --- a/compensation/templates/compensation/detail/eco_account/includes/states-after.html +++ b/compensation/templates/compensation/detail/eco_account/includes/states-after.html @@ -25,7 +25,7 @@ {% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m² {% endif %} -
+
diff --git a/compensation/templates/compensation/detail/eco_account/includes/states-before.html b/compensation/templates/compensation/detail/eco_account/includes/states-before.html index 10b3f63..56fe0b0 100644 --- a/compensation/templates/compensation/detail/eco_account/includes/states-before.html +++ b/compensation/templates/compensation/detail/eco_account/includes/states-before.html @@ -25,7 +25,7 @@ {% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m² {% endif %} -
+
diff --git a/compensation/views/compensation/report.py b/compensation/views/compensation/report.py index 28d563e..e81cb1d 100644 --- a/compensation/views/compensation/report.py +++ b/compensation/views/compensation/report.py @@ -73,6 +73,7 @@ def report_view(request: HttpRequest, id: str): "geom_form": geom_form, "parcels": parcels, "actions": actions, + "tables_scrollable": False, TAB_TITLE_IDENTIFIER: tab_title, } context = BaseContext(request, context).context diff --git a/compensation/views/eco_account/report.py b/compensation/views/eco_account/report.py index 9bbf32b..47b2a10 100644 --- a/compensation/views/eco_account/report.py +++ b/compensation/views/eco_account/report.py @@ -80,6 +80,7 @@ def report_view(request: HttpRequest, id: str): "parcels": parcels, "actions": actions, "deductions": deductions, + "tables_scrollable": False, TAB_TITLE_IDENTIFIER: tab_title, } context = BaseContext(request, context).context diff --git a/ema/templates/ema/detail/includes/actions.html b/ema/templates/ema/detail/includes/actions.html index 9111070..8a77c79 100644 --- a/ema/templates/ema/detail/includes/actions.html +++ b/ema/templates/ema/detail/includes/actions.html @@ -20,7 +20,7 @@ -
+
diff --git a/ema/templates/ema/detail/includes/deadlines.html b/ema/templates/ema/detail/includes/deadlines.html index 0c25b39..bc267dd 100644 --- a/ema/templates/ema/detail/includes/deadlines.html +++ b/ema/templates/ema/detail/includes/deadlines.html @@ -25,7 +25,7 @@ {% trans 'Missing finished deadline ' %} {% endif %} -
+
diff --git a/ema/templates/ema/detail/includes/documents.html b/ema/templates/ema/detail/includes/documents.html index b38d549..d1f60a0 100644 --- a/ema/templates/ema/detail/includes/documents.html +++ b/ema/templates/ema/detail/includes/documents.html @@ -20,7 +20,7 @@ -
+
diff --git a/ema/templates/ema/detail/includes/states-after.html b/ema/templates/ema/detail/includes/states-after.html index 78cbee0..0277e02 100644 --- a/ema/templates/ema/detail/includes/states-after.html +++ b/ema/templates/ema/detail/includes/states-after.html @@ -25,7 +25,7 @@ {% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m² {% endif %} -
+
diff --git a/ema/templates/ema/detail/includes/states-before.html b/ema/templates/ema/detail/includes/states-before.html index fb29024..f0d4edd 100644 --- a/ema/templates/ema/detail/includes/states-before.html +++ b/ema/templates/ema/detail/includes/states-before.html @@ -25,7 +25,7 @@ {% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m² {% endif %} -
+
diff --git a/ema/views/report.py b/ema/views/report.py index daea0b4..6b7840f 100644 --- a/ema/views/report.py +++ b/ema/views/report.py @@ -73,6 +73,7 @@ def report_view(request:HttpRequest, id: str): "geom_form": geom_form, "parcels": parcels, "actions": actions, + "tables_scrollable": False, TAB_TITLE_IDENTIFIER: tab_title, } context = BaseContext(request, context).context diff --git a/intervention/templates/intervention/detail/includes/compensations.html b/intervention/templates/intervention/detail/includes/compensations.html index c572a34..758d0a8 100644 --- a/intervention/templates/intervention/detail/includes/compensations.html +++ b/intervention/templates/intervention/detail/includes/compensations.html @@ -22,7 +22,7 @@ -
+
diff --git a/intervention/templates/intervention/detail/includes/deductions.html b/intervention/templates/intervention/detail/includes/deductions.html index 04110b8..66a5504 100644 --- a/intervention/templates/intervention/detail/includes/deductions.html +++ b/intervention/templates/intervention/detail/includes/deductions.html @@ -20,7 +20,7 @@ -
+
diff --git a/intervention/templates/intervention/detail/includes/documents.html b/intervention/templates/intervention/detail/includes/documents.html index 5037ff8..2374694 100644 --- a/intervention/templates/intervention/detail/includes/documents.html +++ b/intervention/templates/intervention/detail/includes/documents.html @@ -25,7 +25,7 @@ {% trans 'You entered a payment. Please upload the legal document which defines the payment`s amount.' %} {% endif %} -
+
diff --git a/intervention/templates/intervention/detail/includes/payments.html b/intervention/templates/intervention/detail/includes/payments.html index 65408e4..5dde009 100644 --- a/intervention/templates/intervention/detail/includes/payments.html +++ b/intervention/templates/intervention/detail/includes/payments.html @@ -20,7 +20,7 @@ -
+
diff --git a/intervention/templates/intervention/detail/includes/revocation.html b/intervention/templates/intervention/detail/includes/revocation.html index 39738d2..60cedfc 100644 --- a/intervention/templates/intervention/detail/includes/revocation.html +++ b/intervention/templates/intervention/detail/includes/revocation.html @@ -23,7 +23,7 @@ -
+
diff --git a/intervention/templates/intervention/report/report.html b/intervention/templates/intervention/report/report.html index 9ab9a7b..6c14c22 100644 --- a/intervention/templates/intervention/report/report.html +++ b/intervention/templates/intervention/report/report.html @@ -103,7 +103,7 @@
{% include 'konova/includes/parcels/parcels.html' %}
-
+
{% include 'konova/includes/report/qrcodes.html' %}
diff --git a/intervention/views/report.py b/intervention/views/report.py index fa4798d..663c293 100644 --- a/intervention/views/report.py +++ b/intervention/views/report.py @@ -67,6 +67,7 @@ def report_view(request:HttpRequest, id: str): }, "geom_form": geom_form, "parcels": parcels, + "tables_scrollable": False, TAB_TITLE_IDENTIFIER: tab_title, } context = BaseContext(request, context).context diff --git a/konova/contexts.py b/konova/contexts.py index 70cb1aa..23faedb 100644 --- a/konova/contexts.py +++ b/konova/contexts.py @@ -28,6 +28,7 @@ class BaseContext: "help_link": HELP_LINK, "impressum_link": IMPRESSUM_LINK, "CONTACT_MAIL": EMAIL_REPLY_TO, + "tables_scrollable": True, # tables in boxes } # Add additional context, derived from given parameters diff --git a/konova/static/css/konova.css b/konova/static/css/konova.css index 0092fe9..eb72789 100644 --- a/konova/static/css/konova.css +++ b/konova/static/css/konova.css @@ -60,7 +60,7 @@ a { color: var(--rlp-red); } -label { +.form-label { width: 100%; } diff --git a/templates/form/table/generic_table_form_body.html b/templates/form/table/generic_table_form_body.html index 6fae274..aac5563 100644 --- a/templates/form/table/generic_table_form_body.html +++ b/templates/form/table/generic_table_form_body.html @@ -6,7 +6,7 @@
{{form.small_label_column}}
-