-
- {% 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 %}
+ |