ccs-digitalmarketplace-frontend-jinja 4.10.0__tar.gz → 4.11.0__tar.gz

{ccs_digitalmarketplace_frontend_jinja-4.10.0/ccs_digitalmarketplace_frontend_jinja.egg-info → ccs_digitalmarketplace_frontend_jinja-4.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ccs-digitalmarketplace-frontend-jinja
-Version: 4.10.0
+Version: 4.11.0
 Summary: Jinja templates for Digital Marketplace apps.
 Author: CCS Developers
 Project-URL: Homepage, https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja
@@ -15,7 +15,7 @@ Requires-Dist: ccs-govuk-frontend-jinja<2,>=1.5
 Requires-Dist: ccs-digitalmarketplace-utils>=69.0.0
 Provides-Extra: dev
 Requires-Dist: flake8==7.3.0; extra == "dev"
-Requires-Dist: mypy==1.17.0; extra == "dev"
+Requires-Dist: mypy==1.17.1; extra == "dev"
 Requires-Dist: pytest==8.4.1; extra == "dev"
 Requires-Dist: lxml==6.0.0; extra == "dev"
 Requires-Dist: xmldiff==2.7.0; extra == "dev"
@@ -41,6 +41,8 @@ The following table shows the version of Digital Marketplace Frontend Jinja that
 
 | Digital Marketplace Frontend Jinja Version | Target CCS Digital Marketplace GOV.UK Frontend Version |
 | ------------------------------------------ | ------------------------------------------------------ |
+| [4.11.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.11.0) | [3.11.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.11.0) |
+| [4.10.1](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.10.1) | [3.10.1](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.10.1) |
 | [4.10.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.10.0) | [3.10.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.10.0) |
 | [4.9.2](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.9.2) | [3.9.2](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.9.2) |
 | [4.9.1](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.9.1) | [3.9.1](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.9.1) |

{ccs_digitalmarketplace_frontend_jinja-4.10.0 → ccs_digitalmarketplace_frontend_jinja-4.11.0}/README.md

@@ -16,6 +16,8 @@ The following table shows the version of Digital Marketplace Frontend Jinja that
 
 | Digital Marketplace Frontend Jinja Version | Target CCS Digital Marketplace GOV.UK Frontend Version |
 | ------------------------------------------ | ------------------------------------------------------ |
+| [4.11.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.11.0) | [3.11.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.11.0) |
+| [4.10.1](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.10.1) | [3.10.1](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.10.1) |
 | [4.10.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.10.0) | [3.10.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.10.0) |
 | [4.9.2](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.9.2) | [3.9.2](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.9.2) |
 | [4.9.1](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.9.1) | [3.9.1](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.9.1) |

{ccs_digitalmarketplace_frontend_jinja-4.10.0 → ccs_digitalmarketplace_frontend_jinja-4.11.0/ccs_digitalmarketplace_frontend_jinja.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ccs-digitalmarketplace-frontend-jinja
-Version: 4.10.0
+Version: 4.11.0
 Summary: Jinja templates for Digital Marketplace apps.
 Author: CCS Developers
 Project-URL: Homepage, https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja
@@ -15,7 +15,7 @@ Requires-Dist: ccs-govuk-frontend-jinja<2,>=1.5
 Requires-Dist: ccs-digitalmarketplace-utils>=69.0.0
 Provides-Extra: dev
 Requires-Dist: flake8==7.3.0; extra == "dev"
-Requires-Dist: mypy==1.17.0; extra == "dev"
+Requires-Dist: mypy==1.17.1; extra == "dev"
 Requires-Dist: pytest==8.4.1; extra == "dev"
 Requires-Dist: lxml==6.0.0; extra == "dev"
 Requires-Dist: xmldiff==2.7.0; extra == "dev"
@@ -41,6 +41,8 @@ The following table shows the version of Digital Marketplace Frontend Jinja that
 
 | Digital Marketplace Frontend Jinja Version | Target CCS Digital Marketplace GOV.UK Frontend Version |
 | ------------------------------------------ | ------------------------------------------------------ |
+| [4.11.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.11.0) | [3.11.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.11.0) |
+| [4.10.1](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.10.1) | [3.10.1](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.10.1) |
 | [4.10.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.10.0) | [3.10.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.10.0) |
 | [4.9.2](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.9.2) | [3.9.2](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.9.2) |
 | [4.9.1](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.9.1) | [3.9.1](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.9.1) |

{ccs_digitalmarketplace_frontend_jinja-4.10.0 → ccs_digitalmarketplace_frontend_jinja-4.11.0}/ccs_digitalmarketplace_frontend_jinja.egg-info/requires.txt

@@ -4,7 +4,7 @@ ccs-digitalmarketplace-utils>=69.0.0
 
 [dev]
 flake8==7.3.0
-mypy==1.17.0
+mypy==1.17.1
 pytest==8.4.1
 lxml==6.0.0
 xmldiff==2.7.0

ccs_digitalmarketplace_frontend_jinja-4.11.0/digitalmarketplace_frontend_jinja/__init__.py

@@ -0,0 +1 @@
+__version__ = '4.11.0'

{ccs_digitalmarketplace_frontend_jinja-4.10.0 → ccs_digitalmarketplace_frontend_jinja-4.11.0}/digitalmarketplace_frontend_jinja/templates/components/question-checkbox-tree-large/macro.html

@@ -43,14 +43,20 @@
           {% set checkboxItems = [] %}
 
           {% for label in option.options %}
-            {% set value = label.value if label.value else label.label %}
-            {% set checkboxItem = {
-              "text": label.label,
-              "value": value,
-              "checked": value in values
-            } %}
-            {% if label.description %}
-              {% set _checkboxItem = checkboxItem.__setitem__("hint", { "html": label.description }) %}
+            {% if label.divider %}
+              {% set checkboxItem = {
+                "divider": label.divider | safe
+              } %}
+            {% else %}
+              {% set value = label.value if label.value else label.label %}
+              {% set checkboxItem = {
+                "text": label.label,
+                "value": value,
+                "checked": value in values
+              } %}
+              {% if label.description %}
+                {% set _checkboxItem = checkboxItem.__setitem__("hint", { "html": label.description }) %}
+              {% endif %}
             {% endif %}
             {% set _checkboxItems = checkboxItems.append(checkboxItem) %}
           {% endfor %}

{ccs_digitalmarketplace_frontend_jinja-4.10.0 → ccs_digitalmarketplace_frontend_jinja-4.11.0}/digitalmarketplace_frontend_jinja/templates/components/question-checkboxes/macro.html

@@ -21,25 +21,29 @@
 {% endif %}
 
 {% for option in params.question.options %}
-  {% set value = option.value if option.value else option.label %}
-  {% set item = {
-    "text": option.label,
-    "value": value,
-    "checked": value in (params.data[name] or [] if params.data else [])
-  } %}
-  {% if option.description %}
-    {% set _item = item.__setitem__('hint', { "html": option.description }) %}
-  {% endif %}
-  {% if valueToQuestions[value] %}
-    {% set data_targets = [] %}
-    {% for data_target in valueToQuestions[value].split(" ") %}
-      {% if params.list_multi_question_index != undefined  %}
-        {% set _data_targets = data_targets.append("{}-{}".format(data_target, params.list_multi_question_index)) %}
-      {% else %}
-        {% set _data_targets = data_targets.append(data_target) %}
-      {% endif %}
-    {% endfor %}
-    {% set _item = item.__setitem__('attributes', { 'data-target': " ".join(data_targets) }) %}
+  {% if option.divider %}
+    {% set item = { "divider": option.divider } %}
+  {% else %}
+    {% set value = option.value if option.value else option.label %}
+    {% set item = {
+      "text": option.label,
+      "value": value,
+      "checked": value in (params.data[name] or [] if params.data else [])
+    } %}
+    {% if option.description %}
+      {% set _item = item.__setitem__('hint', { "html": option.description }) %}
+    {% endif %}
+    {% if valueToQuestions[value] %}
+      {% set data_targets = [] %}
+      {% for data_target in valueToQuestions[value].split(" ") %}
+        {% if params.list_multi_question_index != undefined  %}
+          {% set _data_targets = data_targets.append("{}-{}".format(data_target, params.list_multi_question_index)) %}
+        {% else %}
+          {% set _data_targets = data_targets.append(data_target) %}
+        {% endif %}
+      {% endfor %}
+      {% set _item = item.__setitem__('attributes', { 'data-target': " ".join(data_targets) }) %}
+    {% endif %}
   {% endif %}
   {% set _items = items.append(item) %}
 {% endfor %}

{ccs_digitalmarketplace_frontend_jinja-4.10.0 → ccs_digitalmarketplace_frontend_jinja-4.11.0}/digitalmarketplace_frontend_jinja/templates/components/question-radios/macro.html

@@ -21,25 +21,29 @@
 {% endif %}
 
 {% for option in params.question.options %}
-  {% set value = option.value if option.value else option.label %}
-  {% set item = {
-    "text": option.label,
-    "value": value,
-    "checked": value == params.data[name] if params.data
-  } %}
-  {% if option.description %}
-    {% set _item = item.__setitem__('hint', { "html": option.description }) %}
-  {% endif %}
-  {% if valueToQuestions[value] %}
-    {% set data_targets = [] %}
-    {% for data_target in valueToQuestions[value].split(" ") %}
-      {% if params.list_multi_question_index != undefined  %}
-        {% set _data_targets = data_targets.append("{}-{}".format(data_target, params.list_multi_question_index)) %}
-      {% else %}
-        {% set _data_targets = data_targets.append(data_target) %}
-      {% endif %}
-    {% endfor %}
-    {% set _item = item.__setitem__('attributes', { 'data-target': " ".join(data_targets) }) %}
+  {% if option.divider %}
+    {% set item = { "divider": option.divider } %}
+  {% else %}
+    {% set value = option.value if option.value else option.label %}
+    {% set item = {
+      "text": option.label,
+      "value": value,
+      "checked": value == params.data[name] if params.data
+    } %}
+    {% if option.description %}
+      {% set _item = item.__setitem__('hint', { "html": option.description }) %}
+    {% endif %}
+    {% if valueToQuestions[value] %}
+      {% set data_targets = [] %}
+      {% for data_target in valueToQuestions[value].split(" ") %}
+        {% if params.list_multi_question_index != undefined  %}
+          {% set _data_targets = data_targets.append("{}-{}".format(data_target, params.list_multi_question_index)) %}
+        {% else %}
+          {% set _data_targets = data_targets.append(data_target) %}
+        {% endif %}
+      {% endfor %}
+      {% set _item = item.__setitem__('attributes', { 'data-target': " ".join(data_targets) }) %}
+    {% endif %}
   {% endif %}
   {% set _items = items.append(item) %}
 {% endfor %}

ccs_digitalmarketplace_frontend_jinja-4.11.0/digitalmarketplace_frontend_jinja/templates/components/summary-content-checkbox-tree/macro.html

@@ -0,0 +1,38 @@
+{% macro digitalmarketplaceSummaryContentCheckboxTree(params) %}
+{% macro checkboxTreeList(items) %}
+  <ul class="govuk-list govuk-list--bullet govuk-body-s">
+    {% for item in items %}
+      <li>{{ item.label }}</li>
+    {% endfor %}
+  </ul>
+{% endmacro %}
+
+{% macro checkboxTreeSummary(item) %}
+  <li>
+    <p class="govuk-!-margin-bottom-1">{{ item.label }}</p>
+    {% if item.options[0].options %}
+      <ul class="govuk-list">
+        {% for sub_item in item.options %}
+          {{ checkboxTreeSummary(sub_item) }}
+        {% endfor %}
+      </ul>
+    {% else %}
+      {{ checkboxTreeList(item.options) }}
+    {% endif %}
+  </li>
+{% endmacro %}
+
+{% if params.value -%}
+  {% set no_children = (params.value | selectattr("options") | list |length) == 0 %}
+
+  {% if no_children %}
+    {{ checkboxTreeList(params.value) }}
+  {% else %}
+    <ul class="govuk-list">
+      {% for item in params.value %}
+        {{ checkboxTreeSummary(item) }}
+      {% endfor %}
+    </ul>
+  {% endif %}
+{% endif %}
+{% endmacro %}

{ccs_digitalmarketplace_frontend_jinja-4.10.0 → ccs_digitalmarketplace_frontend_jinja-4.11.0}/pyproject.toml

@@ -27,7 +27,7 @@ Changelog = "https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-
 [project.optional-dependencies]
 dev = [
   'flake8==7.3.0',
-  'mypy==1.17.0',
+  'mypy==1.17.1',
   'pytest==8.4.1',
   'lxml==6.0.0',
   'xmldiff==2.7.0',

ccs_digitalmarketplace_frontend_jinja-4.10.0/digitalmarketplace_frontend_jinja/__init__.py

@@ -1 +0,0 @@
-__version__ = '4.10.0'

ccs_digitalmarketplace_frontend_jinja-4.10.0/digitalmarketplace_frontend_jinja/templates/components/summary-content-checkbox-tree/macro.html

@@ -1,28 +0,0 @@
-{% macro digitalmarketplaceSummaryContentCheckboxTree(params) %}
-{% if params.value -%}
-  {% set no_children = (params.value | selectattr("options") | list |length) == 0 %}
-
-  {% if no_children %}
-    <ul class="govuk-list govuk-list--bullet govuk-body-s">
-      {% for item in params.value %}
-        <li>{{ item.label }}</li>
-      {% endfor %}
-    </ul>
-  {% else %}
-    <ul class="govuk-list">
-      {% for parent_category in params.value %}
-        <li>
-          <p class="govuk-!-margin-bottom-1">{{ parent_category.label }}</p>
-          {% if parent_category.options %}
-            <ul class="govuk-list govuk-list--bullet govuk-body-s">
-              {% for item in parent_category.options %}
-                <li>{{ item.label }}</li>
-              {% endfor %}
-            </ul>
-          {% endif %}
-        </li>
-      {% endfor %}
-    </ul>
-  {% endif %}
-{% endif %}
-{% endmacro %}