ccs-digitalmarketplace-frontend-jinja 4.8.0__tar.gz → 4.9.1__tar.gz

{ccs_digitalmarketplace_frontend_jinja-4.8.0/ccs_digitalmarketplace_frontend_jinja.egg-info → ccs_digitalmarketplace_frontend_jinja-4.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ccs-digitalmarketplace-frontend-jinja
-Version: 4.8.0
+Version: 4.9.1
 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.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) |
 | [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) |

{ccs_digitalmarketplace_frontend_jinja-4.8.0 → ccs_digitalmarketplace_frontend_jinja-4.9.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.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) |
 | [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) |

{ccs_digitalmarketplace_frontend_jinja-4.8.0 → ccs_digitalmarketplace_frontend_jinja-4.9.1/ccs_digitalmarketplace_frontend_jinja.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ccs-digitalmarketplace-frontend-jinja
-Version: 4.8.0
+Version: 4.9.1
 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.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) |
 | [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) |

{ccs_digitalmarketplace_frontend_jinja-4.8.0 → ccs_digitalmarketplace_frontend_jinja-4.9.1}/ccs_digitalmarketplace_frontend_jinja.egg-info/SOURCES.txt

@@ -28,6 +28,7 @@ digitalmarketplace_frontend_jinja/templates/components/question/macro.html
 digitalmarketplace_frontend_jinja/templates/components/question-boolean/macro.html
 digitalmarketplace_frontend_jinja/templates/components/question-character-count/macro.html
 digitalmarketplace_frontend_jinja/templates/components/question-checkbox-tree/macro.html
+digitalmarketplace_frontend_jinja/templates/components/question-checkbox-tree-large/macro.html
 digitalmarketplace_frontend_jinja/templates/components/question-checkboxes/macro.html
 digitalmarketplace_frontend_jinja/templates/components/question-date/macro.html
 digitalmarketplace_frontend_jinja/templates/components/question-format-hint/macro.html

ccs_digitalmarketplace_frontend_jinja-4.9.1/ccs_digitalmarketplace_frontend_jinja.egg-info/requires.txt

@@ -0,0 +1,12 @@
+jinja2>3
+ccs-govuk-frontend-jinja<2,>=1.5
+ccs-digitalmarketplace-utils>=69.0.0
+
+[dev]
+flake8==7.3.0
+mypy==1.16.1
+pytest==8.4.1
+lxml==5.4.0
+xmldiff==2.7.0
+flask==3.1.1
+pre-commit==4.2.0

ccs_digitalmarketplace_frontend_jinja-4.9.1/digitalmarketplace_frontend_jinja/__init__.py

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

{ccs_digitalmarketplace_frontend_jinja-4.8.0 → ccs_digitalmarketplace_frontend_jinja-4.9.1}/digitalmarketplace_frontend_jinja/templates/components/header/macro.html

@@ -9,15 +9,17 @@
 
 {% if isAdmin %}
   {% set adminAppClass = 'dm-admin-header govuk-header--full-width-border' %}
+  {% set adminServiceNavigationClass = 'dm-admin-service-navigation' %}
   {% set productName = 'Digital Marketplace Admin' %}
 {% else %}
   {% set adminAppClass = 'govuk-header--full-width-border' %}
+  {% set adminServiceNavigationClass = '' %}
   {% set productName = 'Digital Marketplace' %}
 {% endif %}
 
 {% if user_logged_in %}
   {% if users_role in['buyer', 'supplier'] %}
-    {% set headerNavigation = [
+    {% set serviceNavigation = [
       {
         'text': 'Guidance',
         'href': 'https://www.gov.uk/guidance/buying-and-selling-on-the-digital-marketplace'
@@ -35,7 +37,7 @@
     ]%}
   {% else %}
     {# Any other role #}
-    {% set headerNavigation = [
+    {% set serviceNavigation = [
       {
         'text': 'Guidance',
         'href': 'https://www.gov.uk/guidance/buying-and-selling-on-the-digital-marketplace'
@@ -48,7 +50,7 @@
     ]%}
   {% endif %}
 {% else %}
-  {% set headerNavigation = [
+  {% set serviceNavigation = [
     {
       'text': 'Guidance',
       'href': 'https://www.gov.uk/guidance/buying-and-selling-on-the-digital-marketplace'
@@ -65,8 +67,9 @@
   'classes': adminAppClass
 }) }}
 {{ govukServiceNavigation({
-  'navigation': headerNavigation,
+  'navigation': serviceNavigation,
   'serviceName': productName,
-  'serviceUrl': '/'
+  'serviceUrl': '/',
+  'classes': adminServiceNavigationClass
 }) }}
 {% endmacro %}

{ccs_digitalmarketplace_frontend_jinja-4.8.0 → ccs_digitalmarketplace_frontend_jinja-4.9.1}/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' %}

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

{ccs_digitalmarketplace_frontend_jinja-4.8.0 → ccs_digitalmarketplace_frontend_jinja-4.9.1}/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) }}

{ccs_digitalmarketplace_frontend_jinja-4.8.0 → ccs_digitalmarketplace_frontend_jinja-4.9.1}/digitalmarketplace_frontend_jinja/templates/components/question-upload/macro.html

@@ -15,23 +15,23 @@
       <ul class="dm-document-upload-list">
         <li class="dm-document-list-item">
           <div class="govuk-grid-row">
-            <div class="govuk-grid-column-two-thirds">
+            <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>
-            <div class="govuk-grid-column-one-third">
-                {% if params.question.optional %}
-                    {{ govukButton({
-                      "text": "Remove upload",
-                      "name": "remove-upload",
-                      "value": name,
-                      "classes": "govuk-button--secondary",
-                      "preventDoubleClick": true
-                    }) }}
-                {% endif %}
-            </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>

{ccs_digitalmarketplace_frontend_jinja-4.8.0 → ccs_digitalmarketplace_frontend_jinja-4.9.1}/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
   }) }}

{ccs_digitalmarketplace_frontend_jinja-4.8.0 → ccs_digitalmarketplace_frontend_jinja-4.9.1}/pyproject.toml

@@ -26,13 +26,13 @@ Changelog = "https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-
 
 [project.optional-dependencies]
 dev = [
-  'flake8',
-  'mypy',
-  'pytest',
-  'lxml',
-  'xmldiff',
-  'flask',
-  'pre-commit',
+  'flake8==7.3.0',
+  'mypy==1.16.1',
+  'pytest==8.4.1',
+  'lxml==5.4.0',
+  'xmldiff==2.7.0',
+  'flask==3.1.1',
+  'pre-commit==4.2.0',
 ]
 
 [tool.setuptools.dynamic]

ccs_digitalmarketplace_frontend_jinja-4.8.0/ccs_digitalmarketplace_frontend_jinja.egg-info/requires.txt

@@ -1,12 +0,0 @@
-jinja2>3
-ccs-govuk-frontend-jinja<2,>=1.5
-ccs-digitalmarketplace-utils>=69.0.0
-
-[dev]
-flake8
-mypy
-pytest
-lxml
-xmldiff
-flask
-pre-commit

ccs_digitalmarketplace_frontend_jinja-4.8.0/digitalmarketplace_frontend_jinja/__init__.py

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