From 2b66189590e32a9faeb113446c4883d4b64333ed Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Thu, 10 Feb 2022 14:45:00 +0100 Subject: [PATCH 01/12] #112 WIP: Restructure CompensationAction * changes action_type from ForeignKey into M2M * adds migration * changes form widget * WIP: changes rendering on detail view of compensation * TEST NOT CHECKED YET! --- compensation/forms/modalForms.py | 8 ++-- compensation/managers.py | 11 ------ .../migrations/0004_auto_20220210_1402.py | 39 +++++++++++++++++++ compensation/models/action.py | 10 +---- compensation/models/compensation.py | 2 +- .../detail/compensation/includes/actions.html | 6 ++- .../detail/eco_account/includes/actions.html | 6 ++- .../ema/detail/includes/actions.html | 6 ++- 8 files changed, 61 insertions(+), 27 deletions(-) create mode 100644 compensation/migrations/0004_auto_20220210_1402.py diff --git a/compensation/forms/modalForms.py b/compensation/forms/modalForms.py index 804ebad4..90b0b64c 100644 --- a/compensation/forms/modalForms.py +++ b/compensation/forms/modalForms.py @@ -405,7 +405,7 @@ class NewActionModalForm(BaseModalForm): """ from compensation.models import UnitChoices - action_type = forms.ModelChoiceField( + action_type = forms.ModelMultipleChoiceField( label=_("Action Type"), label_suffix="", required=True, @@ -415,7 +415,7 @@ class NewActionModalForm(BaseModalForm): is_leaf=True, code_lists__in=[CODELIST_COMPENSATION_ACTION_ID], ), - widget=autocomplete.ModelSelect2( + widget=autocomplete.ModelSelect2Multiple( url="codes-compensation-action-autocomplete", attrs={ "data-placeholder": _("Action"), @@ -496,7 +496,7 @@ class EditCompensationActionModalForm(NewActionModalForm): self.action = kwargs.pop("action", None) super().__init__(*args, **kwargs) form_data = { - "action_type": self.action.action_type, + "action_type": self.action.action_type.all(), "action_type_details": self.action.action_type_details.all(), "amount": self.action.amount, "unit": self.action.unit, @@ -506,7 +506,7 @@ class EditCompensationActionModalForm(NewActionModalForm): def save(self): action = self.action - action.action_type = self.cleaned_data.get("action_type", None) + action.action_type.set(self.cleaned_data.get("action_type", [])) action.action_type_details.set(self.cleaned_data.get("action_type_details", [])) action.amount = self.cleaned_data.get("amount", None) action.unit = self.cleaned_data.get("unit", None) diff --git a/compensation/managers.py b/compensation/managers.py index c97cd518..b496eb1e 100644 --- a/compensation/managers.py +++ b/compensation/managers.py @@ -8,17 +8,6 @@ Created on: 14.10.21 from django.db import models -class CompensationActionManager(models.Manager): - """ Holds default db fetch setting for this model type - - """ - def get_queryset(self): - return super().get_queryset().select_related( - "action_type", - "action_type__parent" - ) - - class CompensationStateManager(models.Manager): """ Holds default db fetch setting for this model type diff --git a/compensation/migrations/0004_auto_20220210_1402.py b/compensation/migrations/0004_auto_20220210_1402.py new file mode 100644 index 00000000..44d43cbe --- /dev/null +++ b/compensation/migrations/0004_auto_20220210_1402.py @@ -0,0 +1,39 @@ +# Generated by Django 3.1.3 on 2022-02-10 13:02 + +from django.db import migrations, models + + +def migrate_actions(apps, schema_editor): + CompensationAction = apps.get_model('compensation', 'CompensationAction') + actions = CompensationAction.objects.all() + + for action in actions: + action_type = action.action_type or [] + action.action_type_tmp.set(action_type) + action.save() + + +class Migration(migrations.Migration): + + dependencies = [ + ('codelist', '0001_initial'), + ('compensation', '0003_auto_20220202_0846'), + ] + + operations = [ + migrations.AddField( + model_name='compensationaction', + name='action_type_tmp', + field=models.ManyToManyField(blank=True, limit_choices_to={'code_lists__in': [1026], 'is_archived': False, 'is_selectable': True}, related_name='_compensationaction_action_type_+', to='codelist.KonovaCode'), + ), + migrations.RunPython(migrate_actions), + migrations.RemoveField( + model_name='compensationaction', + name='action_type', + ), + migrations.RenameField( + model_name='compensationaction', + old_name='action_type_tmp', + new_name='action_type', + ) + ] diff --git a/compensation/models/action.py b/compensation/models/action.py index a5579159..e54f53d3 100644 --- a/compensation/models/action.py +++ b/compensation/models/action.py @@ -10,9 +10,7 @@ from django.utils.translation import gettext_lazy as _ from codelist.models import KonovaCode from codelist.settings import CODELIST_COMPENSATION_ACTION_ID, CODELIST_COMPENSATION_ACTION_DETAIL_ID -from compensation.managers import CompensationActionManager from konova.models import BaseResource -from konova.utils.message_templates import COMPENSATION_ACTION_REMOVED class UnitChoices(models.TextChoices): @@ -31,10 +29,8 @@ class CompensationAction(BaseResource): """ Compensations include actions like planting trees, refreshing rivers and so on. """ - action_type = models.ForeignKey( + action_type = models.ManyToManyField( KonovaCode, - on_delete=models.SET_NULL, - null=True, blank=True, limit_choices_to={ "code_lists__in": [CODELIST_COMPENSATION_ACTION_ID], @@ -57,10 +53,8 @@ class CompensationAction(BaseResource): unit = models.CharField(max_length=100, null=True, blank=True, choices=UnitChoices.choices) comment = models.TextField(blank=True, null=True, help_text="Additional comment") - objects = CompensationActionManager() - def __str__(self): - return f"{self.action_type} | {self.amount} {self.unit}" + return f"{self.action_type.all()} | {self.amount} {self.unit}" @property def unit_humanize(self): diff --git a/compensation/models/compensation.py b/compensation/models/compensation.py index 4dd2b4c2..7a10aa0b 100644 --- a/compensation/models/compensation.py +++ b/compensation/models/compensation.py @@ -104,12 +104,12 @@ class AbstractCompensation(BaseObject, GeoReferencedMixin): with transaction.atomic(): user_action = UserActionLogEntry.get_created_action(user) comp_action = CompensationAction.objects.create( - action_type=form_data["action_type"], amount=form_data["amount"], unit=form_data["unit"], comment=form_data["comment"], created=user_action, ) + comp_action.action_type.set(form_data.get("action_type", [])) comp_action_details = form_data["action_type_details"] comp_action.action_type_details.set(comp_action_details) self.actions.add(comp_action) diff --git a/compensation/templates/compensation/detail/compensation/includes/actions.html b/compensation/templates/compensation/detail/compensation/includes/actions.html index 33037ecf..18e9304b 100644 --- a/compensation/templates/compensation/detail/compensation/includes/actions.html +++ b/compensation/templates/compensation/detail/compensation/includes/actions.html @@ -47,7 +47,11 @@ {% for action in actions %} - {{ action.action_type }} + {% if action.action_type_details.count > 0 %}
{% for detail in action.action_type_details.all %} diff --git a/compensation/templates/compensation/detail/eco_account/includes/actions.html b/compensation/templates/compensation/detail/eco_account/includes/actions.html index add698e0..092c5e8d 100644 --- a/compensation/templates/compensation/detail/eco_account/includes/actions.html +++ b/compensation/templates/compensation/detail/eco_account/includes/actions.html @@ -46,7 +46,11 @@ {% for action in actions %} - {{ action.action_type }} + {% if action.action_type_details.count > 0 %}
{% for detail in action.action_type_details.all %} diff --git a/ema/templates/ema/detail/includes/actions.html b/ema/templates/ema/detail/includes/actions.html index 02772b36..9d91caf0 100644 --- a/ema/templates/ema/detail/includes/actions.html +++ b/ema/templates/ema/detail/includes/actions.html @@ -44,7 +44,11 @@ {% for action in obj.actions.all %} - {{ action.action_type }} + {% if action.action_type_details.count > 0 %}
{% for detail in action.action_type_details.all %} From afb78fa670303834637e0769620a1e4f369929f3 Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Fri, 11 Feb 2022 08:43:21 +0100 Subject: [PATCH 02/12] #112 Migration enhance * fixes bug in migration * adds check to migration which raises error before data loss might happen --- compensation/migrations/0004_auto_20220210_1402.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/compensation/migrations/0004_auto_20220210_1402.py b/compensation/migrations/0004_auto_20220210_1402.py index 44d43cbe..7cc8126c 100644 --- a/compensation/migrations/0004_auto_20220210_1402.py +++ b/compensation/migrations/0004_auto_20220210_1402.py @@ -9,9 +9,12 @@ def migrate_actions(apps, schema_editor): for action in actions: action_type = action.action_type or [] - action.action_type_tmp.set(action_type) + action.action_type_tmp.set([action_type]) action.save() + if not action.action_type_tmp.count() > 0: + raise ValueError("Migration of actions did not work! Stoped before data loss!") + class Migration(migrations.Migration): From 62e452c62567064f047e81940487e80131567094 Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Fri, 11 Feb 2022 14:13:42 +0100 Subject: [PATCH 03/12] WIP: CompensationAction using jstree --- compensation/forms/modalForms.py | 20 ++++++--- .../detail/compensation/view.html | 5 +++ .../compensation/detail/eco_account/view.html | 5 +++ ema/templates/ema/detail/view.html | 5 +++ intervention/inputs.py | 15 +++++++ .../widgets/checkbox-tree-select-base.html | 45 +++++++++++++++++++ .../widgets/checkbox-tree-select-content.html | 9 ++++ konova/urls.py | 4 +- konova/views.py | 24 ++++++++++ templates/form/scripts/jstree-scripts.html | 2 + 10 files changed, 126 insertions(+), 8 deletions(-) create mode 100644 konova/templates/konova/widgets/checkbox-tree-select-base.html create mode 100644 konova/templates/konova/widgets/checkbox-tree-select-content.html create mode 100644 templates/form/scripts/jstree-scripts.html diff --git a/compensation/forms/modalForms.py b/compensation/forms/modalForms.py index 90b0b64c..20ff5ddc 100644 --- a/compensation/forms/modalForms.py +++ b/compensation/forms/modalForms.py @@ -11,12 +11,14 @@ 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 konova.contexts import BaseContext from konova.forms import BaseModalForm, NewDocumentModalForm, RemoveModalForm from konova.models import DeadlineType @@ -411,15 +413,11 @@ class NewActionModalForm(BaseModalForm): required=True, help_text=_("Select the action type"), queryset=KonovaCode.objects.filter( - is_archived=False, - is_leaf=True, code_lists__in=[CODELIST_COMPENSATION_ACTION_ID], + is_archived=False, ), - widget=autocomplete.ModelSelect2Multiple( - url="codes-compensation-action-autocomplete", - attrs={ - "data-placeholder": _("Action"), - } + widget=TreeSelectMultiple( + url=None, ), ) action_type_details = forms.ModelMultipleChoiceField( @@ -482,6 +480,14 @@ 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 def save(self): action = self.instance.add_action(self) diff --git a/compensation/templates/compensation/detail/compensation/view.html b/compensation/templates/compensation/detail/compensation/view.html index 3f843c0a..17f79bc8 100644 --- a/compensation/templates/compensation/detail/compensation/view.html +++ b/compensation/templates/compensation/detail/compensation/view.html @@ -2,6 +2,11 @@ {% 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. This does not work properly with modal forms, as the scripts are not loaded properly inside the modal. diff --git a/compensation/templates/compensation/detail/eco_account/view.html b/compensation/templates/compensation/detail/eco_account/view.html index f276f931..132e0b61 100644 --- a/compensation/templates/compensation/detail/eco_account/view.html +++ b/compensation/templates/compensation/detail/eco_account/view.html @@ -2,6 +2,11 @@ {% 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/ema/templates/ema/detail/view.html b/ema/templates/ema/detail/view.html index 32ddd66b..cdab570d 100644 --- a/ema/templates/ema/detail/view.html +++ b/ema/templates/ema/detail/view.html @@ -2,6 +2,11 @@ {% 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 2e84edc5..9cf8e5ab 100644 --- a/intervention/inputs.py +++ b/intervention/inputs.py @@ -1,4 +1,5 @@ from django import forms +from django.urls import reverse class DummyFilterInput(forms.HiddenInput): @@ -30,3 +31,17 @@ class GenerateInput(forms.TextInput): """ template_name = "konova/widgets/generate-content-input.html" + + +class TreeSelectMultiple(forms.SelectMultiple): + """ Provides multiple selection of parent-child data + + """ + template_name = "konova/widgets/checkbox-tree-select-base.html" + url = None + + def __init__(self, *args, **kwargs): + self.url = kwargs.pop("url", None) + if self.url: + self.url = reverse(self.url) + super().__init__(*args, **kwargs) diff --git a/konova/templates/konova/widgets/checkbox-tree-select-base.html b/konova/templates/konova/widgets/checkbox-tree-select-base.html new file mode 100644 index 00000000..793ab83f --- /dev/null +++ b/konova/templates/konova/widgets/checkbox-tree-select-base.html @@ -0,0 +1,45 @@ + +
+
+ + + + \ 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 new file mode 100644 index 00000000..13b3a34d --- /dev/null +++ b/konova/templates/konova/widgets/checkbox-tree-select-content.html @@ -0,0 +1,9 @@ +{% load l10n %} + +
    + {% for code in codes %} +
  • + {{code.long_name}} +
    • + {% endfor %} +
\ No newline at end of file diff --git a/konova/urls.py b/konova/urls.py index 68256e7a..734be3cd 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 +from konova.views import logout_view, home_view, get_konova_code_action_children sso_client = KonovaSSOClient(SSO_SERVER, SSO_PUBLIC_KEY, SSO_PRIVATE_KEY) urlpatterns = [ @@ -40,6 +40,8 @@ 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 2a4c8ad5..2eac8b20 100644 --- a/konova/views.py +++ b/konova/views.py @@ -9,9 +9,12 @@ from django.contrib.auth import logout from django.contrib.auth.decorators import login_required from django.http import HttpRequest, FileResponse from django.shortcuts import redirect, render, get_object_or_404 +from django.template.loader import render_to_string from django.utils import timezone from django.utils.translation import gettext_lazy as _ +from codelist.models import KonovaCode +from codelist.settings import CODELIST_COMPENSATION_ACTION_ID from compensation.models import Compensation, EcoAccount from intervention.models import Intervention from konova.contexts import BaseContext @@ -124,3 +127,24 @@ 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/templates/form/scripts/jstree-scripts.html b/templates/form/scripts/jstree-scripts.html new file mode 100644 index 00000000..c9367609 --- /dev/null +++ b/templates/form/scripts/jstree-scripts.html @@ -0,0 +1,2 @@ + + \ No newline at end of file From d04d02380f6ec763ff24fe61babd2aa2e6c9344b Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Fri, 11 Feb 2022 16:21:44 +0100 Subject: [PATCH 04/12] WIP: #112 Restructure CompensationAction --- compensation/forms/modalForms.py | 2 +- .../widgets/checkbox-tree-select-base.html | 26 ++++--------------- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/compensation/forms/modalForms.py b/compensation/forms/modalForms.py index 20ff5ddc..6dc0c98e 100644 --- a/compensation/forms/modalForms.py +++ b/compensation/forms/modalForms.py @@ -22,7 +22,7 @@ from intervention.inputs import TreeSelectMultiple from konova.contexts import BaseContext from konova.forms import BaseModalForm, NewDocumentModalForm, RemoveModalForm from konova.models import DeadlineType -from konova.utils.message_templates import FORM_INVALID, ADDED_COMPENSATION_STATE, ADDED_DEADLINE, \ +from konova.utils.message_templates import FORM_INVALID, ADDED_COMPENSATION_STATE, \ ADDED_COMPENSATION_ACTION, PAYMENT_EDITED, COMPENSATION_STATE_EDITED, COMPENSATION_ACTION_EDITED, DEADLINE_EDITED diff --git a/konova/templates/konova/widgets/checkbox-tree-select-base.html b/konova/templates/konova/widgets/checkbox-tree-select-base.html index 793ab83f..6a10ff02 100644 --- a/konova/templates/konova/widgets/checkbox-tree-select-base.html +++ b/konova/templates/konova/widgets/checkbox-tree-select-base.html @@ -1,18 +1,14 @@ -
-
- - +
+ \ No newline at end of file From 95856c9ee94cdb999b48d245f5cea0026081d88e Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Tue, 15 Feb 2022 10:48:01 +0100 Subject: [PATCH 05/12] #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 %} -
    - {% for type in action.action_type.all %} -
  • {{type}}
    • - {% endfor %} -
- {% 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 %} -
    - {% for type in action.action_type.all%} -
  • {{type.long_name}}
    • - {% endfor %} -
- {% 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 %} -
    - {% for type in action.action_type.all%} -
  • {{type}}
    • - {% endfor %} -
- {% 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 %} - -
    - {% for code in codes %} -
  • - {{code.long_name}} -
    • - {% endfor %} -
\ 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 From c0de1ae28d5331b692b0816eca501c1fb22b184a Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Tue, 15 Feb 2022 10:56:49 +0100 Subject: [PATCH 06/12] #112 AbstractCompensation rendering enhancements * minor changes to detail view rendering of EMA, Compensation and EcoAccount --- .../compensation/includes/states-after.html | 14 +-- .../compensation/includes/states-before.html | 14 +-- .../eco_account/includes/states-after.html | 14 +-- .../eco_account/includes/states-before.html | 14 +-- .../ema/detail/includes/states-after.html | 14 +-- .../ema/detail/includes/states-before.html | 14 +-- locale/de/LC_MESSAGES/django.mo | Bin 37523 -> 37589 bytes locale/de/LC_MESSAGES/django.po | 91 +++++++++--------- 8 files changed, 90 insertions(+), 85 deletions(-) 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 e9a94ccb374f1fcb49ae6b60cf0df3131a61819d..cbbff8e8beb3e75746f17607296ed15d29eb4fd1 100644 GIT binary patch delta 10433 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 Ul~NnT?H, 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" From 4be26fbc226d005f0171fbb79800efb2f6140799 Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Tue, 15 Feb 2022 11:32:20 +0100 Subject: [PATCH 07/12] #112 CompensationAction explanation * updates the help_text for action_type on NewActionModalForm to give a better explanation --- compensation/forms/modalForms.py | 2 +- locale/de/LC_MESSAGES/django.mo | Bin 37589 -> 37895 bytes locale/de/LC_MESSAGES/django.po | 31 ++++++++++++++++++++++--------- 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/compensation/forms/modalForms.py b/compensation/forms/modalForms.py index a8d38aa2..cdcc26e9 100644 --- a/compensation/forms/modalForms.py +++ b/compensation/forms/modalForms.py @@ -410,7 +410,7 @@ class NewActionModalForm(BaseModalForm): label=_("Action Type"), label_suffix="", required=True, - help_text=_("Select the action type"), + help_text=_("An action can consist of multiple different action types. All the selected action types are expected to be performed according to the amount and unit below on this form."), choices=[], widget=CompensationActionTreeCheckboxSelectMultiple(), ) diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index cbbff8e8beb3e75746f17607296ed15d29eb4fd1..87e1e03a5d6b5139726bf84ca2cdc849f3fe98fe 100644 GIT binary patch delta 10588 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\n" "Language-Team: LANGUAGE \n" @@ -560,8 +560,13 @@ msgid "Action Type" msgstr "Maßnahmentyp" #: compensation/forms/modalForms.py:413 -msgid "Select the action type" -msgstr "Maßnahmentyp wählen" +msgid "" +"An action can consist of multiple different action types. All the selected " +"action types are expected to be performed according to the amount and unit " +"below on this form." +msgstr "" +"Eine Maßnahme kann aus mehreren verschiedenen Maßnahmentypen bestehen. Alle hier gewählten " +"Einträge sollen mit der weiter unten angegebenen Einheit und Menge umgesetzt werden. " #: compensation/forms/modalForms.py:418 compensation/forms/modalForms.py:430 msgid "Action Type detail" @@ -892,8 +897,17 @@ msgstr "Fehlende Flächenmengen laut Ausgangszustand: " msgid "Biotope type" msgstr "Biotoptyp" +#: compensation/templates/compensation/detail/compensation/includes/states-after.html:56 +#: compensation/templates/compensation/detail/compensation/includes/states-before.html:56 +#: compensation/templates/compensation/detail/eco_account/includes/states-after.html:56 +#: compensation/templates/compensation/detail/eco_account/includes/states-before.html:56 +#: ema/templates/ema/detail/includes/states-after.html:54 +#: ema/templates/ema/detail/includes/states-before.html:54 +msgid "No biotope type details" +msgstr "Keine Zusatzbezeichnungen" + #: compensation/templates/compensation/detail/compensation/includes/states-after.html:62 -#: compensation/templates/compensation/detail/compensation/includes/states-before.html:64 +#: compensation/templates/compensation/detail/compensation/includes/states-before.html:62 #: 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 @@ -902,7 +916,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:67 +#: compensation/templates/compensation/detail/compensation/includes/states-before.html:65 #: 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 @@ -929,10 +943,6 @@ 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" @@ -3993,6 +4003,9 @@ msgstr "" msgid "Unable to connect to qpid with SASL mechanism %s" msgstr "" +#~ msgid "Select the action type" +#~ msgstr "Maßnahmentyp wählen" + #~ msgid "No revocation" #~ msgstr "Kein Widerspruch" From 6d5e2b8d1508bf753f934eb23016aaa0f96414d9 Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Tue, 15 Feb 2022 13:23:15 +0100 Subject: [PATCH 08/12] #112 TreeWidget JS * adds visual support on (de-)selecting checkboxes * adds same support on initialization of checked checkboxes e.g. on edit forms --- .../widgets/checkbox-tree-select-content.html | 21 +++++++ .../konova/widgets/checkbox-tree-select.html | 63 ++++++++++++------- 2 files changed, 62 insertions(+), 22 deletions(-) create mode 100644 konova/templates/konova/widgets/checkbox-tree-select-content.html diff --git a/konova/templates/konova/widgets/checkbox-tree-select-content.html b/konova/templates/konova/widgets/checkbox-tree-select-content.html new file mode 100644 index 00000000..9bf57253 --- /dev/null +++ b/konova/templates/konova/widgets/checkbox-tree-select-content.html @@ -0,0 +1,21 @@ +{% load l10n fontawesome_5 %} + +{% for code in codes %} +
+ + {% if not code.is_leaf %} +
+ {% with code.children as codes %} + {% include 'konova/widgets/checkbox-tree-select-content.html' %} + {% endwith %} +
+ {% endif %} +
+{% endfor %} \ 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 index 5b40d3f1..ddcc60c0 100644 --- a/konova/templates/konova/widgets/checkbox-tree-select.html +++ b/konova/templates/konova/widgets/checkbox-tree-select.html @@ -1,23 +1,42 @@ -{% load l10n fontawesome_5 %} +
+ {% include 'konova/widgets/checkbox-tree-select-content.html' %} +
-
- {% 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 + \ No newline at end of file From 1ea5b4fc39b33a5b6a503cd5e70833c3e957c663 Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Tue, 15 Feb 2022 14:35:49 +0100 Subject: [PATCH 09/12] # 112 Search input for TreeWidget * adds search input field for js-filtering by input --- .../konova/widgets/checkbox-tree-select.html | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/konova/templates/konova/widgets/checkbox-tree-select.html b/konova/templates/konova/widgets/checkbox-tree-select.html index ddcc60c0..3129be8a 100644 --- a/konova/templates/konova/widgets/checkbox-tree-select.html +++ b/konova/templates/konova/widgets/checkbox-tree-select.html @@ -1,3 +1,9 @@ +{% load i18n %} + +
+ +
+
{% include 'konova/widgets/checkbox-tree-select-content.html' %}
@@ -31,6 +37,22 @@ toggleSelectedCssClass(this); } + function searchInputHandler(event){ + var elem = $(this); + var val = elem.val() + var allTreeElements = $(".tree-element") + var allTreeElementsContain = $(".tree-element:contains(" + val + ")") + if(val.length > 0){ + allTreeElements.hide() + allTreeElementsContain.show() + }else{ + allTreeElements.show() + } + } + + // Add event listener on search input + $("#tree-search-input").keyup(searchInputHandler) + // Add event listener on changed checkboxes $(".tree-input").change(changeHandler); From a160f3fe6ca1caeb4082d7c526ec03c04403b883 Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Tue, 15 Feb 2022 15:33:25 +0100 Subject: [PATCH 10/12] #112 Autocomplete enhancements * enhances filtering for Autocomplete -> parent_parent will be searched for match as well * adds rendering of parent_parent group for BiotopeAutocomplete * enhances ordering of registration office autocomplete --- konova/autocompletes.py | 49 +++++++++++++++++++++++++++++- konova/static/css/konova.css | 13 ++++++-- konova/utils/message_templates.py | 2 +- locale/de/LC_MESSAGES/django.mo | Bin 37895 -> 37936 bytes locale/de/LC_MESSAGES/django.po | 20 +++++++----- 5 files changed, 73 insertions(+), 11 deletions(-) diff --git a/konova/autocompletes.py b/konova/autocompletes.py index 3a79ab68..b07e2088 100644 --- a/konova/autocompletes.py +++ b/konova/autocompletes.py @@ -5,7 +5,12 @@ Contact: michel.peltriaux@sgdnord.rlp.de Created on: 07.12.20 """ +import collections + from dal_select2.views import Select2QuerySetView, Select2GroupQuerySetView +from django.core.exceptions import ImproperlyConfigured + +from konova.utils.message_templates import UNGROUPED from user.models import User from django.db.models import Q @@ -139,6 +144,8 @@ class KonovaCodeAutocomplete(Select2GroupQuerySetView): q_or |= Q(short_name__icontains=keyword) q_or |= Q(parent__long_name__icontains=keyword) q_or |= Q(parent__short_name__icontains=keyword) + q_or |= Q(parent__parent__long_name__icontains=keyword) + q_or |= Q(parent__parent__short_name__icontains=keyword) _filter.add(q_or, Q.AND) qs = qs.filter(_filter).distinct() return qs @@ -214,6 +221,41 @@ class BiotopeCodeAutocomplete(KonovaCodeAutocomplete): def get_result_label(self, result): return f"{result.long_name} ({result.short_name})" + def get_results(self, context): + """Return the options grouped by a common related model. + + Raises ImproperlyConfigured if self.group_by_name is not configured + """ + if not self.group_by_related: + raise ImproperlyConfigured("Missing group_by_related.") + + super_groups = collections.OrderedDict() + + object_list = context['object_list'] + + for result in object_list: + group = result.parent if result.parent else None + group_name = f"{group.long_name} ({group.short_name})" if group else UNGROUPED + super_group = result.parent.parent if result.parent else None + super_group_name = f"{super_group.long_name} ({super_group.short_name})" if super_group else UNGROUPED + super_groups.setdefault(super_group_name, {}) + super_groups[super_group_name].setdefault(group_name, []) + super_groups[super_group_name][group_name].append(result) + + return [{ + 'id': None, + 'text': super_group, + 'children': [{ + "id": None, + "text": group, + "children": [{ + 'id': self.get_result_value(result), + 'text': self.get_result_label(result), + 'selected_text': self.get_selected_result_label(result), + } for result in results] + } for group, results in groups.items()] + } for super_group, groups in super_groups.items()] + class BiotopeExtraCodeAutocomplete(KonovaCodeAutocomplete): """ @@ -284,6 +326,11 @@ class RegistrationOfficeCodeAutocomplete(KonovaCodeAutocomplete): self.c = CODELIST_REGISTRATION_OFFICE_ID super().__init__(*args, **kwargs) + def order_by(self, qs): + return qs.order_by( + "parent__long_name" + ) + class ConservationOfficeCodeAutocomplete(KonovaCodeAutocomplete): """ @@ -297,4 +344,4 @@ class ConservationOfficeCodeAutocomplete(KonovaCodeAutocomplete): super().__init__(*args, **kwargs) def get_result_label(self, result): - return f"{result.long_name} ({result.short_name})" \ No newline at end of file + return f"{result.long_name} ({result.short_name})" diff --git a/konova/static/css/konova.css b/konova/static/css/konova.css index 709d3eb3..7e7f3fd1 100644 --- a/konova/static/css/konova.css +++ b/konova/static/css/konova.css @@ -242,15 +242,24 @@ Similar to bootstraps 'shadow-lg' .select2-results__option--highlighted{ background-color: var(--rlp-red) !important; } +/* .select2-container--default .select2-results__group{ background-color: var(--rlp-gray-light); } .select2-container--default .select2-results__option .select2-results__option{ - padding-left: 2em !important; + padding-left: 1em !important; +} + + */ +.select2-results__options--nested{ + padding-left: 1em !important; } .select2-container--default .select2-results > .select2-results__options{ max-height: 500px !important; } +/* .select2-container--default .select2-results__option .select2-results__option{ padding-left: 2em; -} \ No newline at end of file +} + + */ \ No newline at end of file diff --git a/konova/utils/message_templates.py b/konova/utils/message_templates.py index c7a2be00..5809b3b6 100644 --- a/konova/utils/message_templates.py +++ b/konova/utils/message_templates.py @@ -7,7 +7,7 @@ Created on: 02.08.21 """ from django.utils.translation import gettext_lazy as _ - +UNGROUPED = _("Ungrouped") FORM_INVALID = _("There was an error on this form.") PARAMS_INVALID = _("Invalid parameters") INTERVENTION_INVALID = _("There are errors in this intervention.") diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo index 87e1e03a5d6b5139726bf84ca2cdc849f3fe98fe..022e9e1a728d186a0e8be95eee8ae29ea5928bee 100644 GIT binary patch delta 8795 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 A4*&oF delta 8770 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\n" "Language-Team: LANGUAGE \n" @@ -565,8 +565,9 @@ msgid "" "action types are expected to be performed according to the amount and unit " "below on this form." msgstr "" -"Eine Maßnahme kann aus mehreren verschiedenen Maßnahmentypen bestehen. Alle hier gewählten " -"Einträge sollen mit der weiter unten angegebenen Einheit und Menge umgesetzt werden. " +"Eine Maßnahme kann aus mehreren verschiedenen Maßnahmentypen bestehen. Alle " +"hier gewählten Einträge sollen mit der weiter unten angegebenen Einheit und " +"Menge umgesetzt werden. " #: compensation/forms/modalForms.py:418 compensation/forms/modalForms.py:430 msgid "Action Type detail" @@ -1765,6 +1766,11 @@ msgstr "Neu" msgid "Show" msgstr "Anzeigen" +#: konova/templates/konova/widgets/checkbox-tree-select.html:4 +#: templates/generic_index.html:56 +msgid "Search" +msgstr "Suchen" + #: konova/templates/konova/widgets/generate-content-input.html:6 msgid "Generate new" msgstr "Neu generieren" @@ -1805,6 +1811,10 @@ msgstr "{} - Freigegebene Daten geprüft" msgid "Request for new API token" msgstr "Anfrage für neuen API Token" +#: konova/utils/message_templates.py:10 +msgid "Ungrouped" +msgstr "Ohne Zuordnung" + #: konova/utils/message_templates.py:11 msgid "There was an error on this form." msgstr "Es gab einen Fehler im Formular." @@ -2270,10 +2280,6 @@ msgstr "Neu" msgid "Search for keywords" msgstr "Nach Schlagwörtern suchen" -#: templates/generic_index.html:56 -msgid "Search" -msgstr "Suchen" - #: templates/generic_index.html:57 msgid "Start search" msgstr "Starte Suche" From ed27d8d589fd298be47bf835c56a605a96048753 Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Wed, 16 Feb 2022 08:26:24 +0100 Subject: [PATCH 11/12] #112 Order enhancement * enhances ordering for action details and biotope details --- konova/autocompletes.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/konova/autocompletes.py b/konova/autocompletes.py index b07e2088..432df614 100644 --- a/konova/autocompletes.py +++ b/konova/autocompletes.py @@ -188,7 +188,7 @@ class CompensationActionDetailCodeAutocomplete(KonovaCodeAutocomplete): def order_by(self, qs): return qs.order_by( - "parent__long_name" + "long_name" ) @@ -281,7 +281,7 @@ class BiotopeExtraCodeAutocomplete(KonovaCodeAutocomplete): qs (QuerySet): The ordered queryset """ return qs.order_by( - "parent__long_name", + "long_name", ) def get_result_label(self, result): From 91185ef847c02d68bd9f2f91248747bdd429d07f Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Wed, 16 Feb 2022 08:31:18 +0100 Subject: [PATCH 12/12] #112 Tree filter case insensitive search * adds case insensitive search for TreeWidget --- konova/templates/konova/widgets/checkbox-tree-select.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/konova/templates/konova/widgets/checkbox-tree-select.html b/konova/templates/konova/widgets/checkbox-tree-select.html index 3129be8a..c2b107cc 100644 --- a/konova/templates/konova/widgets/checkbox-tree-select.html +++ b/konova/templates/konova/widgets/checkbox-tree-select.html @@ -41,7 +41,11 @@ var elem = $(this); var val = elem.val() var allTreeElements = $(".tree-element") - var allTreeElementsContain = $(".tree-element:contains(" + val + ")") + var allTreeElementsContain = $(".tree-element").filter(function(){ + var reg = new RegExp(val, "i"); + return reg.test($(this).text()); + } + ); if(val.length > 0){ allTreeElements.hide() allTreeElementsContain.show()