From 92155fb742082f00f366527f7b7444e302c27941 Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Mon, 18 Oct 2021 15:52:51 +0200 Subject: [PATCH 01/14] #26 Annual conservation report * introduces new app 'analysis' for annual report generating and future features * adds new templates (WIP) * adds new routes (WIP) --- analysis/__init__.py | 0 analysis/admin.py | 3 + analysis/apps.py | 5 + analysis/models.py | 3 + .../templates/analysis/reports/detail.html | 17 + .../reports/includes/card_compensation.html | 23 ++ .../reports/includes/card_eco_account.html | 23 ++ .../includes/card_old_interventions.html | 24 ++ .../reports/includes/intervention/amount.html | 30 ++ .../intervention/card_intervention.html | 26 ++ .../includes/intervention/compensated_by.html | 34 ++ .../reports/includes/intervention/laws.html | 50 +++ .../templates/analysis/reports/index.html | 8 + analysis/tests.py | 3 + analysis/urls.py | 15 + analysis/utils/report.py | 127 +++++++ analysis/views.py | 59 ++++ konova/sub_settings/django_settings.py | 1 + konova/urls.py | 3 +- locale/de/LC_MESSAGES/django.mo | Bin 24781 -> 25176 bytes locale/de/LC_MESSAGES/django.po | 311 +++++++++++------- templates/navbars/navbar.html | 2 +- 22 files changed, 641 insertions(+), 126 deletions(-) create mode 100644 analysis/__init__.py create mode 100644 analysis/admin.py create mode 100644 analysis/apps.py create mode 100644 analysis/models.py create mode 100644 analysis/templates/analysis/reports/detail.html create mode 100644 analysis/templates/analysis/reports/includes/card_compensation.html create mode 100644 analysis/templates/analysis/reports/includes/card_eco_account.html create mode 100644 analysis/templates/analysis/reports/includes/card_old_interventions.html create mode 100644 analysis/templates/analysis/reports/includes/intervention/amount.html create mode 100644 analysis/templates/analysis/reports/includes/intervention/card_intervention.html create mode 100644 analysis/templates/analysis/reports/includes/intervention/compensated_by.html create mode 100644 analysis/templates/analysis/reports/includes/intervention/laws.html create mode 100644 analysis/templates/analysis/reports/index.html create mode 100644 analysis/tests.py create mode 100644 analysis/urls.py create mode 100644 analysis/utils/report.py create mode 100644 analysis/views.py diff --git a/analysis/__init__.py b/analysis/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/analysis/admin.py b/analysis/admin.py new file mode 100644 index 00000000..8c38f3f3 --- /dev/null +++ b/analysis/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/analysis/apps.py b/analysis/apps.py new file mode 100644 index 00000000..126ab0e5 --- /dev/null +++ b/analysis/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class AnalysisConfig(AppConfig): + name = 'analysis' diff --git a/analysis/models.py b/analysis/models.py new file mode 100644 index 00000000..71a83623 --- /dev/null +++ b/analysis/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/analysis/templates/analysis/reports/detail.html b/analysis/templates/analysis/reports/detail.html new file mode 100644 index 00000000..219ad46d --- /dev/null +++ b/analysis/templates/analysis/reports/detail.html @@ -0,0 +1,17 @@ +{% extends 'base.html' %} +{% load i18n fontawesome_5 %} + +{% block body %} +
+
+

{% trans 'Report' %}

+
{{office.long_name}}
+
+
+
+ {% include 'analysis/reports/includes/intervention/card_intervention.html' %} + {% include 'analysis/reports/includes/card_compensation.html' %} + {% include 'analysis/reports/includes/card_eco_account.html' %} + {% include 'analysis/reports/includes/card_old_interventions.html' %} +
+{% endblock %} \ No newline at end of file diff --git a/analysis/templates/analysis/reports/includes/card_compensation.html b/analysis/templates/analysis/reports/includes/card_compensation.html new file mode 100644 index 00000000..24d0eabf --- /dev/null +++ b/analysis/templates/analysis/reports/includes/card_compensation.html @@ -0,0 +1,23 @@ +{% load i18n fontawesome_5 %} + +
+
+
+
+
+
+
+ {% fa5_icon 'leaf' %} + {% trans 'Compensations' %} +
+
+
+
+
+
+ {% include 'form/table/generic_table_form_body.html' %} +
+
+
+
+
\ No newline at end of file diff --git a/analysis/templates/analysis/reports/includes/card_eco_account.html b/analysis/templates/analysis/reports/includes/card_eco_account.html new file mode 100644 index 00000000..744ce07f --- /dev/null +++ b/analysis/templates/analysis/reports/includes/card_eco_account.html @@ -0,0 +1,23 @@ +{% load i18n fontawesome_5 %} + +
+
+
+
+
+
+
+ {% fa5_icon 'tree' %} + {% trans 'Eco-Accounts' %} +
+
+
+
+
+
+ {% include 'form/table/generic_table_form_body.html' %} +
+
+
+
+
\ No newline at end of file diff --git a/analysis/templates/analysis/reports/includes/card_old_interventions.html b/analysis/templates/analysis/reports/includes/card_old_interventions.html new file mode 100644 index 00000000..400d0085 --- /dev/null +++ b/analysis/templates/analysis/reports/includes/card_old_interventions.html @@ -0,0 +1,24 @@ +{% load i18n fontawesome_5 %} + +
+
+
+
+
+
+
+ {% fa5_icon 'pencil-ruler' %} + {% trans 'Old interventions' %} +
+ {% trans 'Before' %} 16.06.2018 +
+
+
+
+
+ {% include 'form/table/generic_table_form_body.html' %} +
+
+
+
+
\ No newline at end of file diff --git a/analysis/templates/analysis/reports/includes/intervention/amount.html b/analysis/templates/analysis/reports/includes/intervention/amount.html new file mode 100644 index 00000000..a146d4b2 --- /dev/null +++ b/analysis/templates/analysis/reports/includes/intervention/amount.html @@ -0,0 +1,30 @@ +{% load i18n fontawesome_5 %} + +

{% trans 'Amount' %}

+ + {% blocktrans %} + Checked = Has been checked by the registration office according to LKompVzVo + {% endblocktrans %} +
+ {% blocktrans %} + Recorded = Has been checked and published by the conservation office + {% endblocktrans %} + +
+ + + + + + + + + + + + + + + +
{% trans 'Total' %}{% fa5_icon 'star' %} {% trans 'Checked' %}{% fa5_icon 'bookmark' %} {% trans 'Recorded' %}
{{report.intervention_report.queryset.count}}{{report.intervention_report.queryset_checked.count}}{{report.intervention_report.queryset_recorded.count}}
+
\ No newline at end of file diff --git a/analysis/templates/analysis/reports/includes/intervention/card_intervention.html b/analysis/templates/analysis/reports/includes/intervention/card_intervention.html new file mode 100644 index 00000000..13c22892 --- /dev/null +++ b/analysis/templates/analysis/reports/includes/intervention/card_intervention.html @@ -0,0 +1,26 @@ +{% load i18n fontawesome_5 %} +
+
+
+
+
+
+
+ {% fa5_icon 'pencil-ruler' %} + {% trans 'Interventions' %} +
+
+
+
+
+
+ {% include 'analysis/reports/includes/intervention/amount.html' %} +
+ {% include 'analysis/reports/includes/intervention/laws.html' %} +
+ {% include 'analysis/reports/includes/intervention/compensated_by.html' %} +
+
+
+
+
\ No newline at end of file diff --git a/analysis/templates/analysis/reports/includes/intervention/compensated_by.html b/analysis/templates/analysis/reports/includes/intervention/compensated_by.html new file mode 100644 index 00000000..87dfc570 --- /dev/null +++ b/analysis/templates/analysis/reports/includes/intervention/compensated_by.html @@ -0,0 +1,34 @@ +{% load i18n fontawesome_5 %} +

{% trans 'Compensated by' %}

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans 'Compensation type' %}{% trans 'Total' %}{% trans 'Checked' %}{% trans 'Recorded' %}
{% trans 'Compensation' %}{{report.intervention_report.compensation_sum}}{{report.intervention_report.compensation_sum_checked}}{{report.intervention_report.compensation_sum_recorded}}
{% trans 'Payment' %}{{report.intervention_report.payment_sum}}{{report.intervention_report.payment_sum_checked}}{{report.intervention_report.payment_sum_recorded}}
{% trans 'Deductions' %}{{report.intervention_report.deduction_sum}}{{report.intervention_report.deduction_sum_checked}}{{report.intervention_report.deduction_sum_recorded}}
+
\ No newline at end of file diff --git a/analysis/templates/analysis/reports/includes/intervention/laws.html b/analysis/templates/analysis/reports/includes/intervention/laws.html new file mode 100644 index 00000000..d373c681 --- /dev/null +++ b/analysis/templates/analysis/reports/includes/intervention/laws.html @@ -0,0 +1,50 @@ +{% load i18n fontawesome_5 %} +

{% trans 'Law usage' %}

+ + {% blocktrans %} + Please note: One intervention can be based on multiple laws. This table therefore does not + count + {% endblocktrans %} + +
+ + + + + + + + + + + {% for law in report.intervention_report.evaluated_laws %} + + + + + + + {% endfor %} + + + + + + + +
+ {% trans 'Law' %} + + {% trans 'Checked' %} + + {% trans 'Recorded' %} + + {% trans 'Total' %} +
+ {{law.short_name}} +
+ + {{law.long_name}} + + 		{{law.num_checked}}{{law.num_recorded}}{{law.num}}
{% trans 'Total' %}{{report.intervention_report.law_sum_checked}}{{report.intervention_report.law_sum_recorded}}{{report.intervention_report.law_sum}}
+
\ No newline at end of file diff --git a/analysis/templates/analysis/reports/index.html b/analysis/templates/analysis/reports/index.html new file mode 100644 index 00000000..4f7d8bd0 --- /dev/null +++ b/analysis/templates/analysis/reports/index.html @@ -0,0 +1,8 @@ +{% extends 'base.html' %} +{% load i18n fontawesome_5 %} + +{% block body %} +
+

{% trans 'Reports' %}

+
+{% endblock %} \ No newline at end of file diff --git a/analysis/tests.py b/analysis/tests.py new file mode 100644 index 00000000..7ce503c2 --- /dev/null +++ b/analysis/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/analysis/urls.py b/analysis/urls.py new file mode 100644 index 00000000..71eb6665 --- /dev/null +++ b/analysis/urls.py @@ -0,0 +1,15 @@ +""" +Author: Michel Peltriaux +Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany +Contact: michel.peltriaux@sgdnord.rlp.de +Created on: 15.10.21 + +""" +from django.urls import path +from analysis.views import * + +app_name = "analysis" +urlpatterns = [ + path("reports/", index_reports_view, name="reports"), + path("reports/", detail_report_view, name="report-detail"), +] \ No newline at end of file diff --git a/analysis/utils/report.py b/analysis/utils/report.py new file mode 100644 index 00000000..fbc88520 --- /dev/null +++ b/analysis/utils/report.py @@ -0,0 +1,127 @@ +""" +Author: Michel Peltriaux +Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany +Contact: michel.peltriaux@sgdnord.rlp.de +Created on: 18.10.21 + +""" +from django.db.models import Count, Sum, Q + +from codelist.models import KonovaCode +from codelist.settings import CODELIST_LAW_ID +from compensation.models import Compensation, Payment, EcoAccountDeduction +from intervention.models import Intervention + + +class TimespanReport: + office_id = -1 + + class InterventionReport: + queryset = Intervention.objects.none() + queryset_checked = Intervention.objects.none() + queryset_recorded = Intervention.objects.none() + + # Law related + law_sum = -1 + law_sum_checked = -1 + law_sum_recorded = -1 + evaluated_laws = None + + # Compensations related + compensation_sum = -1 + compensation_sum_checked = -1 + compensation_sum_recorded = -1 + payment_sum = -1 + payment_sum_checked = -1 + payment_sum_recorded = -1 + deduction_sum = -1 + deduction_sum_checked = -1 + deduction_sum_recorded = -1 + + def __init__(self, id: str): + self.queryset = Intervention.objects.filter( + responsible__conservation_office__id=id, + deleted=None, + ) + self.queryset_checked = self.queryset.filter( + checked__isnull=False + ) + self.queryset_recorded = self.queryset.filter( + recorded__isnull=False + ) + self._create_report() + + def _create_report(self): + """ Creates all report information + + Returns: + + """ + self._evaluate_laws() + self._evaluate_compensations() + + def _evaluate_laws(self): + """ Analyzes the intervention-law distribution + + Returns: + + """ + # Count interventions based on law + # Fetch all KonovaCodes for laws, sorted alphabetically + laws = KonovaCode.objects.filter( + is_archived=False, + is_leaf=True, + code_lists__in=[CODELIST_LAW_ID], + ).order_by( + "long_name" + ) + # Fetch all law ids which are used by any .legal object of an intervention object + intervention_laws_total = self.queryset.values_list("legal__laws__id") + intervention_laws_checked = self.queryset.filter(checked__isnull=False).values_list("legal__laws__id") + intervention_laws_recorded = self.queryset.filter(recorded__isnull=False).values_list( + "legal__laws__id") + # Count how often which law id appears in the above list, return only the long_name of the law and the resulting + # count (here 'num'). This is for keeping the db fetch as small as possible + # Compute the sum for total, checked and recorded + self.evaluated_laws = laws.annotate( + num=Count("id", filter=Q(id__in=intervention_laws_total)), + num_checked=Count("id", filter=Q(id__in=intervention_laws_checked)), + num_recorded=Count("id", filter=Q(id__in=intervention_laws_recorded)), + ).values_list("short_name", "long_name", "num_checked", "num_recorded", "num", named=True) + self.law_sum = self.evaluated_laws.aggregate(sum_num=Sum("num"))["sum_num"] + self.law_sum_checked = self.evaluated_laws.aggregate(sum_num_checked=Sum("num_checked"))["sum_num_checked"] + self.law_sum_recorded = self.evaluated_laws.aggregate(sum_num_recorded=Sum("num_recorded"))["sum_num_recorded"] + + def _evaluate_compensations(self): + """ Analyzes the types of compensation distribution + + Returns: + + """ + # Count all compensations + comps = Compensation.objects.filter( + intervention__in=self.queryset + ) + self.compensation_sum = comps.count() + self.compensation_sum_checked = comps.filter(intervention__checked__isnull=False).count() + self.compensation_sum_recorded = comps.filter(intervention__recorded__isnull=False).count() + + # Count all payments + payments = Payment.objects.filter( + intervention__in=self.queryset + ) + self.payment_sum = payments.count() + self.payment_sum_checked = payments.filter(intervention__checked__isnull=False).count() + self.payment_sum_recorded = payments.filter(intervention__recorded__isnull=False).count() + + # Count all deductions + deductions = EcoAccountDeduction.objects.filter( + intervention__in=self.queryset + ) + self.deduction_sum = deductions.count() + self.deduction_sum_checked = deductions.filter(intervention__checked__isnull=False).count() + self.deduction_sum_recorded = deductions.filter(intervention__recorded__isnull=False).count() + + def __init__(self, office_id: str): + self.office_id = office_id + self.intervention_report = self.InterventionReport(self.office_id) diff --git a/analysis/views.py b/analysis/views.py new file mode 100644 index 00000000..43dd061b --- /dev/null +++ b/analysis/views.py @@ -0,0 +1,59 @@ +from django.contrib.auth.decorators import login_required +from django.db.models import Count, Q, Sum +from django.http import HttpRequest +from django.shortcuts import render, get_object_or_404 + +from analysis.utils.report import TimespanReport +from codelist.models import KonovaCode +from codelist.settings import CODELIST_LAW_ID +from compensation.models import EcoAccount, Compensation +from ema.models import Ema +from intervention.models import Intervention +from konova.contexts import BaseContext +from konova.decorators import conservation_office_group_required + + +@login_required +@conservation_office_group_required +def index_reports_view(request: HttpRequest): + """ + + Args: + request (HttpRequest): The incoming request + + Returns: + + """ + template = "analysis/reports/index.html" + context = {} + context = BaseContext(request, context).context + return render(request, template, context) + + +def detail_report_view(request: HttpRequest, id: str): + cons_office = get_object_or_404( + KonovaCode, + id=id, + ) + cons_interventions = Intervention.objects.filter( + responsible__conservation_office__id=id, + deleted=None, + ) + cons_comps = Compensation.objects.filter( + intervention__in=cons_interventions, + deleted=None, + ) + cons_eco_account = EcoAccount.objects.filter( + responsible__conservation_office__id=id, + deleted=None, + ) + + report = TimespanReport(id) + + template = "analysis/reports/detail.html" + context = { + "office": cons_office, + "report": report, + } + context = BaseContext(request, context).context + return render(request, template, context) \ No newline at end of file diff --git a/konova/sub_settings/django_settings.py b/konova/sub_settings/django_settings.py index 29540d4b..df875a81 100644 --- a/konova/sub_settings/django_settings.py +++ b/konova/sub_settings/django_settings.py @@ -69,6 +69,7 @@ INSTALLED_APPS = [ 'user', 'ema', 'codelist', + 'analysis', ] if DEBUG: INSTALLED_APPS += [ diff --git a/konova/urls.py b/konova/urls.py index 8448cb4e..1aebcbcc 100644 --- a/konova/urls.py +++ b/konova/urls.py @@ -36,7 +36,8 @@ urlpatterns = [ path('ema/', include("ema.urls")), path('user/', include("user.urls")), path('news/', include("news.urls")), - path('news/', include("codelist.urls")), + path('cl/', include("codelist.urls")), + path('analysis/', include("analysis.urls")), # Generic deadline routes path('deadline//remove', remove_deadline_view, name="deadline-remove"), diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index b9d3ebde2f32b322b31bbe5e82f547e9e9e5b976..c65e66dc01cf89f3565d996215b6934dfe6b7363 100644 GIT binary patch delta 8283 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 Ow(q*2lH_6W75@i-DK3Ek diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index aebd7445..f02eced3 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-10-14 09:12+0200\n" +"POT-Creation-Date: 2021-10-18 14:59+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,12 +29,111 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: analysis/templates/analysis/reports/detail.html:7 +#: compensation/templates/compensation/report/compensation/report.html:7 +#: compensation/templates/compensation/report/eco_account/report.html:7 +#: ema/templates/ema/report/report.html:7 +#: intervention/templates/intervention/report/report.html:7 +msgid "Report" +msgstr "Bericht" + +#: analysis/templates/analysis/reports/includes/card_compensation.html:11 +#: compensation/tables.py:62 +#: intervention/templates/intervention/detail/includes/compensations.html:8 +#: intervention/templates/intervention/report/report.html:49 +msgid "Compensations" +msgstr "Kompensationen" + +#: analysis/templates/analysis/reports/includes/card_eco_account.html:11 +msgid "Eco-Accounts" +msgstr "Ökokonten" + +#: analysis/templates/analysis/reports/includes/card_intervention.html:10 +#: intervention/tables.py:66 +msgid "Interventions" +msgstr "Eingriffe" + +#: analysis/templates/analysis/reports/includes/card_intervention.html:17 +msgid "Total interventions" +msgstr "Insgesamt" + +#: analysis/templates/analysis/reports/includes/card_intervention.html:22 +msgid "Amount total" +msgstr "Anzahl insgesamt" + +#: analysis/templates/analysis/reports/includes/card_intervention.html:26 +msgid "Amount checked" +msgstr "Anzahl geprüft" + +#: analysis/templates/analysis/reports/includes/card_intervention.html:30 +msgid "Amount recorded" +msgstr "Anzahl verzeichnet" + +#: analysis/templates/analysis/reports/includes/card_intervention.html:37 +msgid "Law usage" +msgstr "Gesetzesanwendungen" + +#: analysis/templates/analysis/reports/includes/card_intervention.html:43 +#: intervention/forms/forms.py:68 +#: intervention/templates/intervention/detail/view.html:39 +#: intervention/templates/intervention/report/report.html:20 +msgid "Law" +msgstr "Gesetz" + +#: analysis/templates/analysis/reports/includes/card_intervention.html:46 +#: compensation/tables.py:35 +#: compensation/templates/compensation/detail/compensation/view.html:43 +#: intervention/tables.py:33 +#: intervention/templates/intervention/detail/view.html:68 user/models.py:48 +msgid "Checked" +msgstr "Geprüft" + +#: analysis/templates/analysis/reports/includes/card_intervention.html:49 +#: compensation/tables.py:41 compensation/tables.py:181 +#: compensation/templates/compensation/detail/compensation/view.html:57 +#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:31 +#: compensation/templates/compensation/detail/eco_account/view.html:44 +#: ema/tables.py:38 ema/templates/ema/detail/view.html:28 +#: intervention/tables.py:39 +#: intervention/templates/intervention/detail/view.html:82 user/models.py:49 +msgid "Recorded" +msgstr "Verzeichnet" + +#: analysis/templates/analysis/reports/includes/card_intervention.html:52 +#: analysis/templates/analysis/reports/includes/card_intervention.html:72 +#: konova/templates/konova/home.html:23 konova/templates/konova/home.html:61 +#: konova/templates/konova/home.html:100 +msgid "Total" +msgstr "Insgesamt" + +#: analysis/templates/analysis/reports/includes/card_intervention.html:81 +msgid "" +"\n" +" Please note: One intervention can be based on " +"multiple laws. This table therefore does not\n" +" count\n" +" " +msgstr "" + +#: analysis/templates/analysis/reports/includes/card_old_interventions.html:11 +msgid "Old interventions" +msgstr "Altfälle" + +#: analysis/templates/analysis/reports/includes/card_old_interventions.html:13 +msgid "Before" +msgstr "Vor" + +#: analysis/templates/analysis/reports/index.html:6 +#: templates/navbars/navbar.html:46 +msgid "Reports" +msgstr "Berichte" + #: compensation/filters.py:70 msgid "Show only unrecorded" msgstr "Nur unverzeichnete anzeigen" #: compensation/forms/forms.py:31 compensation/tables.py:25 -#: compensation/tables.py:167 ema/tables.py:28 intervention/forms/forms.py:27 +#: compensation/tables.py:166 ema/tables.py:28 intervention/forms/forms.py:27 #: intervention/tables.py:23 #: intervention/templates/intervention/detail/includes/compensations.html:30 msgid "Identifier" @@ -45,7 +144,7 @@ msgid "Generated automatically" msgstr "Automatisch generiert" #: compensation/forms/forms.py:43 compensation/tables.py:30 -#: compensation/tables.py:172 +#: compensation/tables.py:171 #: compensation/templates/compensation/detail/compensation/includes/documents.html:28 #: compensation/templates/compensation/detail/compensation/view.html:31 #: compensation/templates/compensation/detail/eco_account/includes/documents.html:28 @@ -308,12 +407,12 @@ msgstr "Maßnahmentyp wählen" #: compensation/templates/compensation/detail/compensation/includes/documents.html:35 #: compensation/templates/compensation/detail/compensation/includes/states-after.html:40 #: compensation/templates/compensation/detail/compensation/includes/states-before.html:40 -#: compensation/templates/compensation/detail/eco_account/includes/actions.html:37 +#: compensation/templates/compensation/detail/eco_account/includes/actions.html:38 #: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:37 #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:40 #: compensation/templates/compensation/detail/eco_account/includes/documents.html:34 -#: compensation/templates/compensation/detail/eco_account/includes/states-after.html:39 -#: compensation/templates/compensation/detail/eco_account/includes/states-before.html:39 +#: compensation/templates/compensation/detail/eco_account/includes/states-after.html:40 +#: compensation/templates/compensation/detail/eco_account/includes/states-before.html:40 #: ema/templates/ema/detail/includes/actions.html:37 #: ema/templates/ema/detail/includes/deadlines.html:37 #: ema/templates/ema/detail/includes/documents.html:34 @@ -358,38 +457,38 @@ msgstr "Geben Sie die Daten der neuen Maßnahme ein" msgid "Added action" msgstr "Maßnahme hinzugefügt" -#: compensation/models.py:78 +#: compensation/models.py:82 msgid "cm" msgstr "" -#: compensation/models.py:79 +#: compensation/models.py:83 msgid "m" msgstr "" -#: compensation/models.py:80 +#: compensation/models.py:84 msgid "km" msgstr "" -#: compensation/models.py:81 +#: compensation/models.py:85 msgid "m²" msgstr "" -#: compensation/models.py:82 +#: compensation/models.py:86 msgid "ha" msgstr "" -#: compensation/models.py:83 +#: compensation/models.py:87 msgid "Pieces" msgstr "Stück" -#: compensation/models.py:311 +#: compensation/models.py:321 msgid "" "Deductable surface can not be larger than existing surfaces in after states" msgstr "" "Die abbuchbare Fläche darf die Gesamtfläche der Zielzustände nicht " "überschreiten" -#: compensation/models.py:318 +#: compensation/models.py:328 msgid "" "Deductable surface can not be smaller than the sum of already existing " "deductions. Please contact the responsible users for the deductions!" @@ -397,40 +496,17 @@ msgstr "" "Es wurde bereits mehr Fläche abgebucht, als Sie nun als abbuchbar einstellen " "wollen. Kontaktieren Sie die für die Abbuchungen verantwortlichen Nutzer!" -#: compensation/tables.py:35 -#: compensation/templates/compensation/detail/compensation/view.html:43 -#: intervention/tables.py:33 -#: intervention/templates/intervention/detail/view.html:68 user/models.py:48 -msgid "Checked" -msgstr "Geprüft" - -#: compensation/tables.py:41 compensation/tables.py:182 -#: compensation/templates/compensation/detail/compensation/view.html:57 -#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:31 -#: compensation/templates/compensation/detail/eco_account/view.html:44 -#: ema/tables.py:38 ema/templates/ema/detail/view.html:28 -#: intervention/tables.py:39 -#: intervention/templates/intervention/detail/view.html:82 user/models.py:49 -msgid "Recorded" -msgstr "Verzeichnet" - -#: compensation/tables.py:47 compensation/tables.py:188 ema/tables.py:44 +#: compensation/tables.py:47 compensation/tables.py:187 ema/tables.py:44 #: intervention/tables.py:51 msgid "Editable" msgstr "Freigegeben" -#: compensation/tables.py:53 compensation/tables.py:194 ema/tables.py:50 +#: compensation/tables.py:53 compensation/tables.py:193 ema/tables.py:50 #: intervention/tables.py:57 msgid "Last edit" msgstr "Zuletzt bearbeitet" -#: compensation/tables.py:62 -#: intervention/templates/intervention/detail/includes/compensations.html:8 -#: intervention/templates/intervention/report/report.html:49 -msgid "Compensations" -msgstr "Kompensationen" - -#: compensation/tables.py:84 compensation/tables.py:225 ema/tables.py:82 +#: compensation/tables.py:84 compensation/tables.py:224 ema/tables.py:82 #: intervention/tables.py:88 msgid "Open {}" msgstr "Öffne {}" @@ -451,46 +527,47 @@ msgstr "Am {} von {} geprüft worden" #: compensation/tables.py:129 #: compensation/templates/compensation/detail/compensation/view.html:60 +#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:56 #: compensation/templates/compensation/detail/eco_account/view.html:47 #: ema/tables.py:101 ema/templates/ema/detail/view.html:31 -#: intervention/models.py:384 intervention/tables.py:131 +#: intervention/tables.py:131 #: intervention/templates/intervention/detail/view.html:85 msgid "Not recorded yet" msgstr "Noch nicht verzeichnet" -#: compensation/tables.py:134 compensation/tables.py:263 ema/tables.py:106 -#: intervention/models.py:389 intervention/tables.py:136 +#: compensation/tables.py:134 compensation/tables.py:262 ema/tables.py:106 +#: intervention/tables.py:136 msgid "Recorded on {} by {}" msgstr "Am {} von {} verzeichnet worden" -#: compensation/tables.py:159 compensation/tables.py:286 ema/tables.py:129 +#: compensation/tables.py:158 compensation/tables.py:284 ema/tables.py:129 #: intervention/tables.py:159 msgid "Full access granted" msgstr "Für Sie freigegeben - Datensatz kann bearbeitet werden" -#: compensation/tables.py:159 compensation/tables.py:286 ema/tables.py:129 +#: compensation/tables.py:158 compensation/tables.py:284 ema/tables.py:129 #: intervention/tables.py:159 msgid "Access not granted" msgstr "Nicht freigegeben - Datensatz nur lesbar" -#: compensation/tables.py:177 +#: compensation/tables.py:176 #: compensation/templates/compensation/detail/eco_account/view.html:35 #: konova/templates/konova/widgets/progressbar.html:3 msgid "Available" msgstr "Verfügbar" -#: compensation/tables.py:203 +#: compensation/tables.py:202 msgid "Eco Accounts" msgstr "Ökokonten" -#: compensation/tables.py:225 +#: compensation/tables.py:224 #: compensation/templates/compensation/detail/eco_account/view.html:19 #: intervention/forms/modalForms.py:258 intervention/forms/modalForms.py:265 #: konova/templates/konova/home.html:88 templates/navbars/navbar.html:34 msgid "Eco-account" msgstr "Ökokonto" -#: compensation/tables.py:258 +#: compensation/tables.py:257 msgid "Not recorded yet. Can not be used for deductions, yet." msgstr "" "Noch nicht verzeichnet. Kann noch nicht für Abbuchungen genutzt werden." @@ -522,7 +599,7 @@ msgid "Amount" msgstr "Menge" #: compensation/templates/compensation/detail/compensation/includes/actions.html:53 -#: compensation/templates/compensation/detail/eco_account/includes/actions.html:51 +#: compensation/templates/compensation/detail/eco_account/includes/actions.html:53 #: ema/templates/ema/detail/includes/actions.html:51 msgid "Remove action" msgstr "Maßnahme entfernen" @@ -638,8 +715,8 @@ msgstr "Biotoptyp" #: compensation/templates/compensation/detail/compensation/includes/states-after.html:54 #: compensation/templates/compensation/detail/compensation/includes/states-before.html:54 -#: compensation/templates/compensation/detail/eco_account/includes/states-after.html:52 -#: compensation/templates/compensation/detail/eco_account/includes/states-before.html:52 +#: compensation/templates/compensation/detail/eco_account/includes/states-after.html:54 +#: compensation/templates/compensation/detail/eco_account/includes/states-before.html:54 #: ema/templates/ema/detail/includes/states-after.html:52 #: ema/templates/ema/detail/includes/states-before.html:52 msgid "Remove state" @@ -670,6 +747,7 @@ msgstr "Geprüft am " #: compensation/templates/compensation/detail/compensation/view.html:50 #: compensation/templates/compensation/detail/compensation/view.html:64 +#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:54 #: compensation/templates/compensation/detail/eco_account/view.html:51 #: ema/templates/ema/detail/view.html:35 #: intervention/templates/intervention/detail/view.html:75 @@ -755,6 +833,12 @@ msgstr "Eingriffskennung" msgid "Created" msgstr "Erstellt" +#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:54 +#, fuzzy +#| msgid "Recorded on " +msgid "Recorded on" +msgstr "Verzeichnet am" + #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:63 #: intervention/templates/intervention/detail/includes/deductions.html:58 msgid "Remove Deduction" @@ -789,24 +873,17 @@ msgstr "Fehlt" msgid "Action handler" msgstr "Maßnahmenträger" -#: compensation/templates/compensation/report/compensation/report.html:7 -#: compensation/templates/compensation/report/eco_account/report.html:7 -#: ema/templates/ema/report/report.html:7 -#: intervention/templates/intervention/report/report.html:7 -msgid "Report" -msgstr "Bericht" - -#: compensation/templates/compensation/report/compensation/report.html:58 -#: compensation/templates/compensation/report/eco_account/report.html:75 -#: ema/templates/ema/report/report.html:62 -#: intervention/templates/intervention/report/report.html:108 +#: compensation/templates/compensation/report/compensation/report.html:55 +#: compensation/templates/compensation/report/eco_account/report.html:72 +#: ema/templates/ema/report/report.html:59 +#: intervention/templates/intervention/report/report.html:105 msgid "Open in browser" msgstr "Im Browser öffnen" -#: compensation/templates/compensation/report/compensation/report.html:62 -#: compensation/templates/compensation/report/eco_account/report.html:79 -#: ema/templates/ema/report/report.html:66 -#: intervention/templates/intervention/report/report.html:112 +#: compensation/templates/compensation/report/compensation/report.html:59 +#: compensation/templates/compensation/report/eco_account/report.html:76 +#: ema/templates/ema/report/report.html:63 +#: intervention/templates/intervention/report/report.html:109 msgid "View in LANIS" msgstr "In LANIS öffnen" @@ -823,8 +900,8 @@ msgid "Compensation {} edited" msgstr "Kompensation {} bearbeitet" #: compensation/views/compensation_views.py:213 -#: compensation/views/eco_account_views.py:278 ema/views.py:175 -#: intervention/views.py:428 +#: compensation/views/eco_account_views.py:287 ema/views.py:175 +#: intervention/views.py:437 msgid "Log" msgstr "Log" @@ -833,23 +910,23 @@ msgid "Compensation removed" msgstr "Kompensation entfernt" #: compensation/views/compensation_views.py:253 -#: compensation/views/eco_account_views.py:377 ema/views.py:328 -#: intervention/views.py:124 +#: compensation/views/eco_account_views.py:386 ema/views.py:328 +#: intervention/views.py:126 msgid "Document added" msgstr "Dokument hinzugefügt" #: compensation/views/compensation_views.py:309 -#: compensation/views/eco_account_views.py:321 ema/views.py:272 +#: compensation/views/eco_account_views.py:330 ema/views.py:272 msgid "State added" msgstr "Zustand hinzugefügt" #: compensation/views/compensation_views.py:328 -#: compensation/views/eco_account_views.py:340 ema/views.py:291 +#: compensation/views/eco_account_views.py:349 ema/views.py:291 msgid "Action added" msgstr "Maßnahme hinzugefügt" #: compensation/views/compensation_views.py:347 -#: compensation/views/eco_account_views.py:359 ema/views.py:310 +#: compensation/views/eco_account_views.py:368 ema/views.py:310 msgid "Deadline added" msgstr "Frist/Termin hinzugefügt" @@ -861,33 +938,33 @@ msgstr "Zustand gelöscht" msgid "Action removed" msgstr "Maßnahme entfernt" -#: compensation/views/eco_account_views.py:87 +#: compensation/views/eco_account_views.py:86 msgid "Eco-Account {} added" msgstr "Ökokonto {} hinzugefügt" -#: compensation/views/eco_account_views.py:142 +#: compensation/views/eco_account_views.py:141 msgid "Eco-Account {} edited" msgstr "Ökokonto {} bearbeitet" -#: compensation/views/eco_account_views.py:228 +#: compensation/views/eco_account_views.py:237 msgid "Eco-account removed" msgstr "Ökokonto entfernt" -#: compensation/views/eco_account_views.py:255 +#: compensation/views/eco_account_views.py:264 msgid "Deduction removed" msgstr "Abbuchung entfernt" -#: compensation/views/eco_account_views.py:298 ema/views.py:249 -#: intervention/views.py:468 +#: compensation/views/eco_account_views.py:307 ema/views.py:249 +#: intervention/views.py:477 msgid "{} unrecorded" msgstr "{} entzeichnet" -#: compensation/views/eco_account_views.py:298 ema/views.py:249 -#: intervention/views.py:468 +#: compensation/views/eco_account_views.py:307 ema/views.py:249 +#: intervention/views.py:477 msgid "{} recorded" msgstr "{} verzeichnet" -#: compensation/views/eco_account_views.py:434 intervention/views.py:450 +#: compensation/views/eco_account_views.py:443 intervention/views.py:459 msgid "Deduction added" msgstr "Abbuchung hinzugefügt" @@ -965,12 +1042,6 @@ msgstr "Bauvorhaben XY; Flur ABC" msgid "Process type" msgstr "Verfahrenstyp" -#: intervention/forms/forms.py:68 -#: intervention/templates/intervention/detail/view.html:39 -#: intervention/templates/intervention/report/report.html:20 -msgid "Law" -msgstr "Gesetz" - #: intervention/forms/forms.py:70 msgid "Multiple selection possible" msgstr "Mehrfachauswahl möglich" @@ -1120,31 +1191,31 @@ msgstr "" "Das Ökokonto {} hat für eine Abbuchung von {} m² nicht ausreichend " "Restfläche. Es stehen noch {} m² zur Verfügung." -#: intervention/models.py:324 +#: intervention/models.py:329 msgid "Registration office file number missing" msgstr "Aktenzeichen Zulassungsbehörde fehlt" -#: intervention/models.py:327 +#: intervention/models.py:332 msgid "Conservation office file number missing" msgstr "Aktenzeichen Naturschutzbehörde fehlt" -#: intervention/models.py:330 +#: intervention/models.py:335 msgid "Responsible data missing" msgstr "Daten zu Verantwortlichen fehlen" -#: intervention/models.py:344 +#: intervention/models.py:349 msgid "Revocation exists" msgstr "Widerspruch liegt vor" -#: intervention/models.py:347 +#: intervention/models.py:352 msgid "Registration date missing" msgstr "Datum Zulassung bzw. Satzungsbeschluss fehlt" -#: intervention/models.py:350 +#: intervention/models.py:355 msgid "Binding on missing" msgstr "Datum Bestandskraft fehlt" -#: intervention/models.py:352 +#: intervention/models.py:357 msgid "Legal data missing" msgstr "Rechtliche Daten fehlen" @@ -1155,10 +1226,6 @@ msgstr "Rechtliche Daten fehlen" msgid "Revocation" msgstr "Widerspruch" -#: intervention/tables.py:66 -msgid "Interventions" -msgstr "Eingriffe" - #: intervention/tables.py:176 msgid "No revocation" msgstr "Kein Widerspruch" @@ -1226,15 +1293,15 @@ msgstr "Abbuchungen von Ökokonten" msgid "Exist" msgstr "Vorhanden" -#: intervention/views.py:77 +#: intervention/views.py:79 msgid "Intervention {} added" msgstr "Eingriff {} hinzugefügt" -#: intervention/views.py:212 +#: intervention/views.py:221 msgid "This intervention has a revocation from {}" msgstr "Es existiert ein Widerspruch vom {}" -#: intervention/views.py:228 +#: intervention/views.py:237 msgid "" "Remember: This data has not been shared with you, yet. This means you can " "only read but can not edit or perform any actions like running a check or " @@ -1244,43 +1311,43 @@ msgstr "" "bedeutet, dass Sie nur lesenden Zugriff hierauf haben und weder bearbeiten, " "noch Prüfungen durchführen oder verzeichnen können." -#: intervention/views.py:255 +#: intervention/views.py:264 msgid "Intervention {} edited" msgstr "Eingriff {} bearbeitet" -#: intervention/views.py:287 +#: intervention/views.py:296 msgid "{} removed" msgstr "{} entfernt" -#: intervention/views.py:308 +#: intervention/views.py:317 msgid "Revocation removed" msgstr "Widerspruch entfernt" -#: intervention/views.py:334 +#: intervention/views.py:343 msgid "{} has already been shared with you" msgstr "{} wurde bereits für Sie freigegeben" -#: intervention/views.py:339 +#: intervention/views.py:348 msgid "{} has been shared with you" msgstr "{} ist nun für Sie freigegeben" -#: intervention/views.py:346 +#: intervention/views.py:355 msgid "Share link invalid" msgstr "Freigabelink ungültig" -#: intervention/views.py:367 +#: intervention/views.py:376 msgid "Share settings updated" msgstr "Freigabe Einstellungen aktualisiert" -#: intervention/views.py:386 +#: intervention/views.py:395 msgid "Check performed" msgstr "Prüfung durchgeführt" -#: intervention/views.py:406 +#: intervention/views.py:415 msgid "Revocation added" msgstr "Widerspruch hinzugefügt" -#: intervention/views.py:473 +#: intervention/views.py:482 msgid "There are errors on this intervention:" msgstr "Es liegen Fehler in diesem Eingriff vor:" @@ -1403,10 +1470,13 @@ msgstr "Kontrolle am" msgid "Other" msgstr "Sonstige" -#: konova/templates/konova/home.html:23 konova/templates/konova/home.html:61 -#: konova/templates/konova/home.html:100 -msgid "Total" -msgstr "Insgesamt" +#: konova/sub_settings/django_settings.py:154 +msgid "German" +msgstr "" + +#: konova/sub_settings/django_settings.py:155 +msgid "English" +msgstr "" #: konova/templates/konova/home.html:27 konova/templates/konova/home.html:65 #: konova/templates/konova/home.html:104 @@ -1634,10 +1704,6 @@ msgstr "" msgid "Export..." msgstr "" -#: templates/navbars/navbar.html:46 -msgid "Reports" -msgstr "Berichte" - #: templates/navbars/navbar.html:58 user/templates/user/index.html:31 msgid "Settings" msgstr "Einstellungen" @@ -2980,9 +3046,6 @@ msgstr "" #~ msgid "Transfer comment" #~ msgstr "Verwendungszweck" -#~ msgid "EMA recorded" -#~ msgstr "EMA verzeichnet" - #~ msgid "Edit {}" #~ msgstr "Bearbeite {}" diff --git a/templates/navbars/navbar.html b/templates/navbars/navbar.html index 39b622e1..46a274ff 100644 --- a/templates/navbars/navbar.html +++ b/templates/navbars/navbar.html @@ -43,7 +43,7 @@ {% fa5_icon 'euro-sign' %} {% trans 'EMA' %} {% fa5_icon 'file-import' %} {% trans 'Import...' %} {% fa5_icon 'file-export' %} {% trans 'Export...' %} - {% fa5_icon 'file-alt' %} {% trans 'Reports' %} + {% fa5_icon 'file-alt' %} {% trans 'Reports' %} -- 2.45.2 From 33de71d5543e772b8c1903adc1e5701679deb81e Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Tue, 19 Oct 2021 09:13:20 +0200 Subject: [PATCH 02/14] #26 Annual conservation report * adds new templatetag default_if_zero in ksp_filters.py * adds/updates translations --- .../reports/includes/intervention/amount.html | 8 +- .../intervention/card_intervention.html | 4 +- .../includes/intervention/compensated_by.html | 20 +- .../reports/includes/intervention/laws.html | 14 +- konova/templatetags/ksp_filters.py | 16 ++ locale/de/LC_MESSAGES/django.mo | Bin 25176 -> 25882 bytes locale/de/LC_MESSAGES/django.po | 178 +++++++++++------- 7 files changed, 148 insertions(+), 92 deletions(-) diff --git a/analysis/templates/analysis/reports/includes/intervention/amount.html b/analysis/templates/analysis/reports/includes/intervention/amount.html index a146d4b2..8ecbe018 100644 --- a/analysis/templates/analysis/reports/includes/intervention/amount.html +++ b/analysis/templates/analysis/reports/includes/intervention/amount.html @@ -1,4 +1,4 @@ -{% load i18n fontawesome_5 %} +{% load i18n fontawesome_5 ksp_filters %}

{% trans 'Amount' %}

@@ -21,9 +21,9 @@ - {{report.intervention_report.queryset.count}} - {{report.intervention_report.queryset_checked.count}} - {{report.intervention_report.queryset_recorded.count}} + {{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:"-"}} diff --git a/analysis/templates/analysis/reports/includes/intervention/card_intervention.html b/analysis/templates/analysis/reports/includes/intervention/card_intervention.html index 13c22892..6a9993a3 100644 --- a/analysis/templates/analysis/reports/includes/intervention/card_intervention.html +++ b/analysis/templates/analysis/reports/includes/intervention/card_intervention.html @@ -16,9 +16,9 @@
{% include 'analysis/reports/includes/intervention/amount.html' %}
- {% include 'analysis/reports/includes/intervention/laws.html' %} -
{% include 'analysis/reports/includes/intervention/compensated_by.html' %} +
+ {% include 'analysis/reports/includes/intervention/laws.html' %}
diff --git a/analysis/templates/analysis/reports/includes/intervention/compensated_by.html b/analysis/templates/analysis/reports/includes/intervention/compensated_by.html index 87dfc570..8608f113 100644 --- a/analysis/templates/analysis/reports/includes/intervention/compensated_by.html +++ b/analysis/templates/analysis/reports/includes/intervention/compensated_by.html @@ -1,4 +1,4 @@ -{% load i18n fontawesome_5 %} +{% load i18n fontawesome_5 ksp_filters %}

{% trans 'Compensated by' %}

@@ -13,21 +13,21 @@ - - - + + + - - - + + + - - - + + +
{% trans 'Compensation' %}{{report.intervention_report.compensation_sum}}{{report.intervention_report.compensation_sum_checked}}{{report.intervention_report.compensation_sum_recorded}}{{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:"-"}}
{% trans 'Payment' %}{{report.intervention_report.payment_sum}}{{report.intervention_report.payment_sum_checked}}{{report.intervention_report.payment_sum_recorded}}{{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:"-"}}
{% trans 'Deductions' %}{{report.intervention_report.deduction_sum}}{{report.intervention_report.deduction_sum_checked}}{{report.intervention_report.deduction_sum_recorded}}{{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:"-"}}
diff --git a/analysis/templates/analysis/reports/includes/intervention/laws.html b/analysis/templates/analysis/reports/includes/intervention/laws.html index d373c681..8e04341c 100644 --- a/analysis/templates/analysis/reports/includes/intervention/laws.html +++ b/analysis/templates/analysis/reports/includes/intervention/laws.html @@ -1,4 +1,4 @@ -{% load i18n fontawesome_5 %} +{% load i18n fontawesome_5 ksp_filters %}

{% trans 'Law usage' %}

{% blocktrans %} @@ -34,16 +34,16 @@ {{law.long_name}} - {{law.num_checked}} - {{law.num_recorded}} - {{law.num}} + {{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_checked}} - {{report.intervention_report.law_sum_recorded}} - {{report.intervention_report.law_sum}} + {{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/konova/templatetags/ksp_filters.py b/konova/templatetags/ksp_filters.py index 95fc7ea0..1472d503 100644 --- a/konova/templatetags/ksp_filters.py +++ b/konova/templatetags/ksp_filters.py @@ -34,3 +34,19 @@ def bootstrap_cls(value): """ return SVI_BOOTSTRAP_CLS_MAP.get(value, "") + + +@register.filter("default_if_zero") +def default_if_zero(val1, val2): + """ Returns val2 if val1 is 0 + + Similar to default_if_none + + Args: + val1 (int): The numerical value + val2 (str): The alternative + + Returns: + + """ + return val1 if val1 > 0 else val2 diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index c65e66dc01cf89f3565d996215b6934dfe6b7363..9b21d9f7b429469e5694404e04790d94dbaa2e39 100644 GIT binary patch delta 8850 zcmZwM2Y3}#-pBDtffPCf5Gk3!1_*>u1R)RzO=@T%1f}03ljK6UH{5$eOx*RlD58kv zl_H28u(1e|6${9gASjA$6@gU{VJ!=&?4qEEyx-rQ6Q4Zq^UmWxpL5R4obo?2lc-1b zMLm2lDtx?U>{^SXGRm?#;75%t>mubrQNvVp;jP27P!2 zC*!QnmURa{haEAai)FRM9OHa!NIifI6}GAW-kcjHA6YBn+n1Gq6iH$;CKLZnS4yxZ0Y|QvpwFSN9g&UD9T5q9N zbQa_A7wm?y%&Hxxqb58Cwc=c3G3xqi)PT!S8CZ)NZ!?CKninbP#{H;0JBDh%gjzup zMr)19*aionR+@uxI1ANr0cs1Dp!!>eJT}%kX4RMG$KN6L~2^fnrP%E2-n$Tj@L~cP%WF=}VHex((LG||nPQ;hGlmB}tM5VbY zz85v{qo{$lqdI&Iuf?}eGe3>$=&Yd60TV{8vMV@*)^cfkbghq^BdBhN;dg7$U> zY7ZUM-Yh|_=vGw9SDE%rsMmA{YKsn`w&n|S{t~L620h)Bw?Jhy6Vq{$saN9^>f!q+ zD3!-iD>#Kp-C5KOuNa$gw^E&gx~@NJB|~u(j>ZOfmubHbb=_KQkB_0odCj!{1$mpo z)|(X6(L1P_{sWb&uTUMF$Hw@xF^*S5-=-wg`E=C%15g8G8AsqW>SM4!uE#_?gxBK{ z?8Nw1vkc3!X~;l5ol{UNUyK?!j2dtiD&?C|DSs8UHSb{){1WwSTtH3a7h_a!cR>wN z*EL6dM>?rp?|)|sN^QD1k&Rl>DAWokpe8aMmEr}c4vNkBg{XmpNRq5uki}WgqOLoP z>hBn8Vkc2s@+F4#R7dx5FYJh#VG63l-q;KWqEa^&n`16&LWQWUDmU%brhX4xEh!9B(8?F0I;b@D<>rD1Q8#Qrb+E7F28QP0V^?p?UCs5DO_o)6ZyX|4C5gVP#N2a>TfT$!PBU%zKoh!tAUo4t@l5jg5LWw9EvMZGkg=r;t|xq z_8@o9(@-nvjhg6SY>ksp0~MksP>t&6PSk|gp%%Ik)!#Nu()+)Qf>Qss@hB>#U!gj> zVA`!rx4kJwwhEP*G*l*fp;F%;XJZ!j!1eeCti`T4Vz6r|hHV<|ryzHrZukJz@h_;E zT0`8eNI*UHt&HtZ*CnF{?t)rrPh%g{{R2=F9)`+X4k|MKV9V>WRbLj+&xU*aEv?2kec*QJE-5Ju|CN*R4loaube>;!i#NjQWLaK57{LaJXgd zrcgb?{rmm;kvx#pm*Yf96p;~GrC+|icR9Yd&0J&M}0?WloXLA?e0&H2wznfT6} zkG{d3aC5wt@vY$$ImRBEc+6V`*qZKnNA)O9CO6S<0QF=dQ9U?#SsJ{9#kE<|nJ zZJ2~>P}e_)J@IcCtM~sLg$6YI$6Rm;wYSa3x_fG)QrQ>PVHRrdrkZ*lYT#1T!@113 z%D4`-HBVqy+=I%{DU8?q|1*VDj2Y+7Fb%c$Bd`NbMx}NUYJe)#!*)Ar3)Y~ne;PH> z8q|XJq9(Qvm67A9`!1mRZ7`nvvjL}a8QF`?@ol#~Y<)^W9iBlA7&Xo9pb=_- zRv3%za5{EEw$BQn2HJ~!tE~Ol6BBaXzjOwm>T^*OxErroSU5|i})@1&ro_y8(J zpQ9#n5%n}jF{&mIZ)}1sskbzyqOKc+tuPz4h0{?_`y$l9e$>D>qZW3z)cb!w1zorn zwG|u81zWHO^{tqJhfyhRz@x4K<53f9hFU-p>O<2DBd-~1<&!W8=U_8jV%qRQF}WL z^)MEoR=NfCEbKvT)wjqWKi03P{)W!e!r1?b6!c}vL*3}XPIxnR!G}-->_)BR9aKh6 zqE_^8)csemJtod~C)gEL&qAHQ5p}2;_roPt_$K5D>1R0e&he!>`yD+eHpR#z&()|e*%O$I@1x$= z?@`xXHT6c0`^nu(Tiv0FW=FXb`ip6N5W5irY5y80Vcju=a`6t;&bZH5#JL0ZqmyXIo>nsHPdmK;LB`v59L?GuU4=DgY;CMFWE6MrL?a*o7VUUN-S z6yrCfl1Ypq_`P8D!tunvDW{_Tp8FGJJ#c*}-;N&;ZxHp5TdCBThL&8XqYu%Ja!cH( z296Ty18_R_4fEqOD(S>H%3X=N<0^%NrZNI2b8Z+hlJZg_k+R;BXdFc7I6yoZDe=KE zZ2`);w0ri5ISZM7d3usPUzTA+(67G_7dBPKN9mfzYZr5?-CuT{~ezqW)V7u zx>!|snz)XrG;R72U2n#?oALt6LvSee*Z%8xfhdlY_!^=dl=#L~xo)EW@uh*WcC1nqyOywKF|#KE++!*CA@mV%=dQA)WVu_w~v{#XqI ziA}`y#J>m~%UmKqKjx>yecg#;lwT(1M$WkZT_KD14W=#cTH%`N`+ zbCD_Cg5MEQT=VvCXZa{mzpGyTHp-n%{Sw9#M~KnH1;WSmbw_61^FN4|oy6~mQC!fJ z7)$(QuJq}gxzWbgsP`hy5^<)TV&q6L^(<;jOq-~neGLAd_z&?V@tF3%6(_o&jwbaw zD|ef$(X@Gp9@GyLD~RJnIc+=eQQ{jy|9wZt8KQznr~bSe>K(6A9zgp{b8R@E!dP>` zJ;q7KWTPnKx-xu*SU~8QM%!1I6REjBcEb$XAHhb%vqU9z9r4&4bFhebTKm6?h8QaU zqbuqi0m_Ss-b4q}p2u}MZgR248~b86&Yi+G#3-VOc%OKaNFlBzmT=7jSd9DdNA3T0 zRPLwZA?l70g(rv?i8-7fbETB~6X%E) zw7r8zyYWLu7aH1PZ|sSA#1Djy!Nh8RcAJ`vnpKCemiHPe{p$!b-q8+p%wW# zwaoDZ9oy#*IfLyfKF9X@LQY_*y?Jq1p{y|-TaMmnCt(hzq{_maOGygo%qz*}5wFY@@vms1)bFFt#$6An6|YD(1= zB@QX@IU&1JsqooB$Lq_mM|&MMBF|Icl#$Nr+Rde9A-l*!T5X?~LF^*0^IPu@HWu`A(qPp<7Mk|E7W^@EDb7 z`N2?RHuV;7SFlS(Uekv-_>jao;MWC>Bb=;WQF+oqD hCU49S(KSQI&q|2uRkJSl+nAb){2lQ%z2~RJ{4Zy2I7R>f delta 8229 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\n" "Language-Team: LANGUAGE \n" @@ -48,39 +48,54 @@ msgstr "Kompensationen" msgid "Eco-Accounts" msgstr "Ökokonten" -#: analysis/templates/analysis/reports/includes/card_intervention.html:10 -#: intervention/tables.py:66 -msgid "Interventions" -msgstr "Eingriffe" +#: analysis/templates/analysis/reports/includes/card_old_interventions.html:11 +msgid "Old interventions" +msgstr "Altfälle" -#: analysis/templates/analysis/reports/includes/card_intervention.html:17 -msgid "Total interventions" +#: analysis/templates/analysis/reports/includes/card_old_interventions.html:13 +msgid "Before" +msgstr "Vor" + +#: analysis/templates/analysis/reports/includes/intervention/amount.html:3 +#: compensation/forms/modalForms.py:351 +#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:34 +#: intervention/templates/intervention/detail/includes/deductions.html:31 +msgid "Amount" +msgstr "Menge" + +#: analysis/templates/analysis/reports/includes/intervention/amount.html:5 +msgid "" +"\n" +" Checked = Has been checked by the registration office according to " +"LKompVzVo\n" +" " +msgstr "" +"\n" +" Geprüft = Wurde von der zuständigen Zulassungsbehörde überprüft\n" +" " + +#: analysis/templates/analysis/reports/includes/intervention/amount.html:9 +msgid "" +"\n" +" Recorded = Has been checked and published by the conservation office\n" +" " +msgstr "" +"\n" +" Verzeichnet = Wurde von der Eintragungsstelle überprüft und veröffentlicht\n" +" " + +#: analysis/templates/analysis/reports/includes/intervention/amount.html:17 +#: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:8 +#: analysis/templates/analysis/reports/includes/intervention/laws.html:23 +#: analysis/templates/analysis/reports/includes/intervention/laws.html:43 +#: konova/templates/konova/home.html:23 konova/templates/konova/home.html:61 +#: konova/templates/konova/home.html:100 +msgid "Total" msgstr "Insgesamt" -#: analysis/templates/analysis/reports/includes/card_intervention.html:22 -msgid "Amount total" -msgstr "Anzahl insgesamt" - -#: analysis/templates/analysis/reports/includes/card_intervention.html:26 -msgid "Amount checked" -msgstr "Anzahl geprüft" - -#: analysis/templates/analysis/reports/includes/card_intervention.html:30 -msgid "Amount recorded" -msgstr "Anzahl verzeichnet" - -#: analysis/templates/analysis/reports/includes/card_intervention.html:37 -msgid "Law usage" -msgstr "Gesetzesanwendungen" - -#: analysis/templates/analysis/reports/includes/card_intervention.html:43 -#: intervention/forms/forms.py:68 -#: intervention/templates/intervention/detail/view.html:39 -#: intervention/templates/intervention/report/report.html:20 -msgid "Law" -msgstr "Gesetz" - -#: analysis/templates/analysis/reports/includes/card_intervention.html:46 +#: analysis/templates/analysis/reports/includes/intervention/amount.html:18 +#: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:9 +#: analysis/templates/analysis/reports/includes/intervention/laws.html:17 #: compensation/tables.py:35 #: compensation/templates/compensation/detail/compensation/view.html:43 #: intervention/tables.py:33 @@ -88,7 +103,9 @@ msgstr "Gesetz" msgid "Checked" msgstr "Geprüft" -#: analysis/templates/analysis/reports/includes/card_intervention.html:49 +#: analysis/templates/analysis/reports/includes/intervention/amount.html:19 +#: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:10 +#: analysis/templates/analysis/reports/includes/intervention/laws.html:20 #: compensation/tables.py:41 compensation/tables.py:181 #: compensation/templates/compensation/detail/compensation/view.html:57 #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:31 @@ -99,29 +116,58 @@ msgstr "Geprüft" msgid "Recorded" msgstr "Verzeichnet" -#: analysis/templates/analysis/reports/includes/card_intervention.html:52 -#: analysis/templates/analysis/reports/includes/card_intervention.html:72 -#: konova/templates/konova/home.html:23 konova/templates/konova/home.html:61 -#: konova/templates/konova/home.html:100 -msgid "Total" -msgstr "Insgesamt" +#: analysis/templates/analysis/reports/includes/intervention/card_intervention.html:10 +#: intervention/tables.py:66 +msgid "Interventions" +msgstr "Eingriffe" -#: analysis/templates/analysis/reports/includes/card_intervention.html:81 +#: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:2 +msgid "Compensated by" +msgstr "Kompensiert durch" + +#: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:7 +msgid "Compensation type" +msgstr "Kompensationsart" + +#: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:15 +#: compensation/tables.py:84 +#: compensation/templates/compensation/detail/compensation/view.html:19 +#: konova/templates/konova/home.html:49 templates/navbars/navbar.html:28 +msgid "Compensation" +msgstr "Kompensation" + +#: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:21 +#: compensation/forms/modalForms.py:75 +msgid "Payment" +msgstr "Zahlung" + +#: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:27 +msgid "Deductions" +msgstr "Abbuchungen" + +#: analysis/templates/analysis/reports/includes/intervention/laws.html:2 +msgid "Law usage" +msgstr "Gesetzesanwendungen" + +#: analysis/templates/analysis/reports/includes/intervention/laws.html:4 msgid "" "\n" -" Please note: One intervention can be based on " -"multiple laws. This table therefore does not\n" -" count\n" -" " +" Please note: One intervention can be based on multiple laws. This table " +"therefore does not\n" +" count\n" +" " msgstr "" +"\n" +" Beachten Sie: Ein Eingriff kann mehreren Gesetzen zugeordnet worden sein. Diese Tabelle zählt daher nicht die Eingriffe selbst " +", sondern wie oft ein Gesetz Anwendung fand.\n" +" " -#: analysis/templates/analysis/reports/includes/card_old_interventions.html:11 -msgid "Old interventions" -msgstr "Altfälle" - -#: analysis/templates/analysis/reports/includes/card_old_interventions.html:13 -msgid "Before" -msgstr "Vor" +#: analysis/templates/analysis/reports/includes/intervention/laws.html:14 +#: intervention/forms/forms.py:68 +#: intervention/templates/intervention/detail/view.html:39 +#: intervention/templates/intervention/report/report.html:20 +msgid "Law" +msgstr "Gesetz" #: analysis/templates/analysis/reports/index.html:6 #: templates/navbars/navbar.html:46 @@ -306,10 +352,6 @@ msgstr "Zahlung wird an diesem Datum erwartet" msgid "Additional comment, maximum {} letters" msgstr "Zusätzlicher Kommentar, maximal {} Zeichen" -#: compensation/forms/modalForms.py:75 -msgid "Payment" -msgstr "Zahlung" - #: compensation/forms/modalForms.py:76 msgid "Add a payment for intervention '{}'" msgstr "Neue Ersatzzahlung zu Eingriff '{}' hinzufügen" @@ -435,12 +477,6 @@ msgstr "Einheit" msgid "Select the unit" msgstr "Einheit wählen" -#: compensation/forms/modalForms.py:351 -#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:34 -#: intervention/templates/intervention/detail/includes/deductions.html:31 -msgid "Amount" -msgstr "Menge" - #: compensation/forms/modalForms.py:354 msgid "Insert the amount" msgstr "Menge eingeben" @@ -511,12 +547,6 @@ msgstr "Zuletzt bearbeitet" msgid "Open {}" msgstr "Öffne {}" -#: compensation/tables.py:84 -#: compensation/templates/compensation/detail/compensation/view.html:19 -#: konova/templates/konova/home.html:49 templates/navbars/navbar.html:28 -msgid "Compensation" -msgstr "Kompensation" - #: compensation/tables.py:105 intervention/tables.py:107 msgid "Not checked yet" msgstr "Noch nicht geprüft" @@ -781,7 +811,7 @@ msgstr "Gefördert mit" #: intervention/templates/intervention/report/report.html:57 #: intervention/templates/intervention/report/report.html:78 msgid "None" -msgstr "" +msgstr "-" #: compensation/templates/compensation/detail/compensation/view.html:84 #: compensation/templates/compensation/detail/eco_account/view.html:83 @@ -834,8 +864,6 @@ msgid "Created" msgstr "Erstellt" #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:54 -#, fuzzy -#| msgid "Recorded on " msgid "Recorded on" msgstr "Verzeichnet am" @@ -3001,6 +3029,18 @@ msgstr "" msgid "A fontawesome icon field" msgstr "" +#~ msgid "Total interventions" +#~ msgstr "Insgesamt" + +#~ msgid "Amount total" +#~ msgstr "Anzahl insgesamt" + +#~ msgid "Amount checked" +#~ msgstr "Anzahl geprüft" + +#~ msgid "Amount recorded" +#~ msgstr "Anzahl verzeichnet" + #~ msgid "Funding by..." #~ msgstr "Gefördert mit..." -- 2.45.2 From 88c7f649010367ad65feb33540fe0f0ae2904908 Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Tue, 19 Oct 2021 13:34:33 +0200 Subject: [PATCH 03/14] #26 Annual conservation report * finishes compensation analysis report --- .../templates/analysis/reports/detail.html | 2 +- .../reports/includes/compensation/amount.html | 55 +++++++ .../{ => compensation}/card_compensation.html | 2 +- .../reports/includes/intervention/amount.html | 20 +-- .../includes/intervention/compensated_by.html | 10 +- .../reports/includes/intervention/laws.html | 4 +- analysis/utils/report.py | 140 ++++++++++++++++++ locale/de/LC_MESSAGES/django.mo | Bin 25882 -> 26230 bytes locale/de/LC_MESSAGES/django.po | 76 +++++++--- 9 files changed, 266 insertions(+), 43 deletions(-) create mode 100644 analysis/templates/analysis/reports/includes/compensation/amount.html rename analysis/templates/analysis/reports/includes/{ => compensation}/card_compensation.html (90%) diff --git a/analysis/templates/analysis/reports/detail.html b/analysis/templates/analysis/reports/detail.html index 219ad46d..f90acdaf 100644 --- a/analysis/templates/analysis/reports/detail.html +++ b/analysis/templates/analysis/reports/detail.html @@ -10,7 +10,7 @@
{% include 'analysis/reports/includes/intervention/card_intervention.html' %} - {% include 'analysis/reports/includes/card_compensation.html' %} + {% include 'analysis/reports/includes/compensation/card_compensation.html' %} {% include 'analysis/reports/includes/card_eco_account.html' %} {% include 'analysis/reports/includes/card_old_interventions.html' %}
diff --git a/analysis/templates/analysis/reports/includes/compensation/amount.html b/analysis/templates/analysis/reports/includes/compensation/amount.html new file mode 100644 index 00000000..27b79f65 --- /dev/null +++ b/analysis/templates/analysis/reports/includes/compensation/amount.html @@ -0,0 +1,55 @@ +{% load i18n fontawesome_5 ksp_filters %} + +

{% trans 'Amount' %}

+ + {% blocktrans %} + Checked = Has been checked by the registration office according to LKompVzVo + {% endblocktrans %} +
+ {% blocktrans %} + Recorded = Has been checked and published by the conservation office + {% endblocktrans %} + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans 'Area of responsibility' %}{% 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_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_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_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_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:"-"}}
+
\ No newline at end of file diff --git a/analysis/templates/analysis/reports/includes/card_compensation.html b/analysis/templates/analysis/reports/includes/compensation/card_compensation.html similarity index 90% rename from analysis/templates/analysis/reports/includes/card_compensation.html rename to analysis/templates/analysis/reports/includes/compensation/card_compensation.html index 24d0eabf..8fe2eec4 100644 --- a/analysis/templates/analysis/reports/includes/card_compensation.html +++ b/analysis/templates/analysis/reports/includes/compensation/card_compensation.html @@ -15,7 +15,7 @@
- {% include 'form/table/generic_table_form_body.html' %} + {% include 'analysis/reports/includes/compensation/amount.html' %}
diff --git a/analysis/templates/analysis/reports/includes/intervention/amount.html b/analysis/templates/analysis/reports/includes/intervention/amount.html index 8ecbe018..e2b94a31 100644 --- a/analysis/templates/analysis/reports/includes/intervention/amount.html +++ b/analysis/templates/analysis/reports/includes/intervention/amount.html @@ -13,18 +13,18 @@
- - - - - + + + + + - - - - - + + + + +
{% trans 'Total' %}{% fa5_icon 'star' %} {% trans 'Checked' %}{% fa5_icon 'bookmark' %} {% trans 'Recorded' %}
{% 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_checked.count|default_if_zero:"-"}}{{report.intervention_report.queryset_recorded.count|default_if_zero:"-"}}{{report.intervention_report.queryset.count|default_if_zero:"-"}}
\ No newline at end of file diff --git a/analysis/templates/analysis/reports/includes/intervention/compensated_by.html b/analysis/templates/analysis/reports/includes/intervention/compensated_by.html index 8608f113..c6be40cc 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' %} + {% fa5_icon 'star' %} {% trans 'Checked' %} + {% fa5_icon 'bookmark' %} {% trans 'Recorded' %} {% trans 'Total' %} - {% trans 'Checked' %} - {% trans 'Recorded' %} {% 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 8e04341c..e310197f 100644 --- a/analysis/templates/analysis/reports/includes/intervention/laws.html +++ b/analysis/templates/analysis/reports/includes/intervention/laws.html @@ -14,10 +14,10 @@ {% trans 'Law' %} - {% trans 'Checked' %} + {% fa5_icon 'star' %} {% trans 'Checked' %} - {% trans 'Recorded' %} + {% fa5_icon 'bookmark' %} {% trans 'Recorded' %} {% trans 'Total' %} diff --git a/analysis/utils/report.py b/analysis/utils/report.py index fbc88520..ce5d895a 100644 --- a/analysis/utils/report.py +++ b/analysis/utils/report.py @@ -5,12 +5,14 @@ Contact: michel.peltriaux@sgdnord.rlp.de Created on: 18.10.21 """ +from django.contrib.gis.db.models.functions import NumGeometries from django.db.models import Count, Sum, Q from codelist.models import KonovaCode from codelist.settings import CODELIST_LAW_ID from compensation.models import Compensation, Payment, EcoAccountDeduction from intervention.models import Intervention +from konova.models import Geometry class TimespanReport: @@ -122,6 +124,144 @@ class TimespanReport: self.deduction_sum_checked = deductions.filter(intervention__checked__isnull=False).count() self.deduction_sum_recorded = deductions.filter(intervention__recorded__isnull=False).count() + class CompensationReport: + queryset = Compensation.objects.none() + queryset_checked = Compensation.objects.none() + queryset_recorded = Compensation.objects.none() + + queryset_registration_office_unb = Compensation.objects.none() + queryset_registration_office_unb_checked = Compensation.objects.none() + queryset_registration_office_unb_recorded = Compensation.objects.none() + num_single_surfaces_total_unb = -1 + + queryset_registration_office_tbp = Compensation.objects.none() + queryset_registration_office_tbp_checked = Compensation.objects.none() + queryset_registration_office_tbp_recorded = Compensation.objects.none() + num_single_surfaces_total_tbp = -1 + + queryset_registration_office_other = Compensation.objects.none() + queryset_registration_office_other_checked = Compensation.objects.none() + queryset_registration_office_other_recorded = Compensation.objects.none() + num_single_surfaces_total_other = -1 + + num_single_surfaces_total = -1 + num_single_surfaces_recorded = -1 + + # Code list id for 'Träger der Bauleitplanung' parent + id_tbp = 1943695 + # Code list id for 'untere Naturschutzbehörde' + id_unb = 1943087 + # Code list id for 'obere Naturschutzbehörde' + id_onb = 1943084 + + def __init__(self, id: str): + self.queryset = Compensation.objects.filter( + intervention__responsible__conservation_office__id=id, + deleted=None, + ) + self.queryset_checked = self.queryset.filter( + intervention__checked__isnull=False + ) + self.queryset_recorded = self.queryset.filter( + intervention__recorded__isnull=False + ) + self._create_report() + + def _create_report(self): + """ Creates all report information + + Returns: + + """ + self._evaluate_compensation_responsibility() + self._evaluate_surfaces() + + def _evaluate_surfaces(self): + """ Evaluates the surfaces of compensation Multipolygon fields + + Returns: + + """ + # Evaluate all surfaces + ids = self.queryset.values_list("geometry_id") + self.num_single_surfaces_total = self._count_geometry_surfaces(ids) + + # Evaluate surfaces where the conservation office is the registration office as well + ids = self.queryset_registration_office_unb.values_list("geometry_id") + self.num_single_surfaces_total_unb = self._count_geometry_surfaces(ids) + + # Evaluates surfaces where the registration office is a Träger Bauleitplanung + ids = self.queryset_registration_office_tbp.values_list("geometry_id") + self.num_single_surfaces_total_tbp = self._count_geometry_surfaces(ids) + + # Evaluates surfaces where any other registration office is responsible + ids = self.queryset_registration_office_other.values_list("geometry_id") + self.num_single_surfaces_total_other = self._count_geometry_surfaces(ids) + + def _count_geometry_surfaces(self, ids: list): + """ Wraps counting of geometry surfaces from a given list of ids + + Args: + ids (list): List of geometry ids + + Returns: + + """ + # Now select all geometries matching the ids + # Then perform a ST_NumGeometries variant over all geometries + # Then sum up all of the calculated surface numbers + return Geometry.objects.filter( + id__in=ids + ).annotate( + num=NumGeometries("geom") + ).aggregate( + num_geoms=Sum("num") + )["num_geoms"] or 0 + + def _evaluate_compensation_responsibility(self): + """ Evaluates compensations based on different responsibility areas + + unb -> Untere Naturschutzbehörde + Holds entries where conservation_office and registration_office basically are the same + tbp -> Träger Bauleitplanung + Holds entries where registration_office is a Träger der Bauleitplanung + other -> Other registration offices + Holds all other entries + + Returns: + + """ + self.queryset_registration_office_unb = self.queryset.filter( + intervention__responsible__registration_office__parent__id=self.id_unb + ) + self.queryset_registration_office_unb_recorded = self.queryset_registration_office_unb.filter( + intervention__recorded__isnull=False, + ) + self.queryset_registration_office_unb_checked = self.queryset_registration_office_unb.filter( + intervention__checked__isnull=False, + ) + + self.queryset_registration_office_tbp = self.queryset.filter( + intervention__responsible__registration_office__parent__id=self.id_tbp + ) + self.queryset_registration_office_tbp_recorded = self.queryset_registration_office_tbp.filter( + intervention__recorded__isnull=False, + ) + self.queryset_registration_office_tbp_checked = self.queryset_registration_office_tbp.filter( + intervention__checked__isnull=False, + ) + + self.queryset_registration_office_other = self.queryset.exclude( + Q(id__in=self.queryset_registration_office_tbp) | Q(id__in=self.queryset_registration_office_unb) + ) + self.queryset_registration_office_other_recorded = self.queryset_registration_office_other.filter( + intervention__recorded__isnull=False, + ) + self.queryset_registration_office_other_checked = self.queryset_registration_office_other.filter( + intervention__checked__isnull=False, + ) + def __init__(self, office_id: str): self.office_id = office_id self.intervention_report = self.InterventionReport(self.office_id) + self.compensation_report = self.CompensationReport(self.office_id) diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index 9b21d9f7b429469e5694404e04790d94dbaa2e39..1523b7ae2d3e587da16b406cbee6b727124a13cb 100644 GIT binary patch delta 8499 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 Hx8eT)@!q$6 delta 8166 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 uTkB\n" "Language-Team: LANGUAGE \n" @@ -37,13 +37,6 @@ msgstr "" msgid "Report" msgstr "Bericht" -#: analysis/templates/analysis/reports/includes/card_compensation.html:11 -#: compensation/tables.py:62 -#: intervention/templates/intervention/detail/includes/compensations.html:8 -#: intervention/templates/intervention/report/report.html:49 -msgid "Compensations" -msgstr "Kompensationen" - #: analysis/templates/analysis/reports/includes/card_eco_account.html:11 msgid "Eco-Accounts" msgstr "Ökokonten" @@ -56,6 +49,7 @@ msgstr "Altfälle" msgid "Before" msgstr "Vor" +#: analysis/templates/analysis/reports/includes/compensation/amount.html:3 #: analysis/templates/analysis/reports/includes/intervention/amount.html:3 #: compensation/forms/modalForms.py:351 #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:34 @@ -63,6 +57,7 @@ msgstr "Vor" msgid "Amount" msgstr "Menge" +#: analysis/templates/analysis/reports/includes/compensation/amount.html:5 #: analysis/templates/analysis/reports/includes/intervention/amount.html:5 msgid "" "\n" @@ -74,6 +69,7 @@ msgstr "" " Geprüft = Wurde von der zuständigen Zulassungsbehörde überprüft\n" " " +#: analysis/templates/analysis/reports/includes/compensation/amount.html:9 #: analysis/templates/analysis/reports/includes/intervention/amount.html:9 msgid "" "\n" @@ -81,9 +77,53 @@ msgid "" " " msgstr "" "\n" -" Verzeichnet = Wurde von der Eintragungsstelle überprüft und veröffentlicht\n" +" Verzeichnet = Wurde von der Eintragungsstelle überprüft und " +"veröffentlicht\n" " " +#: analysis/templates/analysis/reports/includes/compensation/amount.html:17 +msgid "Area of responsibility" +msgstr "Zuständigkeitsbereich" + +#: analysis/templates/analysis/reports/includes/compensation/amount.html:18 +#: analysis/templates/analysis/reports/includes/compensation/card_compensation.html:11 +#: compensation/tables.py:62 +#: intervention/templates/intervention/detail/includes/compensations.html:8 +#: intervention/templates/intervention/report/report.html:49 +msgid "Compensations" +msgstr "Kompensationen" + +#: analysis/templates/analysis/reports/includes/compensation/amount.html:19 +#: analysis/templates/analysis/reports/includes/intervention/amount.html:19 +#: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:10 +#: analysis/templates/analysis/reports/includes/intervention/laws.html:20 +#: compensation/tables.py:41 compensation/tables.py:181 +#: compensation/templates/compensation/detail/compensation/view.html:57 +#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:31 +#: compensation/templates/compensation/detail/eco_account/view.html:44 +#: ema/tables.py:38 ema/templates/ema/detail/view.html:28 +#: intervention/tables.py:39 +#: intervention/templates/intervention/detail/view.html:82 user/models.py:49 +msgid "Recorded" +msgstr "Verzeichnet" + +#: analysis/templates/analysis/reports/includes/compensation/amount.html:20 +msgid "Number single areas" +msgstr "Einzelflächen" + +#: analysis/templates/analysis/reports/includes/compensation/amount.html:25 +msgid "Conservation office by law" +msgstr "Naturschutzbehörde (§17 Abs.3 BNatSchG)" + +#: analysis/templates/analysis/reports/includes/compensation/amount.html:31 +msgid "Other registration office" +msgstr "Andere Zulassungsbehörden" + +#: analysis/templates/analysis/reports/includes/compensation/amount.html:37 +msgid "Land-use planning" +msgstr "Träger Bauleitplanung" + +#: analysis/templates/analysis/reports/includes/compensation/amount.html:43 #: analysis/templates/analysis/reports/includes/intervention/amount.html:17 #: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:8 #: analysis/templates/analysis/reports/includes/intervention/laws.html:23 @@ -103,19 +143,6 @@ msgstr "Insgesamt" msgid "Checked" msgstr "Geprüft" -#: analysis/templates/analysis/reports/includes/intervention/amount.html:19 -#: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:10 -#: analysis/templates/analysis/reports/includes/intervention/laws.html:20 -#: compensation/tables.py:41 compensation/tables.py:181 -#: compensation/templates/compensation/detail/compensation/view.html:57 -#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:31 -#: compensation/templates/compensation/detail/eco_account/view.html:44 -#: ema/tables.py:38 ema/templates/ema/detail/view.html:28 -#: intervention/tables.py:39 -#: intervention/templates/intervention/detail/view.html:82 user/models.py:49 -msgid "Recorded" -msgstr "Verzeichnet" - #: analysis/templates/analysis/reports/includes/intervention/card_intervention.html:10 #: intervention/tables.py:66 msgid "Interventions" @@ -158,8 +185,9 @@ msgid "" " " msgstr "" "\n" -" Beachten Sie: Ein Eingriff kann mehreren Gesetzen zugeordnet worden sein. Diese Tabelle zählt daher nicht die Eingriffe selbst " -", sondern wie oft ein Gesetz Anwendung fand.\n" +" Beachten Sie: Ein Eingriff kann mehreren Gesetzen zugeordnet worden " +"sein. Diese Tabelle zählt daher nicht die Eingriffe selbst , sondern wie oft " +"ein Gesetz Anwendung fand.\n" " " #: analysis/templates/analysis/reports/includes/intervention/laws.html:14 -- 2.45.2 From 0e9a169d381875d9279564ade8f4eb7515266b2a Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Tue, 19 Oct 2021 14:22:41 +0200 Subject: [PATCH 04/14] #26 Annual conservation report * finishes intervention analysis report for cases before 16.06.2018 (LKompVzVo) --- analysis/settings.py | 12 ++++++++ .../templates/analysis/reports/detail.html | 2 +- .../includes/old_intervention/amount.html | 30 +++++++++++++++++++ .../card_old_interventions.html | 2 +- analysis/utils/report.py | 23 ++++++++++++++ analysis/views.py | 22 ++++++-------- 6 files changed, 76 insertions(+), 15 deletions(-) create mode 100644 analysis/settings.py create mode 100644 analysis/templates/analysis/reports/includes/old_intervention/amount.html rename analysis/templates/analysis/reports/includes/{ => old_intervention}/card_old_interventions.html (91%) diff --git a/analysis/settings.py b/analysis/settings.py new file mode 100644 index 00000000..5ea5fadf --- /dev/null +++ b/analysis/settings.py @@ -0,0 +1,12 @@ +""" +Author: Michel Peltriaux +Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany +Contact: michel.peltriaux@sgdnord.rlp.de +Created on: 19.10.21 + +""" + +import datetime + +# Defines the date of the legal publishing of the LKompVzVo +LKOMPVZVO_PUBLISH_DATE = datetime.date.fromisoformat("2018-06-16") diff --git a/analysis/templates/analysis/reports/detail.html b/analysis/templates/analysis/reports/detail.html index f90acdaf..42322418 100644 --- a/analysis/templates/analysis/reports/detail.html +++ b/analysis/templates/analysis/reports/detail.html @@ -12,6 +12,6 @@ {% include 'analysis/reports/includes/intervention/card_intervention.html' %} {% include 'analysis/reports/includes/compensation/card_compensation.html' %} {% include 'analysis/reports/includes/card_eco_account.html' %} - {% include 'analysis/reports/includes/card_old_interventions.html' %} + {% include 'analysis/reports/includes/old_intervention/card_old_interventions.html' %} {% endblock %} \ No newline at end of file diff --git a/analysis/templates/analysis/reports/includes/old_intervention/amount.html b/analysis/templates/analysis/reports/includes/old_intervention/amount.html new file mode 100644 index 00000000..5ab45a93 --- /dev/null +++ b/analysis/templates/analysis/reports/includes/old_intervention/amount.html @@ -0,0 +1,30 @@ +{% load i18n fontawesome_5 ksp_filters %} + +

{% trans 'Amount' %}

+ + {% blocktrans %} + Checked = Has been checked by the registration office according to LKompVzVo + {% endblocktrans %} +
+ {% blocktrans %} + Recorded = Has been checked and published by the conservation office + {% endblocktrans %} + +
+ + + + + + + + + + + + + + + +
{% fa5_icon 'star' %} {% trans 'Checked' %}{% fa5_icon 'bookmark' %} {% trans 'Recorded' %}{% trans 'Total' %}
{{report.old_intervention_report.queryset_checked.count|default_if_zero:"-"}}{{report.old_intervention_report.queryset_recorded.count|default_if_zero:"-"}}{{report.old_intervention_report.queryset.count|default_if_zero:"-"}}
+
\ No newline at end of file diff --git a/analysis/templates/analysis/reports/includes/card_old_interventions.html b/analysis/templates/analysis/reports/includes/old_intervention/card_old_interventions.html similarity index 91% rename from analysis/templates/analysis/reports/includes/card_old_interventions.html rename to analysis/templates/analysis/reports/includes/old_intervention/card_old_interventions.html index 400d0085..3a272874 100644 --- a/analysis/templates/analysis/reports/includes/card_old_interventions.html +++ b/analysis/templates/analysis/reports/includes/old_intervention/card_old_interventions.html @@ -16,7 +16,7 @@
- {% include 'form/table/generic_table_form_body.html' %} + {% include 'analysis/reports/includes/old_intervention/amount.html' %}
diff --git a/analysis/utils/report.py b/analysis/utils/report.py index ce5d895a..12d0a46c 100644 --- a/analysis/utils/report.py +++ b/analysis/utils/report.py @@ -8,6 +8,7 @@ Created on: 18.10.21 from django.contrib.gis.db.models.functions import NumGeometries from django.db.models import Count, Sum, Q +from analysis.settings import LKOMPVZVO_PUBLISH_DATE from codelist.models import KonovaCode from codelist.settings import CODELIST_LAW_ID from compensation.models import Compensation, Payment, EcoAccountDeduction @@ -23,6 +24,7 @@ class TimespanReport: queryset_checked = Intervention.objects.none() queryset_recorded = Intervention.objects.none() + # Law related law_sum = -1 law_sum_checked = -1 @@ -43,6 +45,7 @@ class TimespanReport: def __init__(self, id: str): self.queryset = Intervention.objects.filter( responsible__conservation_office__id=id, + legal__registration_date__gt=LKOMPVZVO_PUBLISH_DATE, deleted=None, ) self.queryset_checked = self.queryset.filter( @@ -157,6 +160,7 @@ class TimespanReport: def __init__(self, id: str): self.queryset = Compensation.objects.filter( intervention__responsible__conservation_office__id=id, + intervention__legal__registration_date__gt=LKOMPVZVO_PUBLISH_DATE, deleted=None, ) self.queryset_checked = self.queryset.filter( @@ -261,7 +265,26 @@ class TimespanReport: intervention__checked__isnull=False, ) + class OldInterventionReport: + queryset = Compensation.objects.none() + queryset_checked = Compensation.objects.none() + queryset_recorded = Compensation.objects.none() + + def __init__(self, id: str): + self.queryset = Intervention.objects.filter( + legal__registration_date__lte=LKOMPVZVO_PUBLISH_DATE, + responsible__conservation_office__id=id, + deleted=None, + ) + self.queryset_checked = self.queryset.filter( + checked__isnull=False + ) + self.queryset_recorded = self.queryset.filter( + recorded__isnull=False + ) + def __init__(self, office_id: str): self.office_id = office_id self.intervention_report = self.InterventionReport(self.office_id) self.compensation_report = self.CompensationReport(self.office_id) + self.old_intervention_report = self.OldInterventionReport(self.office_id) diff --git a/analysis/views.py b/analysis/views.py index 43dd061b..b7699719 100644 --- a/analysis/views.py +++ b/analysis/views.py @@ -31,23 +31,19 @@ def index_reports_view(request: HttpRequest): def detail_report_view(request: HttpRequest, id: str): + """ Renders the detailed report for a conservation office + + Args: + request (HttpRequest): The incoming request + id (str): The conservation_office KonovaCode id + + Returns: + + """ cons_office = get_object_or_404( KonovaCode, id=id, ) - cons_interventions = Intervention.objects.filter( - responsible__conservation_office__id=id, - deleted=None, - ) - cons_comps = Compensation.objects.filter( - intervention__in=cons_interventions, - deleted=None, - ) - cons_eco_account = EcoAccount.objects.filter( - responsible__conservation_office__id=id, - deleted=None, - ) - report = TimespanReport(id) template = "analysis/reports/detail.html" -- 2.45.2 From b90a07ca2a8275fc7553a4651f0a28a5e86040ab Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Tue, 19 Oct 2021 16:06:19 +0200 Subject: [PATCH 05/14] #26 Annual conservation report * WIP: EcoAccountReport --- .../templates/analysis/reports/detail.html | 2 +- .../reports/includes/eco_account/amount.html | 32 ++++ .../{ => eco_account}/card_eco_account.html | 4 +- .../includes/eco_account/deductions.html | 23 +++ analysis/utils/report.py | 65 +++++++- analysis/views.py | 5 - konova/models.py | 3 +- locale/de/LC_MESSAGES/django.mo | Bin 26230 -> 26257 bytes locale/de/LC_MESSAGES/django.po | 144 ++++++++++-------- 9 files changed, 208 insertions(+), 70 deletions(-) create mode 100644 analysis/templates/analysis/reports/includes/eco_account/amount.html rename analysis/templates/analysis/reports/includes/{ => eco_account}/card_eco_account.html (80%) create mode 100644 analysis/templates/analysis/reports/includes/eco_account/deductions.html diff --git a/analysis/templates/analysis/reports/detail.html b/analysis/templates/analysis/reports/detail.html index 42322418..4497adf3 100644 --- a/analysis/templates/analysis/reports/detail.html +++ b/analysis/templates/analysis/reports/detail.html @@ -11,7 +11,7 @@
{% include 'analysis/reports/includes/intervention/card_intervention.html' %} {% include 'analysis/reports/includes/compensation/card_compensation.html' %} - {% include 'analysis/reports/includes/card_eco_account.html' %} + {% include 'analysis/reports/includes/eco_account/card_eco_account.html' %} {% include 'analysis/reports/includes/old_intervention/card_old_interventions.html' %}
{% endblock %} \ No newline at end of file diff --git a/analysis/templates/analysis/reports/includes/eco_account/amount.html b/analysis/templates/analysis/reports/includes/eco_account/amount.html new file mode 100644 index 00000000..092ee9a8 --- /dev/null +++ b/analysis/templates/analysis/reports/includes/eco_account/amount.html @@ -0,0 +1,32 @@ +{% load i18n fontawesome_5 ksp_filters %} + +

{% trans 'Amount' %}

+ + {% blocktrans %} + Checked = Has been checked by the registration office according to LKompVzVo + {% endblocktrans %} +
+ {% blocktrans %} + Recorded = Has been checked and published by the conservation office + {% endblocktrans %} + +
+ + + + + + + + + + + + + + + + + +
{% trans 'Before' %} LKompVzVo{% trans 'After' %} LKompVzVo{% fa5_icon 'bookmark' %} {% trans 'Recorded' %}{% trans 'Total' %}
{{report.eco_account_report.queryset_old.count|default_if_zero:"-"}}{{report.eco_account_report.queryset.count|default_if_zero:"-"}}{{report.eco_account_report.queryset_recorded.count|default_if_zero:"-"}}{{report.eco_account_report.queryset_total.count|default_if_zero:"-"}}
+
\ No newline at end of file diff --git a/analysis/templates/analysis/reports/includes/card_eco_account.html b/analysis/templates/analysis/reports/includes/eco_account/card_eco_account.html similarity index 80% rename from analysis/templates/analysis/reports/includes/card_eco_account.html rename to analysis/templates/analysis/reports/includes/eco_account/card_eco_account.html index 744ce07f..850ac60a 100644 --- a/analysis/templates/analysis/reports/includes/card_eco_account.html +++ b/analysis/templates/analysis/reports/includes/eco_account/card_eco_account.html @@ -15,7 +15,9 @@
- {% include 'form/table/generic_table_form_body.html' %} + {% include 'analysis/reports/includes/eco_account/amount.html' %} +
+ {% include 'analysis/reports/includes/eco_account/deductions.html' %}
diff --git a/analysis/templates/analysis/reports/includes/eco_account/deductions.html b/analysis/templates/analysis/reports/includes/eco_account/deductions.html new file mode 100644 index 00000000..1520e080 --- /dev/null +++ b/analysis/templates/analysis/reports/includes/eco_account/deductions.html @@ -0,0 +1,23 @@ +{% load i18n fontawesome_5 ksp_filters %} + +

{% trans 'Deductions' %}

+
+ + + + + + + + + + + + + + + + + +
{% fa5_icon 'bookmark' %} {% trans 'Recorded' %}{% fa5_icon 'bookmark' %} {% trans 'Recorded' %} {% trans 'Surface' %}{% trans 'Total' %}{% trans 'Total' %} {% 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_recorded.count|default_if_zero:"-"}}{{report.eco_account_report.deductions_sq_m|default_if_zero:"-"}}m²
+
\ No newline at end of file diff --git a/analysis/utils/report.py b/analysis/utils/report.py index 12d0a46c..4792a166 100644 --- a/analysis/utils/report.py +++ b/analysis/utils/report.py @@ -5,13 +5,16 @@ Contact: michel.peltriaux@sgdnord.rlp.de Created on: 18.10.21 """ +from django.contrib.gis.db.models import MultiPolygonField from django.contrib.gis.db.models.functions import NumGeometries +from django.contrib.gis.measure import Area from django.db.models import Count, Sum, Q +from django.db.models.functions import Cast from analysis.settings import LKOMPVZVO_PUBLISH_DATE from codelist.models import KonovaCode from codelist.settings import CODELIST_LAW_ID -from compensation.models import Compensation, Payment, EcoAccountDeduction +from compensation.models import Compensation, Payment, EcoAccountDeduction, EcoAccount from intervention.models import Intervention from konova.models import Geometry @@ -217,7 +220,9 @@ class TimespanReport: return Geometry.objects.filter( id__in=ids ).annotate( - num=NumGeometries("geom") + geom_cast=Cast("geom", MultiPolygonField()) + ).annotate( + num=NumGeometries("geom_cast") ).aggregate( num_geoms=Sum("num") )["num_geoms"] or 0 @@ -265,6 +270,61 @@ class TimespanReport: intervention__checked__isnull=False, ) + class EcoAccountReport: + queryset = EcoAccount.objects.none() + queryset_recorded = EcoAccount.objects.none() + queryset_old = EcoAccount.objects.none() + queryset_deductions = EcoAccountDeduction.objects.none() + queryset_deductions_recorded = EcoAccountDeduction.objects.none() + queryset_has_deductions = EcoAccountDeduction.objects.none() + + # Total size of deductions + deductions_sq_m = -1 + recorded_deductions_sq_m = -1 + + def __init__(self, id: str): + # First fetch all eco account for this office + self.queryset_total = EcoAccount.objects.filter( + responsible__conservation_office__id=id, + deleted=None, + ) + self.queryset_recorded = self.queryset_total.filter( + recorded__isnull=False + ) + # Then fetch the old ones (pre-LKompVzVo) + self.queryset_old = self.queryset_total.filter( + recorded__timestamp__lte=LKOMPVZVO_PUBLISH_DATE, + ) + # Then fetch the default queryset with the new ones (post-LKompVzVo) + self.queryset = self.queryset_total.filter( + recorded__timestamp__gte=LKOMPVZVO_PUBLISH_DATE, + ) + # Fetch all related deductions + self.queryset_deductions = EcoAccountDeduction.objects.filter( + account__id__in=self.queryset.values_list("id") + ) + # Fetch deductions for interventions which are already recorded + self.queryset_deductions_recorded = self.queryset_deductions.filter( + intervention__recorded__isnull=False + ) + self._create_report() + + def _create_report(self): + """ Creates all report information + + Returns: + + """ + self._evaluate_deductions() + + def _evaluate_deductions(self): + self.deductions_sq_m = self.queryset_deductions.aggregate( + sum=Sum("surface") + )["sum"] + self.recorded_deductions_sq_m = self.queryset_deductions_recorded.aggregate( + sum=Sum("surface") + )["sum"] + class OldInterventionReport: queryset = Compensation.objects.none() queryset_checked = Compensation.objects.none() @@ -287,4 +347,5 @@ class TimespanReport: self.office_id = office_id self.intervention_report = self.InterventionReport(self.office_id) self.compensation_report = self.CompensationReport(self.office_id) + self.eco_account_report = self.EcoAccountReport(self.office_id) self.old_intervention_report = self.OldInterventionReport(self.office_id) diff --git a/analysis/views.py b/analysis/views.py index b7699719..7e297e6a 100644 --- a/analysis/views.py +++ b/analysis/views.py @@ -1,14 +1,9 @@ from django.contrib.auth.decorators import login_required -from django.db.models import Count, Q, Sum from django.http import HttpRequest from django.shortcuts import render, get_object_or_404 from analysis.utils.report import TimespanReport from codelist.models import KonovaCode -from codelist.settings import CODELIST_LAW_ID -from compensation.models import EcoAccount, Compensation -from ema.models import Ema -from intervention.models import Intervention from konova.contexts import BaseContext from konova.decorators import conservation_office_group_required diff --git a/konova/models.py b/konova/models.py index f9f87584..2b351e14 100644 --- a/konova/models.py +++ b/konova/models.py @@ -312,4 +312,5 @@ class Geometry(BaseResource): Outsourced geometry model so multiple versions of the same object can refer to the same geometry if it is not changed """ from konova.settings import DEFAULT_SRID - geom = MultiPolygonField(null=True, blank=True, srid=DEFAULT_SRID) + # Read more about geography=True here: https://docs.djangoproject.com/en/3.2/ref/contrib/gis/model-api/#geography + geom = MultiPolygonField(null=True, blank=True, srid=DEFAULT_SRID, geography=True) diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index 1523b7ae2d3e587da16b406cbee6b727124a13cb..5a1733c1f00002998058c4654832abdf7a2d8932 100644 GIT binary patch delta 8238 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 XlLHEiLuY#w&WsowUU;R$)*Al-Q|?ww diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 17306e74..85533a66 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-10-19 13:23+0200\n" +"POT-Creation-Date: 2021-10-19 16:04+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -37,20 +37,10 @@ msgstr "" msgid "Report" msgstr "Bericht" -#: analysis/templates/analysis/reports/includes/card_eco_account.html:11 -msgid "Eco-Accounts" -msgstr "Ökokonten" - -#: analysis/templates/analysis/reports/includes/card_old_interventions.html:11 -msgid "Old interventions" -msgstr "Altfälle" - -#: analysis/templates/analysis/reports/includes/card_old_interventions.html:13 -msgid "Before" -msgstr "Vor" - #: analysis/templates/analysis/reports/includes/compensation/amount.html:3 +#: analysis/templates/analysis/reports/includes/eco_account/amount.html:3 #: analysis/templates/analysis/reports/includes/intervention/amount.html:3 +#: analysis/templates/analysis/reports/includes/old_intervention/amount.html:3 #: compensation/forms/modalForms.py:351 #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:34 #: intervention/templates/intervention/detail/includes/deductions.html:31 @@ -58,7 +48,9 @@ msgid "Amount" msgstr "Menge" #: analysis/templates/analysis/reports/includes/compensation/amount.html:5 +#: analysis/templates/analysis/reports/includes/eco_account/amount.html:5 #: analysis/templates/analysis/reports/includes/intervention/amount.html:5 +#: analysis/templates/analysis/reports/includes/old_intervention/amount.html:5 msgid "" "\n" " Checked = Has been checked by the registration office according to " @@ -70,7 +62,9 @@ msgstr "" " " #: analysis/templates/analysis/reports/includes/compensation/amount.html:9 +#: analysis/templates/analysis/reports/includes/eco_account/amount.html:9 #: analysis/templates/analysis/reports/includes/intervention/amount.html:9 +#: analysis/templates/analysis/reports/includes/old_intervention/amount.html:9 msgid "" "\n" " Recorded = Has been checked and published by the conservation office\n" @@ -86,17 +80,25 @@ msgid "Area of responsibility" msgstr "Zuständigkeitsbereich" #: analysis/templates/analysis/reports/includes/compensation/amount.html:18 -#: analysis/templates/analysis/reports/includes/compensation/card_compensation.html:11 -#: compensation/tables.py:62 -#: intervention/templates/intervention/detail/includes/compensations.html:8 -#: intervention/templates/intervention/report/report.html:49 -msgid "Compensations" -msgstr "Kompensationen" +#: analysis/templates/analysis/reports/includes/intervention/amount.html:17 +#: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:8 +#: analysis/templates/analysis/reports/includes/intervention/laws.html:17 +#: analysis/templates/analysis/reports/includes/old_intervention/amount.html:17 +#: compensation/tables.py:35 +#: compensation/templates/compensation/detail/compensation/view.html:43 +#: intervention/tables.py:33 +#: intervention/templates/intervention/detail/view.html:68 user/models.py:48 +msgid "Checked" +msgstr "Geprüft" #: analysis/templates/analysis/reports/includes/compensation/amount.html:19 -#: analysis/templates/analysis/reports/includes/intervention/amount.html:19 -#: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:10 +#: analysis/templates/analysis/reports/includes/eco_account/amount.html:19 +#: analysis/templates/analysis/reports/includes/eco_account/deductions.html:8 +#: analysis/templates/analysis/reports/includes/eco_account/deductions.html:9 +#: analysis/templates/analysis/reports/includes/intervention/amount.html:18 +#: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:9 #: analysis/templates/analysis/reports/includes/intervention/laws.html:20 +#: analysis/templates/analysis/reports/includes/old_intervention/amount.html:18 #: compensation/tables.py:41 compensation/tables.py:181 #: compensation/templates/compensation/detail/compensation/view.html:57 #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:31 @@ -111,37 +113,70 @@ msgstr "Verzeichnet" msgid "Number single areas" msgstr "Einzelflächen" -#: analysis/templates/analysis/reports/includes/compensation/amount.html:25 -msgid "Conservation office by law" -msgstr "Naturschutzbehörde (§17 Abs.3 BNatSchG)" - -#: analysis/templates/analysis/reports/includes/compensation/amount.html:31 -msgid "Other registration office" -msgstr "Andere Zulassungsbehörden" - -#: analysis/templates/analysis/reports/includes/compensation/amount.html:37 -msgid "Land-use planning" -msgstr "Träger Bauleitplanung" - -#: analysis/templates/analysis/reports/includes/compensation/amount.html:43 -#: analysis/templates/analysis/reports/includes/intervention/amount.html:17 -#: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:8 +#: analysis/templates/analysis/reports/includes/compensation/amount.html:21 +#: analysis/templates/analysis/reports/includes/compensation/amount.html:47 +#: analysis/templates/analysis/reports/includes/eco_account/amount.html:20 +#: analysis/templates/analysis/reports/includes/eco_account/deductions.html:10 +#: analysis/templates/analysis/reports/includes/eco_account/deductions.html:11 +#: analysis/templates/analysis/reports/includes/intervention/amount.html:19 +#: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:10 #: analysis/templates/analysis/reports/includes/intervention/laws.html:23 #: analysis/templates/analysis/reports/includes/intervention/laws.html:43 +#: analysis/templates/analysis/reports/includes/old_intervention/amount.html:19 #: konova/templates/konova/home.html:23 konova/templates/konova/home.html:61 #: konova/templates/konova/home.html:100 msgid "Total" msgstr "Insgesamt" -#: analysis/templates/analysis/reports/includes/intervention/amount.html:18 -#: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:9 -#: analysis/templates/analysis/reports/includes/intervention/laws.html:17 -#: compensation/tables.py:35 -#: compensation/templates/compensation/detail/compensation/view.html:43 -#: intervention/tables.py:33 -#: intervention/templates/intervention/detail/view.html:68 user/models.py:48 -msgid "Checked" -msgstr "Geprüft" +#: analysis/templates/analysis/reports/includes/compensation/amount.html:26 +msgid "Conservation office by law" +msgstr "Naturschutzbehörde (§17 Abs.3 BNatSchG)" + +#: analysis/templates/analysis/reports/includes/compensation/amount.html:33 +msgid "Land-use planning" +msgstr "Träger Bauleitplanung" + +#: analysis/templates/analysis/reports/includes/compensation/amount.html:40 +msgid "Other registration office" +msgstr "Andere Zulassungsbehörden" + +#: analysis/templates/analysis/reports/includes/compensation/card_compensation.html:11 +#: compensation/tables.py:62 +#: intervention/templates/intervention/detail/includes/compensations.html:8 +#: intervention/templates/intervention/report/report.html:49 +msgid "Compensations" +msgstr "Kompensationen" + +#: analysis/templates/analysis/reports/includes/eco_account/amount.html:17 +#: analysis/templates/analysis/reports/includes/old_intervention/card_old_interventions.html:13 +msgid "Before" +msgstr "Vor" + +#: analysis/templates/analysis/reports/includes/eco_account/amount.html:18 +msgid "After" +msgstr "Nach" + +#: analysis/templates/analysis/reports/includes/eco_account/card_eco_account.html:11 +msgid "Eco-Accounts" +msgstr "Ökokonten" + +#: analysis/templates/analysis/reports/includes/eco_account/deductions.html:3 +#: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:27 +msgid "Deductions" +msgstr "Abbuchungen" + +#: analysis/templates/analysis/reports/includes/eco_account/deductions.html:9 +#: analysis/templates/analysis/reports/includes/eco_account/deductions.html:11 +#: compensation/forms/modalForms.py:152 +#: compensation/templates/compensation/detail/compensation/includes/states-after.html:36 +#: compensation/templates/compensation/detail/compensation/includes/states-before.html:36 +#: compensation/templates/compensation/detail/eco_account/includes/states-after.html:36 +#: compensation/templates/compensation/detail/eco_account/includes/states-before.html:36 +#: ema/templates/ema/detail/includes/states-after.html:36 +#: ema/templates/ema/detail/includes/states-before.html:36 +#: intervention/forms/modalForms.py:274 +msgid "Surface" +msgstr "Fläche" #: analysis/templates/analysis/reports/includes/intervention/card_intervention.html:10 #: intervention/tables.py:66 @@ -168,10 +203,6 @@ msgstr "Kompensation" msgid "Payment" msgstr "Zahlung" -#: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:27 -msgid "Deductions" -msgstr "Abbuchungen" - #: analysis/templates/analysis/reports/includes/intervention/laws.html:2 msgid "Law usage" msgstr "Gesetzesanwendungen" @@ -197,6 +228,10 @@ msgstr "" msgid "Law" msgstr "Gesetz" +#: analysis/templates/analysis/reports/includes/old_intervention/card_old_interventions.html:11 +msgid "Old interventions" +msgstr "Altfälle" + #: analysis/templates/analysis/reports/index.html:6 #: templates/navbars/navbar.html:46 msgid "Reports" @@ -400,17 +435,6 @@ msgstr "Biotoptyp" msgid "Select the biotope type" msgstr "Biotoptyp wählen" -#: compensation/forms/modalForms.py:152 -#: compensation/templates/compensation/detail/compensation/includes/states-after.html:36 -#: compensation/templates/compensation/detail/compensation/includes/states-before.html:36 -#: compensation/templates/compensation/detail/eco_account/includes/states-after.html:36 -#: compensation/templates/compensation/detail/eco_account/includes/states-before.html:36 -#: ema/templates/ema/detail/includes/states-after.html:36 -#: ema/templates/ema/detail/includes/states-before.html:36 -#: intervention/forms/modalForms.py:274 -msgid "Surface" -msgstr "Fläche" - #: compensation/forms/modalForms.py:155 intervention/forms/modalForms.py:276 msgid "in m²" msgstr "" -- 2.45.2 From 9e7e5ee726484ed65a07d11064e02dd595263a88 Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Wed, 20 Oct 2021 10:28:01 +0200 Subject: [PATCH 06/14] EcoAccount fixes * adds deductable surface field into NewEcoAccountForm directly * removes custom manager for LegalData and ResponsibilityData --- compensation/forms/forms.py | 43 ++++++++++++++++--------------------- intervention/managers.py | 23 -------------------- intervention/models.py | 5 +---- 3 files changed, 19 insertions(+), 52 deletions(-) diff --git a/compensation/forms/forms.py b/compensation/forms/forms.py index fd747ef5..59054836 100644 --- a/compensation/forms/forms.py +++ b/compensation/forms/forms.py @@ -284,10 +284,26 @@ class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMix Inherits from basic AbstractCompensationForm and further form fields from CompensationResponsibleFormMixin """ + surface = forms.DecimalField( + min_value=0.00, + decimal_places=2, + label=_("Available Surface"), + label_suffix="", + required=False, + help_text=_("The amount that can be used for deductions"), + widget=forms.NumberInput( + attrs={ + "class": "form-control", + "placeholder": "0,00" + } + ) + ) + field_order = [ "identifier", "title", "conservation_office", + "surface", "conservation_file_number", "handler", "fundings", @@ -314,6 +330,7 @@ class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMix title = self.cleaned_data.get("title", None) fundings = self.cleaned_data.get("fundings", None) handler = self.cleaned_data.get("handler", None) + surface = self.cleaned_data.get("surface", None) conservation_office = self.cleaned_data.get("conservation_office", None) conservation_file_number = self.cleaned_data.get("conservation_file_number", None) comment = self.cleaned_data.get("comment", None) @@ -337,7 +354,7 @@ class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMix identifier=identifier, title=title, responsible=responsible, - deductable_surface=0.00, + deductable_surface=surface, created=action, geometry=geometry, comment=comment, @@ -354,30 +371,6 @@ class EditEcoAccountForm(NewEcoAccountForm): """ Form for editing eco accounts """ - surface = forms.DecimalField( - min_value=0.00, - decimal_places=2, - label=_("Available Surface"), - label_suffix="", - required=False, - help_text=_("The amount that can be used for deductions"), - widget=forms.NumberInput( - attrs={ - "class": "form-control", - "placeholder": "0,00" - } - ) - ) - field_order = [ - "identifier", - "title", - "conservation_office", - "surface", - "conservation_file_number", - "handler", - "fundings", - "comment", - ] def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) diff --git a/intervention/managers.py b/intervention/managers.py index 213e8659..a0fb28ae 100644 --- a/intervention/managers.py +++ b/intervention/managers.py @@ -23,26 +23,3 @@ class InterventionManager(models.Manager): ).prefetch_related( "users", ) - - -class LegalDataManager(models.Manager): - """ Holds default db fetch setting for this model type - - """ - def get_queryset(self): - return super().get_querset().select_related( - "process_type", - ).prefetch_related( - "laws" - ) - - -class ResponsibilityDataManager(models.Manager): - """ Holds default db fetch setting for this model type - - """ - def get_queryset(self): - return super().get_querset().select_related( - "registration_office", - "conservation_office", - ) diff --git a/intervention/models.py b/intervention/models.py index 2bdf1eff..9d0c8816 100644 --- a/intervention/models.py +++ b/intervention/models.py @@ -15,7 +15,7 @@ from django.utils.translation import gettext_lazy as _ from codelist.models import KonovaCode from codelist.settings import CODELIST_REGISTRATION_OFFICE_ID, CODELIST_CONSERVATION_OFFICE_ID, CODELIST_LAW_ID, \ CODELIST_PROCESS_TYPE_ID -from intervention.managers import InterventionManager, LegalDataManager, ResponsibilityDataManager +from intervention.managers import InterventionManager from konova.models import BaseObject, Geometry, UuidModel, BaseResource, AbstractDocument, \ generate_document_file_upload_path from konova.settings import DEFAULT_SRID_RLP, LANIS_LINK_TEMPLATE, LANIS_ZOOM_LUT @@ -56,7 +56,6 @@ class ResponsibilityData(UuidModel): conservation_file_number = models.CharField(max_length=1000, blank=True, null=True) handler = models.CharField(max_length=500, null=True, blank=True, help_text="Refers to 'Eingriffsverursacher' or 'Maßnahmenträger'") - objects = ResponsibilityDataManager() def __str__(self): return "ZB: {} | ETS: {} | Handler: {}".format( @@ -172,8 +171,6 @@ class LegalData(UuidModel): revocation = models.OneToOneField(Revocation, null=True, blank=True, help_text="Refers to 'Widerspruch am'", on_delete=models.SET_NULL) - objects = LegalDataManager() - class Intervention(BaseObject): """ -- 2.45.2 From d5b6c7f098ebc67ffb675e47b380047e28ea66ee Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Wed, 20 Oct 2021 10:38:07 +0200 Subject: [PATCH 07/14] Geometry fix * removes geographic=True from Geometry model --- konova/models.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/konova/models.py b/konova/models.py index 2b351e14..f9f87584 100644 --- a/konova/models.py +++ b/konova/models.py @@ -312,5 +312,4 @@ class Geometry(BaseResource): Outsourced geometry model so multiple versions of the same object can refer to the same geometry if it is not changed """ from konova.settings import DEFAULT_SRID - # Read more about geography=True here: https://docs.djangoproject.com/en/3.2/ref/contrib/gis/model-api/#geography - geom = MultiPolygonField(null=True, blank=True, srid=DEFAULT_SRID, geography=True) + geom = MultiPolygonField(null=True, blank=True, srid=DEFAULT_SRID) -- 2.45.2 From 6b839b7f60dab95aa25d42839136dc58bb19d3fb Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Wed, 20 Oct 2021 13:23:35 +0200 Subject: [PATCH 08/14] #26 Annual conservation reports * adds index form for selecting timespan and office of interest * adds timespan support for TimespanReport * fixes naive datetime issues * fixes missing error message css tag * adds/updates translations --- analysis/forms.py | 80 ++++++++++ analysis/settings.py | 6 +- .../templates/analysis/reports/detail.html | 5 +- .../templates/analysis/reports/index.html | 4 +- analysis/utils/report.py | 40 +++-- analysis/views.py | 49 ++++++- compensation/views/compensation_views.py | 4 +- compensation/views/eco_account_views.py | 4 +- ema/views.py | 4 +- intervention/views.py | 4 +- konova/utils/message_templates.py | 1 + locale/de/LC_MESSAGES/django.mo | Bin 26257 -> 26670 bytes locale/de/LC_MESSAGES/django.po | 137 ++++++++++-------- 13 files changed, 247 insertions(+), 91 deletions(-) create mode 100644 analysis/forms.py diff --git a/analysis/forms.py b/analysis/forms.py new file mode 100644 index 00000000..4aafdcbb --- /dev/null +++ b/analysis/forms.py @@ -0,0 +1,80 @@ +""" +Author: Michel Peltriaux +Organization: Struktur- und Genehmigungsdirektion Nord, Rhineland-Palatinate, Germany +Contact: michel.peltriaux@sgdnord.rlp.de +Created on: 20.10.21 + +""" +from dal import autocomplete +from django import forms +from django.urls import reverse +from django.utils.translation import gettext_lazy as _ + +from codelist.models import KonovaCode +from codelist.settings import CODELIST_CONSERVATION_OFFICE_ID +from konova.forms import BaseForm + + +class TimespanReportForm(BaseForm): + """ TimespanReporForm is used for allowing simple creation of an e.g. annual report for conservation offices + + """ + date_from = forms.DateField( + label_suffix="", + label=_("From"), + widget=forms.DateInput( + attrs={ + "type": "date", + "data-provide": "datepicker", + "class": "form-control", + }, + format="%d.%m.%Y" + ) + ) + date_to = forms.DateField( + label_suffix="", + label=_("To"), + widget=forms.DateInput( + attrs={ + "type": "date", + "data-provide": "datepicker", + "class": "form-control", + }, + format="%d.%m.%Y" + ) + ) + conservation_office = forms.ModelChoiceField( + label=_("Conservation office"), + label_suffix="", + help_text=_("Select the responsible office"), + queryset=KonovaCode.objects.filter( + is_archived=False, + is_leaf=True, + code_lists__in=[CODELIST_CONSERVATION_OFFICE_ID], + ), + widget=autocomplete.ModelSelect2( + url="codes-conservation-office-autocomplete", + attrs={ + "data-placeholder": _("Click for selection") + } + ), + ) + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.form_title = _("Generate report") + self.form_caption = _("Select a timespan and the desired conservation office") + self.action_url = reverse("analysis:reports") + + def save(self) -> str: + """ Generates a redirect url for the detail report + + Returns: + detail_report_url (str): The constructed detail report url + + """ + date_from = self.cleaned_data.get("date_from", None) + date_to = self.cleaned_data.get("date_to", None) + office = self.cleaned_data.get("conservation_office", None) + detail_report_url = reverse("analysis:report-detail", args=(office.id,)) + f"?df={date_from}&dt={date_to}" + return detail_report_url diff --git a/analysis/settings.py b/analysis/settings.py index 5ea5fadf..74978d13 100644 --- a/analysis/settings.py +++ b/analysis/settings.py @@ -6,7 +6,7 @@ Created on: 19.10.21 """ -import datetime - # Defines the date of the legal publishing of the LKompVzVo -LKOMPVZVO_PUBLISH_DATE = datetime.date.fromisoformat("2018-06-16") +from django.utils import timezone + +LKOMPVZVO_PUBLISH_DATE = timezone.make_aware(timezone.datetime.fromisoformat("2018-06-16")) diff --git a/analysis/templates/analysis/reports/detail.html b/analysis/templates/analysis/reports/detail.html index 4497adf3..1ba78d54 100644 --- a/analysis/templates/analysis/reports/detail.html +++ b/analysis/templates/analysis/reports/detail.html @@ -4,10 +4,11 @@ {% block body %}
-

{% trans 'Report' %}

-
{{office.long_name}}
+

{% trans 'Evaluation report' %} {{office.long_name}}

+
{% trans 'From' %} {{report.date_from.date}} {% trans 'to' %} {{report.date_to.date}}
+
{% include 'analysis/reports/includes/intervention/card_intervention.html' %} {% include 'analysis/reports/includes/compensation/card_compensation.html' %} diff --git a/analysis/templates/analysis/reports/index.html b/analysis/templates/analysis/reports/index.html index 4f7d8bd0..9c35d057 100644 --- a/analysis/templates/analysis/reports/index.html +++ b/analysis/templates/analysis/reports/index.html @@ -3,6 +3,8 @@ {% block body %}
-

{% trans 'Reports' %}

+
+ {% include 'form/table/generic_table_form.html' %} +
{% endblock %} \ No newline at end of file diff --git a/analysis/utils/report.py b/analysis/utils/report.py index 4792a166..c9c7a1bd 100644 --- a/analysis/utils/report.py +++ b/analysis/utils/report.py @@ -7,7 +7,6 @@ Created on: 18.10.21 """ from django.contrib.gis.db.models import MultiPolygonField from django.contrib.gis.db.models.functions import NumGeometries -from django.contrib.gis.measure import Area from django.db.models import Count, Sum, Q from django.db.models.functions import Cast @@ -20,14 +19,18 @@ from konova.models import Geometry class TimespanReport: + """ Holds multiple report elements for a timespan report + + """ office_id = -1 + date_from = -1 + date_to = -1 class InterventionReport: queryset = Intervention.objects.none() queryset_checked = Intervention.objects.none() queryset_recorded = Intervention.objects.none() - # Law related law_sum = -1 law_sum_checked = -1 @@ -45,11 +48,13 @@ class TimespanReport: deduction_sum_checked = -1 deduction_sum_recorded = -1 - def __init__(self, id: str): + def __init__(self, id: str, date_from: str, date_to: str): self.queryset = Intervention.objects.filter( responsible__conservation_office__id=id, legal__registration_date__gt=LKOMPVZVO_PUBLISH_DATE, deleted=None, + created__timestamp__gte=date_from, + created__timestamp__lte=date_to, ) self.queryset_checked = self.queryset.filter( checked__isnull=False @@ -160,11 +165,13 @@ class TimespanReport: # Code list id for 'obere Naturschutzbehörde' id_onb = 1943084 - def __init__(self, id: str): + def __init__(self, id: str, date_from: str, date_to: str): self.queryset = Compensation.objects.filter( intervention__responsible__conservation_office__id=id, intervention__legal__registration_date__gt=LKOMPVZVO_PUBLISH_DATE, deleted=None, + intervention__created__timestamp__gte=date_from, + intervention__created__timestamp__lte=date_to, ) self.queryset_checked = self.queryset.filter( intervention__checked__isnull=False @@ -282,11 +289,13 @@ class TimespanReport: deductions_sq_m = -1 recorded_deductions_sq_m = -1 - def __init__(self, id: str): + def __init__(self, id: str, date_from: str, date_to: str): # First fetch all eco account for this office self.queryset_total = EcoAccount.objects.filter( responsible__conservation_office__id=id, deleted=None, + created__timestamp__gte=date_from, + created__timestamp__lte=date_to, ) self.queryset_recorded = self.queryset_total.filter( recorded__isnull=False @@ -320,21 +329,23 @@ class TimespanReport: def _evaluate_deductions(self): self.deductions_sq_m = self.queryset_deductions.aggregate( sum=Sum("surface") - )["sum"] + )["sum"] or 0 self.recorded_deductions_sq_m = self.queryset_deductions_recorded.aggregate( sum=Sum("surface") - )["sum"] + )["sum"] or 0 class OldInterventionReport: queryset = Compensation.objects.none() queryset_checked = Compensation.objects.none() queryset_recorded = Compensation.objects.none() - def __init__(self, id: str): + def __init__(self, id: str, date_from: str, date_to: str): self.queryset = Intervention.objects.filter( legal__registration_date__lte=LKOMPVZVO_PUBLISH_DATE, responsible__conservation_office__id=id, deleted=None, + created__timestamp__gte=date_from, + created__timestamp__lte=date_to, ) self.queryset_checked = self.queryset.filter( checked__isnull=False @@ -343,9 +354,12 @@ class TimespanReport: recorded__isnull=False ) - def __init__(self, office_id: str): + def __init__(self, office_id: str, date_from: str, date_to: str): self.office_id = office_id - self.intervention_report = self.InterventionReport(self.office_id) - self.compensation_report = self.CompensationReport(self.office_id) - self.eco_account_report = self.EcoAccountReport(self.office_id) - self.old_intervention_report = self.OldInterventionReport(self.office_id) + self.date_from = date_from + self.date_to = date_to + + self.intervention_report = self.InterventionReport(self.office_id, date_from, date_to) + self.compensation_report = self.CompensationReport(self.office_id, date_from, date_to) + self.eco_account_report = self.EcoAccountReport(self.office_id, date_from, date_to) + self.old_intervention_report = self.OldInterventionReport(self.office_id, date_from, date_to) diff --git a/analysis/views.py b/analysis/views.py index 7e297e6a..dab3b276 100644 --- a/analysis/views.py +++ b/analysis/views.py @@ -1,11 +1,16 @@ +from django.contrib import messages from django.contrib.auth.decorators import login_required +from django.core.exceptions import ObjectDoesNotExist from django.http import HttpRequest -from django.shortcuts import render, get_object_or_404 +from django.shortcuts import render, redirect +from django.utils import timezone +from analysis.forms import TimespanReportForm from analysis.utils.report import TimespanReport from codelist.models import KonovaCode from konova.contexts import BaseContext from konova.decorators import conservation_office_group_required +from konova.utils.message_templates import FORM_INVALID, PARAMS_INVALID @login_required @@ -20,11 +25,26 @@ def index_reports_view(request: HttpRequest): """ template = "analysis/reports/index.html" - context = {} + form = TimespanReportForm(request.POST or None) + if request.method == "POST": + if form.is_valid(): + redirect_url = form.save() + return redirect(redirect_url) + else: + messages.error( + request, + FORM_INVALID, + extra_tags="danger", + ) + context = { + "form": form + } context = BaseContext(request, context).context return render(request, template, context) +@login_required +@conservation_office_group_required def detail_report_view(request: HttpRequest, id: str): """ Renders the detailed report for a conservation office @@ -35,12 +55,27 @@ def detail_report_view(request: HttpRequest, id: str): Returns: """ - cons_office = get_object_or_404( - KonovaCode, - id=id, - ) - report = TimespanReport(id) + try: + cons_office = KonovaCode.objects.get(id=id) + except (ObjectDoesNotExist, ValueError) as e: + messages.error( + request, + PARAMS_INVALID, + extra_tags="danger", + ) + return redirect("analysis:reports") + try: + date_from = timezone.make_aware(timezone.datetime.fromisoformat(request.GET.get("df", None))) + date_to = timezone.make_aware(timezone.datetime.fromisoformat(request.GET.get("dt", None))) + except ValueError: + messages.error( + request, + PARAMS_INVALID, + extra_tags="danger", + ) + return redirect("analysis:reports") + report = TimespanReport(id, date_from, date_to) template = "analysis/reports/detail.html" context = { "office": cons_office, diff --git a/compensation/views/compensation_views.py b/compensation/views/compensation_views.py index 994e9647..5b187501 100644 --- a/compensation/views/compensation_views.py +++ b/compensation/views/compensation_views.py @@ -77,7 +77,7 @@ def new_view(request: HttpRequest, intervention_id: str = None): messages.success(request, _("Compensation {} added").format(comp.identifier)) return redirect("compensation:detail", id=comp.id) else: - messages.error(request, FORM_INVALID) + messages.error(request, FORM_INVALID, extra_tags="danger",) else: # For clarification: nothing in this case pass @@ -132,7 +132,7 @@ def edit_view(request: HttpRequest, id: str): messages.success(request, _("Compensation {} edited").format(comp.identifier)) return redirect("compensation:detail", id=comp.id) else: - messages.error(request, FORM_INVALID) + messages.error(request, FORM_INVALID, extra_tags="danger",) else: # For clarification: nothing in this case pass diff --git a/compensation/views/eco_account_views.py b/compensation/views/eco_account_views.py index dadac7e6..bb04facb 100644 --- a/compensation/views/eco_account_views.py +++ b/compensation/views/eco_account_views.py @@ -86,7 +86,7 @@ def new_view(request: HttpRequest): messages.success(request, _("Eco-Account {} added").format(acc.identifier)) return redirect("compensation:acc-detail", id=acc.id) else: - messages.error(request, FORM_INVALID) + messages.error(request, FORM_INVALID, extra_tags="danger",) else: # For clarification: nothing in this case pass @@ -141,7 +141,7 @@ def edit_view(request: HttpRequest, id: str): messages.success(request, _("Eco-Account {} edited").format(acc.identifier)) return redirect("compensation:acc-detail", id=acc.id) else: - messages.error(request, FORM_INVALID) + messages.error(request, FORM_INVALID, extra_tags="danger",) else: # For clarification: nothing in this case pass diff --git a/ema/views.py b/ema/views.py index ead1a899..a9ad2bdb 100644 --- a/ema/views.py +++ b/ema/views.py @@ -78,7 +78,7 @@ def new_view(request: HttpRequest): messages.success(request, _("EMA {} added").format(ema.identifier)) return redirect("ema:detail", id=ema.id) else: - messages.error(request, FORM_INVALID) + messages.error(request, FORM_INVALID, extra_tags="danger",) else: # For clarification: nothing in this case pass @@ -202,7 +202,7 @@ def edit_view(request: HttpRequest, id: str): messages.success(request, _("EMA {} edited").format(ema.identifier)) return redirect("ema:detail", id=ema.id) else: - messages.error(request, FORM_INVALID) + messages.error(request, FORM_INVALID, extra_tags="danger",) else: # For clarification: nothing in this case pass diff --git a/intervention/views.py b/intervention/views.py index 6853197f..bd770ce2 100644 --- a/intervention/views.py +++ b/intervention/views.py @@ -79,7 +79,7 @@ def new_view(request: HttpRequest): messages.success(request, _("Intervention {} added").format(intervention.identifier)) return redirect("intervention:detail", id=intervention.id) else: - messages.error(request, FORM_INVALID) + messages.error(request, FORM_INVALID, extra_tags="danger",) else: # For clarification: nothing in this case pass @@ -264,7 +264,7 @@ def edit_view(request: HttpRequest, id: str): messages.success(request, _("Intervention {} edited").format(intervention.identifier)) return redirect("intervention:detail", id=intervention.id) else: - messages.error(request, FORM_INVALID) + messages.error(request, FORM_INVALID, extra_tags="danger",) else: # For clarification: nothing in this case pass diff --git a/konova/utils/message_templates.py b/konova/utils/message_templates.py index f9c8e2b9..e28f39de 100644 --- a/konova/utils/message_templates.py +++ b/konova/utils/message_templates.py @@ -9,6 +9,7 @@ from django.utils.translation import gettext_lazy as _ FORM_INVALID = _("There was an error on this form.") +PARAMS_INVALID = _("Invalid parameters") INTERVENTION_INVALID = _("There are errors in this intervention.") IDENTIFIER_REPLACED = _("The identifier '{}' had to be changed to '{}' since another entry has been added in the meanwhile, which uses this identifier") DATA_UNSHARED = _("This data is not shared with you") diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index 5a1733c1f00002998058c4654832abdf7a2d8932..ef92aa2c6906e36bc682fee868c04730bd59e29d 100644 GIT binary patch delta 8671 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 TuP!XUH!x^QX?fLI?=$}c00GCv delta 8288 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\n" "Language-Team: LANGUAGE \n" @@ -29,13 +29,50 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: analysis/forms.py:26 analysis/templates/analysis/reports/detail.html:8 +msgid "From" +msgstr "Vom" + +#: analysis/forms.py:38 +msgid "To" +msgstr "Bis" + +#: analysis/forms.py:49 compensation/forms/forms.py:93 +#: compensation/templates/compensation/detail/eco_account/view.html:58 +#: compensation/templates/compensation/report/eco_account/report.html:16 +#: ema/templates/ema/detail/view.html:42 +#: ema/templates/ema/report/report.html:16 intervention/forms/forms.py:101 +#: intervention/templates/intervention/detail/view.html:56 +#: intervention/templates/intervention/report/report.html:37 +msgid "Conservation office" +msgstr "Eintragungsstelle" + +#: analysis/forms.py:51 compensation/forms/forms.py:95 +msgid "Select the responsible office" +msgstr "Verantwortliche Stelle" + +#: analysis/forms.py:60 compensation/forms/forms.py:67 +#: compensation/forms/forms.py:104 compensation/forms/forms.py:155 +#: intervention/forms/forms.py:63 intervention/forms/forms.py:80 +#: intervention/forms/forms.py:96 intervention/forms/forms.py:112 +msgid "Click for selection" +msgstr "Auswählen..." + +#: analysis/forms.py:67 +msgid "Generate report" +msgstr "Bericht generieren" + +#: analysis/forms.py:68 +msgid "Select a timespan and the desired conservation office" +msgstr "Wählen Sie die Zeitspanne und die gewünschte Eintragungsstelle" + #: analysis/templates/analysis/reports/detail.html:7 -#: compensation/templates/compensation/report/compensation/report.html:7 -#: compensation/templates/compensation/report/eco_account/report.html:7 -#: ema/templates/ema/report/report.html:7 -#: intervention/templates/intervention/report/report.html:7 -msgid "Report" -msgstr "Bericht" +msgid "Evaluation report" +msgstr "Auswertungsbericht" + +#: analysis/templates/analysis/reports/detail.html:8 +msgid "to" +msgstr "bis" #: analysis/templates/analysis/reports/includes/compensation/amount.html:3 #: analysis/templates/analysis/reports/includes/eco_account/amount.html:3 @@ -232,11 +269,6 @@ msgstr "Gesetz" msgid "Old interventions" msgstr "Altfälle" -#: analysis/templates/analysis/reports/index.html:6 -#: templates/navbars/navbar.html:46 -msgid "Reports" -msgstr "Berichte" - #: compensation/filters.py:70 msgid "Show only unrecorded" msgstr "Nur unverzeichnete anzeigen" @@ -288,13 +320,6 @@ msgstr "Förderungen" msgid "Select fundings for this compensation" msgstr "Wählen Sie ggf. Fördermittelprojekte" -#: compensation/forms/forms.py:67 compensation/forms/forms.py:104 -#: compensation/forms/forms.py:155 intervention/forms/forms.py:63 -#: intervention/forms/forms.py:80 intervention/forms/forms.py:96 -#: intervention/forms/forms.py:112 -msgid "Click for selection" -msgstr "Auswählen..." - #: compensation/forms/forms.py:73 compensation/forms/modalForms.py:61 #: compensation/forms/modalForms.py:272 compensation/forms/modalForms.py:367 #: compensation/templates/compensation/detail/compensation/includes/actions.html:34 @@ -318,20 +343,6 @@ msgstr "Kommentar" msgid "Additional comment" msgstr "Zusätzlicher Kommentar" -#: compensation/forms/forms.py:93 -#: compensation/templates/compensation/detail/eco_account/view.html:58 -#: compensation/templates/compensation/report/eco_account/report.html:16 -#: ema/templates/ema/detail/view.html:42 -#: ema/templates/ema/report/report.html:16 intervention/forms/forms.py:101 -#: intervention/templates/intervention/detail/view.html:56 -#: intervention/templates/intervention/report/report.html:37 -msgid "Conservation office" -msgstr "Eintragungsstelle" - -#: compensation/forms/forms.py:95 -msgid "Select the responsible office" -msgstr "Verantwortliche Stelle" - #: compensation/forms/forms.py:109 #: compensation/templates/compensation/detail/eco_account/view.html:62 #: compensation/templates/compensation/report/eco_account/report.html:20 @@ -376,23 +387,23 @@ msgstr "Neue Kompensation" msgid "Edit compensation" msgstr "Bearbeite Kompensation" -#: compensation/forms/forms.py:299 -msgid "New Eco-Account" -msgstr "Neues Ökokonto" - -#: compensation/forms/forms.py:308 -msgid "Eco-Account XY; Location ABC" -msgstr "Ökokonto XY; Flur ABC" - -#: compensation/forms/forms.py:360 +#: compensation/forms/forms.py:290 msgid "Available Surface" msgstr "Verfügbare Fläche" -#: compensation/forms/forms.py:363 +#: compensation/forms/forms.py:293 msgid "The amount that can be used for deductions" msgstr "Die für Abbuchungen zur Verfügung stehende Menge" -#: compensation/forms/forms.py:384 +#: compensation/forms/forms.py:315 +msgid "New Eco-Account" +msgstr "Neues Ökokonto" + +#: compensation/forms/forms.py:324 +msgid "Eco-Account XY; Location ABC" +msgstr "Ökokonto XY; Flur ABC" + +#: compensation/forms/forms.py:377 msgid "Edit Eco-Account" msgstr "Ökokonto bearbeiten" @@ -953,6 +964,13 @@ msgstr "Fehlt" msgid "Action handler" msgstr "Maßnahmenträger" +#: compensation/templates/compensation/report/compensation/report.html:7 +#: compensation/templates/compensation/report/eco_account/report.html:7 +#: ema/templates/ema/report/report.html:7 +#: intervention/templates/intervention/report/report.html:7 +msgid "Report" +msgstr "Bericht" + #: compensation/templates/compensation/report/compensation/report.html:55 #: compensation/templates/compensation/report/eco_account/report.html:72 #: ema/templates/ema/report/report.html:59 @@ -1271,31 +1289,31 @@ msgstr "" "Das Ökokonto {} hat für eine Abbuchung von {} m² nicht ausreichend " "Restfläche. Es stehen noch {} m² zur Verfügung." -#: intervention/models.py:329 +#: intervention/models.py:326 msgid "Registration office file number missing" msgstr "Aktenzeichen Zulassungsbehörde fehlt" -#: intervention/models.py:332 +#: intervention/models.py:329 msgid "Conservation office file number missing" msgstr "Aktenzeichen Naturschutzbehörde fehlt" -#: intervention/models.py:335 +#: intervention/models.py:332 msgid "Responsible data missing" msgstr "Daten zu Verantwortlichen fehlen" -#: intervention/models.py:349 +#: intervention/models.py:346 msgid "Revocation exists" msgstr "Widerspruch liegt vor" -#: intervention/models.py:352 +#: intervention/models.py:349 msgid "Registration date missing" msgstr "Datum Zulassung bzw. Satzungsbeschluss fehlt" -#: intervention/models.py:355 +#: intervention/models.py:352 msgid "Binding on missing" msgstr "Datum Bestandskraft fehlt" -#: intervention/models.py:357 +#: intervention/models.py:354 msgid "Legal data missing" msgstr "Rechtliche Daten fehlen" @@ -1598,10 +1616,14 @@ msgid "There was an error on this form." msgstr "Es gab einen Fehler im Formular." #: konova/utils/message_templates.py:12 +msgid "Invalid parameters" +msgstr "Parameter ungültig" + +#: konova/utils/message_templates.py:13 msgid "There are errors in this intervention." msgstr "Es liegen Fehler in diesem Eingriff vor:" -#: konova/utils/message_templates.py:13 +#: konova/utils/message_templates.py:14 msgid "" "The identifier '{}' had to be changed to '{}' since another entry has been " "added in the meanwhile, which uses this identifier" @@ -1609,11 +1631,11 @@ msgstr "" "Die Kennung '{}' musste zu '{}' geändert werden, da ein anderer Eintrag in " "der Zwischenzeit angelegt wurde, welcher diese Kennung nun bereits verwendet" -#: konova/utils/message_templates.py:14 +#: konova/utils/message_templates.py:15 msgid "This data is not shared with you" msgstr "Diese Daten sind für Sie nicht freigegeben" -#: konova/utils/message_templates.py:15 +#: konova/utils/message_templates.py:16 msgid "You need to be part of another user group." msgstr "Hierfür müssen Sie einer anderen Nutzergruppe angehören!" @@ -1784,6 +1806,10 @@ msgstr "" msgid "Export..." msgstr "" +#: templates/navbars/navbar.html:46 +msgid "Reports" +msgstr "Berichte" + #: templates/navbars/navbar.html:58 user/templates/user/index.html:31 msgid "Settings" msgstr "Einstellungen" @@ -3214,9 +3240,6 @@ msgstr "" #~ msgid "Role changed" #~ msgstr "Rolle geändert" -#~ msgid "Invalid role" -#~ msgstr "Rolle ungültig" - #~ msgid "Official" #~ msgstr "Amtlich" -- 2.45.2 From e22e390040f4a7db7d122998fa1f6b782947c8e1 Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Wed, 20 Oct 2021 13:41:32 +0200 Subject: [PATCH 09/14] #26 Annual conservation reports * enhances TimespanReportForm control rendering * adds/updates translations --- analysis/forms.py | 2 + konova/forms.py | 3 + locale/de/LC_MESSAGES/django.mo | Bin 26670 -> 26698 bytes locale/de/LC_MESSAGES/django.po | 77 +++++++++---------- templates/form/table/generic_table_form.html | 4 +- templates/modal/modal_form.html | 2 +- 6 files changed, 47 insertions(+), 41 deletions(-) diff --git a/analysis/forms.py b/analysis/forms.py index 4aafdcbb..11d2f98b 100644 --- a/analysis/forms.py +++ b/analysis/forms.py @@ -65,6 +65,8 @@ class TimespanReportForm(BaseForm): self.form_title = _("Generate report") self.form_caption = _("Select a timespan and the desired conservation office") self.action_url = reverse("analysis:reports") + self.show_cancel_btn = False + self.action_btn_label = _("Continue") def save(self) -> str: """ Generates a redirect url for the detail report diff --git a/konova/forms.py b/konova/forms.py index 26914d27..74e53896 100644 --- a/konova/forms.py +++ b/konova/forms.py @@ -37,12 +37,14 @@ class BaseForm(forms.Form): """ template = None action_url = None + action_btn_label = _("Save") form_title = None cancel_redirect = None form_caption = None instance = None # The data holding model object form_attrs = {} # Holds additional attributes, that can be used in the template has_required_fields = False # Automatically set. Triggers hint rendering in templates + show_cancel_btn = True def __init__(self, *args, **kwargs): self.instance = kwargs.pop("instance", None) @@ -189,6 +191,7 @@ class BaseModalForm(BaseForm, BSModalForm): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) + self.action_btn_label = _("Continue") def process_request(self, request: HttpRequest, msg_success: str = _("Object removed"), msg_error: str = FORM_INVALID, redirect_url: str = None): """ Generic processing of request diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index ef92aa2c6906e36bc682fee868c04730bd59e29d..baf99f19c210ba8ab7f63c1ae584e0b6c60c5519 100644 GIT binary patch delta 7936 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 Ql2PMJ9@#UyXnW{?0oRFF#sB~S delta 7909 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 C15;`M diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 2c6664ec..764b7349 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -11,15 +11,15 @@ #: intervention/forms/forms.py:53 intervention/forms/forms.py:155 #: intervention/forms/forms.py:167 intervention/forms/modalForms.py:107 #: intervention/forms/modalForms.py:120 intervention/forms/modalForms.py:133 -#: konova/forms.py:140 konova/forms.py:244 konova/forms.py:310 -#: konova/forms.py:337 konova/forms.py:347 konova/forms.py:360 -#: konova/forms.py:372 konova/forms.py:393 user/forms.py:38 +#: konova/forms.py:142 konova/forms.py:246 konova/forms.py:312 +#: konova/forms.py:339 konova/forms.py:349 konova/forms.py:362 +#: konova/forms.py:374 konova/forms.py:395 user/forms.py:38 #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-10-20 13:19+0200\n" +"POT-Creation-Date: 2021-10-20 13:37+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,15 +29,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: analysis/forms.py:26 analysis/templates/analysis/reports/detail.html:8 +#: analysis/forms.py:24 analysis/templates/analysis/reports/detail.html:8 msgid "From" msgstr "Vom" -#: analysis/forms.py:38 +#: analysis/forms.py:36 msgid "To" msgstr "Bis" -#: analysis/forms.py:49 compensation/forms/forms.py:93 +#: analysis/forms.py:47 compensation/forms/forms.py:93 #: compensation/templates/compensation/detail/eco_account/view.html:58 #: compensation/templates/compensation/report/eco_account/report.html:16 #: ema/templates/ema/detail/view.html:42 @@ -47,22 +47,22 @@ msgstr "Bis" msgid "Conservation office" msgstr "Eintragungsstelle" -#: analysis/forms.py:51 compensation/forms/forms.py:95 +#: analysis/forms.py:49 compensation/forms/forms.py:95 msgid "Select the responsible office" msgstr "Verantwortliche Stelle" -#: analysis/forms.py:60 compensation/forms/forms.py:67 +#: analysis/forms.py:58 compensation/forms/forms.py:67 #: compensation/forms/forms.py:104 compensation/forms/forms.py:155 #: intervention/forms/forms.py:63 intervention/forms/forms.py:80 #: intervention/forms/forms.py:96 intervention/forms/forms.py:112 msgid "Click for selection" msgstr "Auswählen..." -#: analysis/forms.py:67 +#: analysis/forms.py:65 msgid "Generate report" msgstr "Bericht generieren" -#: analysis/forms.py:68 +#: analysis/forms.py:66 msgid "Select a timespan and the desired conservation office" msgstr "Wählen Sie die Zeitspanne und die gewünschte Eintragungsstelle" @@ -300,7 +300,7 @@ msgstr "Automatisch generiert" #: intervention/templates/intervention/detail/includes/documents.html:28 #: intervention/templates/intervention/detail/view.html:31 #: intervention/templates/intervention/report/report.html:12 -#: konova/forms.py:336 +#: konova/forms.py:338 msgid "Title" msgstr "Bezeichnung" @@ -335,7 +335,7 @@ msgstr "Wählen Sie ggf. Fördermittelprojekte" #: intervention/templates/intervention/detail/includes/documents.html:31 #: intervention/templates/intervention/detail/includes/payments.html:34 #: intervention/templates/intervention/detail/includes/revocation.html:38 -#: konova/forms.py:371 konova/templates/konova/comment_card.html:16 +#: konova/forms.py:373 konova/templates/konova/comment_card.html:16 msgid "Comment" msgstr "Kommentar" @@ -422,7 +422,7 @@ msgstr "Zahlung wird an diesem Datum erwartet" #: compensation/forms/modalForms.py:63 compensation/forms/modalForms.py:274 #: compensation/forms/modalForms.py:369 intervention/forms/modalForms.py:134 -#: konova/forms.py:373 +#: konova/forms.py:375 msgid "Additional comment, maximum {} letters" msgstr "Zusätzlicher Kommentar, maximal {} Zeichen" @@ -462,7 +462,7 @@ msgstr "Geben Sie die Daten des neuen Zustandes ein" msgid "Added state" msgstr "Zustand hinzugefügt" -#: compensation/forms/modalForms.py:190 konova/forms.py:193 +#: compensation/forms/modalForms.py:190 konova/forms.py:195 msgid "Object removed" msgstr "Objekt entfernt" @@ -768,7 +768,7 @@ msgstr "Dokumente" #: compensation/templates/compensation/detail/eco_account/includes/documents.html:14 #: ema/templates/ema/detail/includes/documents.html:14 #: intervention/templates/intervention/detail/includes/documents.html:14 -#: konova/forms.py:392 +#: konova/forms.py:394 msgid "Add new document" msgstr "Neues Dokument hinzufügen" @@ -1220,7 +1220,7 @@ msgstr "Datum des Widerspruchs" msgid "Document" msgstr "Dokument" -#: intervention/forms/modalForms.py:122 konova/forms.py:361 +#: intervention/forms/modalForms.py:122 konova/forms.py:363 msgid "Must be smaller than 15 Mb" msgstr "Muss kleiner als 15 Mb sein" @@ -1242,7 +1242,7 @@ msgstr "Kompensationen und Zahlungen geprüft" msgid "Run check" msgstr "Prüfung vornehmen" -#: intervention/forms/modalForms.py:201 konova/forms.py:446 +#: intervention/forms/modalForms.py:201 konova/forms.py:448 msgid "" "I, {} {}, confirm that all necessary control steps have been performed by " "myself." @@ -1466,64 +1466,68 @@ msgstr "" "somit nichts eingeben, bearbeiten oder sonstige Aktionen ausführen. " "Kontaktieren Sie bitte einen Administrator. +++" -#: konova/forms.py:69 +#: konova/forms.py:40 templates/form/collapsable/form.html:62 +msgid "Save" +msgstr "Speichern" + +#: konova/forms.py:71 msgid "Not editable" msgstr "Nicht editierbar" -#: konova/forms.py:139 konova/forms.py:309 +#: konova/forms.py:141 konova/forms.py:311 msgid "Confirm" msgstr "Bestätige" -#: konova/forms.py:151 konova/forms.py:318 +#: konova/forms.py:153 konova/forms.py:320 msgid "Remove" msgstr "Löschen" -#: konova/forms.py:153 +#: konova/forms.py:155 msgid "You are about to remove {} {}" msgstr "Sie sind dabei {} {} zu löschen" -#: konova/forms.py:243 templates/form/collapsable/form.html:45 +#: konova/forms.py:245 templates/form/collapsable/form.html:45 msgid "Geometry" msgstr "Geometrie" -#: konova/forms.py:319 +#: konova/forms.py:321 msgid "Are you sure?" msgstr "Sind Sie sicher?" -#: konova/forms.py:346 +#: konova/forms.py:348 msgid "Created on" msgstr "Erstellt" -#: konova/forms.py:348 +#: konova/forms.py:350 msgid "When has this file been created? Important for photos." msgstr "Wann wurde diese Datei erstellt oder das Foto aufgenommen?" -#: konova/forms.py:359 +#: konova/forms.py:361 #: venv/lib/python3.7/site-packages/django/db/models/fields/files.py:231 msgid "File" msgstr "Datei" -#: konova/forms.py:423 +#: konova/forms.py:425 msgid "Added document" msgstr "Dokument hinzugefügt" -#: konova/forms.py:437 +#: konova/forms.py:439 msgid "Confirm record" msgstr "Verzeichnen bestätigen" -#: konova/forms.py:445 +#: konova/forms.py:447 msgid "Record data" msgstr "Daten verzeichnen" -#: konova/forms.py:452 +#: konova/forms.py:454 msgid "Confirm unrecord" msgstr "Entzeichnen bestätigen" -#: konova/forms.py:453 +#: konova/forms.py:455 msgid "Unrecord data" msgstr "Daten entzeichnen" -#: konova/forms.py:454 +#: konova/forms.py:456 msgid "I, {} {}, confirm that this data must be unrecorded." msgstr "" "Ich, {} {}, bestätige, dass diese Daten wieder entzeichnet werden müssen." @@ -1721,15 +1725,10 @@ msgid "General data" msgstr "Allgemeine Daten" #: templates/form/collapsable/form.html:58 -#: templates/form/table/generic_table_form.html:23 +#: templates/form/table/generic_table_form.html:24 msgid "Cancel" msgstr "Abbrechen" -#: templates/form/collapsable/form.html:62 -#: templates/form/table/generic_table_form.html:27 -msgid "Save" -msgstr "Speichern" - #: templates/form/table/generic_table_form_body.html:24 msgid "Fields with * are required." msgstr "* sind Pflichtfelder." diff --git a/templates/form/table/generic_table_form.html b/templates/form/table/generic_table_form.html index 7d321436..a89ee4bf 100644 --- a/templates/form/table/generic_table_form.html +++ b/templates/form/table/generic_table_form.html @@ -19,12 +19,14 @@ {% include 'form/table/generic_table_form_body.html' %} diff --git a/templates/modal/modal_form.html b/templates/modal/modal_form.html index eda17303..6f47b127 100644 --- a/templates/modal/modal_form.html +++ b/templates/modal/modal_form.html @@ -22,7 +22,7 @@
+ {% if form.show_cancel_btn %} + {% endif %}
- +
{% if form.render_submit %}
- +
{% endif %} \ No newline at end of file -- 2.45.2 From 419a48cff13fcfd6a837d131f3648dd7ea2e23cf Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Wed, 20 Oct 2021 15:25:08 +0200 Subject: [PATCH 10/14] #26 Annual conservation report * adds first try for excel file downloading (WIP) --- .../templates/analysis/reports/detail.html | 20 ++++++- analysis/utils/report.py | 13 +++++ analysis/views.py | 53 +++++++++++-------- requirements.txt | 7 ++- 4 files changed, 69 insertions(+), 24 deletions(-) diff --git a/analysis/templates/analysis/reports/detail.html b/analysis/templates/analysis/reports/detail.html index 1ba78d54..7a5aee0a 100644 --- a/analysis/templates/analysis/reports/detail.html +++ b/analysis/templates/analysis/reports/detail.html @@ -3,10 +3,28 @@ {% block body %}
-
+

{% trans 'Evaluation report' %} {{office.long_name}}

{% trans 'From' %} {{report.date_from.date}} {% trans 'to' %} {{report.date_to.date}}
+
+
+
+ +
+ + + +
+
+
+
diff --git a/analysis/utils/report.py b/analysis/utils/report.py index c9c7a1bd..8d945f6d 100644 --- a/analysis/utils/report.py +++ b/analysis/utils/report.py @@ -5,10 +5,13 @@ Contact: michel.peltriaux@sgdnord.rlp.de Created on: 18.10.21 """ +from tempfile import NamedTemporaryFile + from django.contrib.gis.db.models import MultiPolygonField from django.contrib.gis.db.models.functions import NumGeometries from django.db.models import Count, Sum, Q from django.db.models.functions import Cast +from openpyxl import Workbook from analysis.settings import LKOMPVZVO_PUBLISH_DATE from codelist.models import KonovaCode @@ -16,6 +19,7 @@ from codelist.settings import CODELIST_LAW_ID from compensation.models import Compensation, Payment, EcoAccountDeduction, EcoAccount from intervention.models import Intervention from konova.models import Geometry +from konova.utils.generators import generate_random_string class TimespanReport: @@ -363,3 +367,12 @@ class TimespanReport: self.compensation_report = self.CompensationReport(self.office_id, date_from, date_to) self.eco_account_report = self.EcoAccountReport(self.office_id, date_from, date_to) self.old_intervention_report = self.OldInterventionReport(self.office_id, date_from, date_to) + + def to_excel_file(self): + workbook = Workbook() + tmp_file = NamedTemporaryFile() + ws = workbook.active + ws["A1"] = "TEST" + workbook.save(tmp_file.name) + tmp_file.seek(0) + return tmp_file diff --git a/analysis/views.py b/analysis/views.py index dab3b276..fcefa15f 100644 --- a/analysis/views.py +++ b/analysis/views.py @@ -1,8 +1,7 @@ from django.contrib import messages from django.contrib.auth.decorators import login_required -from django.core.exceptions import ObjectDoesNotExist -from django.http import HttpRequest -from django.shortcuts import render, redirect +from django.http import HttpRequest, FileResponse +from django.shortcuts import render, redirect, get_object_or_404 from django.utils import timezone from analysis.forms import TimespanReportForm @@ -55,18 +54,17 @@ def detail_report_view(request: HttpRequest, id: str): Returns: """ + # Try to resolve the requested office id + cons_office = get_object_or_404( + KonovaCode, + id=id + ) + # Try to resolve the date parameters into Date objects -> redirect if this fails try: - cons_office = KonovaCode.objects.get(id=id) - except (ObjectDoesNotExist, ValueError) as e: - messages.error( - request, - PARAMS_INVALID, - extra_tags="danger", - ) - return redirect("analysis:reports") - try: - date_from = timezone.make_aware(timezone.datetime.fromisoformat(request.GET.get("df", None))) - date_to = timezone.make_aware(timezone.datetime.fromisoformat(request.GET.get("dt", None))) + df = request.GET.get("df", None) + dt = request.GET.get("dt", None) + date_from = timezone.make_aware(timezone.datetime.fromisoformat(df)) + date_to = timezone.make_aware(timezone.datetime.fromisoformat(dt)) except ValueError: messages.error( request, @@ -75,11 +73,24 @@ def detail_report_view(request: HttpRequest, id: str): ) return redirect("analysis:reports") + # Check whether the html default rendering is requested or an alternative + format_param = request.GET.get("format", "html") report = TimespanReport(id, date_from, date_to) - template = "analysis/reports/detail.html" - context = { - "office": cons_office, - "report": report, - } - context = BaseContext(request, context).context - return render(request, template, context) \ No newline at end of file + + if format_param == "html": + template = "analysis/reports/detail.html" + context = { + "office": cons_office, + "report": report, + } + context = BaseContext(request, context).context + return render(request, template, context) + elif format_param == "excel": + stream = report.to_excel_file() + response = FileResponse( + filename=stream.name, + ) + response['Content-Disposition'] = f'attachement;"' + return response + else: + raise NotImplementedError diff --git a/requirements.txt b/requirements.txt index 360af590..ac893917 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,11 +11,14 @@ django-filter==2.4.0 django-fontawesome-5==1.0.18 django-simple-sso==1.1.0 django-tables2==2.3.4 +et-xmlfile==1.1.0 idna==2.10 importlib-metadata==2.1.1 -itsdangerous -psycopg2-binary +itsdangerous==0.24 +openpyxl==3.0.9 +psycopg2-binary==2.9.1 pytz==2020.4 +qrcode==7.3.1 requests==2.25.0 six==1.15.0 soupsieve==2.2.1 -- 2.45.2 From 4e89fd9678db651673c855b59c0e048ac6db6ae7 Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Thu, 21 Oct 2021 14:58:54 +0200 Subject: [PATCH 11/14] #26 Annual conservation report * Adds download as excel sheet * improves db access performance --- .../templates/analysis/reports/detail.html | 4 +- .../reports/includes/compensation/amount.html | 24 ++-- .../reports/includes/eco_account/amount.html | 8 +- .../includes/eco_account/deductions.html | 4 +- .../reports/includes/intervention/amount.html | 6 +- .../includes/old_intervention/amount.html | 6 +- analysis/utils/excel/excel.py | 112 ++++++++++++++++++ analysis/utils/excel/excel_report.xlsx | Bin 0 -> 5958 bytes analysis/utils/report.py | 105 ++++++++++++++-- analysis/views.py | 12 +- 10 files changed, 238 insertions(+), 43 deletions(-) create mode 100644 analysis/utils/excel/excel.py create mode 100644 analysis/utils/excel/excel_report.xlsx diff --git a/analysis/templates/analysis/reports/detail.html b/analysis/templates/analysis/reports/detail.html index 7a5aee0a..9cdae7d2 100644 --- a/analysis/templates/analysis/reports/detail.html +++ b/analysis/templates/analysis/reports/detail.html @@ -9,13 +9,13 @@
-
+
-
+
{% endblock %} \ No newline at end of file diff --git a/analysis/templates/analysis/reports/includes/eco_account/amount.html b/analysis/templates/analysis/reports/includes/eco_account/amount.html index becdfff9..668250e6 100644 --- a/analysis/templates/analysis/reports/includes/eco_account/amount.html +++ b/analysis/templates/analysis/reports/includes/eco_account/amount.html @@ -2,10 +2,6 @@

{% trans 'Amount' %}

- {% blocktrans %} - Checked = Has been checked by the registration office according to LKompVzVo - {% endblocktrans %} -
{% blocktrans %} Recorded = Has been checked and published by the conservation office {% endblocktrans %} @@ -14,18 +10,14 @@ - - - - + + - - - +
{% trans 'Before' %} LKompVzVo{% trans 'After' %} LKompVzVo{% fa5_icon 'bookmark' %} {% trans 'Recorded' %}{% trans 'Total' %}{% fa5_icon 'bookmark' %} {% trans 'Recorded' %}{% trans 'Total' %}
{{report.eco_account_report.queryset_old_count|default_if_zero:"-"}}{{report.eco_account_report.queryset_count|default_if_zero:"-"}} {{report.eco_account_report.queryset_recorded_count|default_if_zero:"-"}}{{report.eco_account_report.queryset_total_count|default_if_zero:"-"}}{{report.eco_account_report.queryset_count|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 new file mode 100644 index 00000000..cd79cb6f --- /dev/null +++ b/analysis/templates/analysis/reports/includes/old_data/amount.html @@ -0,0 +1,40 @@ +{% load i18n fontawesome_5 ksp_filters %} + +

{% trans 'Amount' %}

+ + {% blocktrans %} + Checked = Has been checked by the registration office according to LKompVzVo + {% endblocktrans %} +
+ {% blocktrans %} + Recorded = Has been checked and published by the conservation office + {% endblocktrans %} + +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
{% fa5_icon 'star' %} {% trans 'Type' %}{% fa5_icon 'bookmark' %} {% trans 'Recorded' %}{% trans 'Total' %}
{% trans 'Intervention' %}{{report.old_data_report.queryset_intervention_recorded_count|default_if_zero:"-"}}{{report.old_data_report.queryset_intervention_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:"-"}}
{% trans 'Eco-account' %}{{report.old_data_report.queryset_acc_recorded_count|default_if_zero:"-"}}{{report.old_data_report.queryset_acc_count|default_if_zero:"-"}}
+
\ No newline at end of file diff --git a/analysis/templates/analysis/reports/includes/old_intervention/card_old_interventions.html b/analysis/templates/analysis/reports/includes/old_data/card_old_interventions.html similarity index 97% rename from analysis/templates/analysis/reports/includes/old_intervention/card_old_interventions.html rename to analysis/templates/analysis/reports/includes/old_data/card_old_interventions.html index 3a272874..a25a5712 100644 --- a/analysis/templates/analysis/reports/includes/old_intervention/card_old_interventions.html +++ b/analysis/templates/analysis/reports/includes/old_data/card_old_interventions.html @@ -16,7 +16,7 @@
- {% include 'analysis/reports/includes/old_intervention/amount.html' %} + {% include 'analysis/reports/includes/old_data/amount.html' %}
diff --git a/analysis/templates/analysis/reports/includes/old_intervention/amount.html b/analysis/templates/analysis/reports/includes/old_intervention/amount.html deleted file mode 100644 index 8a6b4be0..00000000 --- a/analysis/templates/analysis/reports/includes/old_intervention/amount.html +++ /dev/null @@ -1,30 +0,0 @@ -{% load i18n fontawesome_5 ksp_filters %} - -

{% trans 'Amount' %}

- - {% blocktrans %} - Checked = Has been checked by the registration office according to LKompVzVo - {% endblocktrans %} -
- {% blocktrans %} - Recorded = Has been checked and published by the conservation office - {% endblocktrans %} - -
- - - - - - - - - - - - - - - -
{% fa5_icon 'star' %} {% trans 'Checked' %}{% fa5_icon 'bookmark' %} {% trans 'Recorded' %}{% trans 'Total' %}
{{report.old_intervention_report.queryset_checked_count|default_if_zero:"-"}}{{report.old_intervention_report.queryset_recorded_count|default_if_zero:"-"}}{{report.old_intervention_report.queryset_count|default_if_zero:"-"}}
-
\ No newline at end of file diff --git a/analysis/utils/excel/excel.py b/analysis/utils/excel/excel.py index 69fbcdfe..611f6a0c 100644 --- a/analysis/utils/excel/excel.py +++ b/analysis/utils/excel/excel.py @@ -47,28 +47,30 @@ class TempExcelFile: Returns: """ - ws = self._workbook.active - # Always activate sheet protection - ws.protection.sheet = True - ws.protection.enable() - _rows = ws.iter_rows(start_row) - for row in _rows: - for cell in row: - val = cell.value - if val in self._template_map: - attr = self._template_map[val] - # If keyword '_iter' can be found inside the placeholder value it's an iterable and we - # need to process it differently - if isinstance(attr, dict): - # Read the iterable object and related attributes from the dict - _iter_obj = attr.get("iterable", None) - _attrs = attr.get("attrs", []) - self._add_cells_from_iterable(ws, cell, _iter_obj, _attrs) - # Since the sheet length did change now, we need to rerun this function starting with the new - # row counter - self._replace_template_placeholders(start_row=cell.row + len(_iter_obj)) - else: - cell.value = attr + sheets = self._workbook.worksheets + for sheet in sheets: + ws = sheet + # Always activate sheet protection + ws.protection.sheet = True + ws.protection.enable() + _rows = ws.iter_rows(start_row) + for row in _rows: + for cell in row: + val = cell.value + if val in self._template_map: + attr = self._template_map[val] + # If keyword '_iter' can be found inside the placeholder value it's an iterable and we + # need to process it differently + if isinstance(attr, dict): + # Read the iterable object and related attributes from the dict + _iter_obj = attr.get("iterable", None) + _attrs = attr.get("attrs", []) + self._add_cells_from_iterable(ws, cell, _iter_obj, _attrs) + # Since the sheet length did change now, we need to rerun this function starting with the new + # row counter + self._replace_template_placeholders(start_row=cell.row + len(_iter_obj)) + else: + cell.value = attr self._workbook.save(self._file.name) self._file.seek(0) self.stream = self._file.read() diff --git a/analysis/utils/excel/excel_report.xlsx b/analysis/utils/excel/excel_report.xlsx index 4383fbe8a80f4a056579b72136dc1c19759745bf..72cf1295461bac4f862d9bc163f7601c7c32ba20 100644 GIT binary patch literal 10693 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 delta 5748 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 Date: Fri, 22 Oct 2021 13:32:05 +0200 Subject: [PATCH 14/14] #26 Annual conservation report * adds LegalData to EcoAccount to provide registration_date support ("agreement date") for old-data report generating * adds/updates translations --- analysis/utils/report.py | 2 +- compensation/forms/forms.py | 31 ++- compensation/models.py | 10 +- .../compensation/detail/eco_account/view.html | 4 + locale/de/LC_MESSAGES/django.mo | Bin 26698 -> 26795 bytes locale/de/LC_MESSAGES/django.po | 194 ++++++++++-------- 6 files changed, 147 insertions(+), 94 deletions(-) diff --git a/analysis/utils/report.py b/analysis/utils/report.py index 1fd86604..3bfd6370 100644 --- a/analysis/utils/report.py +++ b/analysis/utils/report.py @@ -498,7 +498,7 @@ class TimespanReport: self.queryset_comps_recorded_count = self.queryset_comps_recorded.count() self.queryset_acc = EcoAccount.objects.filter( - #legal__registration_date__lte=LKOMPVZVO_PUBLISH_DATE, + legal__registration_date__lte=LKOMPVZVO_PUBLISH_DATE, responsible__conservation_office__id=id, deleted=None, created__timestamp__gte=date_from, diff --git a/compensation/forms/forms.py b/compensation/forms/forms.py index 59054836..eadee2f4 100644 --- a/compensation/forms/forms.py +++ b/compensation/forms/forms.py @@ -16,7 +16,7 @@ from codelist.models import KonovaCode from codelist.settings import CODELIST_COMPENSATION_FUNDING_ID, CODELIST_CONSERVATION_OFFICE_ID from compensation.models import Compensation, EcoAccount from intervention.inputs import GenerateInput -from intervention.models import Intervention, ResponsibilityData +from intervention.models import Intervention, ResponsibilityData, LegalData from konova.forms import BaseForm, SimpleGeomForm from user.models import UserActionLogEntry, UserAction @@ -298,11 +298,25 @@ class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMix } ) ) + registration_date = forms.DateField( + label=_("Agreement date"), + label_suffix="", + help_text=_("When did the parties agree on this?"), + required=False, + widget=forms.DateInput( + attrs={ + "type": "date", + "class": "form-control", + }, + format="%d.%m.%Y" + ) + ) field_order = [ "identifier", "title", "conservation_office", + "registration_date", "surface", "conservation_file_number", "handler", @@ -329,6 +343,7 @@ class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMix identifier = self.cleaned_data.get("identifier", None) title = self.cleaned_data.get("title", None) fundings = self.cleaned_data.get("fundings", None) + registration_date = self.cleaned_data.get("registration_date", None) handler = self.cleaned_data.get("handler", None) surface = self.cleaned_data.get("surface", None) conservation_office = self.cleaned_data.get("conservation_office", None) @@ -349,6 +364,10 @@ class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMix conservation_office=conservation_office, ) + legal = LegalData.objects.create( + registration_date=registration_date + ) + # Finally create main object acc = EcoAccount.objects.create( identifier=identifier, @@ -358,6 +377,7 @@ class NewEcoAccountForm(AbstractCompensationForm, CompensationResponsibleFormMix created=action, geometry=geometry, comment=comment, + legal=legal ) acc.fundings.set(fundings) acc.users.add(user) @@ -380,11 +400,15 @@ class EditEcoAccountForm(NewEcoAccountForm): self.cancel_redirect = reverse("compensation:acc-detail", args=(self.instance.id,)) # Initialize form data + reg_date = self.instance.legal.registration_date + if reg_date is not None: + reg_date = reg_date.isoformat() form_data = { "identifier": self.instance.identifier, "title": self.instance.title, "surface": self.instance.deductable_surface, "handler": self.instance.responsible.handler, + "registration_date": reg_date, "conservation_office": self.instance.responsible.conservation_office, "conservation_file_number": self.instance.responsible.conservation_file_number, "fundings": self.instance.fundings.all(), @@ -402,6 +426,7 @@ class EditEcoAccountForm(NewEcoAccountForm): identifier = self.cleaned_data.get("identifier", None) title = self.cleaned_data.get("title", None) fundings = self.cleaned_data.get("fundings", None) + registration_date = self.cleaned_data.get("registration_date", None) handler = self.cleaned_data.get("handler", None) surface = self.cleaned_data.get("surface", None) conservation_office = self.cleaned_data.get("conservation_office", None) @@ -422,6 +447,10 @@ class EditEcoAccountForm(NewEcoAccountForm): self.instance.responsible.conservation_file_number = conservation_file_number self.instance.responsible.save() + # Update legal data + self.instance.legal.registration_date = registration_date + self.instance.legal.save() + # Update main oject data self.instance.identifier = identifier self.instance.title = title diff --git a/compensation/models.py b/compensation/models.py index 4f9cc919..d2d18be5 100644 --- a/compensation/models.py +++ b/compensation/models.py @@ -19,7 +19,7 @@ from codelist.settings import CODELIST_COMPENSATION_ACTION_ID, CODELIST_BIOTOPES CODELIST_COMPENSATION_FUNDING_ID from compensation.managers import CompensationStateManager, EcoAccountDeductionManager, CompensationActionManager, \ EcoAccountManager, CompensationManager -from intervention.models import Intervention, ResponsibilityData +from intervention.models import Intervention, ResponsibilityData, LegalData from konova.models import BaseObject, BaseResource, Geometry, UuidModel, AbstractDocument, \ generate_document_file_upload_path from konova.settings import DEFAULT_SRID_RLP, LANIS_LINK_TEMPLATE @@ -309,6 +309,14 @@ class EcoAccount(AbstractCompensation): default=0, ) + legal = models.OneToOneField( + LegalData, + on_delete=models.SET_NULL, + null=True, + blank=True, + help_text="Holds data on legal dates or law" + ) + objects = EcoAccountManager() def __str__(self): diff --git a/compensation/templates/compensation/detail/eco_account/view.html b/compensation/templates/compensation/detail/eco_account/view.html index e839e6e9..6f7eca99 100644 --- a/compensation/templates/compensation/detail/eco_account/view.html +++ b/compensation/templates/compensation/detail/eco_account/view.html @@ -61,6 +61,10 @@ {% trans 'Conservation office file number' %} {{obj.responsible.conservation_file_number|default_if_none:""}} + + {% trans 'Agreement date' %} + {{obj.legal.registration_date|default_if_none:""}} + {% trans 'Action handler' %} {{obj.responsible.handler|default_if_none:""}} diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index baf99f19c210ba8ab7f63c1ae584e0b6c60c5519..8a1e11b3bf85fc2addccaff72983a2c4993babf7 100644 GIT binary patch delta 7560 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 delta 7483 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 diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 74b0ecab..2ac3f918 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -11,15 +11,15 @@ #: intervention/forms/forms.py:53 intervention/forms/forms.py:155 #: intervention/forms/forms.py:167 intervention/forms/modalForms.py:107 #: intervention/forms/modalForms.py:120 intervention/forms/modalForms.py:133 -#: konova/forms.py:142 konova/forms.py:246 konova/forms.py:312 -#: konova/forms.py:339 konova/forms.py:349 konova/forms.py:362 -#: konova/forms.py:374 konova/forms.py:395 user/forms.py:38 +#: konova/forms.py:142 konova/forms.py:247 konova/forms.py:313 +#: konova/forms.py:340 konova/forms.py:350 konova/forms.py:363 +#: konova/forms.py:375 konova/forms.py:396 user/forms.py:38 #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-10-20 13:37+0200\n" +"POT-Creation-Date: 2021-10-22 13:14+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -37,7 +37,7 @@ msgstr "Vom" msgid "To" msgstr "Bis" -#: analysis/forms.py:47 compensation/forms/forms.py:93 +#: analysis/forms.py:47 compensation/forms/forms.py:94 #: compensation/templates/compensation/detail/eco_account/view.html:58 #: compensation/templates/compensation/report/eco_account/report.html:16 #: ema/templates/ema/detail/view.html:42 @@ -47,12 +47,12 @@ msgstr "Bis" msgid "Conservation office" msgstr "Eintragungsstelle" -#: analysis/forms.py:49 compensation/forms/forms.py:95 +#: analysis/forms.py:49 compensation/forms/forms.py:96 msgid "Select the responsible office" msgstr "Verantwortliche Stelle" -#: analysis/forms.py:58 compensation/forms/forms.py:67 -#: compensation/forms/forms.py:104 compensation/forms/forms.py:155 +#: analysis/forms.py:58 compensation/forms/forms.py:68 +#: compensation/forms/forms.py:105 compensation/forms/forms.py:156 #: intervention/forms/forms.py:63 intervention/forms/forms.py:80 #: intervention/forms/forms.py:96 intervention/forms/forms.py:112 msgid "Click for selection" @@ -66,6 +66,10 @@ msgstr "Bericht generieren" msgid "Select a timespan and the desired conservation office" msgstr "Wählen Sie die Zeitspanne und die gewünschte Eintragungsstelle" +#: analysis/forms.py:69 konova/forms.py:194 +msgid "Continue" +msgstr "Weiter" + #: analysis/templates/analysis/reports/detail.html:7 msgid "Evaluation report" msgstr "Auswertungsbericht" @@ -74,6 +78,10 @@ msgstr "Auswertungsbericht" msgid "to" msgstr "bis" +#: analysis/templates/analysis/reports/detail.html:14 +msgid "Download" +msgstr "" + #: analysis/templates/analysis/reports/includes/compensation/amount.html:3 #: analysis/templates/analysis/reports/includes/eco_account/amount.html:3 #: analysis/templates/analysis/reports/includes/intervention/amount.html:3 @@ -85,7 +93,6 @@ msgid "Amount" msgstr "Menge" #: analysis/templates/analysis/reports/includes/compensation/amount.html:5 -#: analysis/templates/analysis/reports/includes/eco_account/amount.html:5 #: analysis/templates/analysis/reports/includes/intervention/amount.html:5 #: analysis/templates/analysis/reports/includes/old_data/amount.html:5 msgid "" @@ -99,7 +106,7 @@ msgstr "" " " #: analysis/templates/analysis/reports/includes/compensation/amount.html:9 -#: analysis/templates/analysis/reports/includes/eco_account/amount.html:9 +#: analysis/templates/analysis/reports/includes/eco_account/amount.html:5 #: analysis/templates/analysis/reports/includes/intervention/amount.html:9 #: analysis/templates/analysis/reports/includes/old_data/amount.html:9 msgid "" @@ -120,7 +127,6 @@ msgstr "Zuständigkeitsbereich" #: analysis/templates/analysis/reports/includes/intervention/amount.html:17 #: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:8 #: analysis/templates/analysis/reports/includes/intervention/laws.html:17 -#: analysis/templates/analysis/reports/includes/old_data/amount.html:17 #: compensation/tables.py:35 #: compensation/templates/compensation/detail/compensation/view.html:43 #: intervention/tables.py:33 @@ -129,7 +135,7 @@ msgid "Checked" msgstr "Geprüft" #: analysis/templates/analysis/reports/includes/compensation/amount.html:19 -#: analysis/templates/analysis/reports/includes/eco_account/amount.html:19 +#: analysis/templates/analysis/reports/includes/eco_account/amount.html:13 #: analysis/templates/analysis/reports/includes/eco_account/deductions.html:8 #: analysis/templates/analysis/reports/includes/eco_account/deductions.html:9 #: analysis/templates/analysis/reports/includes/intervention/amount.html:18 @@ -152,7 +158,7 @@ msgstr "Einzelflächen" #: analysis/templates/analysis/reports/includes/compensation/amount.html:21 #: analysis/templates/analysis/reports/includes/compensation/amount.html:47 -#: analysis/templates/analysis/reports/includes/eco_account/amount.html:20 +#: analysis/templates/analysis/reports/includes/eco_account/amount.html:14 #: analysis/templates/analysis/reports/includes/eco_account/deductions.html:10 #: analysis/templates/analysis/reports/includes/eco_account/deductions.html:11 #: analysis/templates/analysis/reports/includes/intervention/amount.html:19 @@ -184,15 +190,6 @@ msgstr "Andere Zulassungsbehörden" msgid "Compensations" msgstr "Kompensationen" -#: analysis/templates/analysis/reports/includes/eco_account/amount.html:17 -#: analysis/templates/analysis/reports/includes/old_data/card_old_interventions.html:13 -msgid "Before" -msgstr "Vor" - -#: analysis/templates/analysis/reports/includes/eco_account/amount.html:18 -msgid "After" -msgstr "Nach" - #: analysis/templates/analysis/reports/includes/eco_account/card_eco_account.html:11 msgid "Eco-Accounts" msgstr "Ökokonten" @@ -229,6 +226,7 @@ msgid "Compensation type" msgstr "Kompensationsart" #: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:15 +#: analysis/templates/analysis/reports/includes/old_data/amount.html:29 #: compensation/tables.py:84 #: compensation/templates/compensation/detail/compensation/view.html:19 #: konova/templates/konova/home.html:49 templates/navbars/navbar.html:28 @@ -265,26 +263,53 @@ msgstr "" msgid "Law" msgstr "Gesetz" +#: analysis/templates/analysis/reports/includes/old_data/amount.html:17 +#: compensation/templates/compensation/detail/compensation/includes/deadlines.html:28 +#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:28 +#: ema/templates/ema/detail/includes/deadlines.html:28 +msgid "Type" +msgstr "Typ" + +#: analysis/templates/analysis/reports/includes/old_data/amount.html:24 +#: intervention/forms/modalForms.py:285 intervention/forms/modalForms.py:292 +#: intervention/tables.py:88 +#: intervention/templates/intervention/detail/view.html:19 +#: konova/templates/konova/home.html:11 templates/navbars/navbar.html:22 +msgid "Intervention" +msgstr "Eingriff" + +#: analysis/templates/analysis/reports/includes/old_data/amount.html:34 +#: compensation/tables.py:224 +#: compensation/templates/compensation/detail/eco_account/view.html:19 +#: intervention/forms/modalForms.py:258 intervention/forms/modalForms.py:265 +#: konova/templates/konova/home.html:88 templates/navbars/navbar.html:34 +msgid "Eco-account" +msgstr "Ökokonto" + #: analysis/templates/analysis/reports/includes/old_data/card_old_interventions.html:11 msgid "Old interventions" msgstr "Altfälle" +#: analysis/templates/analysis/reports/includes/old_data/card_old_interventions.html:13 +msgid "Before" +msgstr "Vor" + #: compensation/filters.py:70 msgid "Show only unrecorded" msgstr "Nur unverzeichnete anzeigen" -#: compensation/forms/forms.py:31 compensation/tables.py:25 +#: compensation/forms/forms.py:32 compensation/tables.py:25 #: compensation/tables.py:166 ema/tables.py:28 intervention/forms/forms.py:27 #: intervention/tables.py:23 #: intervention/templates/intervention/detail/includes/compensations.html:30 msgid "Identifier" msgstr "Kennung" -#: compensation/forms/forms.py:34 intervention/forms/forms.py:30 +#: compensation/forms/forms.py:35 intervention/forms/forms.py:30 msgid "Generated automatically" msgstr "Automatisch generiert" -#: compensation/forms/forms.py:43 compensation/tables.py:30 +#: compensation/forms/forms.py:44 compensation/tables.py:30 #: compensation/tables.py:171 #: compensation/templates/compensation/detail/compensation/includes/documents.html:28 #: compensation/templates/compensation/detail/compensation/view.html:31 @@ -300,27 +325,27 @@ msgstr "Automatisch generiert" #: intervention/templates/intervention/detail/includes/documents.html:28 #: intervention/templates/intervention/detail/view.html:31 #: intervention/templates/intervention/report/report.html:12 -#: konova/forms.py:338 +#: konova/forms.py:339 msgid "Title" msgstr "Bezeichnung" -#: compensation/forms/forms.py:45 intervention/forms/forms.py:41 +#: compensation/forms/forms.py:46 intervention/forms/forms.py:41 msgid "An explanatory name" msgstr "Aussagekräftiger Titel" -#: compensation/forms/forms.py:49 ema/forms.py:47 ema/forms.py:105 +#: compensation/forms/forms.py:50 ema/forms.py:47 ema/forms.py:105 msgid "Compensation XY; Location ABC" msgstr "Kompensation XY; Flur ABC" -#: compensation/forms/forms.py:55 +#: compensation/forms/forms.py:56 msgid "Fundings" msgstr "Förderungen" -#: compensation/forms/forms.py:58 +#: compensation/forms/forms.py:59 msgid "Select fundings for this compensation" msgstr "Wählen Sie ggf. Fördermittelprojekte" -#: compensation/forms/forms.py:73 compensation/forms/modalForms.py:61 +#: compensation/forms/forms.py:74 compensation/forms/modalForms.py:61 #: compensation/forms/modalForms.py:272 compensation/forms/modalForms.py:367 #: compensation/templates/compensation/detail/compensation/includes/actions.html:34 #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:34 @@ -335,15 +360,15 @@ msgstr "Wählen Sie ggf. Fördermittelprojekte" #: intervention/templates/intervention/detail/includes/documents.html:31 #: intervention/templates/intervention/detail/includes/payments.html:34 #: intervention/templates/intervention/detail/includes/revocation.html:38 -#: konova/forms.py:373 konova/templates/konova/comment_card.html:16 +#: konova/forms.py:374 konova/templates/konova/comment_card.html:16 msgid "Comment" msgstr "Kommentar" -#: compensation/forms/forms.py:75 intervention/forms/forms.py:181 +#: compensation/forms/forms.py:76 intervention/forms/forms.py:181 msgid "Additional comment" msgstr "Zusätzlicher Kommentar" -#: compensation/forms/forms.py:109 +#: compensation/forms/forms.py:110 #: compensation/templates/compensation/detail/eco_account/view.html:62 #: compensation/templates/compensation/report/eco_account/report.html:20 #: ema/templates/ema/detail/view.html:46 @@ -353,57 +378,65 @@ msgstr "Zusätzlicher Kommentar" msgid "Conservation office file number" msgstr "Aktenzeichen Eintragungsstelle" -#: compensation/forms/forms.py:115 intervention/forms/forms.py:135 +#: compensation/forms/forms.py:116 intervention/forms/forms.py:135 msgid "ETS-123/ABC.456" msgstr "" -#: compensation/forms/forms.py:121 +#: compensation/forms/forms.py:122 msgid "Eco-account handler" msgstr "Maßnahmenträger" -#: compensation/forms/forms.py:125 +#: compensation/forms/forms.py:126 msgid "Who handles the eco-account" msgstr "Wer für die Herrichtung des Ökokontos verantwortlich ist" -#: compensation/forms/forms.py:128 intervention/forms/forms.py:148 +#: compensation/forms/forms.py:129 intervention/forms/forms.py:148 msgid "Company Mustermann" msgstr "Firma Mustermann" -#: compensation/forms/forms.py:146 +#: compensation/forms/forms.py:147 #: compensation/templates/compensation/detail/compensation/view.html:35 #: compensation/templates/compensation/report/compensation/report.html:16 msgid "compensates intervention" msgstr "kompensiert Eingriff" -#: compensation/forms/forms.py:148 +#: compensation/forms/forms.py:149 msgid "Select the intervention for which this compensation compensates" msgstr "Wählen Sie den Eingriff, für den diese Kompensation bestimmt ist" -#: compensation/forms/forms.py:173 +#: compensation/forms/forms.py:174 msgid "New compensation" msgstr "Neue Kompensation" -#: compensation/forms/forms.py:231 +#: compensation/forms/forms.py:232 msgid "Edit compensation" msgstr "Bearbeite Kompensation" -#: compensation/forms/forms.py:290 +#: compensation/forms/forms.py:291 msgid "Available Surface" msgstr "Verfügbare Fläche" -#: compensation/forms/forms.py:293 +#: compensation/forms/forms.py:294 msgid "The amount that can be used for deductions" msgstr "Die für Abbuchungen zur Verfügung stehende Menge" -#: compensation/forms/forms.py:315 +#: compensation/forms/forms.py:303 +msgid "Agreement date" +msgstr "Vereinbarungsdatum" + +#: compensation/forms/forms.py:304 +msgid "When did the parties agree on this?" +msgstr "Wann wurde dieses Ökokonto offiziell vereinbart?" + +#: compensation/forms/forms.py:329 msgid "New Eco-Account" msgstr "Neues Ökokonto" -#: compensation/forms/forms.py:324 +#: compensation/forms/forms.py:338 msgid "Eco-Account XY; Location ABC" msgstr "Ökokonto XY; Flur ABC" -#: compensation/forms/forms.py:377 +#: compensation/forms/forms.py:397 msgid "Edit Eco-Account" msgstr "Ökokonto bearbeiten" @@ -422,7 +455,7 @@ msgstr "Zahlung wird an diesem Datum erwartet" #: compensation/forms/modalForms.py:63 compensation/forms/modalForms.py:274 #: compensation/forms/modalForms.py:369 intervention/forms/modalForms.py:134 -#: konova/forms.py:375 +#: konova/forms.py:376 msgid "Additional comment, maximum {} letters" msgstr "Zusätzlicher Kommentar, maximal {} Zeichen" @@ -462,7 +495,7 @@ msgstr "Geben Sie die Daten des neuen Zustandes ein" msgid "Added state" msgstr "Zustand hinzugefügt" -#: compensation/forms/modalForms.py:190 konova/forms.py:195 +#: compensation/forms/modalForms.py:190 konova/forms.py:196 msgid "Object removed" msgstr "Objekt entfernt" @@ -580,14 +613,14 @@ msgstr "" msgid "Pieces" msgstr "Stück" -#: compensation/models.py:321 +#: compensation/models.py:329 msgid "" "Deductable surface can not be larger than existing surfaces in after states" msgstr "" "Die abbuchbare Fläche darf die Gesamtfläche der Zielzustände nicht " "überschreiten" -#: compensation/models.py:328 +#: compensation/models.py:336 msgid "" "Deductable surface can not be smaller than the sum of already existing " "deductions. Please contact the responsible users for the deductions!" @@ -653,13 +686,6 @@ msgstr "Verfügbar" msgid "Eco Accounts" msgstr "Ökokonten" -#: compensation/tables.py:224 -#: compensation/templates/compensation/detail/eco_account/view.html:19 -#: intervention/forms/modalForms.py:258 intervention/forms/modalForms.py:265 -#: konova/templates/konova/home.html:88 templates/navbars/navbar.html:34 -msgid "Eco-account" -msgstr "Ökokonto" - #: compensation/tables.py:257 msgid "Not recorded yet. Can not be used for deductions, yet." msgstr "" @@ -745,12 +771,6 @@ msgstr "Termine und Fristen" msgid "Add new deadline" msgstr "Frist/Termin hinzufügen" -#: compensation/templates/compensation/detail/compensation/includes/deadlines.html:28 -#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:28 -#: ema/templates/ema/detail/includes/deadlines.html:28 -msgid "Type" -msgstr "Typ" - #: compensation/templates/compensation/detail/compensation/includes/deadlines.html:53 #: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:51 #: ema/templates/ema/detail/includes/deadlines.html:51 @@ -768,7 +788,7 @@ msgstr "Dokumente" #: compensation/templates/compensation/detail/eco_account/includes/documents.html:14 #: ema/templates/ema/detail/includes/documents.html:14 #: intervention/templates/intervention/detail/includes/documents.html:14 -#: konova/forms.py:394 +#: konova/forms.py:395 msgid "Add new document" msgstr "Neues Dokument hinzufügen" @@ -1220,7 +1240,7 @@ msgstr "Datum des Widerspruchs" msgid "Document" msgstr "Dokument" -#: intervention/forms/modalForms.py:122 konova/forms.py:363 +#: intervention/forms/modalForms.py:122 konova/forms.py:364 msgid "Must be smaller than 15 Mb" msgstr "Muss kleiner als 15 Mb sein" @@ -1242,7 +1262,7 @@ msgstr "Kompensationen und Zahlungen geprüft" msgid "Run check" msgstr "Prüfung vornehmen" -#: intervention/forms/modalForms.py:201 konova/forms.py:448 +#: intervention/forms/modalForms.py:201 konova/forms.py:449 msgid "" "I, {} {}, confirm that all necessary control steps have been performed by " "myself." @@ -1254,13 +1274,6 @@ msgstr "" msgid "Only recorded accounts can be selected for deductions" msgstr "Nur verzeichnete Ökokonten können für Abbuchungen verwendet werden." -#: intervention/forms/modalForms.py:285 intervention/forms/modalForms.py:292 -#: intervention/tables.py:88 -#: intervention/templates/intervention/detail/view.html:19 -#: konova/templates/konova/home.html:11 templates/navbars/navbar.html:22 -msgid "Intervention" -msgstr "Eingriff" - #: intervention/forms/modalForms.py:287 msgid "Only shared interventions can be selected" msgstr "Nur freigegebene Eingriffe können gewählt werden" @@ -1474,11 +1487,11 @@ msgstr "Speichern" msgid "Not editable" msgstr "Nicht editierbar" -#: konova/forms.py:141 konova/forms.py:311 +#: konova/forms.py:141 konova/forms.py:312 msgid "Confirm" msgstr "Bestätige" -#: konova/forms.py:153 konova/forms.py:320 +#: konova/forms.py:153 konova/forms.py:321 msgid "Remove" msgstr "Löschen" @@ -1486,48 +1499,48 @@ msgstr "Löschen" msgid "You are about to remove {} {}" msgstr "Sie sind dabei {} {} zu löschen" -#: konova/forms.py:245 templates/form/collapsable/form.html:45 +#: konova/forms.py:246 templates/form/collapsable/form.html:45 msgid "Geometry" msgstr "Geometrie" -#: konova/forms.py:321 +#: konova/forms.py:322 msgid "Are you sure?" msgstr "Sind Sie sicher?" -#: konova/forms.py:348 +#: konova/forms.py:349 msgid "Created on" msgstr "Erstellt" -#: konova/forms.py:350 +#: konova/forms.py:351 msgid "When has this file been created? Important for photos." msgstr "Wann wurde diese Datei erstellt oder das Foto aufgenommen?" -#: konova/forms.py:361 +#: konova/forms.py:362 #: venv/lib/python3.7/site-packages/django/db/models/fields/files.py:231 msgid "File" msgstr "Datei" -#: konova/forms.py:425 +#: konova/forms.py:426 msgid "Added document" msgstr "Dokument hinzugefügt" -#: konova/forms.py:439 +#: konova/forms.py:440 msgid "Confirm record" msgstr "Verzeichnen bestätigen" -#: konova/forms.py:447 +#: konova/forms.py:448 msgid "Record data" msgstr "Daten verzeichnen" -#: konova/forms.py:454 +#: konova/forms.py:455 msgid "Confirm unrecord" msgstr "Entzeichnen bestätigen" -#: konova/forms.py:455 +#: konova/forms.py:456 msgid "Unrecord data" msgstr "Daten entzeichnen" -#: konova/forms.py:456 +#: konova/forms.py:457 msgid "I, {} {}, confirm that this data must be unrecorded." msgstr "" "Ich, {} {}, bestätige, dass diese Daten wieder entzeichnet werden müssen." @@ -1777,10 +1790,6 @@ msgstr "Nutzer" msgid "No geometry added, yet." msgstr "Keine Geometrie vorhanden" -#: templates/modal/modal_form.html:25 -msgid "Continue" -msgstr "Weiter" - #: templates/navbars/navbar.html:4 msgid "Kompensationsverzeichnis Service Portal" msgstr "" @@ -3106,6 +3115,9 @@ msgstr "" msgid "A fontawesome icon field" msgstr "" +#~ msgid "After" +#~ msgstr "Nach" + #~ msgid "Total interventions" #~ msgstr "Insgesamt" -- 2.45.2