ccs-digitalmarketplace-frameworks 1.3.30 → 1.3.34

package/frameworks/g-cloud-13/manifests/declaration.yml

@@ -6,12 +6,12 @@
   description: |
     You must answer these questions to confirm that your services are suitable for G-Cloud 13.
 
-    Except for questions [[servicesHaveOrSupportCloudHostingCloudSoftware]] and [[servicesHaveOrSupportCloudSupport],
+    Except for questions [[servicesHaveOrSupportCloudHostingCloudSoftware]] and [[servicesHaveOrSupportCloudSupport]],
     if you can’t answer ‘yes’ to every question in this section,
     it’s very unlikely that your application will be accepted.
 
     You must answer ‘yes’ to at least one of questions
-    [[servicesHaveOrSupportCloudHostingCloudSoftware]] or [[servicesHaveOrSupportCloudSupport]] or answer ‘yes’ to both.
+    [[servicesHaveOrSupportCloudHostingCloudSoftware]] or [[servicesHaveOrSupportCloudSupport]], or answer ‘yes’ to both.
     
     You must be able to truthfully answer every question for your application to be considered eligible.
     The Crown Commercial Service may ask for proof after you’ve submitted your application.

package/frameworks/g-cloud-13/manifests/display_service.yml

@@ -271,7 +271,11 @@
 
 - name: Social Value
   questions:
-    - multiqSocialValue
+    - multiqfightingClimateChange
+    - multiqcovid19Recovery
+    - multiqtacklingEconomicInequality
+    - multiqequalOpportunity
+    - multiqwellbeing
 
 - name: Pricing
   questions:

package/frameworks/g-cloud-13/manifests/edit_service_as_admin.yml

@@ -213,6 +213,23 @@
   questions:
     - multiqEnergyEfficiency
 
+
+- name: Social Value
+  summary_page_description: >
+    Please provide further information about how your G-Cloud service provision will deliver against <b> at least one or more of the following 
+              <a 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></b>.
+    </br>
+    </br>
+    It is expected that public sector buyers will request clarifications on Social Value and/or the information you provide as part of the G-Cloud buying process.
+
+  editable: True
+  questions:
+    - multiqfightingClimateChange
+    - multiqcovid19Recovery
+    - multiqtacklingEconomicInequality
+    - multiqequalOpportunity
+    - multiqwellbeing
+
 - name: Pricing
   editable: True
   questions:

package/frameworks/g-cloud-13/manifests/edit_submission.yml

@@ -251,11 +251,21 @@
     - multiqEnergyEfficiency
 
 - name: Social Value
+  summary_page_description: >
+    Please provide further information about how your G-Cloud service provision will deliver against <b> at least one or more of the following 
+              <a 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></b>.
+    </br>
+    </br>
+    It is expected that public sector buyers will request clarifications on Social Value and/or the information you provide as part of the G-Cloud buying process.
+
   editable: False
   edit_questions: True
   questions:
-    - multiqSocialValue
-
+    - multiqfightingClimateChange
+    - multiqcovid19Recovery
+    - multiqtacklingEconomicInequality
+    - multiqequalOpportunity
+    - multiqwellbeing
 
 - name: Pricing
   editable: False

package/frameworks/g-cloud-13/messages/homepage-sidebar.yml

@@ -1,5 +1,5 @@
 coming:
-  heading: 'G-Cloud 13 will open on 3 March 2525 at 3pm GMT.'
+  heading: 'G-Cloud 13 will open on 8 March 2022 at 3pm GMT.'
   messages:
     - 'Provide cloud hosting, software and support.'
     - 'You’ll need to create a supplier account to apply.'
@@ -8,7 +8,7 @@ open:
   heading: 'G-Cloud 13 is open for applications'
   messages:
     - 'You need an account to apply.'
-    - 'The application deadline is 5pm BST, Monday 20 July 2525.'
+    - 'The application deadline is 5pm BST, Wednesday 18 May 2022.'
 
 pending:
   heading: 'G-Cloud 13 is closed for applications'

package/frameworks/g-cloud-13/metadata/copy_services.yml

@@ -1,3 +1,7 @@
 questions_to_exclude:
 - staffSecurityClearanceChecks
+- serviceDefinitionDocumentURL
+- termsAndConditionsDocumentURL
+- pricingDocumentURL
+- sfiaRateDocumentURL
 source_framework: g-cloud-12

package/frameworks/g-cloud-13/metadata/service_questions_to_scan_for_bad_words.yml

@@ -83,3 +83,8 @@ service_questions:
   - webInterfaceAccessibilityDescription
   - webInterfaceAccessibilityTesting
   - webInterfaceUsage
+  - fightingClimateChange
+  - covid19Recovery
+  - tacklingEconomicInequality
+  - equalOpportunity
+  - wellbeing

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

@@ -14,7 +14,7 @@ validations:
   # Used in custom validator for those not submitting on (lot1 and lot2) and (lot3)
   # See app/main/helpers/validation.py::G12Validator
   - name: dependent_question_error
-    message: You need to answer Yes to either this question or to question 2 or question 3
+    message: You need to answer Yes to either this question or to question 2
 assessment:
   required: True
   passIfIn:

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

@@ -13,7 +13,7 @@ validations:
   # Used in custom validator for those not submitting on (lot1 and lot2) and (lot3)
   # See app/main/helpers/validation.py::G12Validator
   - name: dependent_question_error
-    message: You need to answer Yes to either this question or to question 1 or question 3
+    message: You need to answer Yes to either this question or to question 1
 assessment:
   required: True
   passIfIn:

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

@@ -2,7 +2,7 @@ name: Asking questions
 question: >
   Do you understand that you can ask ‘clarification’ questions on the <a href="https://www.digitalmarketplace.service.gov.uk/suppliers/frameworks/g-cloud-13/updates" target="_blank" rel="noopener noreferrer">G-Cloud&nbsp;13 updates page (link opens in a new tab)</a> in your Digital Marketplace account?
 hint: >
-  You can ask clarification questions about G-Cloud&nbsp;13 until 3pm BST 1 April 2022. All questions and answers will be posted regularly on the G-Cloud 13 updates page. You will be notified by email when new clarification questions and answers are available.
+  You can ask clarification questions about G-Cloud&nbsp;13 until 3pm BST 14 April 2022. All questions and answers will be posted regularly on the G-Cloud 13 updates page. You will be notified by email when new clarification questions and answers are available.
 
 type: boolean
 assessment:

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

@@ -1,5 +1,5 @@
 name: Covid-19 recovery
-question: Covid-19 recovery
+question: ""
 
 depends:
   - "on": lot
@@ -9,12 +9,12 @@ depends:
       - cloud-support
 
 type: textbox_large
-max_length_in_words: 200
+max_length_in_words: 300
 
 validations:
   - name: answer_required
     message: Please complete at least one of the following Social Value fields.
-  - name: under_200_words
-    message: Description must be 200 words or fewer.
+  - name: under_300_words
+    message: Description must be 300 words or fewer.
   - name: under_character_limit
-    message: Description must be 2000 characters or fewer.
+    message: Description must be 3000 characters or fewer.

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

@@ -1,5 +1,5 @@
 name: Equal opportunity
-question: Equal opportunity
+question: ""
 
 depends:
   - "on": lot
@@ -9,12 +9,12 @@ depends:
       - cloud-support
 
 type: textbox_large
-max_length_in_words: 200
+max_length_in_words: 300
 
 validations:
   - name: answer_required
     message: Please complete at least one of the following Social Value fields.
-  - name: under_200_words
-    message: Description must be 200 words or fewer.
+  - name: under_300_words
+    message: Description must be 300 words or fewer.
   - name: under_character_limit
-    message: Description must be 2000 characters or fewer.
+    message: Description must be 3000 characters or fewer.

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

@@ -1,13 +1,5 @@
 name: Fighting climate change
-question: Please provide further information about how your G-Cloud service provision will deliver against at least one or more of the following 
-          <a 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>.
-
-question_advice: >
-  It is expected that public sector buyers will request clarifications on Social Value and/or the information you provide as part of the G-Cloud buying process.
-  <label>
-  <span class="question-heading">Fighting climate change
-  </span>
-  </label>
+question:  ""
 
 depends:
   - "on": lot
@@ -17,12 +9,12 @@ depends:
       - cloud-support
 
 type: textbox_large
-max_length_in_words: 200
+max_length_in_words: 300
 
 validations:
   - name: answer_required
     message: Please complete at least one of the following Social Value fields.
-  - name: under_200_words
-    message: Description must be 200 words or fewer.
+  - name: under_300_words
+    message: Description must be 300 words or fewer.
   - name: under_character_limit
-    message: Description must be 2000 characters or fewer.
+    message: Description must be 3000 characters or fewer.

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

@@ -10,8 +10,8 @@ depends:
 
 type: multiquestion
 questions:
-  - fightingClimateChange
-  - covid19Recovery
-  - tacklingEconomicInequality
-  - equalOpportunity
-  - wellbeing
+  - multiqfightingClimateChange
+  - multiqcovid19Recovery
+  - multiqtacklingEconomicInequality
+  - multiqequalOpportunity
+  - multiqwellbeing

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

@@ -0,0 +1,18 @@
+name: Covid-19 recovery
+question: Covid-19 recovery
+optional: true
+depends:
+  - "on": lot
+    being:
+      - cloud-hosting
+      - cloud-software
+      - cloud-support
+      - cloud-professional
+
+type: multiquestion
+any_of: values
+
+questions:
+  - covid19Recovery
+
+empty_message: Please complete at least one of the following Social Value fields.

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

@@ -0,0 +1,18 @@
+name: Equal opportunity
+question: Equal opportunity
+optional: True
+depends:
+  - "on": lot
+    being:
+      - cloud-hosting
+      - cloud-software
+      - cloud-support
+      - cloud-professional
+
+type: multiquestion
+any_of: values
+
+questions:
+  - equalOpportunity
+
+empty_message: Please complete at least one of the following Social Value fields.

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

@@ -0,0 +1,18 @@
+name: Fighting climate change
+question: Fighting climate change
+optional: True
+depends:
+  - "on": lot
+    being:
+      - cloud-hosting
+      - cloud-software
+      - cloud-support
+      - cloud-professional
+
+type: multiquestion
+any_of: values
+
+questions:
+  - fightingClimateChange
+
+empty_message: Please complete at least one of the following Social Value fields.

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

@@ -0,0 +1,18 @@
+name: Tackling economic inequality
+question: Tackling Economic Inequality
+optional: True
+depends:
+  - "on": lot
+    being:
+      - cloud-hosting
+      - cloud-software
+      - cloud-support
+      - cloud-professional
+
+type: multiquestion
+any_of: values
+
+questions:
+  - tacklingEconomicInequality
+
+empty_message: Please complete at least one of the following Social Value fields.

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

@@ -0,0 +1,18 @@
+name: Wellbeing
+question: Wellbeing
+optional: True
+depends:
+  - "on": lot
+    being:
+      - cloud-hosting
+      - cloud-software
+      - cloud-support
+      - cloud-professional
+
+type: multiquestion
+any_of: values
+
+questions:
+  - wellbeing
+
+empty_message: Please complete at least one of the following Social Value fields.

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

@@ -1,5 +1,5 @@
 name: Tackling economic inequality
-question: Tackling Economic Inequality
+question: ""
 
 depends:
   - "on": lot
@@ -9,12 +9,12 @@ depends:
       - cloud-support
 
 type: textbox_large
-max_length_in_words: 200
+max_length_in_words: 300
 
 validations:
   - name: answer_required
     message: Please complete at least one of the following Social Value fields.
-  - name: under_200_words
-    message: Description must be 200 words or fewer.
+  - name: under_300_words
+    message: Description must be 300 words or fewer.
   - name: under_character_limit
-    message: Description must be 2000 characters or fewer.
+    message: Description must be 3000 characters or fewer.

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

@@ -1,5 +1,5 @@
 name: Wellbeing
-question: Wellbeing
+question: ""
 
 depends:
   - "on": lot
@@ -8,13 +8,15 @@ depends:
       - cloud-software
       - cloud-support
 
+
+
 type: textbox_large
-max_length_in_words: 200
+max_length_in_words: 300
 
 validations:
   - name: answer_required
     message: Please complete at least one of the following Social Value fields.
-  - name: under_200_words
-    message: Description must be 200 words or fewer.
+  - name: under_300_words
+    message: Description must be 300 words or fewer.
   - name: under_character_limit
-    message: Description must be 2000 characters or fewer.
+    message: Description must be 3000 characters or fewer.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccs-digitalmarketplace-frameworks",
-  "version": "1.3.30",
+  "version": "1.3.34",
   "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/schemas/questions.json

@@ -164,6 +164,7 @@
               "under_50_words",
               "under_100_words",
               "under_200_words",
+              "under_300_words",
               "under_word_limit",
               "under_character_limit",
               "total_should_be_100"

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

@@ -1,36 +0,0 @@
-name: Cloud professional services
-question: >
-  If you're submitting Cloud Professional Services (lot 4) service, does your service both:
-    
-    - enable the delivery of cloud services
-    - comply with the definition of Cloud Professional Service in the framework agreement
-
-type: radios
-options:
-  - label: 'Yes'
-    value: cloud-professional-yes
-  - label: My organisation isn't submitting cloud professional (lot 4) services
-    value: cloud-professional-no
-
-
-followup:
-  serviceCloudServiceProfessional:
-    - cloud-professional-yes
-  serviceCloudServiceProfessional2:
-    - cloud-professional-yes
-  serviceCloudServiceProfessional3:
-    - cloud-professional-yes
-  serviceCloudServiceProfessional4:
-    - cloud-professional-yes
-  serviceCloudServiceProfessional5:
-    - cloud-professional-yes
-validations:
-  # See app/main/helpers/validation.py::G13Validator
-  - name: dependent_question_error
-    message: You need to answer Yes to either this question or to question 1 or question 2
-
-assessment:
-  required: True
-  passIfIn:
-    - cloud-professional-yes
-    - "My organisation isn't submitting cloud support (lot 4) services"