From 95856c9ee94cdb999b48d245f5cea0026081d88e Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Tue, 15 Feb 2022 10:48:01 +0100 Subject: [PATCH] #112 CompensationAction Tree * implements generic HTML based and Django compatible TreeView * enhances listing of CompensationActions on DetailView --- codelist/models.py | 20 ++ compensation/forms/modalForms.py | 34 ++- .../detail/compensation/includes/actions.html | 20 +- .../detail/compensation/view.html | 4 - .../detail/eco_account/includes/actions.html | 20 +- .../compensation/detail/eco_account/view.html | 4 - .../ema/detail/includes/actions.html | 20 +- ema/templates/ema/detail/view.html | 5 - intervention/inputs.py | 49 +++- .../widgets/checkbox-tree-select-base.html | 29 --- .../widgets/checkbox-tree-select-content.html | 9 - .../konova/widgets/checkbox-tree-select.html | 23 ++ konova/urls.py | 4 +- konova/views.py | 21 -- locale/de/LC_MESSAGES/django.mo | Bin 37463 -> 37523 bytes locale/de/LC_MESSAGES/django.po | 235 +++++++++--------- templates/form/scripts/jstree-scripts.html | 2 - 17 files changed, 246 insertions(+), 253 deletions(-) delete mode 100644 konova/templates/konova/widgets/checkbox-tree-select-base.html delete mode 100644 konova/templates/konova/widgets/checkbox-tree-select-content.html create mode 100644 konova/templates/konova/widgets/checkbox-tree-select.html delete mode 100644 templates/form/scripts/jstree-scripts.html diff --git a/codelist/models.py b/codelist/models.py index d5be5b10..de7a2100 100644 --- a/codelist/models.py +++ b/codelist/models.py @@ -65,6 +65,26 @@ class KonovaCode(models.Model): ret_val += ", " + self.parent.long_name return ret_val + def add_children(self): + """ Adds all children (resurcively until leaf) as .children to the KonovaCode + + Returns: + code (KonovaCode): The manipulated KonovaCode instance + """ + if self.is_leaf: + return None + + children = KonovaCode.objects.filter( + code_lists__in=self.code_lists.all(), + parent=self + ).order_by( + "long_name" + ) + self.children = children + for child in children: + child.add_children() + return self + class KonovaCodeList(models.Model): """ diff --git a/compensation/forms/modalForms.py b/compensation/forms/modalForms.py index 6dc0c98e..a8d38aa2 100644 --- a/compensation/forms/modalForms.py +++ b/compensation/forms/modalForms.py @@ -11,14 +11,13 @@ from django import forms from django.contrib import messages from django.http import HttpRequest, HttpResponseRedirect from django.shortcuts import render -from django.urls import reverse from django.utils.translation import pgettext_lazy as _con, gettext_lazy as _ from codelist.models import KonovaCode from codelist.settings import CODELIST_BIOTOPES_ID, CODELIST_COMPENSATION_ACTION_ID, CODELIST_BIOTOPES_EXTRA_CODES_ID, \ CODELIST_COMPENSATION_ACTION_DETAIL_ID from compensation.models import CompensationDocument, EcoAccountDocument -from intervention.inputs import TreeSelectMultiple +from intervention.inputs import CompensationActionTreeCheckboxSelectMultiple from konova.contexts import BaseContext from konova.forms import BaseModalForm, NewDocumentModalForm, RemoveModalForm from konova.models import DeadlineType @@ -407,18 +406,13 @@ class NewActionModalForm(BaseModalForm): """ from compensation.models import UnitChoices - action_type = forms.ModelMultipleChoiceField( + action_type = forms.MultipleChoiceField( label=_("Action Type"), label_suffix="", required=True, help_text=_("Select the action type"), - queryset=KonovaCode.objects.filter( - code_lists__in=[CODELIST_COMPENSATION_ACTION_ID], - is_archived=False, - ), - widget=TreeSelectMultiple( - url=None, - ), + choices=[], + widget=CompensationActionTreeCheckboxSelectMultiple(), ) action_type_details = forms.ModelMultipleChoiceField( label=_("Action Type detail"), @@ -480,14 +474,16 @@ class NewActionModalForm(BaseModalForm): super().__init__(*args, **kwargs) self.form_title = _("New action") self.form_caption = _("Insert data for the new action") - url = reverse("codes-action-children") - self.fields["action_type"].widget.attrs = { - "url": url, - } - - def is_valid(self): - super_valid = super().is_valid() - return super_valid + choices =KonovaCode.objects.filter( + code_lists__in=[CODELIST_COMPENSATION_ACTION_ID], + is_archived=False, + is_leaf=True, + ).values_list("id", flat=True) + choices = [ + (choice, choice) + for choice in choices + ] + self.fields["action_type"].choices = choices def save(self): action = self.instance.add_action(self) @@ -502,7 +498,7 @@ class EditCompensationActionModalForm(NewActionModalForm): self.action = kwargs.pop("action", None) super().__init__(*args, **kwargs) form_data = { - "action_type": self.action.action_type.all(), + "action_type": list(self.action.action_type.values_list("id", flat=True)), "action_type_details": self.action.action_type_details.all(), "amount": self.action.amount, "unit": self.action.unit, diff --git a/compensation/templates/compensation/detail/compensation/includes/actions.html b/compensation/templates/compensation/detail/compensation/includes/actions.html index 18e9304b..87f49141 100644 --- a/compensation/templates/compensation/detail/compensation/includes/actions.html +++ b/compensation/templates/compensation/detail/compensation/includes/actions.html @@ -47,17 +47,15 @@ {% for action in actions %} - - {% if action.action_type_details.count > 0 %} -
- {% for detail in action.action_type_details.all %} - {{detail.long_name}} - {% endfor %} - {% endif %} + {% for type in action.action_type.all %} +
{{type.parent.parent.long_name}} {% fa5_icon 'angle-right' %} {{type.parent.long_name}} {% fa5_icon 'angle-right' %} {{type.long_name}}
+
+ {% endfor %} + {% for detail in action.action_type_details.all %} + {{detail.long_name}} + {% empty %} + {% trans 'No action type details' %} + {% endfor %} {{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }} diff --git a/compensation/templates/compensation/detail/compensation/view.html b/compensation/templates/compensation/detail/compensation/view.html index 17f79bc8..c5ff41d6 100644 --- a/compensation/templates/compensation/detail/compensation/view.html +++ b/compensation/templates/compensation/detail/compensation/view.html @@ -2,10 +2,6 @@ {% load i18n l10n static fontawesome_5 humanize ksp_filters %} {% block head %} - {% comment %} - Needed for custom Checkbox Tree Select Widget - {% endcomment %} - {% include 'form/scripts/jstree-scripts.html' %} {% comment %} dal documentation (django-autocomplete-light) states using form.media for adding needed scripts. diff --git a/compensation/templates/compensation/detail/eco_account/includes/actions.html b/compensation/templates/compensation/detail/eco_account/includes/actions.html index 092c5e8d..8ae7c8fd 100644 --- a/compensation/templates/compensation/detail/eco_account/includes/actions.html +++ b/compensation/templates/compensation/detail/eco_account/includes/actions.html @@ -46,17 +46,15 @@ {% for action in actions %} - - {% if action.action_type_details.count > 0 %} -
- {% for detail in action.action_type_details.all %} - {{detail.long_name}} - {% endfor %} - {% endif %} + {% for type in action.action_type.all %} +
{{type.parent.parent.long_name}} {% fa5_icon 'angle-right' %} {{type.parent.long_name}} {% fa5_icon 'angle-right' %} {{type.long_name}}
+
+ {% endfor %} + {% for detail in action.action_type_details.all %} + {{detail.long_name}} + {% empty %} + {% trans 'No action type details' %} + {% endfor %} {{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }} diff --git a/compensation/templates/compensation/detail/eco_account/view.html b/compensation/templates/compensation/detail/eco_account/view.html index 132e0b61..288b971d 100644 --- a/compensation/templates/compensation/detail/eco_account/view.html +++ b/compensation/templates/compensation/detail/eco_account/view.html @@ -2,10 +2,6 @@ {% load i18n l10n static fontawesome_5 humanize %} {% block head %} - {% comment %} - Needed for custom Checkbox Tree Select Widget - {% endcomment %} - {% include 'form/scripts/jstree-scripts.html' %} {% comment %} dal documentation (django-autocomplete-light) states using form.media for adding needed scripts. diff --git a/ema/templates/ema/detail/includes/actions.html b/ema/templates/ema/detail/includes/actions.html index 9d91caf0..0c352c11 100644 --- a/ema/templates/ema/detail/includes/actions.html +++ b/ema/templates/ema/detail/includes/actions.html @@ -44,17 +44,15 @@ {% for action in obj.actions.all %} - - {% if action.action_type_details.count > 0 %} -
- {% for detail in action.action_type_details.all %} - {{detail.long_name}} - {% endfor %} - {% endif %} + {% for type in action.action_type.all %} +
{{type.parent.parent.long_name}} {% fa5_icon 'angle-right' %} {{type.parent.long_name}} {% fa5_icon 'angle-right' %} {{type.long_name}}
+
+ {% endfor %} + {% for detail in action.action_type_details.all %} + {{detail.long_name}} + {% empty %} + {% trans 'No action type details' %} + {% endfor %} {{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }} diff --git a/ema/templates/ema/detail/view.html b/ema/templates/ema/detail/view.html index cdab570d..32ddd66b 100644 --- a/ema/templates/ema/detail/view.html +++ b/ema/templates/ema/detail/view.html @@ -2,11 +2,6 @@ {% load i18n l10n static fontawesome_5 humanize %} {% block head %} - {% comment %} - Needed for custom Checkbox Tree Select Widget - {% endcomment %} - {% include 'form/scripts/jstree-scripts.html' %} - {% comment %} dal documentation (django-autocomplete-light) states using form.media for adding needed scripts. This does not work properly with modal forms, as the scripts are not loaded properly inside the modal. diff --git a/intervention/inputs.py b/intervention/inputs.py index 9cf8e5ab..34fe0434 100644 --- a/intervention/inputs.py +++ b/intervention/inputs.py @@ -1,5 +1,6 @@ from django import forms -from django.urls import reverse +from codelist.models import KonovaCode +from codelist.settings import CODELIST_COMPENSATION_ACTION_ID class DummyFilterInput(forms.HiddenInput): @@ -33,15 +34,49 @@ class GenerateInput(forms.TextInput): template_name = "konova/widgets/generate-content-input.html" -class TreeSelectMultiple(forms.SelectMultiple): +class TreeCheckboxSelectMultiple(forms.CheckboxSelectMultiple): """ Provides multiple selection of parent-child data """ - template_name = "konova/widgets/checkbox-tree-select-base.html" - url = None + template_name = "konova/widgets/checkbox-tree-select.html" + + class meta: + abstract = True + + +class KonovaCodeTreeCheckboxSelectMultiple(TreeCheckboxSelectMultiple): + """ Provides multiple selection of KonovaCodes + + """ + filter = None def __init__(self, *args, **kwargs): - self.url = kwargs.pop("url", None) - if self.url: - self.url = reverse(self.url) + self.code_list = kwargs.pop("code_list", None) + self.filter = kwargs.pop("filter", {}) super().__init__(*args, **kwargs) + + def get_context(self, name, value, attrs): + context = super().get_context(name, value, attrs) + codes = KonovaCode.objects.filter( + **self.filter, + ) + codes = [ + parent_code.add_children() + for parent_code in codes + ] + context["codes"] = codes + return context + + +class CompensationActionTreeCheckboxSelectMultiple(KonovaCodeTreeCheckboxSelectMultiple): + """ Provides multiple selection of CompensationActions + + """ + filter = None + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.filter = { + "code_lists__in": [CODELIST_COMPENSATION_ACTION_ID], + "parent": None, + } \ No newline at end of file diff --git a/konova/templates/konova/widgets/checkbox-tree-select-base.html b/konova/templates/konova/widgets/checkbox-tree-select-base.html deleted file mode 100644 index 6a10ff02..00000000 --- a/konova/templates/konova/widgets/checkbox-tree-select-base.html +++ /dev/null @@ -1,29 +0,0 @@ - -
- - - \ No newline at end of file diff --git a/konova/templates/konova/widgets/checkbox-tree-select-content.html b/konova/templates/konova/widgets/checkbox-tree-select-content.html deleted file mode 100644 index 13b3a34d..00000000 --- a/konova/templates/konova/widgets/checkbox-tree-select-content.html +++ /dev/null @@ -1,9 +0,0 @@ -{% load l10n %} - - \ No newline at end of file diff --git a/konova/templates/konova/widgets/checkbox-tree-select.html b/konova/templates/konova/widgets/checkbox-tree-select.html new file mode 100644 index 00000000..5b40d3f1 --- /dev/null +++ b/konova/templates/konova/widgets/checkbox-tree-select.html @@ -0,0 +1,23 @@ +{% load l10n fontawesome_5 %} + +
+ {% for code in codes %} +
+ + {% if not code.is_leaf %} +
+ {% with code.children as codes %} + {% include 'konova/widgets/checkbox-tree-select.html' %} + {% endwith %} +
+ {% endif %} +
+ {% endfor %} +
\ No newline at end of file diff --git a/konova/urls.py b/konova/urls.py index 734be3cd..68256e7a 100644 --- a/konova/urls.py +++ b/konova/urls.py @@ -23,7 +23,7 @@ from konova.autocompletes import EcoAccountAutocomplete, \ ShareUserAutocomplete, BiotopeExtraCodeAutocomplete, CompensationActionDetailCodeAutocomplete from konova.settings import SSO_SERVER, SSO_PUBLIC_KEY, SSO_PRIVATE_KEY, DEBUG from konova.sso.sso import KonovaSSOClient -from konova.views import logout_view, home_view, get_konova_code_action_children +from konova.views import logout_view, home_view sso_client = KonovaSSOClient(SSO_SERVER, SSO_PUBLIC_KEY, SSO_PRIVATE_KEY) urlpatterns = [ @@ -40,8 +40,6 @@ urlpatterns = [ path('analysis/', include("analysis.urls")), path('api/', include("api.urls")), - path("codes/comp/action/children", get_konova_code_action_children, name="codes-action-children"), - # Autocomplete paths for all apps path("atcmplt/eco-accounts", EcoAccountAutocomplete.as_view(), name="accounts-autocomplete"), path("atcmplt/interventions", InterventionAutocomplete.as_view(), name="interventions-autocomplete"), diff --git a/konova/views.py b/konova/views.py index 2eac8b20..f3c53f01 100644 --- a/konova/views.py +++ b/konova/views.py @@ -127,24 +127,3 @@ def get_500_view(request: HttpRequest): """ context = BaseContext.context return render(request, "500.html", context, status=500) - - -@login_required -def get_konova_code_action_children(request: HttpRequest): - template = "konova/widgets/checkbox-tree-select-content.html" - _id = request.GET.get("id", None) - if _id == "#": - # Return all! - codes = KonovaCode.objects.filter( - code_lists__in=[CODELIST_COMPENSATION_ACTION_ID], - parent=None, - ) - else: - codes = KonovaCode.objects.filter( - code_lists__in=[CODELIST_COMPENSATION_ACTION_ID], - parent__id=_id, - ) - context = { - "codes": codes - } - return render(request, template, context) \ No newline at end of file diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index 99058358253ae1eb76a6a5f21466ae886d82ccaf..e9a94ccb374f1fcb49ae6b60cf0df3131a61819d 100644 GIT binary patch delta 10418 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 HR_Ff!*^K44 delta 10343 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, YEAR. # -#: compensation/filters.py:122 compensation/forms/modalForms.py:35 -#: compensation/forms/modalForms.py:46 compensation/forms/modalForms.py:62 -#: compensation/forms/modalForms.py:355 compensation/forms/modalForms.py:471 +#: 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 #: 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-10 13:31+0100\n" +"POT-Creation-Date: 2022-02-15 10:08+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -45,7 +45,7 @@ msgid "To" msgstr "Bis" #: analysis/forms.py:47 compensation/forms/forms.py:77 -#: compensation/templates/compensation/detail/eco_account/view.html:58 +#: compensation/templates/compensation/detail/eco_account/view.html:59 #: compensation/templates/compensation/report/eco_account/report.html:16 #: compensation/utils/quality.py:100 ema/templates/ema/detail/view.html:49 #: ema/templates/ema/report/report.html:16 ema/utils/quality.py:26 @@ -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:455 +#: compensation/forms/modalForms.py:453 #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:34 #: intervention/templates/intervention/detail/includes/deductions.html:31 msgid "Amount" @@ -137,7 +137,7 @@ msgstr "Zuständigkeitsbereich" #: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:8 #: analysis/templates/analysis/reports/includes/intervention/laws.html:17 #: compensation/tables.py:40 -#: compensation/templates/compensation/detail/compensation/view.html:63 +#: compensation/templates/compensation/detail/compensation/view.html:64 #: intervention/tables.py:39 #: intervention/templates/intervention/detail/view.html:68 #: user/models/user_action.py:20 @@ -153,9 +153,9 @@ msgstr "Geprüft" #: analysis/templates/analysis/reports/includes/intervention/laws.html:20 #: analysis/templates/analysis/reports/includes/old_data/amount.html:18 #: compensation/tables.py:46 compensation/tables.py:222 -#: compensation/templates/compensation/detail/compensation/view.html:77 +#: compensation/templates/compensation/detail/compensation/view.html:78 #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:31 -#: compensation/templates/compensation/detail/eco_account/view.html:44 +#: compensation/templates/compensation/detail/eco_account/view.html:45 #: ema/tables.py:44 ema/templates/ema/detail/view.html:35 #: intervention/tables.py:45 #: intervention/templates/intervention/detail/view.html:82 @@ -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:193 +#: compensation/forms/modalForms.py:195 #: 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 @@ -239,14 +239,14 @@ msgstr "Kompensationsart" #: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:15 #: analysis/templates/analysis/reports/includes/old_data/amount.html:29 -#: compensation/templates/compensation/detail/compensation/view.html:19 +#: compensation/templates/compensation/detail/compensation/view.html:20 #: konova/templates/konova/includes/quickstart/compensations.html:4 #: templates/navbars/navbar.html:28 msgid "Compensation" msgstr "Kompensation" #: analysis/templates/analysis/reports/includes/intervention/compensated_by.html:21 -#: compensation/forms/modalForms.py:75 +#: compensation/forms/modalForms.py:77 msgid "Payment" msgstr "Zahlung" @@ -293,7 +293,7 @@ msgstr "Eingriff" #: analysis/templates/analysis/reports/includes/old_data/amount.html:34 #: compensation/tables.py:266 -#: compensation/templates/compensation/detail/eco_account/view.html:19 +#: compensation/templates/compensation/detail/eco_account/view.html:20 #: intervention/forms/modalForms.py:322 intervention/forms/modalForms.py:329 #: konova/templates/konova/includes/quickstart/ecoaccounts.html:4 #: templates/navbars/navbar.html:34 @@ -327,9 +327,9 @@ msgstr "Automatisch generiert" #: compensation/forms/forms.py:44 compensation/tables.py:30 #: compensation/tables.py:202 #: compensation/templates/compensation/detail/compensation/includes/documents.html:28 -#: compensation/templates/compensation/detail/compensation/view.html:31 +#: compensation/templates/compensation/detail/compensation/view.html:32 #: compensation/templates/compensation/detail/eco_account/includes/documents.html:28 -#: compensation/templates/compensation/detail/eco_account/view.html:31 +#: compensation/templates/compensation/detail/eco_account/view.html:32 #: compensation/templates/compensation/report/compensation/report.html:12 #: compensation/templates/compensation/report/eco_account/report.html:12 #: ema/tables.py:34 ema/templates/ema/detail/includes/documents.html:28 @@ -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:61 -#: compensation/forms/modalForms.py:354 compensation/forms/modalForms.py:470 +#: compensation/forms/forms.py:57 compensation/forms/modalForms.py:63 +#: compensation/forms/modalForms.py:356 compensation/forms/modalForms.py:468 #: 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,13 +371,13 @@ msgstr "Kompensation XY; Flur ABC" msgid "Comment" msgstr "Kommentar" -#: compensation/forms/forms.py:59 compensation/forms/modalForms.py:472 +#: compensation/forms/forms.py:59 compensation/forms/modalForms.py:470 #: intervention/forms/forms.py:182 msgid "Additional comment" msgstr "Zusätzlicher Kommentar" #: compensation/forms/forms.py:93 -#: compensation/templates/compensation/detail/eco_account/view.html:62 +#: compensation/templates/compensation/detail/eco_account/view.html:63 #: compensation/templates/compensation/report/eco_account/report.html:20 #: compensation/utils/quality.py:102 ema/templates/ema/detail/view.html:53 #: ema/templates/ema/report/report.html:20 ema/utils/quality.py:28 @@ -422,7 +422,7 @@ msgid "" msgstr "Optional: Handelt es sich um eine Kohärenzsicherungsmaßnahme?" #: compensation/forms/forms.py:156 -#: compensation/templates/compensation/detail/compensation/view.html:35 +#: compensation/templates/compensation/detail/compensation/view.html:36 #: compensation/templates/compensation/report/compensation/report.html:16 msgid "compensates intervention" msgstr "kompensiert Eingriff" @@ -448,7 +448,7 @@ msgid "The amount that can be used for deductions" msgstr "Die für Abbuchungen zur Verfügung stehende Menge" #: compensation/forms/forms.py:328 -#: compensation/templates/compensation/detail/eco_account/view.html:66 +#: compensation/templates/compensation/detail/eco_account/view.html:67 #: compensation/utils/quality.py:72 msgid "Agreement date" msgstr "Vereinbarungsdatum" @@ -469,73 +469,73 @@ msgstr "Ökokonto XY; Flur ABC" msgid "Edit Eco-Account" msgstr "Ökokonto bearbeiten" -#: compensation/forms/modalForms.py:36 +#: compensation/forms/modalForms.py:38 msgid "in Euro" msgstr "in Euro" -#: compensation/forms/modalForms.py:45 +#: compensation/forms/modalForms.py:47 #: intervention/templates/intervention/detail/includes/payments.html:31 msgid "Due on" msgstr "Fällig am" -#: compensation/forms/modalForms.py:48 +#: compensation/forms/modalForms.py:50 msgid "Due on which date" msgstr "Zahlung wird an diesem Datum erwartet" -#: compensation/forms/modalForms.py:63 compensation/forms/modalForms.py:356 +#: compensation/forms/modalForms.py:65 compensation/forms/modalForms.py:358 #: intervention/forms/modalForms.py:154 konova/forms.py:395 msgid "Additional comment, maximum {} letters" msgstr "Zusätzlicher Kommentar, maximal {} Zeichen" -#: compensation/forms/modalForms.py:76 +#: compensation/forms/modalForms.py:78 msgid "Add a payment for intervention '{}'" msgstr "Neue Ersatzzahlung zu Eingriff '{}' hinzufügen" -#: compensation/forms/modalForms.py:96 +#: compensation/forms/modalForms.py:98 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:157 compensation/forms/modalForms.py:169 +#: compensation/forms/modalForms.py:159 compensation/forms/modalForms.py:171 msgid "Biotope Type" msgstr "Biotoptyp" -#: compensation/forms/modalForms.py:160 +#: compensation/forms/modalForms.py:162 msgid "Select the biotope type" msgstr "Biotoptyp wählen" -#: compensation/forms/modalForms.py:174 compensation/forms/modalForms.py:186 +#: compensation/forms/modalForms.py:176 compensation/forms/modalForms.py:188 msgid "Biotope additional type" msgstr "Zusatzbezeichnung" -#: compensation/forms/modalForms.py:177 +#: compensation/forms/modalForms.py:179 msgid "Select an additional biotope type" msgstr "Zusatzbezeichnung wählen" -#: compensation/forms/modalForms.py:196 intervention/forms/modalForms.py:340 +#: compensation/forms/modalForms.py:198 intervention/forms/modalForms.py:340 msgid "in m²" msgstr "" -#: compensation/forms/modalForms.py:207 +#: compensation/forms/modalForms.py:209 msgid "New state" msgstr "Neuer Zustand" -#: compensation/forms/modalForms.py:208 +#: compensation/forms/modalForms.py:210 msgid "Insert data for the new state" msgstr "Geben Sie die Daten des neuen Zustandes ein" -#: compensation/forms/modalForms.py:215 konova/forms.py:193 +#: compensation/forms/modalForms.py:217 konova/forms.py:193 msgid "Object removed" msgstr "Objekt entfernt" -#: compensation/forms/modalForms.py:326 +#: compensation/forms/modalForms.py:328 msgid "Deadline Type" msgstr "Fristart" -#: compensation/forms/modalForms.py:329 +#: compensation/forms/modalForms.py:331 msgid "Select the deadline type" msgstr "Fristart wählen" -#: compensation/forms/modalForms.py:338 +#: compensation/forms/modalForms.py:340 #: 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,101 +543,75 @@ msgstr "Fristart wählen" msgid "Date" msgstr "Datum" -#: compensation/forms/modalForms.py:341 +#: compensation/forms/modalForms.py:343 msgid "Select date" msgstr "Datum wählen" -#: compensation/forms/modalForms.py:368 +#: compensation/forms/modalForms.py:370 msgid "New deadline" msgstr "Neue Frist" -#: compensation/forms/modalForms.py:369 +#: compensation/forms/modalForms.py:371 msgid "Insert data for the new deadline" msgstr "Geben Sie die Daten der neuen Frist ein" -#: compensation/forms/modalForms.py:409 +#: compensation/forms/modalForms.py:411 msgid "Action Type" msgstr "Maßnahmentyp" -#: compensation/forms/modalForms.py:412 +#: compensation/forms/modalForms.py:414 msgid "Select the action type" msgstr "Maßnahmentyp wählen" -#: compensation/forms/modalForms.py:421 -#: compensation/templates/compensation/detail/compensation/includes/actions.html:40 -#: compensation/templates/compensation/detail/compensation/includes/deadlines.html:39 -#: compensation/templates/compensation/detail/compensation/includes/documents.html:39 -#: compensation/templates/compensation/detail/compensation/includes/states-after.html:41 -#: compensation/templates/compensation/detail/compensation/includes/states-before.html:41 -#: compensation/templates/compensation/detail/eco_account/includes/actions.html:39 -#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:38 -#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:41 -#: compensation/templates/compensation/detail/eco_account/includes/documents.html:38 -#: compensation/templates/compensation/detail/eco_account/includes/states-after.html:41 -#: compensation/templates/compensation/detail/eco_account/includes/states-before.html:41 -#: ema/templates/ema/detail/includes/actions.html:38 -#: ema/templates/ema/detail/includes/deadlines.html:38 -#: ema/templates/ema/detail/includes/documents.html:38 -#: ema/templates/ema/detail/includes/states-after.html:40 -#: ema/templates/ema/detail/includes/states-before.html:40 -#: intervention/templates/intervention/detail/includes/compensations.html:38 -#: intervention/templates/intervention/detail/includes/deductions.html:39 -#: intervention/templates/intervention/detail/includes/documents.html:39 -#: intervention/templates/intervention/detail/includes/payments.html:39 -#: intervention/templates/intervention/detail/includes/revocation.html:43 -#: templates/log.html:10 -msgid "Action" -msgstr "Aktionen" - -#: compensation/forms/modalForms.py:426 compensation/forms/modalForms.py:438 +#: compensation/forms/modalForms.py:424 compensation/forms/modalForms.py:436 msgid "Action Type detail" msgstr "Zusatzmerkmal" -#: compensation/forms/modalForms.py:429 +#: compensation/forms/modalForms.py:427 msgid "Select the action type detail" msgstr "Zusatzmerkmal wählen" -#: compensation/forms/modalForms.py:443 +#: compensation/forms/modalForms.py:441 msgid "Unit" msgstr "Einheit" -#: compensation/forms/modalForms.py:446 +#: compensation/forms/modalForms.py:444 msgid "Select the unit" msgstr "Einheit wählen" -#: compensation/forms/modalForms.py:458 +#: compensation/forms/modalForms.py:456 msgid "Insert the amount" msgstr "Menge eingeben" -#: compensation/forms/modalForms.py:483 +#: compensation/forms/modalForms.py:481 msgid "New action" msgstr "Neue Maßnahme" -#: compensation/forms/modalForms.py:484 +#: compensation/forms/modalForms.py:482 msgid "Insert data for the new action" msgstr "Geben Sie die Daten der neuen Maßnahme ein" -#: compensation/models/action.py:22 +#: compensation/models/action.py:20 msgid "cm" msgstr "" -#: compensation/models/action.py:23 +#: compensation/models/action.py:21 msgid "m" msgstr "" -#: compensation/models/action.py:24 +#: compensation/models/action.py:22 msgid "km" msgstr "" -#: compensation/models/action.py:25 +#: compensation/models/action.py:23 msgid "m²" msgstr "" -#: compensation/models/action.py:26 +#: compensation/models/action.py:24 msgid "ha" msgstr "" -#: compensation/models/action.py:27 +#: compensation/models/action.py:25 msgid "Pieces" msgstr "Stück" @@ -685,9 +659,9 @@ msgid "Checked on {} by {}" msgstr "Am {} von {} geprüft worden" #: compensation/tables.py:160 -#: compensation/templates/compensation/detail/compensation/view.html:80 +#: compensation/templates/compensation/detail/compensation/view.html:81 #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:58 -#: compensation/templates/compensation/detail/eco_account/view.html:47 +#: compensation/templates/compensation/detail/eco_account/view.html:48 #: ema/tables.py:131 ema/templates/ema/detail/view.html:38 #: intervention/tables.py:157 #: intervention/templates/intervention/detail/view.html:85 @@ -710,7 +684,7 @@ msgid "Access not granted" msgstr "Nicht freigegeben - Datensatz nur lesbar" #: compensation/tables.py:212 -#: compensation/templates/compensation/detail/eco_account/view.html:35 +#: compensation/templates/compensation/detail/eco_account/view.html:36 #: konova/templates/konova/widgets/progressbar.html:3 msgid "Available" msgstr "Verfügbar" @@ -750,15 +724,45 @@ msgctxt "Compensation" msgid "Amount" msgstr "Menge" -#: compensation/templates/compensation/detail/compensation/includes/actions.html:66 -#: compensation/templates/compensation/detail/eco_account/includes/actions.html:65 -#: ema/templates/ema/detail/includes/actions.html:63 +#: compensation/templates/compensation/detail/compensation/includes/actions.html:40 +#: compensation/templates/compensation/detail/compensation/includes/deadlines.html:39 +#: compensation/templates/compensation/detail/compensation/includes/documents.html:39 +#: compensation/templates/compensation/detail/compensation/includes/states-after.html:41 +#: compensation/templates/compensation/detail/compensation/includes/states-before.html:41 +#: compensation/templates/compensation/detail/eco_account/includes/actions.html:39 +#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:38 +#: compensation/templates/compensation/detail/eco_account/includes/deductions.html:41 +#: compensation/templates/compensation/detail/eco_account/includes/documents.html:38 +#: compensation/templates/compensation/detail/eco_account/includes/states-after.html:41 +#: compensation/templates/compensation/detail/eco_account/includes/states-before.html:41 +#: ema/templates/ema/detail/includes/actions.html:38 +#: ema/templates/ema/detail/includes/deadlines.html:38 +#: ema/templates/ema/detail/includes/documents.html:38 +#: ema/templates/ema/detail/includes/states-after.html:40 +#: ema/templates/ema/detail/includes/states-before.html:40 +#: intervention/templates/intervention/detail/includes/compensations.html:38 +#: intervention/templates/intervention/detail/includes/deductions.html:39 +#: intervention/templates/intervention/detail/includes/documents.html:39 +#: intervention/templates/intervention/detail/includes/payments.html:39 +#: intervention/templates/intervention/detail/includes/revocation.html:43 +#: templates/log.html:10 +msgid "Action" +msgstr "Aktionen" + +#: compensation/templates/compensation/detail/compensation/includes/actions.html:57 +#: compensation/templates/compensation/detail/eco_account/includes/actions.html:56 +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 msgid "Edit action" msgstr "Maßnahme bearbeiten" -#: compensation/templates/compensation/detail/compensation/includes/actions.html:69 -#: compensation/templates/compensation/detail/eco_account/includes/actions.html:68 -#: ema/templates/ema/detail/includes/actions.html:66 +#: 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 msgid "Remove action" msgstr "Maßnahme entfernen" @@ -924,50 +928,50 @@ msgstr "Neuen Ausgangszustand hinzufügen" msgid "Missing surfaces according to states after: " msgstr "Fehlende Flächenmengen laut Zielzustand: " -#: compensation/templates/compensation/detail/compensation/view.html:43 +#: compensation/templates/compensation/detail/compensation/view.html:44 msgid "Is CEF compensation" msgstr "Ist CEF Maßnahme" -#: compensation/templates/compensation/detail/compensation/view.html:46 -#: compensation/templates/compensation/detail/compensation/view.html:56 +#: compensation/templates/compensation/detail/compensation/view.html:47 +#: compensation/templates/compensation/detail/compensation/view.html:57 #: venv/lib/python3.7/site-packages/django/forms/widgets.py:710 msgid "Yes" msgstr "Ja" -#: compensation/templates/compensation/detail/compensation/view.html:48 -#: compensation/templates/compensation/detail/compensation/view.html:58 +#: compensation/templates/compensation/detail/compensation/view.html:49 +#: compensation/templates/compensation/detail/compensation/view.html:59 #: venv/lib/python3.7/site-packages/django/forms/widgets.py:711 msgid "No" msgstr "Nein" -#: compensation/templates/compensation/detail/compensation/view.html:53 +#: compensation/templates/compensation/detail/compensation/view.html:54 msgid "Is Coherence keeping compensation" msgstr "Ist Kohärenzsicherungsmaßnahme" -#: compensation/templates/compensation/detail/compensation/view.html:70 +#: compensation/templates/compensation/detail/compensation/view.html:71 #: intervention/templates/intervention/detail/view.html:75 msgid "Checked on " msgstr "Geprüft am " -#: compensation/templates/compensation/detail/compensation/view.html:70 -#: compensation/templates/compensation/detail/compensation/view.html:84 +#: compensation/templates/compensation/detail/compensation/view.html:71 +#: compensation/templates/compensation/detail/compensation/view.html:85 #: compensation/templates/compensation/detail/eco_account/includes/deductions.html:56 -#: compensation/templates/compensation/detail/eco_account/view.html:51 +#: compensation/templates/compensation/detail/eco_account/view.html:52 #: ema/templates/ema/detail/view.html:42 #: intervention/templates/intervention/detail/view.html:75 #: intervention/templates/intervention/detail/view.html:89 msgid "by" msgstr "von" -#: compensation/templates/compensation/detail/compensation/view.html:84 -#: compensation/templates/compensation/detail/eco_account/view.html:51 +#: compensation/templates/compensation/detail/compensation/view.html:85 +#: compensation/templates/compensation/detail/eco_account/view.html:52 #: ema/templates/ema/detail/view.html:42 #: intervention/templates/intervention/detail/view.html:89 msgid "Recorded on " msgstr "Verzeichnet am" -#: compensation/templates/compensation/detail/compensation/view.html:91 -#: compensation/templates/compensation/detail/eco_account/view.html:74 +#: compensation/templates/compensation/detail/compensation/view.html:92 +#: compensation/templates/compensation/detail/eco_account/view.html:75 #: compensation/templates/compensation/report/compensation/report.html:24 #: compensation/templates/compensation/report/eco_account/report.html:41 #: ema/templates/ema/detail/view.html:61 @@ -977,8 +981,8 @@ msgstr "Verzeichnet am" msgid "Last modified" msgstr "Zuletzt bearbeitet" -#: compensation/templates/compensation/detail/compensation/view.html:99 -#: compensation/templates/compensation/detail/eco_account/view.html:82 +#: compensation/templates/compensation/detail/compensation/view.html:100 +#: compensation/templates/compensation/detail/eco_account/view.html:83 #: ema/templates/ema/detail/view.html:76 intervention/forms/modalForms.py:56 #: intervention/templates/intervention/detail/view.html:116 msgid "Shared with" @@ -1037,14 +1041,14 @@ msgstr "Abbuchung bearbeiten" msgid "Remove Deduction" msgstr "Abbuchung entfernen" -#: compensation/templates/compensation/detail/eco_account/view.html:34 +#: compensation/templates/compensation/detail/eco_account/view.html:35 msgid "No surface deductable" msgstr "Keine Flächenmenge für Abbuchungen eingegeben. Bitte bearbeiten." -#: compensation/templates/compensation/detail/eco_account/view.html:57 -#: compensation/templates/compensation/detail/eco_account/view.html:61 -#: compensation/templates/compensation/detail/eco_account/view.html:65 -#: compensation/templates/compensation/detail/eco_account/view.html:69 +#: compensation/templates/compensation/detail/eco_account/view.html:58 +#: compensation/templates/compensation/detail/eco_account/view.html:62 +#: compensation/templates/compensation/detail/eco_account/view.html:66 +#: compensation/templates/compensation/detail/eco_account/view.html:70 #: ema/templates/ema/detail/view.html:48 ema/templates/ema/detail/view.html:52 #: ema/templates/ema/detail/view.html:56 #: intervention/templates/intervention/detail/view.html:30 @@ -1060,7 +1064,7 @@ msgstr "Keine Flächenmenge für Abbuchungen eingegeben. Bitte bearbeiten." msgid "Missing" msgstr "fehlt" -#: compensation/templates/compensation/detail/eco_account/view.html:70 +#: compensation/templates/compensation/detail/eco_account/view.html:71 #: compensation/templates/compensation/report/eco_account/report.html:24 #: ema/templates/ema/detail/view.html:57 #: ema/templates/ema/report/report.html:24 @@ -1976,7 +1980,7 @@ msgstr "{} wurde erfolgreich vom Nutzer {} geprüft! {}" msgid "missing" msgstr "fehlt" -#: konova/views.py:96 templates/navbars/navbar.html:16 +#: konova/views.py:99 templates/navbars/navbar.html:16 msgid "Home" msgstr "Home" @@ -3993,9 +3997,6 @@ msgstr "" #~ msgid "General data edited" #~ msgstr "Allgemeine Daten bearbeitet" -#~ msgid "Action type details" -#~ msgstr "Zusatzmerkmale" - #~ msgid "On registered data edited" #~ msgstr "Wenn meine freigegebenen Daten bearbeitet wurden" diff --git a/templates/form/scripts/jstree-scripts.html b/templates/form/scripts/jstree-scripts.html deleted file mode 100644 index c9367609..00000000 --- a/templates/form/scripts/jstree-scripts.html +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file