From 33de71d5543e772b8c1903adc1e5701679deb81e Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Tue, 19 Oct 2021 09:13:20 +0200 Subject: [PATCH] #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 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 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..."