ccs-digitalmarketplace-frameworks 1.9.0 → 1.9.2

package/frameworks/digital-outcomes-and-specialists-7/manifests/edit_evaluations.yml

@@ -0,0 +1,17 @@
+-
+  name: Provide capability
+  editable: True
+  questions:
+    - provideCapability
+
+-
+  name: Deliver capability
+  editable: True
+  questions:
+    - deliverCapability
+
+-
+  name: Describe capability partner
+  editable: True
+  questions:
+    - describeCapabilityPartner

package/frameworks/digital-outcomes-and-specialists-7/manifests/evaluations.yml

@@ -0,0 +1,20 @@
+-
+  name: Provide capability
+  editable: True
+  questions:
+    - provideCapabilityComment
+    - provideCapabilityScore
+
+-
+  name: Deliver capability
+  editable: True
+  questions:
+    - deliverCapabilityComment
+    - deliverCapabilityScore
+
+-
+  name: Describe capability partner
+  editable: True
+  questions:
+    - describeCapabilityPartnerComment
+    - describeCapabilityPartnerScore

package/frameworks/digital-outcomes-and-specialists-7/questions/evaluations/deliverCapability.yml

@@ -0,0 +1,15 @@
+question: How will you deliver the capability?
+type: textbox_large
+max_length_in_words: 500
+depends:
+  - "on": "lot"
+    being:
+      - digital-capability-and-delivery-partner
+
+validations:
+  -
+    name: answer_required
+    message: 'You need to answer this question'
+  -
+    name: under_word_limit
+    message: Your answer must be no more than 500 words

package/frameworks/digital-outcomes-and-specialists-7/questions/evaluations/deliverCapabilityComment.yml

@@ -0,0 +1,15 @@
+question: Comments for "How will you deliver the capability?"
+type: textbox_large
+max_length_in_words: 500
+depends:
+  - "on": "lot"
+    being:
+      - digital-capability-and-delivery-partner
+
+validations:
+  -
+    name: answer_required
+    message: 'You need to answer this question'
+  -
+    name: under_word_limit
+    message: Your answer must be no more than 500 words

package/frameworks/digital-outcomes-and-specialists-7/questions/evaluations/deliverCapabilityScore.yml

@@ -0,0 +1,22 @@
+question: Score for "How will you deliver the capability?"
+depends:
+  - "on": "lot"
+    being:
+      - digital-capability-and-delivery-partner
+
+type: radios
+options:
+  - label: "0"
+    value: "0"
+  - label: "25"
+    value: "25"
+  - label: "50"
+    value: "50"
+  - label: "75"
+    value: "75"
+  - label: "100"
+    value: "100"
+
+validations:
+  - name: answer_required
+    message: You must select an option

package/frameworks/digital-outcomes-and-specialists-7/questions/evaluations/describeCapabilityPartner.yml

@@ -0,0 +1,15 @@
+question: Describe the partner who will deliver the capability?
+type: textbox_large
+max_length_in_words: 500
+depends:
+  - "on": "lot"
+    being:
+      - digital-capability-and-delivery-partner
+
+validations:
+  -
+    name: answer_required
+    message: 'You need to answer this question'
+  -
+    name: under_word_limit
+    message: Your answer must be no more than 500 words

package/frameworks/digital-outcomes-and-specialists-7/questions/evaluations/describeCapabilityPartnerComment.yml

@@ -0,0 +1,15 @@
+question: Comment for "Describe the partner who will deliver the capability?"
+type: textbox_large
+max_length_in_words: 500
+depends:
+  - "on": "lot"
+    being:
+      - digital-capability-and-delivery-partner
+
+validations:
+  -
+    name: answer_required
+    message: 'You need to answer this question'
+  -
+    name: under_word_limit
+    message: Your answer must be no more than 500 words

package/frameworks/digital-outcomes-and-specialists-7/questions/evaluations/describeCapabilityPartnerScore.yml

@@ -0,0 +1,20 @@
+question: Score for "Describe the partner who will deliver the capability?""
+depends:
+  - "on": "lot"
+    being:
+      - digital-capability-and-delivery-partner
+
+type: radios
+options:
+  - label: "0"
+    value: "0"
+  - label: "33"
+    value: "33"
+  - label: "66"
+    value: "66"
+  - label: "100"
+    value: "100"
+
+validations:
+  - name: answer_required
+    message: You must select an option

package/frameworks/digital-outcomes-and-specialists-7/questions/evaluations/provideCapability.yml

@@ -0,0 +1,15 @@
+question: How will you provide the capability?
+type: textbox_large
+max_length_in_words: 500
+depends:
+  - "on": "lot"
+    being:
+      - digital-capability-and-delivery-partner
+
+validations:
+  -
+    name: answer_required
+    message: 'You need to answer this question'
+  -
+    name: under_word_limit
+    message: Your answer must be no more than 500 words

package/frameworks/digital-outcomes-and-specialists-7/questions/evaluations/provideCapabilityComment.yml

@@ -0,0 +1,15 @@
+question: Comment for "How will you provide the capability?"
+type: textbox_large
+max_length_in_words: 500
+depends:
+  - "on": "lot"
+    being:
+      - digital-capability-and-delivery-partner
+
+validations:
+  -
+    name: answer_required
+    message: 'You need to answer this question'
+  -
+    name: under_word_limit
+    message: Your answer must be no more than 500 words

package/frameworks/digital-outcomes-and-specialists-7/questions/evaluations/provideCapabilityScore.yml

@@ -0,0 +1,22 @@
+question: Score for "How will you provide the capability?"
+depends:
+  - "on": "lot"
+    being:
+      - digital-capability-and-delivery-partner
+
+type: radios
+options:
+  - label: "0"
+    value: "0"
+  - label: "25"
+    value: "25"
+  - label: "50"
+    value: "50"
+  - label: "75"
+    value: "75"
+  - label: "100"
+    value: "100"
+
+validations:
+  - name: answer_required
+    message: You must select an option

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

@@ -6,6 +6,16 @@ options:
     value: digital-outcomes
     description: >
       Such as a digital service, strategic delivery programme or an accessibility audit.
+  -
+    label: Provide digital capability and delivery partner
+    value: digital-capability-and-delivery-partner
+    description: >
+      Such as a team of developers from a consultant.
+  -
+    label: Provide digital specialists
+    value: digital-specialists
+    description: >
+      Such as a software engineer or content designer.
   -
     label: Provide user research studios
     value: user-research-studios

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

@@ -7,6 +7,8 @@ depends:
   -
     "on": lot
     being:
+      - digital-capability-and-delivery-partner
+      - digital-specialists
       - user-research-studios
 
 validations:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccs-digitalmarketplace-frameworks",
-  "version": "1.9.0",
+  "version": "1.9.2",
   "description": "Data files for Digital Marketplace’s procurement frameworks",
   "repository": "git@github.com:Crown-Commercial-Service/ccs-digitalmarketplace-frameworks",
   "author": "enquiries@digitalmarketplace.service.gov.uk"

package/schema_generator/validation.py

@@ -21,6 +21,10 @@ MANIFESTS = {
         'question_set': 'briefs',
         'manifest': 'award_brief'
     },
+    'evaluations': {
+        'question_set': 'evaluations',
+        'manifest': 'edit_evaluations'
+    }
 }
 
 LEGACY_GCLOUD_LOTS = [
@@ -111,7 +115,7 @@ BRIEF_EXCLUDED_FRAMEWORKS = [
 ]
 
 
-def _get_schema_title_and_slugs(schema_type, framework_family=None, exclude_lot=None, exclude_frameworks=[]):
+def _get_schema_title_and_slugs(schema_type, framework_family=None, exclude_lots=[], exclude_frameworks=[]):
     titles_and_slugs = []
     for family, framework_list in FRAMEWORKS_AND_LOTS.items():
         if framework_family:
@@ -123,10 +127,8 @@ def _get_schema_title_and_slugs(schema_type, framework_family=None, exclude_lot=
             if framework['framework_slug'] in exclude_frameworks:
                 continue
             for lot_slug, lot_name in framework['lots']:
-                if exclude_lot:
-                    # Some lots don't have briefs/brief response/brief award schemas
-                    if exclude_lot == lot_slug:
-                        continue
+                if lot_slug in exclude_lots:
+                    continue
 
                 titles_and_slugs.append(
                     (
@@ -143,20 +145,30 @@ SCHEMAS = {
     'briefs': _get_schema_title_and_slugs(
         "Brief",
         "digital-outcomes-and-specialists",
-        exclude_lot="user-research-studios",
+        exclude_lots=["user-research-studios"],
         exclude_frameworks=BRIEF_EXCLUDED_FRAMEWORKS
     ),
     'brief-responses': _get_schema_title_and_slugs(
         "Brief Response",
         "digital-outcomes-and-specialists",
-        exclude_lot="user-research-studios",
+        exclude_lots=["user-research-studios"],
         exclude_frameworks=BRIEF_EXCLUDED_FRAMEWORKS
     ),
     'brief-awards': _get_schema_title_and_slugs(
         "Brief Award",
         "digital-outcomes-and-specialists",
-        exclude_lot="user-research-studios",
+        exclude_lots=["user-research-studios"],
         exclude_frameworks=BRIEF_EXCLUDED_FRAMEWORKS
+    ),
+    'evaluations': _get_schema_title_and_slugs(
+        "Evaluation",
+        "digital-outcomes-and-specialists",
+        exclude_lots=[
+            "digital-outcomes",
+            "digital-specialists",
+            "user-research-studios",
+            "user-research-participants",
+        ],
     )
 }
 

package/tests/test_content.py

@@ -32,6 +32,9 @@ MANIFEST_QUESTION_SET = {
     "edit_submission": "services",
     "services_search_filters": "services",
     "download_results": "services",
+
+    "evaluations": "evaluations",
+    "edit_evaluations": "evaluations"
 }
 
 # `item` property wouldn't usually be part of a brief response but is included here as the dynamic list child question
@@ -44,14 +47,32 @@ QUESTION_SET_CONTEXT = {
         'max_day_rate': "max day rate",
         'item': 'essential requirement'
     },
-    'services': {'lot': 'context-lot'}
+    'services': {'lot': 'context-lot'},
+    'evaluation': {'lot': 'context-lot'}
 }
 
+EXCLUDED_FRAMEWORKS = [
+    'digital-outcomes-and-specialists',
+    'digital-outcomes-and-specialists-2',
+    'digital-outcomes-and-specialists-3',
+    'digital-outcomes-and-specialists-4',
+    'digital-outcomes-and-specialists-5',
+    'g-cloud-6',
+    'g-cloud-7',
+    'g-cloud-8',
+    'g-cloud-9',
+    'g-cloud-10',
+    'g-cloud-11',
+    'g-cloud-12',
+]
+
 
 def get_manifests():
     paths = glob.glob('frameworks/*/manifests/*.yml')
     for path in paths:
         _, framework, _, manifest = path.split('/')
+        if framework in EXCLUDED_FRAMEWORKS:
+            continue
         manifest = manifest.replace('.yml', '')
 
         yield (framework, MANIFEST_QUESTION_SET[manifest], manifest)

package/tests/test_messages.py

@@ -4,6 +4,7 @@ import pytest
 
 from dmcontent import ContentLoader
 from dmcontent.utils import TemplateField
+from .test_content import EXCLUDED_FRAMEWORKS
 
 content = ContentLoader('./')
 
@@ -17,6 +18,8 @@ def get_messages():
     paths = glob.glob('frameworks/*/messages/*.yml')
     for path in paths:
         _, framework, _, message = path.split('/')
+        if framework in EXCLUDED_FRAMEWORKS:
+            continue
         message = message.replace('.yml', '')
 
         yield (framework, message)

package/tests/test_schema.py

@@ -5,6 +5,8 @@ import pytest
 from jsonschema.validators import validator_for
 from jsonschema import ValidationError
 
+from .test_content import EXCLUDED_FRAMEWORKS
+
 
 def get_all_files():
     root_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '../frameworks'))
@@ -12,7 +14,10 @@ def get_all_files():
         for filename in files:
             if filename.endswith('.yml'):
                 file_path = os.path.join(root, filename)
-                schema_name = file_path.replace(root_dir, '').split('/')[2:][0]
+                file_path_info = file_path.replace(root_dir, '').split('/')
+                if file_path_info[1] in EXCLUDED_FRAMEWORKS:
+                    continue
+                schema_name = file_path_info[2:][0]
                 yield (file_path, schema_name)