ccs-digitalmarketplace-frontend-jinja 4.5.0__tar.gz → 4.7.0__tar.gz

{ccs_digitalmarketplace_frontend_jinja-4.5.0/ccs_digitalmarketplace_frontend_jinja.egg-info → ccs_digitalmarketplace_frontend_jinja-4.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ccs-digitalmarketplace-frontend-jinja
-Version: 4.5.0
+Version: 4.7.0
 Summary: Jinja templates for Digital Marketplace apps.
 Author: CCS Developers
 Project-URL: Homepage, https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja
@@ -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.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) |
 | [4.4.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.4.0) | [3.4.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.4.0) |
 | [4.3.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.3.0) | [3.3.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.3.0) |

{ccs_digitalmarketplace_frontend_jinja-4.5.0 → ccs_digitalmarketplace_frontend_jinja-4.7.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.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) |
 | [4.4.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.4.0) | [3.4.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.4.0) |
 | [4.3.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.3.0) | [3.3.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.3.0) |

{ccs_digitalmarketplace_frontend_jinja-4.5.0 → ccs_digitalmarketplace_frontend_jinja-4.7.0/ccs_digitalmarketplace_frontend_jinja.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ccs-digitalmarketplace-frontend-jinja
-Version: 4.5.0
+Version: 4.7.0
 Summary: Jinja templates for Digital Marketplace apps.
 Author: CCS Developers
 Project-URL: Homepage, https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja
@@ -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.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) |
 | [4.4.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.4.0) | [3.4.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.4.0) |
 | [4.3.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.3.0) | [3.3.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.3.0) |

ccs_digitalmarketplace_frontend_jinja-4.7.0/digitalmarketplace_frontend_jinja/__init__.py

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

{ccs_digitalmarketplace_frontend_jinja-4.5.0 → ccs_digitalmarketplace_frontend_jinja-4.7.0}/digitalmarketplace_frontend_jinja/templates/components/question-checkbox-tree/macro.html

@@ -1,8 +1,10 @@
 {% macro digitalmarketplaceQuestionCheckboxTree(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 %}
@@ -18,9 +20,17 @@
     "classes": 'dm-checkbox-tree',
     "attributes": {
       'data-module': 'dm-question-checkbox-tree',
-      'aria-describedby': "input-" + name if errorMessage
+      '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"
     }
   }) %}
+    {% if params.question.hint or params.question.question_advice %}
+      {{ govukHint({
+        "html": digitalmarketplaceQuestionFormatHint(params.question)
+      }) }}
+    {% endif %}
+
     {% if errorMessage %}
       {{ govukErrorMessage({
         "text": errorMessage["message"],
@@ -30,9 +40,11 @@
 
     <div class="govuk-grid-row">
       <div class="dm-checkbox-tree__summary govuk-grid-column-one-third">
-        <p class="govuk-body">
-          You can choose up to {{ params.question.number_of_items }} categories.
-        </p>
+        {% if params.question.number_of_items %}
+          <p class="govuk-body">
+            You can choose up to {{ params.question.number_of_items }} {{ params.question.item_name.plural if params.question.item_name else "categories" }}.
+          </p>
+        {% endif %}
         <p class="dm-checkbox-tree__summary-total govuk-body">
           <strong class="dm-checkbox-tree__summary-total-selected"></strong>
           <span class="dm-checkbox-tree__summary-total-selected-text"></span>
@@ -54,7 +66,7 @@
             {% endfor %}
 
             {% set summaryHtml %}
-              {{ option.options | length }} categories<span class="dm-checkbox-tree__options-number-selected"></span>
+              {{ 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({

{ccs_digitalmarketplace_frontend_jinja-4.5.0 → ccs_digitalmarketplace_frontend_jinja-4.7.0}/digitalmarketplace_frontend_jinja/templates/components/summary-content/macro.html

@@ -10,13 +10,7 @@
 {%- from "digitalmarketplace_frontend_jinja/components/summary-content-multiquestion/macro.html" import digitalmarketplaceSummaryContentMultiquestion -%}
 {%- from "digitalmarketplace_frontend_jinja/components/summary-content-list-multiquestion/macro.html" import digitalmarketplaceSummaryContentListMultiquestion -%}
 
-{% set textOptions = ['text', 'text_bold', 'textbox', 'textbox_large', 'pricing', 'date', 'money'] %}
-
-{% if params.type in textOptions %}
-  {{ digitalmarketplaceSummaryContentText({
-    "value": params.value
-  }) }}
-{% elif params.type == 'list' or params.type == 'checkboxes'%}
+{% if params.type == 'list' or params.type == 'checkboxes'%}
   {{ digitalmarketplaceSummaryContentList({
     "value": params.value
   }) }}
@@ -52,5 +46,9 @@
   {{ digitalmarketplaceSummaryContentListMultiquestion({
     'value': params.value
   }) }}
+{% else %}
+  {{ digitalmarketplaceSummaryContentText({
+    "value": params.value
+  }) }}
 {% endif %}
 {% endmacro %}

ccs_digitalmarketplace_frontend_jinja-4.5.0/digitalmarketplace_frontend_jinja/__init__.py

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