ccs-digitalmarketplace-frameworks 4.4.33 → 4.4.35

package/README.md

@@ -4,7 +4,7 @@ Digital Marketplace content
 [![npm version](https://badge.fury.io/js/ccs-digitalmarketplace-frameworks.svg)](https://badge.fury.io/js/ccs-digitalmarketplace-frameworks)
 
 YAML definitions of the Digital Marketplace’s procurement frameworks.
- 
+
 The content here is pulled in to the frontend applications to display forms, and is also used to generate the JSON
 schemas used by the API for validation (by running the `scripts/generate-validation-schemas.py` script).
 
@@ -35,7 +35,7 @@ Question keys
 * `type` type of the question input, used to find the related toolkit form template (required)
 * `name` short question name to use in summary tables instead of the full question. Also used to
   generate the URL slug for addressable questions. This field is a [TemplateField](https://github.com/alphagov/digitalmarketplace-content-loader/blob/474d9adce0f422700cbf2dfc8815a7503ab368bc/dmcontent/utils.py#L8).
-* `filter_label` for boolean questions, a text label to use for filtering services where the question was answered 'yes'. If not present `name` or `question` will be used instead.
+* `filter_label` for boolean questions, a text label to use for filtering services where the question was answered 'yes'. If not present, `name` or `question` will be used instead.
 * `slug` can be used to manually override the slug used for this question.
 * `empty_message` a message to display instead of "Answer required" if question wasn't answered
 * `hint` hint text to display after the question, eg advice about how to best format you answer. This field is a [TemplateField](https://github.com/alphagov/digitalmarketplace-content-loader/blob/474d9adce0f422700cbf2dfc8815a7503ab368bc/dmcontent/utils.py#L8).
@@ -53,7 +53,7 @@ Question keys
 * `validations` a list of validation errors related to the field. Each validation consists of:
     * `name` the error message key that should match the validation error returned by the API (required)
     * `message` text of the message that will be displayed by the frontend app (required)
-* `depends` describes the service conditions that must be met for question to be displayed. Right now, only used to list the
+* `depends` describes the service conditions that must be met for a question to be displayed. Right now, only used to list the
   lots the question applies to. Each depend rule consists of:
     * `"on"` service data key name to use for comparison (e.g. "lot" for lots)
     * `being` a list of acceptable values for the key. If service data key value matches one of the values in the `being` the
@@ -107,7 +107,7 @@ Manifest files define a tree-like structure for content.  A manifest is a list o
 Each section contains:
 
 * `name` name of the section (required). This field is a [TemplateField](https://github.com/alphagov/digitalmarketplace-content-loader/blob/474d9adce0f422700cbf2dfc8815a7503ab368bc/dmcontent/utils.py#L8).
-* `slug` can be used to manually override the slug used for this section. 
+* `slug` can be used to manually override the slug used for this section.
 * `editable` controls whether section allows updates for the questions, boolean value
 * `edit_questions` controls whether individual questions can be edited separately (only supported by `multiquestion` questions)
 * `removable` controls whether individual questions can be removed separately (only supported by `multiquestion` questions and is the same as `edit_questions` by default)
@@ -156,7 +156,7 @@ mapping from `<doc_type>_search_filters` based on this template.
 
 For each field (question) that needs to be used in (e.g. facet) filtering, there must be a corresponding
 `dmfilter_` property added to the `mappings` key. Note that if a question's `id` has been overridden (i.e. the
-`id` is no longer the same as the filename, then the _overridden_ `id` should be used here. (Compare with the manifest,
+`id` is no longer the same as the filename, so the _overridden_ `id` should be used here. (Compare with the manifest,
 where in all cases the filename should be used to specify the question.)
 
 For each field (question) that should have an aggregation available for it, there must similarly be a corresponding
@@ -184,7 +184,7 @@ Development
 A local checkout of the frameworks repo can be shared with locally-running services (i.e. frontend applications). There are two ways of doing this:
 
 1. From this repo, run `npm link`
-2. From each app, run `npm link ccs-digitalmarketplace-frameworks`. 
+2. From each app, run `npm link ccs-digitalmarketplace-frameworks`.
 3. You can then run `npx gulp frameworks` to automatically rebuild the framework content whenever a framework YML file changes. Restart the app in dmrunner to pick up changes.
 
 Or
@@ -245,6 +245,3 @@ of the [Open Government 3.0][ogl] licence.
 [mit]: LICENCE
 [copyright]: http://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/uk-government-licensing-framework/crown-copyright/
 [ogl]: http://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/
-
-
-

package/frameworks/digital-outcomes-and-specialists-7/questions/declaration/immediateParentCompanyDetailsDUNSNumber.yml

@@ -2,6 +2,7 @@ name: DUNS number
 question: DUNS number of head office, if they have a head office
 type: text
 optional: true
+optional_text: if applicable
 
 validations:
   -

package/frameworks/digital-outcomes-and-specialists-7/questions/declaration/immediateParentCompanyDetailsRegistrationNumber.yml

@@ -2,3 +2,4 @@ name: Registration number
 question: Registration number
 type: text
 optional: true
+optional_text: if applicable

package/frameworks/digital-outcomes-and-specialists-7/questions/declaration/immediateParentCompanyDetailsVATNumber.yml

@@ -2,3 +2,4 @@ name: VAT number
 question: VAT number
 type: text
 optional: true
+optional_text: if applicable

package/frameworks/digital-outcomes-and-specialists-7/questions/declaration/improvementActionPlan.yml

@@ -1,8 +1,8 @@
 name: Action plan
 question: >
-  <p class="govuk-body govuk-!-font-weight-bold">If you are unable to demonstrate that 95% or more of invoices payable to your supply chain on all contracts have been paid within 60 days of the receipt of the invoice in at least one of the last two six months reporting periods, but you can evidence that ≥90% < 95% of all supply chain invoices were paid within 60 days of receipt of the invoice in at least one of the two previous six month reporting periods after removing intercompany payments (if relevant) and your average payments days are 55 days or less in the same reporting period, please provide an action plan for improvement which includes (as a minimum) the following:</p>
+  <p class="govuk-body govuk-!-font-weight-bold govuk-label--m">If you are unable to demonstrate that 95% or more of invoices payable to your supply chain on all contracts have been paid within 60 days of the receipt of the invoice in at least one of the last two six months reporting periods, but you can evidence that ≥90% < 95% of all supply chain invoices were paid within 60 days of receipt of the invoice in at least one of the two previous six month reporting periods after removing intercompany payments (if relevant) and your average payments days are 55 days or less in the same reporting period, please provide an action plan for improvement which includes (as a minimum) the following:</p>
 hint: >
-  <ul class="govuk-list govuk-list--bullet govuk-!-font-weight-bold">
+  <ul class="govuk-list govuk-list--bullet govuk-!-font-weight-bold govuk-label--m">
     <li>
       Identification of the primary causes of failure to pay:
       <ul>
@@ -16,9 +16,9 @@ hint: >
     <li>Plan published on its website (this can be a shorter, summary plan).</li>
   </ul>
 
-  <p class="govuk-body">If you have an existing action plan prepared for a different purpose, it is acceptable to attach this but it should contain the above features</p>
-  <p class="govuk-body govuk-!-margin-top-3">If you are unable to demonstrate that all invoices have been paid within the agreed contractual terms for either of the last two six month reporting periods, your action plan must also address steps taken to address your payment within agreed terms in order to achieve a 'pass'.</p>
-  <p class="govuk-body govuk-!-margin-top-3">You are only permitted to provide an action plan if you can evidence payment of ≥90% < 95% of invoices payable to your supply chain within 60 days of receipt of the invoice in at least one of the last two six month reporting periods, and can evidence that the average number of days taken by you to pay an invoice is 55 days or less for the same reporting period.</p>
+  <p class="govuk-body-l">If you have an existing action plan prepared for a different purpose, it is acceptable to attach this but it should contain the above features</p>
+  <p class="govuk-body-l govuk-!-margin-top-3">If you are unable to demonstrate that all invoices have been paid within the agreed contractual terms for either of the last two six month reporting periods, your action plan must also address steps taken to address your payment within agreed terms in order to achieve a 'pass'.</p>
+  <p class="govuk-body-l govuk-!-margin-top-3">You are only permitted to provide an action plan if you can evidence payment of ≥90% < 95% of invoices payable to your supply chain within 60 days of receipt of the invoice in at least one of the last two six month reporting periods, and can evidence that the average number of days taken by you to pay an invoice is 55 days or less for the same reporting period.</p>
   <p class="govuk-hint">Please upload in Open Document Format (ODF) or PDF/A (eg .pdf, .odt). (Maximum file size 5MB).</p>
 
 hidden: true

package/frameworks/digital-outcomes-and-specialists-7/questions/declaration/ultimateParentCompanyDetailsDUNSNumber.yml

@@ -2,6 +2,7 @@ name: DUNS number
 question: DUNS number of head office, if they have a head office
 type: text
 optional: true
+optional_text: if applicable
 
 validations:
   -

package/frameworks/digital-outcomes-and-specialists-7/questions/declaration/ultimateParentCompanyDetailsRegistrationNumber.yml

@@ -2,3 +2,4 @@ name: Registration number
 question: Registration number
 type: text
 optional: true
+optional_text: if applicable

package/frameworks/digital-outcomes-and-specialists-7/questions/declaration/ultimateParentCompanyDetailsVATNumber.yml

@@ -2,3 +2,4 @@ name: VAT number
 question: VAT number
 type: text
 optional: true
+optional_text: if applicable

package/frameworks/digital-outcomes-and-specialists-7/questions/services/technicalAbilityCertificateTwoURL.yml

@@ -1,5 +1,5 @@
 name: Technical ability certificate 2
-question: "Technical ability certificate 2 (optional)"
+question: Technical ability certificate 2
 
 type: upload
 optional: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccs-digitalmarketplace-frameworks",
-  "version": "4.4.33",
+  "version": "4.4.35",
   "description": "Data files for Digital Marketplace’s procurement frameworks",
   "repository": {
     "type": "git",