IT-Naturschutz
/
konova
7
1
Fork 0
Code Issues 3 Pull Requests Actions Projects Releases 21 Wiki Activity

Public report enhancements

Browse Source 
* adds toggling of scrollable box table views
* deactivates scrolling for public report view (so all entries can be seen if page is printed)
pull/274/head
mpeltriaux 2 years ago
parent c4174b5b36
commit f26b26d1a1
29 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File

2
compensation/templates/compensation/detail/compensation/includes/actions.html
Unescape Escape View File

@ -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>

2
compensation/templates/compensation/detail/compensation/includes/deadlines.html
Unescape Escape View File

@ -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>

2
compensation/templates/compensation/detail/compensation/includes/documents.html
Unescape Escape View File

@ -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>

2
compensation/templates/compensation/detail/compensation/includes/states-after.html
Unescape Escape View File

@ -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>

2
compensation/templates/compensation/detail/compensation/includes/states-before.html
Unescape Escape View File

@ -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>

2
compensation/templates/compensation/detail/eco_account/includes/actions.html
Unescape Escape View File

@ -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>

2
compensation/templates/compensation/detail/eco_account/includes/deadlines.html
Unescape Escape View File

@ -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>

2
compensation/templates/compensation/detail/eco_account/includes/deductions.html
Unescape Escape View File

@ -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>

2
compensation/templates/compensation/detail/eco_account/includes/documents.html
Unescape Escape View File

@ -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>

2
compensation/templates/compensation/detail/eco_account/includes/states-after.html
Unescape Escape View File

@ -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>

2
compensation/templates/compensation/detail/eco_account/includes/states-before.html
Unescape Escape View File

@ -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>

1
compensation/views/compensation/report.py
Unescape Escape View File

@ -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

1
compensation/views/eco_account/report.py
Unescape Escape View File

@ -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

2
ema/templates/ema/detail/includes/actions.html
Unescape Escape View File

@ -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>

2
ema/templates/ema/detail/includes/deadlines.html
Unescape Escape View File

@ -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>

2
ema/templates/ema/detail/includes/documents.html
Unescape Escape View File

@ -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>

2
ema/templates/ema/detail/includes/states-after.html
Unescape Escape View File

@ -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>

2
ema/templates/ema/detail/includes/states-before.html
Unescape Escape View File

@ -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>

1
ema/views/report.py
Unescape Escape View File

@ -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

2
intervention/templates/intervention/detail/includes/compensations.html
Unescape Escape View File

@ -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>

2
intervention/templates/intervention/detail/includes/deductions.html
Unescape Escape View File

@ -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>

2
intervention/templates/intervention/detail/includes/documents.html
Unescape Escape View File

@ -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>

2
intervention/templates/intervention/detail/includes/payments.html
Unescape Escape View File

@ -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>

2
intervention/templates/intervention/detail/includes/revocation.html
Unescape Escape View File

@ -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>

2
intervention/templates/intervention/report/report.html
Unescape Escape View File

@ -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>

1
intervention/views/report.py
Unescape Escape View File

@ -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

1
konova/contexts.py
Unescape Escape View File

@ -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

2
konova/static/css/konova.css
Unescape Escape View File

@ -60,7 +60,7 @@ a {
color: var(--rlp-red); color: var(--rlp-red);
} }
label { .form-label {
width: 100%; width: 100%;
} }

2
templates/form/table/generic_table_form_body.html
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save