ccs-digitalmarketplace-frameworks 1.0.4 → 1.0.8

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

@@ -108,10 +108,9 @@
     - confidentialInformation
     - misleadingInformation
     - mitigatingFactors
-    - unspentTaxConvictions
-    - groundsForDiscretionary
-    - incorrectTaxReturns
-    - groundsForDiscretionary2
+    - multiqunspentTaxConvictions
+    - multiqincorrectTaxReturns
+
 
 -
   name: Working with government
@@ -137,6 +136,22 @@
     - socialValueModel
     - supplierCodeOfConduct
 
+-
+  name: Application accuracy
+  slug: application-accuracy
+  editable: True
+  prefill: False # These questions ask about this declaration, so can't be prefilled
+  description: |
+    You must confirm the accuracy of the information in this declaration and in your service descriptions. We might
+    ask for proof after you’ve submitted your application.
+
+  questions:
+    - accurateInformation
+    - informationChanges
+    - accuratelyDescribed
+    - proofOfClaims
+
+
 -
   name: How you’ll deliver your services
   slug: how-youll-deliver-your-services
@@ -166,21 +181,6 @@
   questions:
     - carbonReduction
 
--
-  name: Application accuracy
-  slug: application-accuracy
-  editable: True
-  prefill: False # These questions ask about this declaration, so can't be prefilled
-  description: |
-    You must confirm the accuracy of the information in this declaration and in your service descriptions. We might
-    ask for proof after you’ve submitted your application.
-
-  questions:
-    - accurateInformation
-    - informationChanges
-    - accuratelyDescribed
-    - proofOfClaims
-
 -
   name: Contact details
   slug: contact-details
@@ -192,5 +192,5 @@
     - contact
     - contactsRole
     - contactEmail
-    - contactNameContractNotice
     - contactEmailContractNotice
+    - contactWebContractNotice

package/frameworks/digital-outcomes-6/messages/homepage-sidebar.yml

@@ -1,16 +1,16 @@
 coming:
-  heading: 'Digital Outcomes 6 coming soon'
+  heading: 'Digital Outcomes  6 coming soon'
   messages:
     - 'Provide digital outcomes , and user research studios and participants.'
     - 'You’ll need to create a supplier account to apply.'
 
 open:
-  heading: 'Digital Outcomes 6 is open for applications'
+  heading: 'Digital Outcomes  6 is open for applications'
   messages:
     - 'You need an account to apply.'
     - 'The application deadline is 1pm GMT, 15 November 2021.'
 
 pending:
-  heading: 'Digital Outcomes 6 is closed for applications'
+  heading: 'Digital Outcomes  6 is closed for applications'
   messages:
     - 'Applications are being reviewed.'

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

@@ -4,4 +4,9 @@ type: boolean
 hint: The Crown Commercial Service reserves the right to audit any supplier for compliance, where an awarded contract has a total value of £5 million or more.
 assessment:
   passIfIn:
-    - True
+    - True
+
+validations:
+  -
+    name: answer_required
+    message: You need to answer this question.

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

@@ -1,5 +1,6 @@
 name: Contract notice contact email
-question: If your Digital Outcomes 6 application is successful, what internet (web) address should appear on the contract notice?
+id: contactEmailContractNotice
+question: If your Digital Outcomes 6 application is successful, what email address should appear on the contract notice?
 type: text
 hint: The contract notice confirms the outcome of the framework competition and includes the names of all the successful suppliers.
       This information will be published on Contracts Finder and therefore must be generic with no references to individual names and no contact details that are directly linked to an individual.

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

@@ -1,5 +1,4 @@
 name: Contract notice contact name
-question: If your Digital Outcomes 6 application is successful, what email address should appear on the contract notice?
+question: If your Digital Outcomes  6 application is successful, what contact name should appear on the contract notice?
 type: text
 hint: The contract notice confirms the outcome of the framework competition and includes the names of all the successful suppliers.
-      This information will be published on Contracts Finder and therefore must be generic with no references to individual names and no contact details that are directly linked to an individual.

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

@@ -0,0 +1,5 @@
+name: Contract notice contact name
+question: If your Digital Outcomes 6 application is successful, what email address should appear on the contract notice?
+type: text
+hint: The contract notice confirms the outcome of the framework competition and includes the names of all the successful suppliers.
+      This information will be published on Contracts Finder and therefore must be generic with no references to individual names and no contact details that are directly linked to an individual.

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

@@ -0,0 +1,6 @@
+name: Contract notice contact internet (web) address
+id: contactWebContractNotice
+question: If your Digital Outcomes 6 application is successful, what internet (web) address should appear on the contract notice?
+type: text
+hint: The contract notice confirms the outcome of the framework competition and includes the names of all the successful suppliers.
+      This information will be published on Contracts Finder and therefore must be generic with no references to individual names and no contact details that are directly linked to an individual.

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

@@ -1,7 +1,5 @@
 name: Contact’s role
 question: >
   What is the contact’s role in the organisation?
-type: boolean
-assessment:
-  passIfIn:
-    - True
+type: text
+

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

@@ -1,25 +1,34 @@
 name: __Place holder for question name 31(a)
-question: >
-  If you responded 'yes', enter details for each occurrence.
+question: If you responded 'yes', enter details for each occurrence.
 
-question_advice: |
+hint: |
   The details you provide should include:
 
-   - Country concerned
-   - what is the amount concerned
-   - how the breach was established: through a judicial or administrative decision or by other means
-   - the date of the decision, if the breach has been established through a judicial or administrative decision
-   - if the breach has been established by other means, specify the means
+    - Country concerned
+    - what is the amount concerned
+    - how the breach was established: through a judicial or administrative decision or by other means
+    - the date of the decision, if the breach has been established through a judicial or administrative decision
+    - if the breach has been established by other means, specify the means
 
-  You should also confirm whether you have paid or have entered into a binding arrangement with a view to paying the outstanding sum, including, where applicable, any accrued interest and / or fines.
+    You should also confirm whether you have paid or have entered into a binding arrangement with a view to paying the outstanding sum, including, where applicable, any accrued interest and / or fines.
 
-  If evidence of meeting all obligations is available electronically, provide details of:
+    If evidence of meeting all obligations is available electronically, provide details of:
 
-   - web address
-   - issuing authority
-   - precise reference of the documents
+    - web address
+    - issuing authority
+    - precise reference of the documents
 
-type: boolean
-assessment:
-  passIfIn:
-    - True
+
+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.
+  -
+    name: under_word_limit
+    message: "Your answer must be no more than 500 words."
+  -
+    name: under_character_limit
+    message: "Your answer must be no more than 5000 characters."

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

@@ -1,23 +1,31 @@
 name: __Place holder for question name 32(a)
-question: >
-  If you responded 'yes', enter details for each occurrence.
+question: If you responded 'yes', enter details for each occurrence.
 
-question_advice: |
+hint: |
   The details you provide should include:
 
-   - Country concerned
-   - what is the amount concerned
-   - how and when the breach was established or challenge brought
+    - Country concerned
+    - what is the amount concerned
+    - how and when the breach was established or challenge brought
 
-  You should also confirm whether you have paid or have entered into a binding arrangement with a view to paying the outstanding sum, including, where applicable, any accrued interest and / or fines.
+    You should also confirm whether you have paid or have entered into a binding arrangement with a view to paying the outstanding sum, including, where applicable, any accrued interest and / or fines.
 
-  If evidence of meeting all obligations is available electronically, provide details of:
+    If evidence of meeting all obligations is available electronically, provide details of:
 
-   - web address
-   - issuing authority
-   - precise reference of the documents
+    - web address
+    - issuing authority
+    - precise reference of the documents
 
-type: boolean
-assessment:
-  passIfIn:
-    - True
+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 Incorrect tax returns question.
+  -
+    name: under_word_limit
+    message: "Your answer must be no more than 500 words."
+  -
+    name: under_character_limit
+    message: "Your answer must be no more than 5000 characters."

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

@@ -1,4 +1,4 @@
-name: Why a tax return was incorrect
+name: Is there an incorrect tax returns __placeholder__
 question: >
   Have any tax returns submitted by your organisation on or after 1 October 2012 been found to be incorrect for any of these reasons:
 
@@ -7,7 +7,12 @@ question: >
     - a failure to notify, or failure of an avoidance scheme in which you are or were involved, under the Disclosure of Tax Avoidance Scheme rules (DOTAS), VADR (Schedule 11A to the Value Added Tax Act 1994 (as amended by Schedule 1 to the Finance (no. 2) Act 2005)) or any equivalent or similar regime in a jurisdiction in which your organisation is established
 
 type: boolean
+
+followup:
+  groundsForDiscretionary2:
+    - true
+
 assessment:
   passIfIn:
     - False
-  discretionary: True
+  discretionary: True

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

@@ -3,7 +3,7 @@ question: >
   If you responded ‘yes’ to any of the questions [[taxEvasion]] to [[misleadingInformation]], enter details of
   any mitigating factors that you think should be taken into consideration.
 
-question_advice: |
+hint: |
   The details you provide should include:
 
     - date of the violation or offence

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

@@ -1,21 +1,5 @@
 name: Modern slavery statement required
+id: modernSlaveryStatement
 question: Provide the relevant link to the slavery and human trafficking statement that appears in a prominent place on your organisations website homepage.
-question_advice: |
-  Your statement should:
 
-  - be an Open Document Format (ODF) or PDF/A
-  - have a maximum file size of 5MB
-  - meet accessibility standards
-
-hidden: true
-type: upload
-
-validations:
-  - name: answer_required
-    message: You need to answer this question.
-  - name: file_is_open_document_format
-    message: The selected document must be an Open Document Format (ODF) or PDF/A (eg .pdf, .odt)
-  - name: file_is_less_than_5mb
-    message: The selected document must be smaller than 5MB
-  - name: file_can_be_saved
-    message: The selected document could not be uploaded - try again
+type: text

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

@@ -1,20 +1,5 @@
 name: Modern slavery statement optional
-question: |
-  You can choose to provide the relevant link to the slavery and human trafficking statement that appears in a prominent place on your organisations website homepage.
-question_advice: |
-  Your statement should:
+id: modernSlaveryStatementOptional
+question: You can choose to provide the relevant link to the slavery and human trafficking statement that appears in a prominent place on your organisations website homepage.
 
-  - be an Open Document Format (ODF) or PDF/A
-  - have a maximum file size of 5MB
-  - meet accessibility standards
-
-hidden: true
-type: upload
-
-validations:
-  - name: file_is_open_document_format
-    message: The selected document must be an Open Document Format (ODF) or PDF/A (eg .pdf, .odt)
-  - name: file_is_less_than_5mb
-    message: The selected document must be smaller than 5MB
-  - name: file_can_be_saved
-    message: The selected document could not be uploaded - try again
+type: text

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

@@ -0,0 +1,8 @@
+id: multiqincorrectTaxReturns
+name: Tax return was incorrect
+question: ""
+
+type: multiquestion
+questions:
+  - incorrectTaxReturns
+  - groundsForDiscretionary2

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

@@ -0,0 +1,8 @@
+id: multiqunspentTaxConvictions
+name: Unspent tax convictions
+question: ""
+
+type: multiquestion
+questions:
+  - unspentTaxConvictions
+  - groundsForDiscretionary

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

@@ -3,4 +3,9 @@ question: Are you aware of the <a href="https://assets.publishing.service.gov.uk
 type: boolean
 assessment:
   passIfIn:
-    - True
+    - True
+
+validations:
+  -
+    name: answer_required
+    message: You need to answer this question.

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

@@ -1,9 +1,13 @@
-name: If a tax return was incorrect
-question: >
-  Has your organisation committed a breach of obligations relating to the payment of taxes or social security contributions that has been established by a judicial or administrative decision that has a final and binding effect?
+name: Is there an unspent tax conviction __placeholder__
+question: Has your organisation committed a breach of obligations relating to the payment of taxes or social security contributions that has been established by a judicial or administrative decision that has a final and binding effect?
 
 type: boolean
+
+followup:
+  groundsForDiscretionary:
+    - true
+
 assessment:
   passIfIn:
     - False
-  discretionary: True
+  discretionary: True

package/frameworks/g-cloud-13/messages/become-a-supplier.yml

@@ -8,6 +8,7 @@ coming: |
   - cloud hosting
   - cloud software
   - cloud support
+  - cloud professional
 
 open: |
   ### G-Cloud
@@ -19,6 +20,8 @@ open: |
   - cloud hosting
   - cloud software
   - cloud support
+  - cloud professional
+
 
 pending: &can_not_apply |
   ### G-Cloud
@@ -30,6 +33,7 @@ pending: &can_not_apply |
   - cloud hosting
   - cloud software
   - cloud support
+  - cloud professional
 
 standstill: *can_not_apply
 

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

@@ -6,3 +6,8 @@ type: boolean
 assessment:
   passIfIn:
     - True
+
+validations:
+  -
+    name: answer_required
+    message: You need to answer this question.

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

@@ -3,4 +3,9 @@ question: Are you aware of the <a href="https://assets.publishing.service.gov.uk
 type: boolean
 assessment:
   passIfIn:
-    - True
+    - True
+
+validations:
+  -
+    name: answer_required
+    message: You need to answer this question.

package/frameworks/g-cloud-13/questions/services/boardLevelServiceSecurity.yml

@@ -1,6 +1,5 @@
 name: Named board-level person responsible for service security
-question: >
-  Does your organisation have a named person with board-level (or equivalent) authorisation who’s responsible for the
+question: Does your organisation have a named person with board-level (or equivalent) authorisation who’s responsible for the
   security of all of your services?
 question_advice: >
   Read about the government’s <a href="https://www.ncsc.gov.uk/guidance/cloud-security-principle-4-governance-framework"

package/package.json

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