ccs-digitalmarketplace-frontend-jinja 4.9.2__py3-none-any.whl → 4.10.1__py3-none-any.whl

{ccs_digitalmarketplace_frontend_jinja-4.9.2.dist-info → ccs_digitalmarketplace_frontend_jinja-4.10.1.dist-info}/METADATA

@@ -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.dist-info → ccs_digitalmarketplace_frontend_jinja-4.10.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
-ccs_digitalmarketplace_frontend_jinja-4.9.2.dist-info/licenses/LICENCE,sha256=GbPuM26UomDfs5sMy6udIVXYC8grPSN7bSkO29-F5hI,1110
-digitalmarketplace_frontend_jinja/__init__.py,sha256=y4Ei3Es_AJyfd9oJGiUhtxfX8HtJs-wcbmr1otB2s4Y,22
+ccs_digitalmarketplace_frontend_jinja-4.10.1.dist-info/licenses/LICENCE,sha256=GbPuM26UomDfs5sMy6udIVXYC8grPSN7bSkO29-F5hI,1110
+digitalmarketplace_frontend_jinja/__init__.py,sha256=N_vHXX8wwID5CJHl5qoHMsnsZYCfNR8Rs54Pw2TEzsY,23
 digitalmarketplace_frontend_jinja/templates/components/alert/macro.html,sha256=W4hQmVTEOTSON6ypLoV3cJNgBcCYN1akxy-Y1QZH8X0,992
 digitalmarketplace_frontend_jinja/templates/components/attachment/macro.html,sha256=0Fi8QqqwmPpZ3UBOjCDiUkfSOYxMYyTlBngnPJrZ7Zo,6452
 digitalmarketplace_frontend_jinja/templates/components/banner/macro.html,sha256=AsPQydTvw-SwcgczVZmbdlGMXT0SoilvhAtKrTskpME,905
@@ -19,7 +19,7 @@ digitalmarketplace_frontend_jinja/templates/components/previous-next-pagination/
 digitalmarketplace_frontend_jinja/templates/components/question/macro.html,sha256=MY8f4PTxEBb7ifBx-kurXrLivHW_RN-UpcojJdAjHLk,3985
 digitalmarketplace_frontend_jinja/templates/components/question-boolean/macro.html,sha256=DVxnbPGYfEa_FgYwLPccvYmS2wD-PC_GI1B_fkYGHho,2878
 digitalmarketplace_frontend_jinja/templates/components/question-character-count/macro.html,sha256=YMOJiATKyLByuPq8SuPsjN4WZfpSp5PIPtKks1lGnT8,1501
-digitalmarketplace_frontend_jinja/templates/components/question-checkbox-tree/macro.html,sha256=4Q0U3R_9JqmHYL1hCvtlvTIzYf2ScY2g_wTDLyyNhg8,4657
+digitalmarketplace_frontend_jinja/templates/components/question-checkbox-tree/macro.html,sha256=MV2LC7DwPq_GWf0kG1x3YkVeZTuNCFDfzBQThuULpIQ,4729
 digitalmarketplace_frontend_jinja/templates/components/question-checkbox-tree-large/macro.html,sha256=FEZisjywePPAqwTfN4L5fHeJXWDkNcuehg6h-8BotNw,3230
 digitalmarketplace_frontend_jinja/templates/components/question-checkboxes/macro.html,sha256=LZzaZVJ8o1nkUBX4Lf_fjIoDeuxwpXnfJcYaOFYQUXY,2496
 digitalmarketplace_frontend_jinja/templates/components/question-date/macro.html,sha256=D8UUNZTKuBXoAeWKWL3SLq_IUysOBfkC7Svgl1eYHIM,1948
@@ -42,7 +42,7 @@ digitalmarketplace_frontend_jinja/templates/components/search-box/macro.html,sha
 digitalmarketplace_frontend_jinja/templates/components/select-country-from-form/macro.html,sha256=AHWNjovdZoLz5LP17l1U4XJlPirFTdVxsvUNLTWw-ik,1117
 digitalmarketplace_frontend_jinja/templates/components/summary-content/macro.html,sha256=w2__doR4tBr7njI7aM-Q-EPLG9TNGiRVIBtM8wV_UE0,2778
 digitalmarketplace_frontend_jinja/templates/components/summary-content-boolean/macro.html,sha256=JKMmIt_74HVtThFlvV6JHkmxmHKr7N1Dm9Flarbti6s,517
-digitalmarketplace_frontend_jinja/templates/components/summary-content-checkbox-tree/macro.html,sha256=yfSNtr0PIEgAbN-nxHnk3V1sJFdqLWu_q6CgJ8EWHK4,896
+digitalmarketplace_frontend_jinja/templates/components/summary-content-checkbox-tree/macro.html,sha256=IPJBi671LhV8cjP_MtfTsQYHytitaiJ0-9uS-6nWkhg,1013
 digitalmarketplace_frontend_jinja/templates/components/summary-content-list/macro.html,sha256=whchdQS_dPCoxdjEQ1POpA_cQiN15kuaRAOoft4MNlg,625
 digitalmarketplace_frontend_jinja/templates/components/summary-content-list-multiquestion/macro.html,sha256=dpvyFTnbXG45CGWmOrGkD3O8BGw5JtsuhBh3Wqh069M,715
 digitalmarketplace_frontend_jinja/templates/components/summary-content-multiquestion/macro.html,sha256=-E6z6-ttbF3l9jbjHmo4bRU3mILedhMuZjCxKwnL71U,621
@@ -60,7 +60,7 @@ digitalmarketplace_frontend_jinja/templates/errors/410.html,sha256=ub7W3MRbIPQvj
 digitalmarketplace_frontend_jinja/templates/errors/500.html,sha256=x1Lu8ATSPGGSXvjj1ZHVq-h9eBWLiUK2MxPHwqZCiDQ,408
 digitalmarketplace_frontend_jinja/templates/layouts/_custom_dimensions.html,sha256=SglUULyYlEWLWYQ7luwKONuI2BnWbOnd5MOIblKZR3E,731
 digitalmarketplace_frontend_jinja/templates/layouts/_site_verification.html,sha256=6YWaREd5cPw1u5V9zsVaCOWG_uJ9SUMNdZj9fLK2jU8,142
-ccs_digitalmarketplace_frontend_jinja-4.9.2.dist-info/METADATA,sha256=PcSHJTNb7d-bo5ItWVSE2Nu2CCbbFc6aN2GjKG6zkY0,16196
-ccs_digitalmarketplace_frontend_jinja-4.9.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ccs_digitalmarketplace_frontend_jinja-4.9.2.dist-info/top_level.txt,sha256=MeEUNXXhcYp_c2URA_Npkpxj50E3hc3Eir0PWJjNIrw,34
-ccs_digitalmarketplace_frontend_jinja-4.9.2.dist-info/RECORD,,
+ccs_digitalmarketplace_frontend_jinja-4.10.1.dist-info/METADATA,sha256=uvHDks8syd4_3RpGyUDJhh0oNU6RCwQRn48V2foG3so,16659
+ccs_digitalmarketplace_frontend_jinja-4.10.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ccs_digitalmarketplace_frontend_jinja-4.10.1.dist-info/top_level.txt,sha256=MeEUNXXhcYp_c2URA_Npkpxj50E3hc3Eir0PWJjNIrw,34
+ccs_digitalmarketplace_frontend_jinja-4.10.1.dist-info/RECORD,,

digitalmarketplace_frontend_jinja/__init__.py

@@ -1 +1 @@
-__version__ = '4.9.2'
+__version__ = '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>

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

@@ -1,26 +1,36 @@
 {% 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 %}
-    <ul class="govuk-list govuk-list--bullet govuk-body-s">
-      {% for item in params.value %}
-        <li>{{ item.label }}</li>
-      {% endfor %}
-    </ul>
+    {{ checkboxTreeList(params.value) }}
   {% 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>
+      {% for item in params.value %}
+        {{ checkboxTreeSummary(item) }}
       {% endfor %}
     </ul>
   {% endif %}