ccs-digitalmarketplace-frameworks 1.3.32 → 1.3.36

package/frameworks/digital-outcomes-6/questions/services/InfrastructureOperationsEngineerDayRate.yml

@@ -7,25 +7,25 @@ depends:
 type: pricing
 
 fields:
-  minimum_price: infrastructureengineerPriceMin
-  maximum_price: infrastructureengineerPriceMax
+  minimum_price: infrastructureoperationsengineerPriceMin
+  maximum_price: infrastructureoperationsengineerPriceMax
 field_defaults:
   price_unit: Person
   price_interval: Day
 
 validations:
   - name: answer_required
-    field: infrastructureengineerPriceMin
+    field: infrastructureoperationsengineerPriceMin
     message: 'You need to answer this question.'
   - name: not_money_format
-    field: infrastructureengineerPriceMin
+    field: infrastructureoperationsengineerPriceMin
     message: "Minimum price must be a number, without units, eg 99.95"
   - name: answer_required
-    field: infrastructureengineerPriceMax
-    message: "Enter the amount you will charge for an infrastructure engineer"
+    field: infrastructureoperationsengineerPriceMax
+    message: "Enter the amount you will charge for an infrastructure operations engineer"
   - name: not_money_format
-    field: infrastructureengineerPriceMax
+    field: infrastructureoperationsengineerPriceMax
     message: "Maximum price must be a number, without units, like 99.95"
   - name: max_less_than_min
-    field: infrastructureengineerPriceMax
+    field: infrastructureoperationsengineerPriceMax
     message: "Minimum price must be less than maximum price"

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/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,9 @@
 questions_to_exclude:
 - staffSecurityClearanceChecks
+- serviceDefinitionDocumentURL
+- termsAndConditionsDocumentURL
+- pricingDocumentURL
+- sfiaRateDocumentURL
+- dataStorageAndProcessingLocations
+- browsersSupported
 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/browsersSupported.yml

@@ -9,23 +9,13 @@ depends:
 
 type: checkboxes
 options:
-  - label: Internet Explorer 7
-    value: ie7
-  - label: Internet Explorer 8
-    value: ie8
-  - label: Internet Explorer 9
-    value: ie9
-  - label: Internet Explorer 10
-    value: ie10
-  - label: Internet Explorer 11
-    value: ie11
   - label: Microsoft Edge
     value: edge
   - label: Firefox
     value: firefox
   - label: Chrome
     value: chrome
-  - label: Safari 9+
+  - label: Safari
     value: safari
   - label: Opera
     value: opera

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/dataStorageAndProcessingLocations.yml

@@ -18,13 +18,6 @@ options:
       question: dataStorageAndProcessingLocations
       any_of:
         - uk
-  - label: EU-US Privacy Shield agreement locations
-    value: privacy_shield
-    derived_from:
-      question: dataStorageAndProcessingLocations
-      any_of:
-        - uk
-        - eea
   - label: Other locations
     value: other
     filter_ignore: true

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,5 +1,5 @@
 name: Fighting climate change
-question: Fighting climate change
+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/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
@@ -11,12 +11,12 @@ depends:
 
 
 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.32",
+  "version": "1.3.36",
   "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"