ccs-digitalmarketplace-frameworks 1.2.12 → 1.2.16

package/frameworks/digital-outcomes-6/manifests/declaration.yml

@@ -184,4 +184,4 @@
     - contactsRole
     - contactEmail
     - contactEmailContractNotice
-    - contactWebContractNotice
+    - multiqWebAddress

package/frameworks/digital-outcomes-6/questions/declaration/haveNotWebportal.yml

@@ -0,0 +1,9 @@
+name: An internet (web) address
+question: We have an internet (web) address
+type: boolean
+followup:
+  contactWebContractNotice:
+    - true
+
+
+

package/frameworks/digital-outcomes-6/questions/declaration/modernSlaveryOptionalUpload.yml

@@ -0,0 +1,29 @@
+name: Modern slavery statement required
+question: >
+  <p class="govuk-body">If you do not have a website upload a copy of your organisation’s slavery and human trafficking statement.</p>
+
+  <p class="govuk-body">Your statement should:</p>
+  <ul class="govuk-list govuk-list--bullet">
+    <li>be an Open Document Format (ODF) or PDF/A</li>
+    <li>have a maximum file size of 5MB</li>
+    <li>meet accessibility standards</li>
+  </ul>
+  <p class="govuk-body">
+    <a class="govuk-link" target="_blank" rel="noopener noreferrer" href="https://www.gov.uk/guidance/how-to-publish-on-gov-uk/accessible-pdfs">Read the guidance on accessible documents (link opens in a new tab)</a>.
+  </p>
+  <p class="govuk-body">
+    <a href="https://www.gov.uk/government/publications/transparency-in-supply-chains-a-practical-guide" target="_blank" rel="noopener noreferrer">Read the Home Office guidance about how to write a statement and what information to include (link opens in a new tab)</a>.
+  </p>
+
+hidden: true
+type: upload
+
+validations:
+  - name: answer_required
+    message: Select a file.
+  - name: file_is_open_document_format
+    message: The file must be in an open format. Select an Open Document Format (ODF) or PDF/A (eg .pdf, .odt).
+  - name: file_is_less_than_5mb
+    message: The file must be smaller than 5MB.
+  - name: file_can_be_saved
+    message: The selected file could not be uploaded - try again.

package/frameworks/digital-outcomes-6/questions/declaration/modernSlaveryStatementUpload.yml

@@ -0,0 +1,29 @@
+name: Modern slavery statement required
+question: >
+  <p class="govuk-body">If you do not have a website upload a copy of your organisation’s slavery and human trafficking statement.</p>
+
+  <p class="govuk-body">Your statement should:</p>
+  <ul class="govuk-list govuk-list--bullet">
+    <li>be an Open Document Format (ODF) or PDF/A</li>
+    <li>have a maximum file size of 5MB</li>
+    <li>meet accessibility standards</li>
+  </ul>
+  <p class="govuk-body">
+    <a class="govuk-link" target="_blank" rel="noopener noreferrer" href="https://www.gov.uk/guidance/how-to-publish-on-gov-uk/accessible-pdfs">Read the guidance on accessible documents (link opens in a new tab)</a>.
+  </p>
+  <p class="govuk-body">
+    <a href="https://www.gov.uk/government/publications/transparency-in-supply-chains-a-practical-guide" target="_blank" rel="noopener noreferrer">Read the Home Office guidance about how to write a statement and what information to include (link opens in a new tab)</a>.
+  </p>
+
+hidden: true
+type: upload
+
+validations:
+  - name: answer_required
+    message: Select a file.
+  - name: file_is_open_document_format
+    message: The file must be in an open format. Select an Open Document Format (ODF) or PDF/A (eg .pdf, .odt).
+  - name: file_is_less_than_5mb
+    message: The file must be smaller than 5MB.
+  - name: file_can_be_saved
+    message: The selected file could not be uploaded - try again.

package/frameworks/digital-outcomes-6/questions/declaration/modernSlaveryTurnover.yml

@@ -9,5 +9,9 @@ followup:
     - true
   modernSlaveryStatement:
     - true
+  modernSlaveryStatementUpload:
+    - true
   modernSlaveryStatementOptional:
     - false
+  modernSlaveryOptionalUpload:
+    - false

package/frameworks/digital-outcomes-6/questions/declaration/multiqModernSlavery.yml

@@ -7,5 +7,7 @@ questions:
   - modernSlaveryTurnover
   - modernSlaveryReportingRequirements
   - modernSlaveryStatement
+  - modernSlaveryStatementUpload
   - mitigatingFactors3
   - modernSlaveryStatementOptional
+  - modernSlaveryOptionalUpload

package/frameworks/digital-outcomes-6/questions/declaration/multiqWebAddress.yml

@@ -0,0 +1,7 @@
+id: multiqWebAddress
+name: Web address
+question: " "
+type: multiquestion
+questions:
+  - haveNotWebportal
+  - contactWebContractNotice

package/frameworks/g-cloud-13/questions/declaration/servicesHaveOrprofessionalService.yml

@@ -6,26 +6,31 @@ question: >
     - comply with the definition of Cloud Professional Service in the framework agreement
 
 type: radios
+options:
+  - label: 'Yes'
+    values: cloud-professional-yes
+  - label: My organisation isn't submitting cloud professional (lot 4) services
+    values: No
+
 
 followup:
   serviceCloudServiceProfessional:
-    - true
+    - 'Yes'
   serviceCloudServiceProfessional2:
-    - true
+    - 'Yes'
   serviceCloudServiceProfessional3:
-    - true
+    - 'Yes'
   serviceCloudServiceProfessional4:
-    - true
+    - 'Yes'
   serviceCloudServiceProfessional5:
-    - true
+    - 'Yes'
+validations:
+  # See app/main/helpers/validation.py::G12Validator
+  - name: dependent_question_error
+    message: You need to answer Yes to either this question or to question 4
 
 assessment:
   required: True
   passIfIn:
     - "Yes"
-    - "My organisation isn't submitting cloud support (lot 4) services."
-
-
-
-
-
+    - "My organisation isn't submitting cloud support (lot 4) services"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccs-digitalmarketplace-frameworks",
-  "version": "1.2.12",
+  "version": "1.2.16",
   "description": "Data files for Digital Marketplace’s procurement frameworks",
   "repository": "git@github.com:Brickendon-DMp1-5/digitalmarketplace-frameworks",
   "author": "enquiries@digitalmarketplace.service.gov.uk"

package/frameworks/g-cloud-13/questions/declaration/serviceCloudServiceProvision.yml

@@ -1,18 +0,0 @@
-name: __Place holder for question name 3(1)
-question: > 
-  This is the quality question text for question 1:
-  Please provide further information about how your G-Cloud service provision will deliver against at least one or more of the following <a class="govuk-link" href="https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/921437/PPN-06_20-Taking-Account-of-Social-Value-in-the-Award-of-Central-Government-Contracts.pdf" target="_blank" rel="noopener noreferrer">Social Value themes outlined in PPN 06/20.</a>   
-    
-    - Fighting Climate Change
-    - Covid-19 Recovery
-    - Tackling Economic Inequality
-    - Equal Opportunity
-    - Wellbeing
-
-type: textbox_large
-max_length_in_words: 500
-
-validations:
-  -
-    name: answer_required
-    message: You need to answer this question because you answered ‘yes’ to the __place holder__.

package/frameworks/g-cloud-13/questions/declaration/serviceCloudServiceProvision2.yml

@@ -1,10 +0,0 @@
-name: __Place holder for question name 3(2)
-question: Placeholder that follows the same format - please detail how you meet quality question 2
-
-type: textbox_large
-max_length_in_words: 500
-
-validations:
-  -
-    name: answer_required
-    message: You need to answer this question because you answered ‘yes’ to the Unspent tax convictions question.

package/frameworks/g-cloud-13/questions/declaration/serviceCloudServiceProvision3.yml

@@ -1,10 +0,0 @@
-name: __Place holder for question name 3(3)
-question: Placeholder - Please tell us how you meet quality question 3
-
-type: textbox_large
-max_length_in_words: 500
-
-validations:
-  -
-    name: answer_required
-    message: You need to answer this question because you answered ‘yes’ to the Unspent tax convictions question.

package/frameworks/g-cloud-13/questions/declaration/serviceCloudServiceProvision4.yml

@@ -1,10 +0,0 @@
-name: __Place holder for question name 3(4)
-question: Placeholder - Please tell us how you meet quality question 4
-
-type: textbox_large
-max_length_in_words: 500
-
-validations:
-  -
-    name: answer_required
-    message: You need to answer this question because you answered ‘yes’ to the Unspent tax convictions question.

package/frameworks/g-cloud-13/questions/declaration/serviceCloudServiceProvision5.yml

@@ -1,10 +0,0 @@
-name: __Place holder for question name 3(5)
-question: Placeholder - Please tell us how you meet quality question 5
-
-type: textbox_large
-max_length_in_words: 500
-
-validations:
-  -
-    name: answer_required
-    message: You need to answer this question because you answered ‘yes’ to the Unspent tax convictions question.