ccs-digitalmarketplace-frontend-jinja 4.12.1__tar.gz → 4.13.1__tar.gz

{ccs_digitalmarketplace_frontend_jinja-4.12.1/ccs_digitalmarketplace_frontend_jinja.egg-info → ccs_digitalmarketplace_frontend_jinja-4.13.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ccs-digitalmarketplace-frontend-jinja
-Version: 4.12.1
+Version: 4.13.1
 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.13.1](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.13.1) | [3.13.1](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.13.1) |
+| [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) |

{ccs_digitalmarketplace_frontend_jinja-4.12.1 → ccs_digitalmarketplace_frontend_jinja-4.13.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.13.1](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.13.1) | [3.13.1](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.13.1) |
+| [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) |

{ccs_digitalmarketplace_frontend_jinja-4.12.1 → ccs_digitalmarketplace_frontend_jinja-4.13.1/ccs_digitalmarketplace_frontend_jinja.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ccs-digitalmarketplace-frontend-jinja
-Version: 4.12.1
+Version: 4.13.1
 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.13.1](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-frontend-jinja/releases/tag/4.13.1) | [3.13.1](https://github.com/Crown-Commercial-Service/ccs-digitalmarketplace-govuk-frontend/releases/tag/v3.13.1) |
+| [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) |

{ccs_digitalmarketplace_frontend_jinja-4.12.1 → ccs_digitalmarketplace_frontend_jinja-4.13.1}/ccs_digitalmarketplace_frontend_jinja.egg-info/SOURCES.txt

@@ -32,6 +32,7 @@ digitalmarketplace_frontend_jinja/templates/components/question-checkbox-tree-la
 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
+digitalmarketplace_frontend_jinja/templates/components/question-formula/macro.html
 digitalmarketplace_frontend_jinja/templates/components/question-hidden/macro.html
 digitalmarketplace_frontend_jinja/templates/components/question-list/macro.html
 digitalmarketplace_frontend_jinja/templates/components/question-list-multiquestion/macro.html
@@ -51,6 +52,7 @@ digitalmarketplace_frontend_jinja/templates/components/select-country-from-form/
 digitalmarketplace_frontend_jinja/templates/components/summary-content/macro.html
 digitalmarketplace_frontend_jinja/templates/components/summary-content-boolean/macro.html
 digitalmarketplace_frontend_jinja/templates/components/summary-content-checkbox-tree/macro.html
+digitalmarketplace_frontend_jinja/templates/components/summary-content-formula/macro.html
 digitalmarketplace_frontend_jinja/templates/components/summary-content-list/macro.html
 digitalmarketplace_frontend_jinja/templates/components/summary-content-list-multiquestion/macro.html
 digitalmarketplace_frontend_jinja/templates/components/summary-content-multiquestion/macro.html

ccs_digitalmarketplace_frontend_jinja-4.13.1/digitalmarketplace_frontend_jinja/__init__.py

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

{ccs_digitalmarketplace_frontend_jinja-4.12.1 → ccs_digitalmarketplace_frontend_jinja-4.13.1}/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>
 

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

{ccs_digitalmarketplace_frontend_jinja-4.12.1 → ccs_digitalmarketplace_frontend_jinja-4.13.1}/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,

{ccs_digitalmarketplace_frontend_jinja-4.12.1 → ccs_digitalmarketplace_frontend_jinja-4.13.1}/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

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

@@ -0,0 +1,47 @@
+{% macro digitalmarketplaceSummaryContentFormula(params) %}
+{%- from "govuk_frontend_jinja/components/summary-list/macro.html" import govukSummaryList -%}
+
+{%- if params.value -%}
+  {%- set summaryListRows = [] -%}
+
+  {%- for question in params.value %}
+    {%- if question.operation and question.operation_position == "before" -%}
+      {%- set _summaryListRows = summaryListRows.append({
+        "key": {
+          "text": question.operation
+        },
+        "value": {
+          "text": question.operation
+        }
+      }) -%}
+    {%- endif -%}
+
+    {%- set _summaryListRows = summaryListRows.append({
+      "key": {
+        "text": question.name if question.name else question.question
+      },
+      "value": {
+        'text': question.value
+      }
+    }) -%}
+
+    {%- if question.operation and question.operation_position == "after" -%}
+      {%- set _summaryListRows = summaryListRows.append({
+        "key": {
+          "text": question.operation
+        },
+        "value": {
+          "text": question.operation
+        }
+      }) -%}
+    {%- endif -%}
+  {%- endfor -%}
+
+  <hr class="govuk-section-break govuk-section-break--visible">
+  {{ govukSummaryList({
+    "rows": summaryListRows,
+    "classes": 'dm-summary-content-formula'
+  }) }}
+  <hr class="govuk-section-break govuk-section-break--visible">
+{%- endif -%}
+{% endmacro %}

ccs_digitalmarketplace_frontend_jinja-4.12.1/digitalmarketplace_frontend_jinja/__init__.py

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