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)
This commit is contained in:
parent
c4174b5b36
commit
f26b26d1a1
@ -21,7 +21,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</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">
|
<table class="table table-hover">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
{% trans 'Missing finished deadline ' %}
|
{% trans 'Missing finished deadline ' %}
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% 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">
|
<table class="table table-hover">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</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">
|
<table class="table table-hover">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
{% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m²
|
{% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m²
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% 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">
|
<table class="table table-hover">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
{% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m²
|
{% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m²
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% 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">
|
<table class="table table-hover">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</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">
|
<table class="table table-hover">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
{% trans 'Missing finished deadline ' %}
|
{% trans 'Missing finished deadline ' %}
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% 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">
|
<table class="table table-hover">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</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">
|
<table class="table table-hover">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</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">
|
<table class="table table-hover">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
{% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m²
|
{% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m²
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% 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">
|
<table class="table table-hover">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
{% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m²
|
{% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m²
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% 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">
|
<table class="table table-hover">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -73,6 +73,7 @@ def report_view(request: HttpRequest, id: str):
|
|||||||
"geom_form": geom_form,
|
"geom_form": geom_form,
|
||||||
"parcels": parcels,
|
"parcels": parcels,
|
||||||
"actions": actions,
|
"actions": actions,
|
||||||
|
"tables_scrollable": False,
|
||||||
TAB_TITLE_IDENTIFIER: tab_title,
|
TAB_TITLE_IDENTIFIER: tab_title,
|
||||||
}
|
}
|
||||||
context = BaseContext(request, context).context
|
context = BaseContext(request, context).context
|
||||||
|
@ -80,6 +80,7 @@ def report_view(request: HttpRequest, id: str):
|
|||||||
"parcels": parcels,
|
"parcels": parcels,
|
||||||
"actions": actions,
|
"actions": actions,
|
||||||
"deductions": deductions,
|
"deductions": deductions,
|
||||||
|
"tables_scrollable": False,
|
||||||
TAB_TITLE_IDENTIFIER: tab_title,
|
TAB_TITLE_IDENTIFIER: tab_title,
|
||||||
}
|
}
|
||||||
context = BaseContext(request, context).context
|
context = BaseContext(request, context).context
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</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">
|
<table class="table table-hover">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
{% trans 'Missing finished deadline ' %}
|
{% trans 'Missing finished deadline ' %}
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% 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">
|
<table class="table table-hover">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</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">
|
<table class="table table-hover">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
{% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m²
|
{% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m²
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% 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">
|
<table class="table table-hover">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
{% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m²
|
{% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m²
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% 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">
|
<table class="table table-hover">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -73,6 +73,7 @@ def report_view(request:HttpRequest, id: str):
|
|||||||
"geom_form": geom_form,
|
"geom_form": geom_form,
|
||||||
"parcels": parcels,
|
"parcels": parcels,
|
||||||
"actions": actions,
|
"actions": actions,
|
||||||
|
"tables_scrollable": False,
|
||||||
TAB_TITLE_IDENTIFIER: tab_title,
|
TAB_TITLE_IDENTIFIER: tab_title,
|
||||||
}
|
}
|
||||||
context = BaseContext(request, context).context
|
context = BaseContext(request, context).context
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</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">
|
<table class="table table-hover">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</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">
|
<table class="table table-hover">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
{% trans 'You entered a payment. Please upload the legal document which defines the payment`s amount.' %}
|
{% trans 'You entered a payment. Please upload the legal document which defines the payment`s amount.' %}
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% 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">
|
<table class="table table-hover">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</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">
|
<table class="table table-hover">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</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">
|
<table class="table table-hover">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -103,7 +103,7 @@
|
|||||||
<div class="row">
|
<div class="row">
|
||||||
{% include 'konova/includes/parcels/parcels.html' %}
|
{% include 'konova/includes/parcels/parcels.html' %}
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row qrcodes">
|
||||||
{% include 'konova/includes/report/qrcodes.html' %}
|
{% include 'konova/includes/report/qrcodes.html' %}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -67,6 +67,7 @@ def report_view(request:HttpRequest, id: str):
|
|||||||
},
|
},
|
||||||
"geom_form": geom_form,
|
"geom_form": geom_form,
|
||||||
"parcels": parcels,
|
"parcels": parcels,
|
||||||
|
"tables_scrollable": False,
|
||||||
TAB_TITLE_IDENTIFIER: tab_title,
|
TAB_TITLE_IDENTIFIER: tab_title,
|
||||||
}
|
}
|
||||||
context = BaseContext(request, context).context
|
context = BaseContext(request, context).context
|
||||||
|
@ -28,6 +28,7 @@ class BaseContext:
|
|||||||
"help_link": HELP_LINK,
|
"help_link": HELP_LINK,
|
||||||
"impressum_link": IMPRESSUM_LINK,
|
"impressum_link": IMPRESSUM_LINK,
|
||||||
"CONTACT_MAIL": EMAIL_REPLY_TO,
|
"CONTACT_MAIL": EMAIL_REPLY_TO,
|
||||||
|
"tables_scrollable": True, # tables in boxes
|
||||||
}
|
}
|
||||||
|
|
||||||
# Add additional context, derived from given parameters
|
# Add additional context, derived from given parameters
|
||||||
|
@ -60,7 +60,7 @@ a {
|
|||||||
color: var(--rlp-red);
|
color: var(--rlp-red);
|
||||||
}
|
}
|
||||||
|
|
||||||
label {
|
.form-label {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
<tr title="{{ field.help_text }}" class="{% if field.errors %}alert-danger{% endif %}">
|
<tr title="{{ field.help_text }}" class="{% if field.errors %}alert-danger{% endif %}">
|
||||||
{{form.small_label_column}}
|
{{form.small_label_column}}
|
||||||
<th scope="row" class="col-sm-{{form.label_input_ratio.0}}">
|
<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 }}
|
{{ field.label }}
|
||||||
<span class="label-required">
|
<span class="label-required">
|
||||||
{% if field.field.required %}*{% endif %}
|
{% if field.field.required %}*{% endif %}
|
||||||
|
Loading…
Reference in New Issue
Block a user