ccs-digitalmarketplace-frontend-jinja 4.9.2__tar.gz → 4.10.1__tar.gz

{ccs_digitalmarketplace_frontend_jinja-4.9.2/ccs_digitalmarketplace_frontend_jinja.egg-info → ccs_digitalmarketplace_frontend_jinja-4.10.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ccs-digitalmarketplace-frontend-jinja
-Version: 4.9.2
+Version: 4.10.1
 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.16.1; extra == "dev"
+Requires-Dist: mypy==1.17.0; 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.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) |
 | [4.9.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.9.0) | [3.9.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.9.0) |

{ccs_digitalmarketplace_frontend_jinja-4.9.2 → ccs_digitalmarketplace_frontend_jinja-4.10.1}/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.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) |
 | [4.9.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.9.0) | [3.9.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.9.0) |

{ccs_digitalmarketplace_frontend_jinja-4.9.2 → ccs_digitalmarketplace_frontend_jinja-4.10.1/ccs_digitalmarketplace_frontend_jinja.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ccs-digitalmarketplace-frontend-jinja
-Version: 4.9.2
+Version: 4.10.1
 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.16.1; extra == "dev"
+Requires-Dist: mypy==1.17.0; 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.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) |
 | [4.9.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.9.0) | [3.9.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.9.0) |

{ccs_digitalmarketplace_frontend_jinja-4.9.2 → ccs_digitalmarketplace_frontend_jinja-4.10.1}/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.16.1
+mypy==1.17.0
 pytest==8.4.1
 lxml==6.0.0
 xmldiff==2.7.0

ccs_digitalmarketplace_frontend_jinja-4.10.1/digitalmarketplace_frontend_jinja/__init__.py

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

{ccs_digitalmarketplace_frontend_jinja-4.9.2 → ccs_digitalmarketplace_frontend_jinja-4.10.1}/digitalmarketplace_frontend_jinja/templates/components/question-checkbox-tree/macro.html

@@ -4,6 +4,7 @@
 {%- from "govuk_frontend_jinja/components/hint/macro.html" import govukHint -%}
 {%- from "govuk_frontend_jinja/components/accordion/macro.html" import govukAccordion -%}
 {%- from "govuk_frontend_jinja/components/error-message/macro.html" import govukErrorMessage -%}
+{%- from "govuk_frontend_jinja/components/tag/macro.html" import govukTag -%}
 {%- from "digitalmarketplace_frontend_jinja/components/question-format-hint/macro.html" import digitalmarketplaceQuestionFormatHint -%}
 
 {% set name = params.question.id %}
@@ -11,6 +12,53 @@
 {% set errorMessage = params.errors[name] if params.errors %}
 {% set values = params.data[name] or [] if params.data else [] %}
 
+{% macro checkboxTreeCheckboxes(section, index) %}
+  {% set checkboxItems = [] %}
+
+  {% for option in section.options %}
+    {% set value = option.value if option.value else option.label %}
+    {% set _checkboxItems = checkboxItems.append({
+      "text": option.label,
+      "value": value,
+      "checked": value in values
+    }) %}
+  {% endfor %}
+
+  {{ govukCheckboxes({
+    "name": name,
+    "idPrefix": "input-" + name + '-' + index,
+    "items": checkboxItems,
+    "classes": "govuk-checkboxes--small"
+  }) }}
+{% endmacro %}
+
+{% macro checkboxTreeDetail(section, index) %}
+  <details id="details-{{ index }}" class="dm-checkbox-tree-details">
+    <summary class="dm-checkbox-tree-details__summary">
+      <div class="dm-checkbox-tree-details__summary-text">
+        <div class="dm-checkbox-tree-details__summary-text-label">
+          {{ section.label }}
+        </div>
+        <div class="dm-checkbox-tree-details__summary-text-count">
+          {{ govukTag({
+            "html": '<span class="dm-checkbox-tree-details__summary-text-count-selected"></span> selected',
+            "classes": 'govuk-tag--green govuk-visually-hidden'
+          }) }}
+        </div>
+      </div>
+    </summary>
+    <div class="dm-checkbox-tree-details__text">
+      {% if section.options[0].options %}
+        {% for option in section.options %}
+          {{ checkboxTreeDetail(option, index + (loop.index | string)) }}
+        {% endfor %}
+      {% else %}
+        {{ checkboxTreeCheckboxes(section, index) }}
+      {% endif %}
+    </div>
+  </details>
+{% endmacro %}
+
 <div class="govuk-form-group {%- if errorMessage %} govuk-form-group--error{% endif %}">
   {% call govukFieldset({
     "legend": {
@@ -22,7 +70,8 @@
       'data-module': 'dm-question-checkbox-tree',
       'aria-describedby': "input-" + name if errorMessage,
       'data-item-name-singular': params.question.item_name.singular if params.question.item_name else "category",
-      'data-item-name-plural': params.question.item_name.plural if params.question.item_name else "categories"
+      'data-item-name-plural': params.question.item_name.plural if params.question.item_name else "categories",
+      'data-tier-restriction': params.question.tier_restriction
     }
   }) %}
     {% if params.question.hint or params.question.question_advice %}
@@ -52,61 +101,11 @@
       </div>
       <div class="dm-checkbox-tree__options govuk-grid-column-two-thirds">
         {% if params.question.options[0].options %}
-          {% set accordionItems = [] %}
-
-          {% for option in params.question.options %}
-            {% set checkboxItems = [] %}
-
-            {% for label in option.options %}
-              {% set value = label.value if label.value else label.label %}
-              {% set _checkboxItems = checkboxItems.append({
-                "text": label.label,
-                "value": value,
-                "checked": value in values
-              }) %}
-            {% endfor %}
-
-            {% set summaryHtml %}
-              {{ option.options | length }} {{ params.question.item_name.plural if params.question.item_name else "categories" }}<span class="dm-checkbox-tree__options-number-selected"></span>
-            {% endset %}
-
-            {% set _accordionItems = accordionItems.append({
-              "heading": {
-                "text": option.label
-              },
-              "summary": {
-                "html": summaryHtml
-              },
-              "content": {
-                "html": govukCheckboxes({
-                  "name": name,
-                  "idPrefix": "input-" + name + '-' + loop.index | string,
-                  "items": checkboxItems
-                })
-              }
-            }) %}
+          {% for section in params.question.options %}
+            {{ checkboxTreeDetail(section, loop.index | string) }}
           {% endfor %}
-
-          {{ govukAccordion({
-            "id": "accordion-" + name,
-            "items": accordionItems
-          }) }}
         {% else %}
-          {% set checkboxItems = []%}
-
-          {% for option in params.question.options %}
-            {% set _checkboxItems = checkboxItems.append({
-              "text": option.label,
-              "value": option.label,
-              "checked": option.label in values
-            }) %}
-          {% endfor %}
-
-          {{ govukCheckboxes({
-            "name": name,
-            "idPrefix": "input-" + name,
-            "items": checkboxItems
-          }) }}
+          {{ checkboxTreeCheckboxes(params.question, '0') }}
         {% endif %}
       </div>
     </div>

ccs_digitalmarketplace_frontend_jinja-4.10.1/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.9.2 → ccs_digitalmarketplace_frontend_jinja-4.10.1}/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.16.1',
+  'mypy==1.17.0',
   'pytest==8.4.1',
   'lxml==6.0.0',
   'xmldiff==2.7.0',

ccs_digitalmarketplace_frontend_jinja-4.9.2/digitalmarketplace_frontend_jinja/__init__.py

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

ccs_digitalmarketplace_frontend_jinja-4.9.2/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 %}