Merge pull request 'Public report enhancements' (#274) from enhancements_report_template into master

Reviewed-on: SGD-Nord/konova#274
2022-12-12 13:12:31 +01:00 · 2022-12-12 13:12:31 +01:00 · 66f7341cb5
commit 66f7341cb5
parent 7585551beb f26b26d1a1
29 changed files with 29 additions and 24 deletions
--- a/compensation/templates/compensation/detail/compensation/includes/actions.html
+++ b/compensation/templates/compensation/detail/compensation/includes/actions.html
@ -21,7 +21,7 @@
            </div>
        </div>
    </div>
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
        <table class="table table-hover">
            <thead>
            <tr>
--- 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 ' %}
    </div>
    {% endif %}
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
        <table class="table table-hover">
            <thead>
            <tr>
--- a/compensation/templates/compensation/detail/compensation/includes/documents.html
+++ b/compensation/templates/compensation/detail/compensation/includes/documents.html
@ -20,7 +20,7 @@
            </div>
        </div>
    </div>
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
        <table class="table table-hover">
            <thead>
            <tr>
--- 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²
    </div>
    {% endif %}
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
        <table class="table table-hover">
            <thead>
            <tr>
--- 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²
    </div>
    {% endif %}
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
        <table class="table table-hover">
            <thead>
            <tr>
--- a/compensation/templates/compensation/detail/eco_account/includes/actions.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/actions.html
@ -20,7 +20,7 @@
            </div>
        </div>
    </div>
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
        <table class="table table-hover">
            <thead>
            <tr>
--- 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 ' %}
    </div>
    {% endif %}
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
        <table class="table table-hover">
            <thead>
            <tr>
--- a/compensation/templates/compensation/detail/eco_account/includes/deductions.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/deductions.html
@ -20,7 +20,7 @@
            </div>
        </div>
    </div>
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
        <table class="table table-hover">
            <thead>
            <tr>
--- a/compensation/templates/compensation/detail/eco_account/includes/documents.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/documents.html
@ -20,7 +20,7 @@
            </div>
        </div>
    </div>
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
        <table class="table table-hover">
            <thead>
            <tr>
--- 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²
    </div>
    {% endif %}
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
        <table class="table table-hover">
            <thead>
            <tr>
--- 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²
    </div>
    {% endif %}
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
        <table class="table table-hover">
            <thead>
            <tr>
--- 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
--- 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
--- a/ema/templates/ema/detail/includes/actions.html
+++ b/ema/templates/ema/detail/includes/actions.html
@ -20,7 +20,7 @@
            </div>
        </div>
    </div>
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
        <table class="table table-hover">
            <thead>
            <tr>
--- a/ema/templates/ema/detail/includes/deadlines.html
+++ b/ema/templates/ema/detail/includes/deadlines.html
@ -25,7 +25,7 @@
        {% trans 'Missing finished deadline ' %}
    </div>
    {% endif %}
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
        <table class="table table-hover">
            <thead>
            <tr>
--- a/ema/templates/ema/detail/includes/documents.html
+++ b/ema/templates/ema/detail/includes/documents.html
@ -20,7 +20,7 @@
            </div>
        </div>
    </div>
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
        <table class="table table-hover">
            <thead>
            <tr>
--- 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²
    </div>
    {% endif %}
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
        <table class="table table-hover">
            <thead>
            <tr>
--- 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²
    </div>
    {% endif %}
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
        <table class="table table-hover">
            <thead>
            <tr>
--- 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
--- a/intervention/templates/intervention/detail/includes/compensations.html
+++ b/intervention/templates/intervention/detail/includes/compensations.html
@ -22,7 +22,7 @@
            </div>
        </div>
    </div>
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
        <table class="table table-hover">
            <thead>
            <tr>
--- a/intervention/templates/intervention/detail/includes/deductions.html
+++ b/intervention/templates/intervention/detail/includes/deductions.html
@ -20,7 +20,7 @@
            </div>
        </div>
    </div>
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
        <table class="table table-hover">
            <thead>
            <tr>
--- 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.' %}
    </div>
    {% endif %}
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
        <table class="table table-hover">
            <thead>
            <tr>
--- a/intervention/templates/intervention/detail/includes/payments.html
+++ b/intervention/templates/intervention/detail/includes/payments.html
@ -20,7 +20,7 @@
            </div>
        </div>
    </div>
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
        <table class="table table-hover">
            <thead>
            <tr>
--- a/intervention/templates/intervention/detail/includes/revocation.html
+++ b/intervention/templates/intervention/detail/includes/revocation.html
@ -23,7 +23,7 @@
            </div>
        </div>
    </div>
-    <div class="card-body scroll-300 p-2">
+    <div class="card-body {% if tables_scrollable %}scroll-300{% endif %} p-2">
        <table class="table table-hover">
            <thead>
            <tr>
--- a/intervention/templates/intervention/report/report.html
+++ b/intervention/templates/intervention/report/report.html
@ -103,7 +103,7 @@
        <div class="row">
            {% include 'konova/includes/parcels/parcels.html' %}
        </div>
-        <div class="row">
+        <div class="row qrcodes">
            {% include 'konova/includes/report/qrcodes.html' %}
        </div>

--- 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
--- 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
--- 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%;
 }

--- a/templates/form/table/generic_table_form_body.html
+++ b/templates/form/table/generic_table_form_body.html
@ -6,7 +6,7 @@
        <tr title="{{ field.help_text }}" class="{% if field.errors %}alert-danger{% endif %}">
            {{form.small_label_column}}
            <th scope="row" class="col-sm-{{form.label_input_ratio.0}}">
-                <label for="id_{{ field.name }}">
+                <label class="form-label" for="id_{{ field.name }}">
                    {{ field.label }}
                    <span class="label-required">
                        {% if field.field.required %}*{% endif %}