ccs-digitalmarketplace-frontend-jinja 4.12.0__py3-none-any.whl → 4.13.0__py3-none-any.whl

{ccs_digitalmarketplace_frontend_jinja-4.12.0.dist-info → ccs_digitalmarketplace_frontend_jinja-4.13.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ccs-digitalmarketplace-frontend-jinja
-Version: 4.12.0
+Version: 4.13.0
 Summary: Jinja templates for Digital Marketplace apps.
 Author: CCS Developers
 Project-URL: Homepage, https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja
@@ -17,9 +17,9 @@ Provides-Extra: dev
 Requires-Dist: flake8==7.3.0; extra == "dev"
 Requires-Dist: mypy==1.17.1; extra == "dev"
 Requires-Dist: pytest==8.4.1; extra == "dev"
-Requires-Dist: lxml==6.0.0; extra == "dev"
+Requires-Dist: lxml==6.0.1; extra == "dev"
 Requires-Dist: xmldiff==2.7.0; extra == "dev"
-Requires-Dist: flask==3.1.1; extra == "dev"
+Requires-Dist: flask==3.1.2; extra == "dev"
 Requires-Dist: pre-commit==4.3.0; extra == "dev"
 Dynamic: license-file
 
@@ -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.13.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.13.0) | [3.13.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.13.0) |
+| [4.12.1](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.12.1) | [3.12.1](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.12.1) |
 | [4.12.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.12.0) | [3.12.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.12.0) |
 | [4.11.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.11.0) | [3.11.0](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.11.0) |
 | [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) |

{ccs_digitalmarketplace_frontend_jinja-4.12.0.dist-info → ccs_digitalmarketplace_frontend_jinja-4.13.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
-ccs_digitalmarketplace_frontend_jinja-4.12.0.dist-info/licenses/LICENCE,sha256=GbPuM26UomDfs5sMy6udIVXYC8grPSN7bSkO29-F5hI,1110
-digitalmarketplace_frontend_jinja/__init__.py,sha256=d5iupHdSPCeHI_OAN7eyyB4beUD228iuK9KYvUDuS0o,23
+ccs_digitalmarketplace_frontend_jinja-4.13.0.dist-info/licenses/LICENCE,sha256=GbPuM26UomDfs5sMy6udIVXYC8grPSN7bSkO29-F5hI,1110
+digitalmarketplace_frontend_jinja/__init__.py,sha256=QO8ZboaP90aSi9yfoACjNifzw5tx_SZVJRs5EzV-ZtA,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
@@ -16,7 +16,7 @@ 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=MY8f4PTxEBb7ifBx-kurXrLivHW_RN-UpcojJdAjHLk,3985
+digitalmarketplace_frontend_jinja/templates/components/question/macro.html,sha256=jaEQDkZwuRYpzDOzY2r9pGm87U7hZibW8D_RGp-ybM0,4204
 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=MV2LC7DwPq_GWf0kG1x3YkVeZTuNCFDfzBQThuULpIQ,4729
@@ -24,14 +24,15 @@ digitalmarketplace_frontend_jinja/templates/components/question-checkbox-tree-la
 digitalmarketplace_frontend_jinja/templates/components/question-checkboxes/macro.html,sha256=ZaffviKInxgaNts-Cy8j7Dd2sduOO0_ZY_ftAyozqEw,2640
 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-formula/macro.html,sha256=90IwmoQWDZhRI8fJvlvAUyv0OcgEiioD71nkk6E88hU,4843
 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=D_cdzICRGV8C2qZ5VO8kMN2TB16rGUhbn6F6GPYrOkk,4239
+digitalmarketplace_frontend_jinja/templates/components/question-list-multiquestion-client-side/macro.html,sha256=QZ1UglvJ4Z717IfIZK_0ufuPH00CGgf2bij40RljFrY,4032
 digitalmarketplace_frontend_jinja/templates/components/question-list-multiquestion-server-side/macro.html,sha256=hTxXFdhESA1ieINtr5GptwouN2Pn9_tGkY0hYPYer_8,6981
 digitalmarketplace_frontend_jinja/templates/components/question-money/macro.html,sha256=8H0EIKluzAJ0tAQFVZAlEf4imMMJohp1N7WvQAvTGR0,1472
 digitalmarketplace_frontend_jinja/templates/components/question-multiquestion/macro.html,sha256=LbKMvOBaK_gadlLUUVw0Z_SCeUV9tUkxCqGyjndGrhw,1073
-digitalmarketplace_frontend_jinja/templates/components/question-number/macro.html,sha256=37n9fGhkisxlJKpPBeltA28YPoTgfjeZqZN84KHs4Zw,1657
+digitalmarketplace_frontend_jinja/templates/components/question-number/macro.html,sha256=ND-jSzLChbFix4EJby6h9LSJJBMWkuHtnsLX_whnyFM,1861
 digitalmarketplace_frontend_jinja/templates/components/question-pricing/macro.html,sha256=8ofkZwM_2M8rDWcGzUiqkeMMn2kOKZrH-gRevfq5nlI,6559
 digitalmarketplace_frontend_jinja/templates/components/question-radios/macro.html,sha256=iAoeG4ImkV6n5-_ilVEJ8pDZb6eojDRJK-QldXGXkNU,3028
 digitalmarketplace_frontend_jinja/templates/components/question-select/macro.html,sha256=HUSQiYWv9jMRkV4FdiyVojkGSns_dKoi_FUj9d5w3u0,2031
@@ -40,9 +41,10 @@ digitalmarketplace_frontend_jinja/templates/components/question-upload/macro.htm
 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=w2__doR4tBr7njI7aM-Q-EPLG9TNGiRVIBtM8wV_UE0,2778
+digitalmarketplace_frontend_jinja/templates/components/summary-content/macro.html,sha256=eOqXKvIuehanbZ-pLooMQdotLRYncwKAhGWUHhKLfTs,3037
 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=IPJBi671LhV8cjP_MtfTsQYHytitaiJ0-9uS-6nWkhg,1013
+digitalmarketplace_frontend_jinja/templates/components/summary-content-formula/macro.html,sha256=Sa-H2Xu4eWQeQYo7JTfxshcEaeKTc8fFoj6WiFoW_ow,1081
 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 +62,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.12.0.dist-info/METADATA,sha256=LVpwQLSKlrrWtdmxBGueIgTHqrGjDDVcXi-39SMI_IQ,17121
-ccs_digitalmarketplace_frontend_jinja-4.12.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ccs_digitalmarketplace_frontend_jinja-4.12.0.dist-info/top_level.txt,sha256=MeEUNXXhcYp_c2URA_Npkpxj50E3hc3Eir0PWJjNIrw,34
-ccs_digitalmarketplace_frontend_jinja-4.12.0.dist-info/RECORD,,
+ccs_digitalmarketplace_frontend_jinja-4.13.0.dist-info/METADATA,sha256=nXzWIroSik0Vzs_Vip7x6DCcGDxbLKKswoNZN3d3z2M,17583
+ccs_digitalmarketplace_frontend_jinja-4.13.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ccs_digitalmarketplace_frontend_jinja-4.13.0.dist-info/top_level.txt,sha256=MeEUNXXhcYp_c2URA_Npkpxj50E3hc3Eir0PWJjNIrw,34
+ccs_digitalmarketplace_frontend_jinja-4.13.0.dist-info/RECORD,,

digitalmarketplace_frontend_jinja/__init__.py

@@ -1 +1 @@
-__version__ = '4.12.0'
+__version__ = '4.13.0'

digitalmarketplace_frontend_jinja/templates/components/question/macro.html

@@ -15,6 +15,7 @@
 {%- from "digitalmarketplace_frontend_jinja/components/question-select/macro.html" import digitalmarketplaceQuestionSelect -%}
 {%- from "digitalmarketplace_frontend_jinja/components/question-multiquestion/macro.html" import digitalmarketplaceQuestionMultiquestion -%}
 {%- from "digitalmarketplace_frontend_jinja/components/question-list-multiquestion/macro.html" import digitalmarketplaceQuestionListMultiquestion -%}
+{%- from "digitalmarketplace_frontend_jinja/components/question-formula/macro.html" import digitalmarketplaceQuestionFormula -%}
 
 <div
   class="question {% if params.question.hidden %}js-hidden dm-question__related-information" aria-hidden="false{% endif %}"
@@ -54,6 +55,8 @@
     {{ digitalmarketplaceQuestionMultiquestion(params) }}
   {% elif params.type == 'list_multiquestion' %}
     {{ digitalmarketplaceQuestionListMultiquestion(params) }}
+  {% elif params.type == 'formula' %}
+    {{ digitalmarketplaceQuestionFormula(params) }}
   {% endif %}
 </div>
 

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

@@ -0,0 +1,102 @@
+{% macro digitalmarketplaceQuestionFormula(params) %}
+{%- from "govuk_frontend_jinja/components/fieldset/macro.html" import govukFieldset -%}
+{%- from "govuk_frontend_jinja/components/label/macro.html" import govukLabel -%}
+{%- from "govuk_frontend_jinja/components/hint/macro.html" import govukHint -%}
+{%- from "govuk_frontend_jinja/components/error-message/macro.html" import govukErrorMessage -%}
+{%- from "digitalmarketplace_frontend_jinja/components/question-format-hint/macro.html" import digitalmarketplaceQuestionFormatHint -%}
+
+{%- if params.question.questions -%}
+  {% call govukFieldset({
+    "legend": {
+      "text": params.question.question,
+      "classes": 'govuk-fieldset__legend--m'
+    }
+  }) %}
+    {%- if params.question.question_advice -%}
+      <div class="govuk-body">
+        {{ params.question.question_advice | safe }}
+      </div>
+    {%- endif -%}
+
+    <table class="govuk-table dm-question-formula">
+      <thead class="govuk-table__head">
+        <tr class="govuk-table__row">
+          <th scope="col" class="govuk-table__header govuk-!-width-one-half"><span class="govuk-visually-hidden">Question</span></th>
+          <th scope="col" class="govuk-table__header govuk-!-width-one-half"><span class="govuk-visually-hidden">Answer</span></th>
+        </tr>
+      </thead>
+      <tbody class="govuk-table__body">
+        {%- for question in params.question.questions -%}
+          {%- if question.operation and question.operation_position == "before" -%}
+            <tr class="govuk-table__row">
+              <td class="govuk-table__cell" colspan="2"><strong class="govuk-!-font-size-27">{{ question.operation }}</strong></td>
+            </tr>
+          {%- endif -%}
+
+          {%- if question.type == 'display' -%}
+            <tr class="govuk-table__row">
+              <td class="govuk-table__cell">{{ question.question }}</td>
+              <td class="govuk-table__cell">{{ question.value }}</td>
+            </tr>
+          {%- elif question.type == 'textbox_large' -%}
+            {% set name = question.id %}
+            {% set id =  "input-" + name %}
+            {% set questionText = question.question %}
+            {% set value = params.data[name] if params.data and params.data[name] %}
+
+            {% set describedBy = id + '-info' %}
+
+            <tr class="govuk-table__row govuk-character-count" data-module="govuk-character-count" data-maxwords="{{ (question.max_length_in_words | string) }}">
+              <td class="govuk-table__cell{% if params.errors and params.errors[name] %} dm-question-formula--error{% endif %}">
+                {{ govukLabel({
+                  "html": questionText,
+                  "classes": "govuk-label--s",
+                  "for": id
+                }) | trim | indent(2) }}
+                {% if question.hint or question.question_advice %}
+                  {% set hintId = id + '-hint' %}
+                  {% set describedBy = describedBy + ' ' + hintId %}
+                  {{ govukHint({
+                    "id": hintId,
+                    "html": digitalmarketplaceQuestionFormatHint(question)
+                  }) | trim | indent(2) }}
+                {% endif %}
+                {% if params.errors and params.errors[name] %}
+                  {% set errorId = id + '-error' %}
+                  {% set rowQuestionClasses = "dm-question-formula--error "%}
+                  {% set describedBy = describedBy + ' ' + errorId %}
+                  {% set errorMessage = params.errors[name]["message"] %}
+                  {{ govukErrorMessage({
+                    "id": errorId,
+                    "text": errorMessage
+                  }) | trim | indent(2) }}
+                {% endif %}
+              </td>
+              <td class="govuk-table__cell">
+                <textarea
+                  class="govuk-textarea {%- if errorMessage %} govuk-textarea--error{% endif %} govuk-js-character-count"
+                  id="{{ id }}"
+                  name="{{ name }}"
+                  rows="3"
+                  {%- if describedBy %} aria-describedby="{{ describedBy }}"{% endif %}
+                >{{ value }}</textarea>
+                {{ govukHint({
+                  "text": 'You can enter up to ' + (question.max_length_in_words | string) + ' words',
+                  "id": id + '-info',
+                  "classes": 'govuk-character-count__message'
+                }) | trim }}
+              </td>
+            </tr>
+          {% endif %}
+
+          {%- if question.operation and question.operation_position == "after" -%}
+            <tr class="govuk-table__row">
+              <td class="govuk-table__cell" colspan="2"><strong class="govuk-!-font-size-27">{{ question.operation }}</strong></td>
+            </tr>
+          {%- endif -%}
+        {%- endfor -%}
+      </tbody>
+    </table>
+  {% endcall %}
+{%- endif %}
+{% endmacro %}

digitalmarketplace_frontend_jinja/templates/components/question-list-multiquestion-client-side/macro.html

@@ -50,12 +50,6 @@
                 "classes": 'govuk-fieldset__legend--m'
               }
             }) %}
-              {% if multi_question.question_advice %}
-                <div class="govuk-body">
-                  {{ multi_question.question_advice | safe }}
-                </div>
-              {% endif %}
-
               {% for question in multi_question.questions %}
                 {% set index = loop.index - 1 %}
                 {% if index % column_width_to_number_for_wrap[column_width] == 0 %}

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

@@ -1,5 +1,6 @@
 {% macro digitalmarketplaceQuestionNumber(params) %}
 {%- from "govuk_frontend_jinja/components/input/macro.html" import govukInput -%}
+{%- 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 %}
@@ -39,8 +40,8 @@
     "classes": formGroupClasses
   },
   "hint": {
-    "html": params.question.hint
-  } if params.question.hint,
+    "html": digitalmarketplaceQuestionFormatHint(params.question)
+  } if params.question.hint or params.question.question_advice,
   "value": params.data[name] if params.data,
   "errorMessage": errorMessage if errorMessage,
   "prefix": prefix if prefix,

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

@@ -9,6 +9,7 @@
 {%- from "digitalmarketplace_frontend_jinja/components/summary-content-checkbox-tree/macro.html" import digitalmarketplaceSummaryContentCheckboxTree -%}
 {%- 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 -%}
+{%- from "digitalmarketplace_frontend_jinja/components/summary-content-formula/macro.html" import digitalmarketplaceSummaryContentFormula -%}
 
 {% if params.type == 'list' or params.type == 'checkboxes'%}
   {{ digitalmarketplaceSummaryContentList({
@@ -46,6 +47,10 @@
   {{ digitalmarketplaceSummaryContentListMultiquestion({
     'value': params.value
   }) }}
+{% elif params.type == 'formula' %}
+  {{ digitalmarketplaceSummaryContentFormula({
+    'value': params.value
+  }) }}
 {% else %}
   {{ digitalmarketplaceSummaryContentText({
     "value": params.value

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

@@ -0,0 +1,29 @@
+{% macro digitalmarketplaceSummaryContentFormula(params) %}
+{%- from "govuk_frontend_jinja/components/table/macro.html" import govukTable -%}
+
+{%- if params.value -%}
+  {%- set tableHead = [] -%}
+  {%- set tableRow = [] -%}
+
+  {%- for question in params.value %}
+    {%- if question.operation and question.operation_position == "before" -%}
+      {%- set _tableHead = tableHead.append({ "text": question.operation }) -%}
+      {%- set _tableRow = tableRow.append({ "text": question.operation }) -%}
+    {%- endif -%}
+
+    {%- set _tableHead = tableHead.append({ "text": question.name }) -%}
+    {%- set _tableRow = tableRow.append({ "text": question.value }) -%}
+
+    {%- if question.operation and question.operation_position == "after" -%}
+      {%- set _tableHead = tableHead.append({ "text": question.operation }) -%}
+      {%- set _tableRow = tableRow.append({ "text": question.operation }) -%}
+    {%- endif -%}
+  {%- endfor -%}
+
+  {{ govukTable({
+    "head": tableHead,
+    "rows": [tableRow],
+    "classes": 'dm-summary-content-formula'
+  }) }}
+{%- endif -%}
+{% endmacro %}