diff --git a/analysis/forms.py b/analysis/forms.py
index 11d2f98b..68e217af 100644
--- a/analysis/forms.py
+++ b/analysis/forms.py
@@ -22,6 +22,7 @@ class TimespanReportForm(BaseForm):
date_from = forms.DateField(
label_suffix="",
label=_("From"),
+ help_text=_("Entries created from..."),
widget=forms.DateInput(
attrs={
"type": "date",
@@ -34,6 +35,7 @@ class TimespanReportForm(BaseForm):
date_to = forms.DateField(
label_suffix="",
label=_("To"),
+ help_text=_("Entries created until..."),
widget=forms.DateInput(
attrs={
"type": "date",
diff --git a/analysis/templates/analysis/reports/includes/compensation/amount.html b/analysis/templates/analysis/reports/includes/compensation/amount.html
index 86383b69..de6e2564 100644
--- a/analysis/templates/analysis/reports/includes/compensation/amount.html
+++ b/analysis/templates/analysis/reports/includes/compensation/amount.html
@@ -15,40 +15,40 @@
{% trans 'Area of responsibility' %} |
+ {% trans 'Total' %} |
+ {% trans 'Number single areas' %} |
{% fa5_icon 'star' %} {% trans 'Checked' %} |
{% fa5_icon 'bookmark' %} {% trans 'Recorded' %} |
- {% trans 'Number single areas' %} |
- {% trans 'Total' %} |
{% trans 'Conservation office by law' %} |
+ {{report.compensation_report.queryset_registration_office_unb_count|default_if_zero:"-"}} |
+ {{report.compensation_report.num_single_surfaces_total_unb|default_if_zero:"-"}} |
{{report.compensation_report.queryset_registration_office_unb_checked_count|default_if_zero:"-"}} |
{{report.compensation_report.queryset_registration_office_unb_recorded_count|default_if_zero:"-"}} |
- {{report.compensation_report.num_single_surfaces_total_unb|default_if_zero:"-"}} |
- {{report.compensation_report.queryset_registration_office_unb_count|default_if_zero:"-"}} |
{% trans 'Land-use planning' %} |
+ {{report.compensation_report.queryset_registration_office_tbp_count|default_if_zero:"-"}} |
+ {{report.compensation_report.num_single_surfaces_total_tbp|default_if_zero:"-"}} |
{{report.compensation_report.queryset_registration_office_tbp_checked_count|default_if_zero:"-"}} |
{{report.compensation_report.queryset_registration_office_tbp_recorded_count|default_if_zero:"-"}} |
- {{report.compensation_report.num_single_surfaces_total_tbp|default_if_zero:"-"}} |
- {{report.compensation_report.queryset_registration_office_tbp_count|default_if_zero:"-"}} |
{% trans 'Other registration office' %} |
+ {{report.compensation_report.queryset_registration_office_other_count|default_if_zero:"-"}} |
+ {{report.compensation_report.num_single_surfaces_total_other|default_if_zero:"-"}} |
{{report.compensation_report.queryset_registration_office_other_checked_count|default_if_zero:"-"}} |
{{report.compensation_report.queryset_registration_office_other_recorded_count|default_if_zero:"-"}} |
- {{report.compensation_report.num_single_surfaces_total_other|default_if_zero:"-"}} |
- {{report.compensation_report.queryset_registration_office_other_count|default_if_zero:"-"}} |
{% trans 'Total' %} |
+ {{report.compensation_report.queryset_count|default_if_zero:"-"}} |
+ {{report.compensation_report.num_single_surfaces_total|default_if_zero:"-"}} |
{{report.compensation_report.queryset_checked_count|default_if_zero:"-"}} |
{{report.compensation_report.queryset_recorded_count|default_if_zero:"-"}} |
- {{report.compensation_report.num_single_surfaces_total|default_if_zero:"-"}} |
- {{report.compensation_report.queryset_count|default_if_zero:"-"}} |
diff --git a/analysis/templates/analysis/reports/includes/eco_account/amount.html b/analysis/templates/analysis/reports/includes/eco_account/amount.html
index 668250e6..a36211f3 100644
--- a/analysis/templates/analysis/reports/includes/eco_account/amount.html
+++ b/analysis/templates/analysis/reports/includes/eco_account/amount.html
@@ -10,14 +10,14 @@
- {% fa5_icon 'bookmark' %} {% trans 'Recorded' %} |
- {% fa5_icon 'bookmark' %} {% trans 'Recorded' %} {% trans 'Surface' %} |
{% trans 'Total' %} |
{% trans 'Total' %} {% trans 'Surface' %} |
+ {% fa5_icon 'bookmark' %} {% trans 'Recorded' %} |
+ {% fa5_icon 'bookmark' %} {% trans 'Recorded' %} {% trans 'Surface' %} |
- {{report.eco_account_report.queryset_deductions_recorded_count|default_if_zero:"-"}} |
- {{report.eco_account_report.recorded_deductions_sq_m|default_if_zero:"-"}}m² |
{{report.eco_account_report.queryset_deductions_count|default_if_zero:"-"}} |
- {{report.eco_account_report.deductions_sq_m|default_if_zero:"-"}}m² |
+
+ {{report.eco_account_report.deductions_sq_m|default_if_zero:"-"}}
+ {% if report.eco_account_report.deductions_sq_m > 0 %}
+ m²
+ {% endif %}
+ |
+ {{report.eco_account_report.queryset_deductions_recorded_count|default_if_zero:"-"}} |
+
+ {{report.eco_account_report.recorded_deductions_sq_m|default_if_zero:"-"}}
+ {% if report.eco_account_report.recorded_deductions_sq_m > 0 %}
+ m²
+ {% endif %}
+ |
diff --git a/analysis/templates/analysis/reports/includes/intervention/amount.html b/analysis/templates/analysis/reports/includes/intervention/amount.html
index 0c934483..fc0b5fac 100644
--- a/analysis/templates/analysis/reports/includes/intervention/amount.html
+++ b/analysis/templates/analysis/reports/includes/intervention/amount.html
@@ -14,16 +14,16 @@
+ {% trans 'Total' %} |
{% fa5_icon 'star' %} {% trans 'Checked' %} |
{% fa5_icon 'bookmark' %} {% trans 'Recorded' %} |
- {% trans 'Total' %} |
+ {{report.intervention_report.queryset_count|default_if_zero:"-"}} |
{{report.intervention_report.queryset_checked_count|default_if_zero:"-"}} |
{{report.intervention_report.queryset_recorded_count|default_if_zero:"-"}} |
- {{report.intervention_report.queryset_count|default_if_zero:"-"}} |
diff --git a/analysis/templates/analysis/reports/includes/intervention/compensated_by.html b/analysis/templates/analysis/reports/includes/intervention/compensated_by.html
index c6be40cc..d76bec4a 100644
--- a/analysis/templates/analysis/reports/includes/intervention/compensated_by.html
+++ b/analysis/templates/analysis/reports/includes/intervention/compensated_by.html
@@ -5,29 +5,29 @@
{% trans 'Compensation type' %} |
+ {% trans 'Total' %} |
{% fa5_icon 'star' %} {% trans 'Checked' %} |
{% fa5_icon 'bookmark' %} {% trans 'Recorded' %} |
- {% trans 'Total' %} |
{% trans 'Compensation' %} |
+ {{report.intervention_report.compensation_sum|default_if_zero:"-"}} |
{{report.intervention_report.compensation_sum_checked|default_if_zero:"-"}} |
{{report.intervention_report.compensation_sum_recorded|default_if_zero:"-"}} |
- {{report.intervention_report.compensation_sum|default_if_zero:"-"}} |
{% trans 'Payment' %} |
+ {{report.intervention_report.payment_sum|default_if_zero:"-"}} |
{{report.intervention_report.payment_sum_checked|default_if_zero:"-"}} |
{{report.intervention_report.payment_sum_recorded|default_if_zero:"-"}} |
- {{report.intervention_report.payment_sum|default_if_zero:"-"}} |
{% trans 'Deductions' %} |
+ {{report.intervention_report.deduction_sum|default_if_zero:"-"}} |
{{report.intervention_report.deduction_sum_checked|default_if_zero:"-"}} |
{{report.intervention_report.deduction_sum_recorded|default_if_zero:"-"}} |
- {{report.intervention_report.deduction_sum|default_if_zero:"-"}} |
diff --git a/analysis/templates/analysis/reports/includes/intervention/laws.html b/analysis/templates/analysis/reports/includes/intervention/laws.html
index e310197f..55f6a551 100644
--- a/analysis/templates/analysis/reports/includes/intervention/laws.html
+++ b/analysis/templates/analysis/reports/includes/intervention/laws.html
@@ -13,15 +13,15 @@
{% trans 'Law' %}
|
+
+ {% trans 'Total' %}
+ |
{% fa5_icon 'star' %} {% trans 'Checked' %}
|
{% fa5_icon 'bookmark' %} {% trans 'Recorded' %}
|
-
- {% trans 'Total' %}
- |
@@ -34,16 +34,16 @@
{{law.long_name}}
+ {{law.num|default_if_zero:"-"}} |
{{law.num_checked|default_if_zero:"-"}} |
{{law.num_recorded|default_if_zero:"-"}} |
- {{law.num|default_if_zero:"-"}} |
{% endfor %}
{% trans 'Total' %} |
+ {{report.intervention_report.law_sum|default_if_zero:"-"}} |
{{report.intervention_report.law_sum_checked|default_if_zero:"-"}} |
{{report.intervention_report.law_sum_recorded|default_if_zero:"-"}} |
- {{report.intervention_report.law_sum|default_if_zero:"-"}} |
diff --git a/analysis/templates/analysis/reports/includes/old_data/amount.html b/analysis/templates/analysis/reports/includes/old_data/amount.html
index cd79cb6f..bc1fc1a8 100644
--- a/analysis/templates/analysis/reports/includes/old_data/amount.html
+++ b/analysis/templates/analysis/reports/includes/old_data/amount.html
@@ -14,26 +14,26 @@
- {% fa5_icon 'star' %} {% trans 'Type' %} |
- {% fa5_icon 'bookmark' %} {% trans 'Recorded' %} |
+ {% trans 'Type' %} |
{% trans 'Total' %} |
+ {% fa5_icon 'bookmark' %} {% trans 'Recorded' %} |
{% trans 'Intervention' %} |
- {{report.old_data_report.queryset_intervention_recorded_count|default_if_zero:"-"}} |
{{report.old_data_report.queryset_intervention_count|default_if_zero:"-"}} |
+ {{report.old_data_report.queryset_intervention_recorded_count|default_if_zero:"-"}} |
{% trans 'Compensation' %} |
- {{report.old_data_report.queryset_comps_recorded_count|default_if_zero:"-"}} |
{{report.old_data_report.queryset_comps_count|default_if_zero:"-"}} |
+ {{report.old_data_report.queryset_comps_recorded_count|default_if_zero:"-"}} |
{% trans 'Eco-account' %} |
- {{report.old_data_report.queryset_acc_recorded_count|default_if_zero:"-"}} |
{{report.old_data_report.queryset_acc_count|default_if_zero:"-"}} |
+ {{report.old_data_report.queryset_acc_recorded_count|default_if_zero:"-"}} |
diff --git a/analysis/templates/analysis/reports/includes/old_data/card_old_interventions.html b/analysis/templates/analysis/reports/includes/old_data/card_old_interventions.html
index a25a5712..d0dc356f 100644
--- a/analysis/templates/analysis/reports/includes/old_data/card_old_interventions.html
+++ b/analysis/templates/analysis/reports/includes/old_data/card_old_interventions.html
@@ -10,7 +10,7 @@
{% fa5_icon 'pencil-ruler' %}
{% trans 'Old interventions' %}
-
{% trans 'Before' %} 16.06.2018
+
{% trans 'Binding date before' %} 16.06.2018
diff --git a/analysis/utils/excel/excel.py b/analysis/utils/excel/excel.py
index 611f6a0c..818da7fd 100644
--- a/analysis/utils/excel/excel.py
+++ b/analysis/utils/excel/excel.py
@@ -108,7 +108,7 @@ class TempExcelFile:
for _iter_entry in _iter_obj:
j = 0
for _iter_attr in _attrs:
- _new_cell = ws.cell(start_cell.row + i, start_cell.column + j, getattr(_iter_entry, _iter_attr))
+ _new_cell = ws.cell(start_cell.row + i, start_cell.column + j, _iter_entry.get(_iter_attr, "MISSING"))
_new_cell.border = border_style
j += 1
i += 1
diff --git a/analysis/utils/excel/excel_report.xlsx b/analysis/utils/excel/excel_report.xlsx
index 72cf1295..041dfcf3 100644
Binary files a/analysis/utils/excel/excel_report.xlsx and b/analysis/utils/excel/excel_report.xlsx differ
diff --git a/konova/contexts.py b/konova/contexts.py
index 49357312..70cb1aac 100644
--- a/konova/contexts.py
+++ b/konova/contexts.py
@@ -7,7 +7,8 @@ Created on: 16.11.20
"""
from django.http import HttpRequest
-from konova.sub_settings.context_settings import BASE_TITLE, HELP_LINK, BASE_FRONTEND_TITLE, TAB_TITLE_IDENTIFIER
+from konova.sub_settings.context_settings import BASE_TITLE, HELP_LINK, BASE_FRONTEND_TITLE, TAB_TITLE_IDENTIFIER, \
+ IMPRESSUM_LINK
from konova.sub_settings.django_settings import EMAIL_REPLY_TO
@@ -25,6 +26,7 @@ class BaseContext:
"user": request.user,
"current_role": None,
"help_link": HELP_LINK,
+ "impressum_link": IMPRESSUM_LINK,
"CONTACT_MAIL": EMAIL_REPLY_TO,
}
diff --git a/konova/sub_settings/context_settings.py b/konova/sub_settings/context_settings.py
index c28b744c..d4b1821c 100644
--- a/konova/sub_settings/context_settings.py
+++ b/konova/sub_settings/context_settings.py
@@ -11,3 +11,4 @@ BASE_TITLE = "KSP - Kompensationsverzeichnis Service Portal"
BASE_FRONTEND_TITLE = "Kompensationsverzeichnis Service Portal"
TAB_TITLE_IDENTIFIER = "tab_title"
HELP_LINK = "https://dienste.naturschutz.rlp.de/doku/doku.php?id=ksp:start"
+IMPRESSUM_LINK = "https://naturschutz.rlp.de/index.php?q=impressum"
diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo
index 885f0b9d..176b3feb 100644
Binary files a/locale/de/LC_MESSAGES/django.mo and b/locale/de/LC_MESSAGES/django.mo differ
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index 93238630..6da567e1 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -26,7 +26,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-31 13:05+0200\n"
+"POT-Creation-Date: 2022-06-21 14:11+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME