ccs-digitalmarketplace-frontend-jinja 4.7.0__py3-none-any.whl → 4.9.0__py3-none-any.whl

{ccs_digitalmarketplace_frontend_jinja-4.7.0.dist-info → ccs_digitalmarketplace_frontend_jinja-4.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ccs-digitalmarketplace-frontend-jinja
-Version: 4.7.0
+Version: 4.9.0
 Summary: Jinja templates for Digital Marketplace apps.
 Author: CCS Developers
 Project-URL: Homepage, https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja
@@ -14,13 +14,13 @@ Requires-Dist: jinja2>3
 Requires-Dist: ccs-govuk-frontend-jinja<2,>=1.5
 Requires-Dist: ccs-digitalmarketplace-utils>=69.0.0
 Provides-Extra: dev
-Requires-Dist: flake8; extra == "dev"
-Requires-Dist: mypy; extra == "dev"
-Requires-Dist: pytest; extra == "dev"
-Requires-Dist: lxml; extra == "dev"
-Requires-Dist: xmldiff; extra == "dev"
-Requires-Dist: flask; extra == "dev"
-Requires-Dist: pre-commit; extra == "dev"
+Requires-Dist: flake8==7.3.0; extra == "dev"
+Requires-Dist: mypy==1.16.1; extra == "dev"
+Requires-Dist: pytest==8.4.1; extra == "dev"
+Requires-Dist: lxml==5.4.0; extra == "dev"
+Requires-Dist: xmldiff==2.7.0; extra == "dev"
+Requires-Dist: flask==3.1.1; extra == "dev"
+Requires-Dist: pre-commit==4.2.0; extra == "dev"
 Dynamic: license-file
 
 Digital Marketplace Jinja Macros
@@ -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.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) |
+| [4.8.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.8.0) | [3.8.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.8.0) |
 | [4.7.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.7.0) | [3.7.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.7.0) |
 | [4.6.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.6.0) | [3.6.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.6.0) |
 | [4.5.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.5.0) | [3.5.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.5.0) |

{ccs_digitalmarketplace_frontend_jinja-4.7.0.dist-info → ccs_digitalmarketplace_frontend_jinja-4.9.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
-ccs_digitalmarketplace_frontend_jinja-4.7.0.dist-info/licenses/LICENCE,sha256=GbPuM26UomDfs5sMy6udIVXYC8grPSN7bSkO29-F5hI,1110
-digitalmarketplace_frontend_jinja/__init__.py,sha256=G32d2UVGXzvKEmNGcFTp413PKWdKFkcjXSvx3r2dSeQ,22
+ccs_digitalmarketplace_frontend_jinja-4.9.0.dist-info/licenses/LICENCE,sha256=GbPuM26UomDfs5sMy6udIVXYC8grPSN7bSkO29-F5hI,1110
+digitalmarketplace_frontend_jinja/__init__.py,sha256=TGjqTJXDefd_lENnFYB6xPAor-aV9NiN2jxNvO-G1FA,22
 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
@@ -16,14 +16,15 @@ digitalmarketplace_frontend_jinja/templates/components/input-from-form/macro.htm
 digitalmarketplace_frontend_jinja/templates/components/list-input/macro.html,sha256=MW0PA2jNKFaYJQtYrcEYBVTDBbFa7NL07QCXS3ozQhE,5756
 digitalmarketplace_frontend_jinja/templates/components/option-select/macro.html,sha256=YhQXBlqjPbONv1hTlaTMbEj4SO3wf-FAbeBETYpEB7c,2134
 digitalmarketplace_frontend_jinja/templates/components/previous-next-pagination/macro.html,sha256=z3VnGXfaQvgIgR0XfCkOlC9EDA46UpKgZyTIQQx14_8,668
-digitalmarketplace_frontend_jinja/templates/components/question/macro.html,sha256=lj0D5OopaFalkNG7_wRGHahHg7dbc7ddnMb_K7uv6QM,3722
+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=-nSYoI7rmStap6rp_0QIfcYVhs8EjyLW4r1Y0UsDF7A,4593
+digitalmarketplace_frontend_jinja/templates/components/question-checkbox-tree-large/macro.html,sha256=UteO9Lz5VbDiE5TS9W5LCGHUihx010SPlDBga35ce2g,3168
 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
 digitalmarketplace_frontend_jinja/templates/components/question-format-hint/macro.html,sha256=x6xTgRJgucQ-FVzeTmHLRrD0ocKIOzzGJRIzYsNZIXw,368
-digitalmarketplace_frontend_jinja/templates/components/question-hidden/macro.html,sha256=LX4-2-Js3XKjEYEgpCdNGBxQM3ttblw2IHRzrqXHKL4,4361
+digitalmarketplace_frontend_jinja/templates/components/question-hidden/macro.html,sha256=HdvraPSzTN_x0rtoJLofB6nO3yZqpuqPTVA-4VF_RRU,4384
 digitalmarketplace_frontend_jinja/templates/components/question-list/macro.html,sha256=531t6KzHmeTBU2jNasRpIT8Yl5M-NcqLn720VQQn8YE,3981
 digitalmarketplace_frontend_jinja/templates/components/question-list-multiquestion/macro.html,sha256=oD5PLwydZ6Eg-N2aMS2sBWX9izOSU7Oeg6otMh6_qhc,682
 digitalmarketplace_frontend_jinja/templates/components/question-list-multiquestion-client-side/macro.html,sha256=E1ylDMDDfv8DA33IK3vvJWdctLGrEG1gEWT2_tQ-j1I,4156
@@ -35,11 +36,11 @@ digitalmarketplace_frontend_jinja/templates/components/question-pricing/macro.ht
 digitalmarketplace_frontend_jinja/templates/components/question-radios/macro.html,sha256=UQVf1O4OxTJoA9kLLyLiaHBhxvRSUKXpnA5EkrvLLnw,2884
 digitalmarketplace_frontend_jinja/templates/components/question-select/macro.html,sha256=HUSQiYWv9jMRkV4FdiyVojkGSns_dKoi_FUj9d5w3u0,2031
 digitalmarketplace_frontend_jinja/templates/components/question-text/macro.html,sha256=OV3z43lBdJRYSJofygrWVu3Y4VxWuQAApgebN1kM0-o,1381
-digitalmarketplace_frontend_jinja/templates/components/question-upload/macro.html,sha256=Xyl5Sg67ZsZsYSp4vIGkazcCvLF3C9rrnkKpNEykEmE,1955
+digitalmarketplace_frontend_jinja/templates/components/question-upload/macro.html,sha256=55H3I3oeCbTEHgNd3Mvpd4BJ6pAODmjYJrGACw7kgfU,2651
 digitalmarketplace_frontend_jinja/templates/components/radios-from-form/macro.html,sha256=DqXM84BLsAfLRtfjlLgKQ3-gjPGWFt0O5QdVOQiih60,1776
 digitalmarketplace_frontend_jinja/templates/components/search-box/macro.html,sha256=QHf7Log2Gp31HHCVK3ufoLvJwLDusRmZXDmZ7ME9EtA,1028
 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=I-FoGMcRMvwLx7UvuTkzRWJhu-7lQGEK7GnG_buQI3s,2738
+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-list/macro.html,sha256=whchdQS_dPCoxdjEQ1POpA_cQiN15kuaRAOoft4MNlg,625
@@ -59,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.7.0.dist-info/METADATA,sha256=vo84wwXYiSEAPfAa8hbws8LF2Yb5BR3KjhFJeaNOB4I,15238
-ccs_digitalmarketplace_frontend_jinja-4.7.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ccs_digitalmarketplace_frontend_jinja-4.7.0.dist-info/top_level.txt,sha256=MeEUNXXhcYp_c2URA_Npkpxj50E3hc3Eir0PWJjNIrw,34
-ccs_digitalmarketplace_frontend_jinja-4.7.0.dist-info/RECORD,,
+ccs_digitalmarketplace_frontend_jinja-4.9.0.dist-info/METADATA,sha256=JrSw5lFFDQ7oHJWKzSTzoBytdbtkVMPqOuow4rs8m0M,15742
+ccs_digitalmarketplace_frontend_jinja-4.9.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ccs_digitalmarketplace_frontend_jinja-4.9.0.dist-info/top_level.txt,sha256=MeEUNXXhcYp_c2URA_Npkpxj50E3hc3Eir0PWJjNIrw,34
+ccs_digitalmarketplace_frontend_jinja-4.9.0.dist-info/RECORD,,

digitalmarketplace_frontend_jinja/__init__.py

@@ -1 +1 @@
-__version__ = '4.7.0'
+__version__ = '4.9.0'

digitalmarketplace_frontend_jinja/templates/components/question/macro.html

@@ -10,6 +10,7 @@
 {%- from "digitalmarketplace_frontend_jinja/components/question-boolean/macro.html" import digitalmarketplaceQuestionBoolean -%}
 {%- from "digitalmarketplace_frontend_jinja/components/question-checkboxes/macro.html" import digitalmarketplaceQuestionCheckboxes -%}
 {%- from "digitalmarketplace_frontend_jinja/components/question-checkbox-tree/macro.html" import digitalmarketplaceQuestionCheckboxTree -%}
+{%- from "digitalmarketplace_frontend_jinja/components/question-checkbox-tree-large/macro.html" import digitalmarketplaceQuestionCheckboxTreeLarge -%}
 {%- from "digitalmarketplace_frontend_jinja/components/question-list/macro.html" import digitalmarketplaceQuestionList -%}
 {%- from "digitalmarketplace_frontend_jinja/components/question-select/macro.html" import digitalmarketplaceQuestionSelect -%}
 {%- from "digitalmarketplace_frontend_jinja/components/question-multiquestion/macro.html" import digitalmarketplaceQuestionMultiquestion -%}
@@ -43,6 +44,8 @@
     {{ digitalmarketplaceQuestionCheckboxes(params) }}
   {% elif params.type == 'checkbox_tree' %}
     {{ digitalmarketplaceQuestionCheckboxTree(params) }}
+  {% elif params.type == 'checkbox_tree_large' %}
+    {{ digitalmarketplaceQuestionCheckboxTreeLarge(params) }}
   {% elif params.type == 'list' %}
     {{ digitalmarketplaceQuestionList(params) }}
   {% elif params.type == 'select' %}

digitalmarketplace_frontend_jinja/templates/components/question-checkbox-tree-large/macro.html

@@ -0,0 +1,83 @@
+{% macro digitalmarketplaceQuestionCheckboxTreeLarge(params) %}
+{%- from "govuk_frontend_jinja/components/fieldset/macro.html" import govukFieldset -%}
+{%- from "govuk_frontend_jinja/components/checkboxes/macro.html" import govukCheckboxes -%}
+{%- 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 "digitalmarketplace_frontend_jinja/components/question-format-hint/macro.html" import digitalmarketplaceQuestionFormatHint -%}
+
+{% set name = params.question.id %}
+{% set questionText = params.question.question + " ({})".format(params.question.optional_text if params.question.optional_text else "optional") if params.question.optional else params.question.question %}
+{% set errorMessage = params.errors[name] if params.errors %}
+{% set values = params.data[name] or [] if params.data else [] %}
+
+<div class="govuk-form-group {%- if errorMessage %} govuk-form-group--error{% endif %}">
+  {% call govukFieldset({
+    "legend": {
+      "html": questionText,
+      "classes": "govuk-fieldset__legend--m"
+    },
+    "classes": 'dm-checkbox-tree-large',
+    "attributes": {
+      'aria-describedby': "input-" + name if errorMessage,
+    }
+  }) %}
+    {% if params.question.hint or params.question.question_advice %}
+      {{ govukHint({
+        "html": digitalmarketplaceQuestionFormatHint(params.question)
+      }) }}
+    {% endif %}
+
+    {% if errorMessage %}
+      {{ govukErrorMessage({
+        "text": errorMessage["message"],
+        "id": "input-" + name
+      }) }}
+    {% endif %}
+
+    <div class="govuk-grid-row">
+      <div class="dm-checkbox-tree-large__summary govuk-grid-column-full">
+        {% set accordionItems = [] %}
+
+        {% for option in params.question.options %}
+          {% set checkboxItems = [] %}
+
+          {% for label in option.options %}
+            {% set checkboxItem = {
+              "text": label.label,
+              "value": label.label,
+              "checked": label.label in values
+            } %}
+            {% if label.description %}
+              {% set _checkboxItem = checkboxItem.__setitem__("hint", { "html": label.description }) %}
+            {% endif %}
+            {% set _checkboxItems = checkboxItems.append(checkboxItem) %}
+          {% endfor %}
+
+          {% set _accordionItems = accordionItems.append({
+            "heading": {
+              "text": option.label
+            },
+            "summary": {
+              "html": option.description
+            } if option.description,
+            "content": {
+              "html": govukCheckboxes({
+                "name": name,
+                "idPrefix": "input-" + name + '-' + loop.index | string,
+                "items": checkboxItems,
+                "classes": "govuk-checkboxes--small"
+              })
+            }
+          }) %}
+        {% endfor %}
+
+        {{ govukAccordion({
+          "id": "accordion-" + name,
+          "items": accordionItems
+        }) }}
+      </div>
+    </div>
+  {% endcall %}
+</div>
+{% endmacro %}

digitalmarketplace_frontend_jinja/templates/components/question-hidden/macro.html

@@ -94,7 +94,7 @@
     {{ digitalmarketplaceQuestionPricingHidden(params) }}
   {% elif params.type == 'date' %}
     {{ digitalmarketplaceQuestionDateHidden(params) }}
-  {% elif params.type in ['checkboxes', 'checkbox_tree', 'list'] %}
+  {% elif params.type in ['checkboxes', 'checkbox_tree', 'checkbox_tree_large', 'list'] %}
     {{ digitalmarketplaceQuestionCheckboxesHidden(params) }}
   {% elif params.type == 'multiquestion' %}
     {{ digitalmarketplaceQuestionMultiquestionHidden(params) }}

digitalmarketplace_frontend_jinja/templates/components/question-upload/macro.html

@@ -1,6 +1,7 @@
 {% macro digitalmarketplaceQuestionUpload(params) %}
 {%- from "govuk_frontend_jinja/components/file-upload/macro.html" import govukFileUpload -%}
 {%- from "digitalmarketplace_frontend_jinja/components/question-format-hint/macro.html" import digitalmarketplaceQuestionFormatHint -%}
+{% from "govuk_frontend_jinja/components/button/macro.html" import govukButton %}
 
 {% set name = params.question.id %}
 {% set questionText = params.question.question + " ({})".format(params.question.optional_text if params.question.optional_text else "optional") if params.question.optional else params.question.question %}
@@ -13,10 +14,25 @@
       <input type="hidden" id="input-{{ name }}-upload" name="{{ name }}-upload" value="{{ value }}">
       <ul class="dm-document-upload-list">
         <li class="dm-document-list-item">
-          <span class="dm-document-upload-with-icon">
-            <span class="dm-document-icon"></span>
-            Document uploaded {{ value | parse_document_upload_time | datetimeformat }}
-          </span>
+          <div class="govuk-grid-row">
+            <div class="govuk-grid-column-{{ 'two-thirds' if params.question.optional else 'full' }}">
+              <div class="dm-document-upload-with-icon">
+                <span class="dm-document-icon"></span>
+                Document uploaded {{ value | parse_document_upload_time | datetimeformat }}
+              </div>
+            </div>
+            {% if params.question.optional %}
+              <div class="govuk-grid-column-one-third">
+                {{ govukButton({
+                  "text": "Remove upload",
+                  "name": "remove-upload",
+                  "value": name,
+                  "classes": "govuk-button--secondary",
+                  "preventDoubleClick": true
+                }) }}
+              </div>
+            {% endif %}
+          </div>
         </li>
       </ul>
     {% endif %}

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

@@ -34,7 +34,7 @@
   {{ digitalmarketplaceSummaryContentNumber({
     "value": params.value
   }) }}
-{% elif params.type == 'checkbox_tree' %}
+{% elif params.type == 'checkbox_tree' or params.type == 'checkbox_tree_large' %}
   {{ digitalmarketplaceSummaryContentCheckboxTree({
     "value": params.value
   }) }}