diff --git a/compensation/templates/compensation/detail/compensation/includes/states-after.html b/compensation/templates/compensation/detail/compensation/includes/states-after.html
index 2c95ca1a..7faa0f1e 100644
--- a/compensation/templates/compensation/detail/compensation/includes/states-after.html
+++ b/compensation/templates/compensation/detail/compensation/includes/states-after.html
@@ -48,13 +48,13 @@
{% for state in after_states %}
- {{ state.biotope_type }}
- {% if state.biotope_type_details.count > 0 %}
-
- {% for detail in state.biotope_type_details.all %}
- {{detail.long_name}}
- {% endfor %}
- {% endif %}
+ {{ state.biotope_type.parent.long_name }} {% fa5_icon 'angle-right' %} {{ state.biotope_type.long_name }} ({{state.biotope_type.short_name}})
+
+ {% for detail in state.biotope_type_details.all %}
+ {{detail.long_name}}
+ {% empty %}
+ {% trans 'No biotope type details' %}
+ {% endfor %}
|
{{ state.surface|floatformat:2 }} m² |
diff --git a/compensation/templates/compensation/detail/compensation/includes/states-before.html b/compensation/templates/compensation/detail/compensation/includes/states-before.html
index d2ba3697..23faed43 100644
--- a/compensation/templates/compensation/detail/compensation/includes/states-before.html
+++ b/compensation/templates/compensation/detail/compensation/includes/states-before.html
@@ -48,13 +48,13 @@
{% for state in before_states %}
|
- {{ state.biotope_type }}
- {% if state.biotope_type_details.count > 0 %}
-
- {% for detail in state.biotope_type_details.all %}
- {{detail.long_name}}
- {% endfor %}
- {% endif %}
+ {{ state.biotope_type.parent.long_name }} {% fa5_icon 'angle-right' %} {{ state.biotope_type.long_name }} ({{state.biotope_type.short_name}})
+
+ {% for detail in state.biotope_type_details.all %}
+ {{detail.long_name}}
+ {% empty %}
+ {% trans 'No biotope type details' %}
+ {% endfor %}
|
{{ state.surface|floatformat:2 }} m² |
diff --git a/compensation/templates/compensation/detail/eco_account/includes/states-after.html b/compensation/templates/compensation/detail/eco_account/includes/states-after.html
index bead6f2b..4fce2f0f 100644
--- a/compensation/templates/compensation/detail/eco_account/includes/states-after.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/states-after.html
@@ -48,13 +48,13 @@
{% for state in after_states %}
|
- {{ state.biotope_type }}
- {% if state.biotope_type_details.count > 0 %}
-
- {% for detail in state.biotope_type_details.all %}
- {{detail.long_name}}
- {% endfor %}
- {% endif %}
+ {{ state.biotope_type.parent.long_name }} {% fa5_icon 'angle-right' %} {{ state.biotope_type.long_name }} ({{state.biotope_type.short_name}})
+
+ {% for detail in state.biotope_type_details.all %}
+ {{detail.long_name}}
+ {% empty %}
+ {% trans 'No biotope type details' %}
+ {% endfor %}
|
{{ state.surface|floatformat:2 }} m² |
diff --git a/compensation/templates/compensation/detail/eco_account/includes/states-before.html b/compensation/templates/compensation/detail/eco_account/includes/states-before.html
index c19b4049..1c6311cb 100644
--- a/compensation/templates/compensation/detail/eco_account/includes/states-before.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/states-before.html
@@ -48,13 +48,13 @@
{% for state in before_states %}
|
- {{ state.biotope_type }}
- {% if state.biotope_type_details.count > 0 %}
-
- {% for detail in state.biotope_type_details.all %}
- {{detail.long_name}}
- {% endfor %}
- {% endif %}
+ {{ state.biotope_type.parent.long_name }} {% fa5_icon 'angle-right' %} {{ state.biotope_type.long_name }} ({{state.biotope_type.short_name}})
+
+ {% for detail in state.biotope_type_details.all %}
+ {{detail.long_name}}
+ {% empty %}
+ {% trans 'No biotope type details' %}
+ {% endfor %}
|
{{ state.surface|floatformat:2 }} m² |
diff --git a/ema/templates/ema/detail/includes/states-after.html b/ema/templates/ema/detail/includes/states-after.html
index e09f4ba5..56e87be1 100644
--- a/ema/templates/ema/detail/includes/states-after.html
+++ b/ema/templates/ema/detail/includes/states-after.html
@@ -46,13 +46,13 @@
{% for state in after_states %}
|
- {{ state.biotope_type }}
- {% if state.biotope_type_details.count > 0 %}
-
- {% for detail in state.biotope_type_details.all %}
- {{detail.long_name}}
- {% endfor %}
- {% endif %}
+ {{ state.biotope_type.parent.long_name }} {% fa5_icon 'angle-right' %} {{ state.biotope_type.long_name }} ({{state.biotope_type.short_name}})
+
+ {% for detail in state.biotope_type_details.all %}
+ {{detail.long_name}}
+ {% empty %}
+ {% trans 'No biotope type details' %}
+ {% endfor %}
|
{{ state.surface|floatformat:2 }} m² |
diff --git a/ema/templates/ema/detail/includes/states-before.html b/ema/templates/ema/detail/includes/states-before.html
index 1369829b..2fd7c359 100644
--- a/ema/templates/ema/detail/includes/states-before.html
+++ b/ema/templates/ema/detail/includes/states-before.html
@@ -46,13 +46,13 @@
{% for state in before_states %}
|
- {{ state.biotope_type }}
- {% if state.biotope_type_details.count > 0 %}
-
- {% for detail in state.biotope_type_details.all %}
- {{detail.long_name}}
- {% endfor %}
- {% endif %}
+ {{ state.biotope_type.parent.long_name }} {% fa5_icon 'angle-right' %} {{ state.biotope_type.long_name }} ({{state.biotope_type.short_name}})
+
+ {% for detail in state.biotope_type_details.all %}
+ {{detail.long_name}}
+ {% empty %}
+ {% trans 'No biotope type details' %}
+ {% endfor %}
|
{{ state.surface|floatformat:2 }} m² |
diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo
index e9a94ccb..cbbff8e8 100644
Binary files a/locale/de/LC_MESSAGES/django.mo and b/locale/de/LC_MESSAGES/django.mo differ
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index 9e5c6bb4..90beb1c0 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -3,9 +3,9 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR , YEAR.
#
-#: compensation/filters.py:122 compensation/forms/modalForms.py:37
-#: compensation/forms/modalForms.py:48 compensation/forms/modalForms.py:64
-#: compensation/forms/modalForms.py:357 compensation/forms/modalForms.py:469
+#: compensation/filters.py:122 compensation/forms/modalForms.py:36
+#: compensation/forms/modalForms.py:47 compensation/forms/modalForms.py:63
+#: compensation/forms/modalForms.py:356 compensation/forms/modalForms.py:463
#: intervention/forms/forms.py:54 intervention/forms/forms.py:156
#: intervention/forms/forms.py:168 intervention/forms/modalForms.py:127
#: intervention/forms/modalForms.py:140 intervention/forms/modalForms.py:153
@@ -26,7 +26,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-15 10:08+0100\n"
+"POT-Creation-Date: 2022-02-15 10:53+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -95,7 +95,7 @@ msgstr ""
#: 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_data/amount.html:3
-#: compensation/forms/modalForms.py:453
+#: compensation/forms/modalForms.py:447
#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:34
#: intervention/templates/intervention/detail/includes/deductions.html:31
msgid "Amount"
@@ -213,7 +213,7 @@ 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:195
+#: compensation/forms/modalForms.py:194
#: 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
@@ -246,7 +246,7 @@ msgid "Compensation"
msgstr "Kompensation"
#: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:21
-#: compensation/forms/modalForms.py:77
+#: compensation/forms/modalForms.py:76
msgid "Payment"
msgstr "Zahlung"
@@ -352,8 +352,8 @@ msgstr "Aussagekräftiger Titel"
msgid "Compensation XY; Location ABC"
msgstr "Kompensation XY; Flur ABC"
-#: compensation/forms/forms.py:57 compensation/forms/modalForms.py:63
-#: compensation/forms/modalForms.py:356 compensation/forms/modalForms.py:468
+#: compensation/forms/forms.py:57 compensation/forms/modalForms.py:62
+#: compensation/forms/modalForms.py:355 compensation/forms/modalForms.py:462
#: compensation/templates/compensation/detail/compensation/includes/actions.html:35
#: compensation/templates/compensation/detail/compensation/includes/deadlines.html:34
#: compensation/templates/compensation/detail/compensation/includes/documents.html:34
@@ -371,7 +371,7 @@ msgstr "Kompensation XY; Flur ABC"
msgid "Comment"
msgstr "Kommentar"
-#: compensation/forms/forms.py:59 compensation/forms/modalForms.py:470
+#: compensation/forms/forms.py:59 compensation/forms/modalForms.py:464
#: intervention/forms/forms.py:182
msgid "Additional comment"
msgstr "Zusätzlicher Kommentar"
@@ -469,73 +469,73 @@ msgstr "Ökokonto XY; Flur ABC"
msgid "Edit Eco-Account"
msgstr "Ökokonto bearbeiten"
-#: compensation/forms/modalForms.py:38
+#: compensation/forms/modalForms.py:37
msgid "in Euro"
msgstr "in Euro"
-#: compensation/forms/modalForms.py:47
+#: compensation/forms/modalForms.py:46
#: intervention/templates/intervention/detail/includes/payments.html:31
msgid "Due on"
msgstr "Fällig am"
-#: compensation/forms/modalForms.py:50
+#: compensation/forms/modalForms.py:49
msgid "Due on which date"
msgstr "Zahlung wird an diesem Datum erwartet"
-#: compensation/forms/modalForms.py:65 compensation/forms/modalForms.py:358
+#: compensation/forms/modalForms.py:64 compensation/forms/modalForms.py:357
#: intervention/forms/modalForms.py:154 konova/forms.py:395
msgid "Additional comment, maximum {} letters"
msgstr "Zusätzlicher Kommentar, maximal {} Zeichen"
-#: compensation/forms/modalForms.py:78
+#: compensation/forms/modalForms.py:77
msgid "Add a payment for intervention '{}'"
msgstr "Neue Ersatzzahlung zu Eingriff '{}' hinzufügen"
-#: compensation/forms/modalForms.py:98
+#: compensation/forms/modalForms.py:97
msgid "If there is no date you can enter, please explain why."
msgstr "Falls Sie kein Datum angeben können, erklären Sie bitte weshalb."
-#: compensation/forms/modalForms.py:159 compensation/forms/modalForms.py:171
+#: compensation/forms/modalForms.py:158 compensation/forms/modalForms.py:170
msgid "Biotope Type"
msgstr "Biotoptyp"
-#: compensation/forms/modalForms.py:162
+#: compensation/forms/modalForms.py:161
msgid "Select the biotope type"
msgstr "Biotoptyp wählen"
-#: compensation/forms/modalForms.py:176 compensation/forms/modalForms.py:188
+#: compensation/forms/modalForms.py:175 compensation/forms/modalForms.py:187
msgid "Biotope additional type"
msgstr "Zusatzbezeichnung"
-#: compensation/forms/modalForms.py:179
+#: compensation/forms/modalForms.py:178
msgid "Select an additional biotope type"
msgstr "Zusatzbezeichnung wählen"
-#: compensation/forms/modalForms.py:198 intervention/forms/modalForms.py:340
+#: compensation/forms/modalForms.py:197 intervention/forms/modalForms.py:340
msgid "in m²"
msgstr ""
-#: compensation/forms/modalForms.py:209
+#: compensation/forms/modalForms.py:208
msgid "New state"
msgstr "Neuer Zustand"
-#: compensation/forms/modalForms.py:210
+#: compensation/forms/modalForms.py:209
msgid "Insert data for the new state"
msgstr "Geben Sie die Daten des neuen Zustandes ein"
-#: compensation/forms/modalForms.py:217 konova/forms.py:193
+#: compensation/forms/modalForms.py:216 konova/forms.py:193
msgid "Object removed"
msgstr "Objekt entfernt"
-#: compensation/forms/modalForms.py:328
+#: compensation/forms/modalForms.py:327
msgid "Deadline Type"
msgstr "Fristart"
-#: compensation/forms/modalForms.py:331
+#: compensation/forms/modalForms.py:330
msgid "Select the deadline type"
msgstr "Fristart wählen"
-#: compensation/forms/modalForms.py:340
+#: compensation/forms/modalForms.py:339
#: compensation/templates/compensation/detail/compensation/includes/deadlines.html:31
#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:31
#: ema/templates/ema/detail/includes/deadlines.html:31
@@ -543,51 +543,51 @@ msgstr "Fristart wählen"
msgid "Date"
msgstr "Datum"
-#: compensation/forms/modalForms.py:343
+#: compensation/forms/modalForms.py:342
msgid "Select date"
msgstr "Datum wählen"
-#: compensation/forms/modalForms.py:370
+#: compensation/forms/modalForms.py:369
msgid "New deadline"
msgstr "Neue Frist"
-#: compensation/forms/modalForms.py:371
+#: compensation/forms/modalForms.py:370
msgid "Insert data for the new deadline"
msgstr "Geben Sie die Daten der neuen Frist ein"
-#: compensation/forms/modalForms.py:411
+#: compensation/forms/modalForms.py:410
msgid "Action Type"
msgstr "Maßnahmentyp"
-#: compensation/forms/modalForms.py:414
+#: compensation/forms/modalForms.py:413
msgid "Select the action type"
msgstr "Maßnahmentyp wählen"
-#: compensation/forms/modalForms.py:424 compensation/forms/modalForms.py:436
+#: compensation/forms/modalForms.py:418 compensation/forms/modalForms.py:430
msgid "Action Type detail"
msgstr "Zusatzmerkmal"
-#: compensation/forms/modalForms.py:427
+#: compensation/forms/modalForms.py:421
msgid "Select the action type detail"
msgstr "Zusatzmerkmal wählen"
-#: compensation/forms/modalForms.py:441
+#: compensation/forms/modalForms.py:435
msgid "Unit"
msgstr "Einheit"
-#: compensation/forms/modalForms.py:444
+#: compensation/forms/modalForms.py:438
msgid "Select the unit"
msgstr "Einheit wählen"
-#: compensation/forms/modalForms.py:456
+#: compensation/forms/modalForms.py:450
msgid "Insert the amount"
msgstr "Menge eingeben"
-#: compensation/forms/modalForms.py:481
+#: compensation/forms/modalForms.py:475
msgid "New action"
msgstr "Neue Maßnahme"
-#: compensation/forms/modalForms.py:482
+#: compensation/forms/modalForms.py:476
msgid "Insert data for the new action"
msgstr "Geben Sie die Daten der neuen Maßnahme ein"
@@ -751,18 +751,19 @@ msgstr "Aktionen"
#: compensation/templates/compensation/detail/compensation/includes/actions.html:57
#: compensation/templates/compensation/detail/eco_account/includes/actions.html:56
+#: ema/templates/ema/detail/includes/actions.html:54
msgid "No action type details"
msgstr "Keine Zusatzmerkmale"
#: compensation/templates/compensation/detail/compensation/includes/actions.html:68
#: compensation/templates/compensation/detail/eco_account/includes/actions.html:67
-#: ema/templates/ema/detail/includes/actions.html:67
+#: ema/templates/ema/detail/includes/actions.html:65
msgid "Edit action"
msgstr "Maßnahme bearbeiten"
#: compensation/templates/compensation/detail/compensation/includes/actions.html:71
#: compensation/templates/compensation/detail/eco_account/includes/actions.html:70
-#: ema/templates/ema/detail/includes/actions.html:70
+#: ema/templates/ema/detail/includes/actions.html:68
msgid "Remove action"
msgstr "Maßnahme entfernen"
@@ -892,7 +893,7 @@ msgid "Biotope type"
msgstr "Biotoptyp"
#: compensation/templates/compensation/detail/compensation/includes/states-after.html:62
-#: compensation/templates/compensation/detail/compensation/includes/states-before.html:62
+#: compensation/templates/compensation/detail/compensation/includes/states-before.html:64
#: compensation/templates/compensation/detail/eco_account/includes/states-after.html:62
#: compensation/templates/compensation/detail/eco_account/includes/states-before.html:62
#: ema/templates/ema/detail/includes/states-after.html:60
@@ -901,7 +902,7 @@ msgid "Edit state"
msgstr "Zustand bearbeiten"
#: compensation/templates/compensation/detail/compensation/includes/states-after.html:65
-#: compensation/templates/compensation/detail/compensation/includes/states-before.html:65
+#: compensation/templates/compensation/detail/compensation/includes/states-before.html:67
#: compensation/templates/compensation/detail/eco_account/includes/states-after.html:65
#: compensation/templates/compensation/detail/eco_account/includes/states-before.html:65
#: ema/templates/ema/detail/includes/states-after.html:63
@@ -928,6 +929,10 @@ msgstr "Neuen Ausgangszustand hinzufügen"
msgid "Missing surfaces according to states after: "
msgstr "Fehlende Flächenmengen laut Zielzustand: "
+#: compensation/templates/compensation/detail/compensation/includes/states-before.html:57
+msgid "No biotope type details"
+msgstr "Keine Zusatzbezeichnungen"
+
#: compensation/templates/compensation/detail/compensation/view.html:44
msgid "Is CEF compensation"
msgstr "Ist CEF Maßnahme"
|