Merge pull request 'master' (#276) from master into Docker

Reviewed-on: SGD-Nord/konova#276

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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

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

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>

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>

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>

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>

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>

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

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>

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>

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>

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>

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>

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>
 

intervention/utils/egon_export.py

@@ -190,14 +190,14 @@ class EgonGmlBuilder:
                     "@gml:id": self.intervention.identifier,
                     "oneo:azEintragungsstelle": self.intervention.responsible.conservation_file_number,
                     "oneo:azZulassungsstelle": self.intervention.responsible.registration_file_number,
-                    "oneo:bemerkungZulassungsstelle": None,
+                    "oneo:bemerkungZulassungsstelle": "",
                     "oneo:eintragungsstelle": {
-                        "@xlink:href": f"http://register.naturschutz.rlp.de/repository/services/referenzliste/907/{cons_office.atom_id if cons_office else None}",
+                        "@xlink:href": f"http://register.naturschutz.rlp.de/repository/services/referenzliste/907/{cons_office.atom_id if cons_office else ''}",
-                        "#text": cons_office.long_name if cons_office else None
+                        "#text": cons_office.long_name if cons_office else ""
                     },
                     "oneo:zulassungsstelle": {
-                        "@xlink:href": f"http://register.naturschutz.rlp.de/repository/services/referenzliste/1053/{reg_office.atom_id if reg_office else None}",
+                        "@xlink:href": f"http://register.naturschutz.rlp.de/repository/services/referenzliste/1053/{reg_office.atom_id if reg_office else ''}",
-                        "#text": reg_office.long_name if reg_office else None
+                        "#text": reg_office.long_name if reg_office else ""
                     },
                     "oneo:ersatzzahlung": self._float_to_localized_string(self._sum_all_payments()),
                     "oneo:kompensationsart": {
@@ -205,33 +205,33 @@ class EgonGmlBuilder:
                         "#text": comp_type
                     },
                     "oneo:verfahrensrecht": {
-                        "@xlink:href": f"http://register.naturschutz.rlp.de/repository/services/referenzliste/1048/{law.atom_id if law else None}",
+                        "@xlink:href": f"http://register.naturschutz.rlp.de/repository/services/referenzliste/1048/{law.atom_id if law else ''}",
-                        "#text": law.short_name if law else None
+                        "#text": law.short_name if law else ""
                     },
                     "oneo:verfahrenstyp": {
-                        "@xlink:href": f"http://register.naturschutz.rlp.de/repository/services/referenzliste/44382/{process_type.atom_id if process_type else None}",
+                        "@xlink:href": f"http://register.naturschutz.rlp.de/repository/services/referenzliste/44382/{process_type.atom_id if process_type else ''}",
-                        "#text": process_type.long_name if process_type else None,
+                        "#text": process_type.long_name if process_type else "",
                     },
                     "oneo:eingreifer": {
                         "oneo:Eingreifer": {
                             "oneo:art": {
-                                "@xlink:href": f"http://register.naturschutz.rlp.de/repository/services/referenzliste/1053/{handler.type.atom_id if handler.type else None}",
+                                "@xlink:href": f"http://register.naturschutz.rlp.de/repository/services/referenzliste/1053/{handler.type.atom_id if handler.type else ''}",
-                                "#text": handler.type.long_name if handler.type else None,
+                                "#text": handler.type.long_name if handler.type else "",
                             },
-                            "oneo:bemerkung": handler.detail if handler else None,
+                            "oneo:bemerkung": handler.detail if handler else "",
                         }
                     },
                     "oneo:erfasser": {
                         "oneo:Erfasser": {
-                            "oneo:name": None,
+                            "oneo:name": "",
-                            "oneo:bemerkung": None,
+                            "oneo:bemerkung": "",
                         }
                     },
                     "oneo:zulassung": {
                         "oneo:Zulassungstermin": {
                             "oneo:bauBeginn": payment_date,
-                            "oneo:erlass": reg_date.strftime(DEFAULT_DATE_FORMAT) if reg_date else None,
+                            "oneo:erlass": reg_date.strftime(DEFAULT_DATE_FORMAT) if reg_date else "",
-                            "oneo:rechtsKraft": bind_date.strftime(DEFAULT_DATE_FORMAT) if bind_date else None,
+                            "oneo:rechtsKraft": bind_date.strftime(DEFAULT_DATE_FORMAT) if bind_date else "",
                         }
                     },
                     "oneo:geometrie": {
@@ -245,8 +245,8 @@ class EgonGmlBuilder:
                     "oneo:kennung": self.intervention.identifier,
                     "oneo:bezeichnung": self.intervention.title,
                     "oneo:bemerkung": self.intervention.comment,
-                    "oneo:verantwortlicheStelle": None,
+                    "oneo:verantwortlicheStelle": "",
-                    "oneo:veroffentlichtAm": None,
+                    "oneo:veroffentlichtAm": "",
                     "oneo:raumreferenz": {
                         "oneo:Raumreferenz": self._gen_raumreferenz(),
                     },

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

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

konova/static/css/konova.css

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

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