ccs-digitalmarketplace-frameworks 2.4.0 → 3.0.1

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 Records breaking changes from major version bumps
 
+## 3.0.0
+
+Add the agreements questions for the framework award form
+
 ## 2.0.0
 
 Rename evaluations to additional lot questions

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

@@ -0,0 +1,10 @@
+- name: Legal text
+  questions:
+    - legalText
+
+
+- name: Framework agreement
+  questions:
+    - signerName
+    - signerRole
+    - signerTermsAndConditions

package/frameworks/digital-outcomes-6/questions/agreements/legalText.yml

@@ -0,0 +1,52 @@
+type: text
+optional: true
+question: |
+    <ol class="govuk-list govuk-list--number">
+        <li>
+            <strong>CCS</strong>:
+            The Minister for the Cabinet Office represented by its executive agency the Crown Commercial Service (CCS). Its offices are on: 9th Floor, The Capital, Old Hall Street, Liverpool L3 9PP.
+        </li>
+        <li>
+            <strong>Supplier</strong>: [[registered_name]]<br>
+            address: [[registered_address]]<br>
+            registration number: [[registration_number]]<br>
+            SID4GOV ID: [[sid4_goc_id]]<br>
+        </li>
+        <li>
+            <strong>Framework Contract</strong>: This framework contract between CCS and the Supplier allows the Supplier to be considered for Call-Off Contracts to supply the Deliverables in [[completed_lots_sentence]].
+            You cannot deliver in any other Lot under this Contract. Any references made to other Lots in this Contract do not apply. This opportunity is advertised in the Contract Notice in the Find a Tender Service reference (2022/S 000-001105).
+        </li>
+        <li>
+            <strong>Deliverables</strong>: See Framework Schedule 1 (Specification) for further details.
+        </li>
+        <li>
+            <strong>Framework Start Date</strong>: 28 June 2022
+        </li>
+        <li>
+            <strong>Framework Expiry Date</strong>: 23:59 on 27 June 2024
+        </li>
+        <li>
+            <strong>Framework Initial Period</strong>: From Framework Start Date to Framework Expiry Date, inclusive.
+        </li>
+        <li>
+            <strong>Framework Optional Extension Period</strong>: Up to twelve (12) months, by CCS giving written notice to Suppliers.
+        </li>
+        <li value="18">
+            <strong>Supplier Authorised Representative</strong>: [[primary_contact]], [[contacts_role]], [[contact_email_contract_notice]]
+        </li>
+    </ol>
+
+    <p>
+        The finalised Framework Award Form includes an electronically signed Framework Award Form. It is electronically signed by the Supplier when they make the legal declaration confirming their agreement to the Digital Outcomes 6 Framework Contract, and countersigned by the Crown Commercial Service.
+    </p>
+
+    <p class="govuk-body">
+        <a href="[[framework_govuk_url]]">
+            Read the [[framework_name]] contract terms and conditions
+        </a>
+    </p>
+
+depends:
+    - "on": agreementVersion
+      being:
+          - standard

package/frameworks/digital-outcomes-6/questions/agreements/signerName.yml

@@ -0,0 +1,15 @@
+question: Your full name
+type: text
+
+depends:
+  - "on": agreementVersion
+    being:
+      - standard
+
+max_length_in_characters: 256
+
+validations:
+  - name: answer_required
+    message: Enter your full name.
+  - name: under_character_limit
+    message: Name must be under 256 characters.

package/frameworks/digital-outcomes-6/questions/agreements/signerRole.yml

@@ -0,0 +1,15 @@
+question: Your role in the company
+type: text
+
+depends:
+  - "on": agreementVersion
+    being:
+      - standard
+
+max_length_in_characters: 256
+
+validations:
+  - name: answer_required
+    message: Enter your role in the company.
+  - name: under_character_limit
+    message: Name must be under 256 characters.

package/frameworks/digital-outcomes-6/questions/agreements/signerTermsAndConditions.yml

@@ -0,0 +1,15 @@
+question: <span class="govuk-visually-hidden">Do you accept the terms and conditions of the [[contract_title]]?</span>
+type: checkboxes
+
+depends:
+  - "on": agreementVersion
+    being:
+      - standard
+
+options:
+  - label: I accept the terms and conditions of the [[contract_title]]
+    value: "yes"
+
+validations:
+  - name: answer_required
+    message: Accept the terms and conditions of the [[contract_title]].

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

@@ -20,7 +20,7 @@ digit_limits:
 validations:
   - name: answer_required
     field: qualityAssuranceTestingQualityAssuranceTestingAnalystBasicPriceMax
-    message: Enter the amount you will charge for a qat analyst
+    message: Enter the amount you will charge for a QAT analyst
   - name: not_money_format
     field: qualityAssuranceTestingQualityAssuranceTestingAnalystBasicPriceMax
     message: Maximum price must be a number less than 10,000, without units, like 99.95

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

@@ -20,7 +20,7 @@ digit_limits:
 validations:
   - name: answer_required
     field: qualityAssuranceTestingQualityAssuranceTestingAnalystBasicPriceMax
-    message: Enter the amount you will charge for a qat analyst
+    message: Enter the amount you will charge for a QAT analyst
   - name: not_money_format
     field: qualityAssuranceTestingQualityAssuranceTestingAnalystBasicPriceMax
     message: Maximum price must be a number less than 10,000, without units, like 99.95

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

@@ -1,6 +1,6 @@
-name: Where will your qat analyst work?
+name: Where will your QAT analyst work?
 question: |
-  <p class="govuk-!-margin-bottom-2"><span class="govuk-fieldset__legend--s">Where will your qat analyst work?</span></p>
+  <p class="govuk-!-margin-bottom-2"><span class="govuk-fieldset__legend--s">Where will your QAT analyst work?</span></p>
   <p class="govuk-!-margin-bottom-0"><span class="govuk-fieldset__legend--s">Choose all the locations where the specialist can work at buyer’s sites, and whether they can work offsite.</span></p>
 hint: |
   ‘Offsite’ means the supplier will not be working at the buyer’s own sites.

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

@@ -20,7 +20,7 @@ digit_limits:
 validations:
   - name: answer_required
     field: qualityAssuranceTestingQualityAssuranceTestingAnalystBasicUkPriceMax
-    message: Enter the amount you will charge for a qat analyst
+    message: Enter the amount you will charge for a QAT analyst
   - name: not_money_format
     field: qualityAssuranceTestingQualityAssuranceTestingAnalystBasicUkPriceMax
     message: Maximum price must be a number less than 10,000, without units, like 99.95

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

@@ -20,7 +20,7 @@ digit_limits:
 validations:
   - name: answer_required
     field: qualityAssuranceTestingQualityAssuranceTestingAnalystLeadPriceMax
-    message: Enter the amount you will charge for a lead qat analyst
+    message: Enter the amount you will charge for a lead QAT analyst
   - name: not_money_format
     field: qualityAssuranceTestingQualityAssuranceTestingAnalystLeadPriceMax
     message: Maximum price must be a number less than 10,000, without units, like 99.95

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

@@ -20,7 +20,7 @@ digit_limits:
 validations:
   - name: answer_required
     field: qualityAssuranceTestingQualityAssuranceTestingAnalystLeadPriceMax
-    message: Enter the amount you will charge for a lead qat analyst
+    message: Enter the amount you will charge for a lead QAT analyst
   - name: not_money_format
     field: qualityAssuranceTestingQualityAssuranceTestingAnalystLeadPriceMax
     message: Maximum price must be a number less than 10,000, without units, like 99.95

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

@@ -1,6 +1,6 @@
-name: Where will your lead qat analyst work?
+name: Where will your lead QAT analyst work?
 question: |
-  <p class="govuk-!-margin-bottom-2"><span class="govuk-fieldset__legend--s">Where will your lead qat analyst work?</span></p>
+  <p class="govuk-!-margin-bottom-2"><span class="govuk-fieldset__legend--s">Where will your lead QAT analyst work?</span></p>
   <p class="govuk-!-margin-bottom-0"><span class="govuk-fieldset__legend--s">Choose all the locations where the specialist can work at buyer’s sites, and whether they can work offsite.</span></p>
 hint: |
   ‘Offsite’ means the supplier will not be working at the buyer’s own sites.

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

@@ -20,7 +20,7 @@ digit_limits:
 validations:
   - name: answer_required
     field: qualityAssuranceTestingQualityAssuranceTestingAnalystLeadUkPriceMax
-    message: Enter the amount you will charge for a lead qat analyst
+    message: Enter the amount you will charge for a lead QAT analyst
   - name: not_money_format
     field: qualityAssuranceTestingQualityAssuranceTestingAnalystLeadUkPriceMax
     message: Maximum price must be a number less than 10,000, without units, like 99.95

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

@@ -1,5 +1,5 @@
 name: Quality assurance testing (QAT) analyst roles
-question: What role levels can you provide for a quality assurance testing (qat) analyst?
+question: What role levels can you provide for a quality assurance testing (QAT) analyst?
 
 depends:
   - "on": lot

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

@@ -20,7 +20,7 @@ digit_limits:
 validations:
   - name: answer_required
     field: qualityAssuranceTestingQualityAssuranceTestingAnalystSeniorPriceMax
-    message: Enter the amount you will charge for a senior qat analyst
+    message: Enter the amount you will charge for a senior QAT analyst
   - name: not_money_format
     field: qualityAssuranceTestingQualityAssuranceTestingAnalystSeniorPriceMax
     message: Maximum price must be a number less than 10,000, without units, like 99.95

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

@@ -20,7 +20,7 @@ digit_limits:
 validations:
   - name: answer_required
     field: qualityAssuranceTestingQualityAssuranceTestingAnalystSeniorPriceMax
-    message: Enter the amount you will charge for a senior qat analyst
+    message: Enter the amount you will charge for a senior QAT analyst
   - name: not_money_format
     field: qualityAssuranceTestingQualityAssuranceTestingAnalystSeniorPriceMax
     message: Maximum price must be a number less than 10,000, without units, like 99.95

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

@@ -1,6 +1,6 @@
-name: Where will your senior qat analyst work?
+name: Where will your senior QAT analyst work?
 question: |
-  <p class="govuk-!-margin-bottom-2"><span class="govuk-fieldset__legend--s">Where will your senior qat analyst work?</span></p>
+  <p class="govuk-!-margin-bottom-2"><span class="govuk-fieldset__legend--s">Where will your senior QAT analyst work?</span></p>
   <p class="govuk-!-margin-bottom-0"><span class="govuk-fieldset__legend--s">Choose all the locations where the specialist can work at buyer’s sites, and whether they can work offsite.</span></p>
 hint: |
   ‘Offsite’ means the supplier will not be working at the buyer’s own sites.

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

@@ -20,7 +20,7 @@ digit_limits:
 validations:
   - name: answer_required
     field: qualityAssuranceTestingQualityAssuranceTestingAnalystSeniorUkPriceMax
-    message: Enter the amount you will charge for a senior qat analyst
+    message: Enter the amount you will charge for a senior QAT analyst
   - name: not_money_format
     field: qualityAssuranceTestingQualityAssuranceTestingAnalystSeniorUkPriceMax
     message: Maximum price must be a number less than 10,000, without units, like 99.95

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

@@ -20,7 +20,7 @@ digit_limits:
 validations:
   - name: answer_required
     field: qualityAssuranceTestingQualityAssuranceTestingAnalystTesterPriceMax
-    message: Enter the amount you will charge for a tester (qat)
+    message: Enter the amount you will charge for a tester (QAT)
   - name: not_money_format
     field: qualityAssuranceTestingQualityAssuranceTestingAnalystTesterPriceMax
     message: Maximum price must be a number less than 10,000, without units, like 99.95

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

@@ -20,7 +20,7 @@ digit_limits:
 validations:
   - name: answer_required
     field: qualityAssuranceTestingQualityAssuranceTestingAnalystTesterPriceMax
-    message: Enter the amount you will charge for a tester (qat)
+    message: Enter the amount you will charge for a tester (QAT)
   - name: not_money_format
     field: qualityAssuranceTestingQualityAssuranceTestingAnalystTesterPriceMax
     message: Maximum price must be a number less than 10,000, without units, like 99.95

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

@@ -1,6 +1,6 @@
-name: Where will your tester (qat) work?
+name: Where will your tester (QAT) work?
 question: |
-  <p class="govuk-!-margin-bottom-2"><span class="govuk-fieldset__legend--s">Where will your tester (qat) work?</span></p>
+  <p class="govuk-!-margin-bottom-2"><span class="govuk-fieldset__legend--s">Where will your tester (QAT) work?</span></p>
   <p class="govuk-!-margin-bottom-0"><span class="govuk-fieldset__legend--s">Choose all the locations where the specialist can work at buyer’s sites, and whether they can work offsite.</span></p>
 hint: |
   ‘Offsite’ means the supplier will not be working at the buyer’s own sites.

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

@@ -20,7 +20,7 @@ digit_limits:
 validations:
   - name: answer_required
     field: qualityAssuranceTestingQualityAssuranceTestingAnalystTesterUkPriceMax
-    message: Enter the amount you will charge for a tester (qat)
+    message: Enter the amount you will charge for a tester (QAT)
   - name: not_money_format
     field: qualityAssuranceTestingQualityAssuranceTestingAnalystTesterUkPriceMax
     message: Maximum price must be a number less than 10,000, without units, like 99.95

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

@@ -0,0 +1,10 @@
+- name: Legal text
+  questions:
+    - legalText
+
+
+- name: Framework agreement
+  questions:
+    - signerName
+    - signerRole
+    - signerTermsAndConditions

package/frameworks/g-cloud-13/questions/agreements/legalText.yml

@@ -0,0 +1,142 @@
+type: text
+optional: true
+question: |
+    <h2 class="govuk-heading-m">
+        1. The Appointment
+    </h2>
+    <p>
+        This section includes terms about the Supplier appointment.
+    </p>
+
+    <p>
+        1.1 <strong>Appointment</strong>
+    <p>
+    <p>
+        Under the terms of this Framework Agreement (RM1557.13) and the Supplier’s Application, the Minister for the Cabinet Office, represented by the Crown Commercial Service (CCS), 9th Floor, The Capital, Old Hall Street, Liverpool, L3 9PP, appoints:
+    </p>
+
+    <p>
+        <strong>Company:</strong>
+        [[registered_name]]
+    </p>
+
+    <p>
+        <strong>Registered address:</strong>
+        [[registered_address]]
+    </p>
+
+    <p>
+        <strong>Company number:</strong>
+        [[registration_number]]
+    </p>
+
+    <p>
+        (the ‘Supplier’), as a Framework Agreement Supplier of G-Cloud Services who can be considered for Call-Off Contracts as outlined in the Contract Notice in the Find a Tender Service reference (2022/S 000-006385).
+    </p>
+
+    <p>
+        <span>
+            1.2
+        </span>
+        <span>
+            <strong>Appointment is to:</strong>
+            [[completed_lots]]
+        </span>
+    </p>
+
+    <p>
+        <span>
+            1.3
+        </span>
+        <span>
+            <strong>Appointment starts at:</strong>
+            9 November 2022
+        </span>
+    </p>
+
+    <p>
+        <span>
+            1.4
+        </span>
+        <span>
+            <strong>Appointment ends at:</strong>
+            23:59 on 8 November 2023 (unless this Framework Agreement is extended by CCS or Ends early).
+        </span>
+    </p>
+
+    <p>
+        <span>
+            1.5
+        </span>
+        <span>
+            <strong>Framework Agreement extension:</strong>
+            Up to 12 months, by CCS giving written notice to Suppliers.
+        </span>
+    </p>
+
+    <p>
+        <span>
+            1.6
+        </span>
+        <span>
+            <strong>Framework Agreement term:</strong>
+            From and including the date at 1.3 above (Appointment starts at) to and including the date at 1.4 above (Appointment ends at).
+        </span>
+    </p>
+
+    <p>
+        <span>
+            1.7
+        </span>
+        <span>
+            <strong>Call-Off Contract length:</strong>
+            Up to 36 months plus an optional extension period of up to 12 months.
+        </span>
+    </p>
+
+    <p>
+        <span>
+            1.8
+        </span>
+        <span>
+            The Parties agree that they have read this Framework Agreement and by signing below agree to be bound by its terms.
+        </span>
+    </p>
+
+    <p>
+        <span>
+            1.9
+        </span>
+        <span>
+            All sections, including the Invitation to Tender and Schedules to this Framework Agreement are expressly part of this Framework Agreement.
+        </span>
+    </p>
+
+    <p>
+        <span>
+            1.10
+        </span>
+        <span>
+            CCS will pay £1 to the Supplier to perform its obligations under this Framework Agreement, receipt of which is acknowledged by the Supplier signing this Framework Agreement.
+        </span>
+    </p>
+
+    <p>
+        <span>
+            1.11
+        </span>
+        <span>
+            The finalised Framework Agreement includes an electronically signed Framework Agreement. It is electronically signed by the Supplier when they make the legal declaration confirming their agreement to the G-Cloud 13 Framework Agreement, and countersigned by the Crown Commercial Service.
+        </span>
+    </p>
+
+    <p class="govuk-body">
+        <a href="[[framework_govuk_url]]">
+            Read the [[framework_name]] contract terms and conditions
+        </a>
+    </p>
+
+depends:
+    - "on": agreementVersion
+      being:
+          - standard

package/frameworks/g-cloud-13/questions/agreements/signerName.yml

@@ -0,0 +1,15 @@
+question: Your full name
+type: text
+
+depends:
+  - "on": agreementVersion
+    being:
+      - standard
+
+max_length_in_characters: 256
+
+validations:
+  - name: answer_required
+    message: Enter your full name.
+  - name: under_character_limit
+    message: Name must be under 256 characters.

package/frameworks/g-cloud-13/questions/agreements/signerRole.yml

@@ -0,0 +1,15 @@
+question: Your role in the company
+type: text
+
+depends:
+  - "on": agreementVersion
+    being:
+      - standard
+
+max_length_in_characters: 256
+
+validations:
+  - name: answer_required
+    message: Enter your role in the company.
+  - name: under_character_limit
+    message: Name must be under 256 characters.

package/frameworks/g-cloud-13/questions/agreements/signerTermsAndConditions.yml

@@ -0,0 +1,15 @@
+question: <span class="govuk-visually-hidden">Do you accept the terms and conditions of the [[contract_title]]?</span>
+type: checkboxes
+
+depends:
+  - "on": agreementVersion
+    being:
+      - standard
+
+options:
+  - label: I accept the terms and conditions of the [[contract_title]]
+    value: "yes"
+
+validations:
+  - name: answer_required
+    message: Accept the terms and conditions of the [[contract_title]].

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccs-digitalmarketplace-frameworks",
-  "version": "2.4.0",
+  "version": "3.0.1",
   "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/requirements-dev.txt

@@ -34,7 +34,7 @@ ccs-digitalmarketplace-apiclient==25.11.0
     # via
     #   -r requirements.txt
     #   ccs-digitalmarketplace-utils
-ccs-digitalmarketplace-content-loader==11.5.0
+ccs-digitalmarketplace-content-loader==11.6.0
     # via -r requirements.txt
 ccs-digitalmarketplace-utils==68.0.0
     # via
@@ -115,7 +115,7 @@ govuk-country-register==0.5.0
     # via
     #   -r requirements.txt
     #   ccs-digitalmarketplace-utils
-hypothesis==6.112.1
+hypothesis==6.112.2
     # via -r requirements-dev.in
 idna==3.7
     # via

package/requirements.in

@@ -1,5 +1,5 @@
 docopt==0.6.2
 deepmerge==2.0
 python-json-logger==2.0.7
-ccs-digitalmarketplace-content-loader==11.5.0
+ccs-digitalmarketplace-content-loader==11.6.0
 ccs-digitalmarketplace-utils==68.0.0

package/requirements.txt

@@ -18,7 +18,7 @@ cachelib==0.13.0
     # via flask-session
 ccs-digitalmarketplace-apiclient==25.11.0
     # via ccs-digitalmarketplace-utils
-ccs-digitalmarketplace-content-loader==11.5.0
+ccs-digitalmarketplace-content-loader==11.6.0
     # via -r requirements.in
 ccs-digitalmarketplace-utils==68.0.0
     # via

package/schema_generator/validation.py

@@ -28,6 +28,10 @@ MANIFESTS = {
     'evaluations': {
         'question_set': 'additional-lot-questions',
         'manifest': 'evaluations'
+    },
+    'agreements': {
+        'question_set': 'agreements',
+        'manifest': 'agreement'
     }
 }
 
@@ -61,17 +65,53 @@ DOS7_LOTS = [
     ('digital-specialists', 'Digital specialists'),
     ('user-research-studios-and-participants', 'User research studios and participants'),
 ]
+STANDARD_AGREEMENT_VERSIONS = [
+    ('standard', 'Standard agreement')
+]
 
 FRAMEWORKS_AND_LOTS = {
     "g-cloud": [
-        {'framework_slug': 'g-cloud-7', 'framework_name': "G-Cloud 7", 'lots': LEGACY_GCLOUD_LOTS},
-        {'framework_slug': 'g-cloud-8', 'framework_name': "G-Cloud 8", 'lots': LEGACY_GCLOUD_LOTS},
-        {'framework_slug': 'g-cloud-9', 'framework_name': "G-Cloud 9", 'lots': G_CLOUD_LOTS},
-        {'framework_slug': 'g-cloud-10', 'framework_name': "G-Cloud 10", 'lots': G_CLOUD_LOTS},
-        {'framework_slug': 'g-cloud-11', 'framework_name': "G-Cloud 11", 'lots': G_CLOUD_LOTS},
-        {'framework_slug': 'g-cloud-12', 'framework_name': "G-Cloud 12", 'lots': G_CLOUD_LOTS},
-        {'framework_slug': 'g-cloud-13', 'framework_name': "G-Cloud 13", 'lots': G_CLOUD13_LOTS},
-        {'framework_slug': 'g-cloud-14', 'framework_name': "G-Cloud 14", 'lots': G_CLOUD13_LOTS},
+        {
+            'framework_slug': 'g-cloud-7',
+            'framework_name': "G-Cloud 7",
+            'lots': LEGACY_GCLOUD_LOTS
+        },
+        {
+            'framework_slug': 'g-cloud-8',
+            'framework_name': "G-Cloud 8",
+            'lots': LEGACY_GCLOUD_LOTS
+        },
+        {
+            'framework_slug': 'g-cloud-9',
+            'framework_name': "G-Cloud 9",
+            'lots': G_CLOUD_LOTS
+        },
+        {
+            'framework_slug': 'g-cloud-10',
+            'framework_name': "G-Cloud 10",
+            'lots': G_CLOUD_LOTS
+        },
+        {
+            'framework_slug': 'g-cloud-11',
+            'framework_name': "G-Cloud 11",
+            'lots': G_CLOUD_LOTS
+        },
+        {
+            'framework_slug': 'g-cloud-12',
+            'framework_name': "G-Cloud 12",
+            'lots': G_CLOUD_LOTS
+        },
+        {
+            'framework_slug': 'g-cloud-13',
+            'framework_name': "G-Cloud 13",
+            'lots': G_CLOUD13_LOTS,
+            'agreement_versions': STANDARD_AGREEMENT_VERSIONS
+        },
+        {
+            'framework_slug': 'g-cloud-14',
+            'framework_name': "G-Cloud 14",
+            'lots': G_CLOUD13_LOTS
+        },
     ],
     "digital-outcomes-and-specialists": [
         {
@@ -102,7 +142,8 @@ FRAMEWORKS_AND_LOTS = {
         {
             'framework_slug': 'digital-outcomes-6',
             'framework_name': "Digital Outcomes 6",
-            'lots': DOS6_LOTS
+            'lots': DOS6_LOTS,
+            'agreement_versions': STANDARD_AGREEMENT_VERSIONS
         },
         {
             'framework_slug': 'digital-outcomes-and-specialists-7',
@@ -129,17 +170,29 @@ def _get_schema_title_and_slugs(schema_type, framework_family=None, exclude_lots
         for framework in framework_list:
             if framework['framework_slug'] in exclude_frameworks:
                 continue
-            for lot_slug, lot_name in framework['lots']:
-                if lot_slug in exclude_lots:
-                    continue
-
-                titles_and_slugs.append(
-                    (
-                        "{} {} {}".format(framework['framework_name'], lot_name, schema_type),
-                        framework['framework_slug'],
-                        lot_slug
+
+            if schema_type == 'Agreement questions':
+                if 'agreement_versions' in framework:
+                    for agreement_version, agreement_version_name in framework['agreement_versions']:
+                        titles_and_slugs.append(
+                            (
+                                "{} {} {}".format(framework['framework_name'], agreement_version_name, schema_type),
+                                framework['framework_slug'],
+                                agreement_version
+                            )
+                        )
+            else:
+                for lot_slug, lot_name in framework['lots']:
+                    if lot_slug in exclude_lots:
+                        continue
+
+                    titles_and_slugs.append(
+                        (
+                            "{} {} {}".format(framework['framework_name'], lot_name, schema_type),
+                            framework['framework_slug'],
+                            lot_slug
+                        )
                     )
-                )
     return titles_and_slugs
 
 
@@ -184,14 +237,32 @@ SCHEMAS = {
             "user-research-participants",
             "user-research-studios-and-participants",
         ],
+    ),
+    'agreements': _get_schema_title_and_slugs(
+        "Agreement questions",
+        exclude_frameworks=[
+            'g-cloud-7',
+            'g-cloud-8',
+            'g-cloud-9',
+            'g-cloud-10',
+            'g-cloud-11',
+            'g-cloud-12',
+            'g-cloud-14',
+            'digital-outcomes-and-specialists',
+            'digital-outcomes-and-specialist-2',
+            'digital-outcomes-and-specialist-3',
+            'digital-outcomes-and-specialist-4',
+            'digital-outcomes-and-specialist-5',
+            'digital-outcomes-and-specialist-7',
+        ],
     )
 }
 
 
-def load_questions(schema_type, framework_slug, lot_slug):
+def load_questions(schema_type, framework_slug, lot_slug_or_agreement_version):
     loader = ContentLoader('./')
     print(
-        f'{framework_slug}/{lot_slug} '
+        f'{framework_slug}/{lot_slug_or_agreement_version} '
         f'question_set: {MANIFESTS[schema_type]["question_set"]}, '
         f'schema_type: {MANIFESTS[schema_type]["manifest"]}'
     )
@@ -202,10 +273,16 @@ def load_questions(schema_type, framework_slug, lot_slug):
         MANIFESTS[schema_type]['manifest']
     )
 
+    if schema_type == 'agreements':
+        filter_key = 'agreementVersion'
+    else:
+        filter_key = 'lot'
+
     manifest = loader.get_manifest(framework_slug, MANIFESTS[schema_type]['manifest']).filter(
-        {'lot': lot_slug},
+        {filter_key: lot_slug_or_agreement_version},
         dynamic=False
     )
+
     return {q['id']: q for q in sum((s.questions for s in manifest.sections), [])}
 
 

package/scripts/generate-validation-schemas.py

@@ -2,7 +2,7 @@
 """Generate validation JSON schemas from the frameworks questions content.
 
 Usage:
-    generate-validation-schemas.py --output-path=<output_path>
+    generate-validation-schemas.py --output-path=<output_path> [--framework=<framework_slug>] [--lot=<lot_slug>]
 
 """
 import os
@@ -20,12 +20,20 @@ from schema_generator.validation import generate_schema_todir, SCHEMAS
 if __name__ == '__main__':
     arguments = docopt(__doc__)
     OUTPUT_DIR = arguments['--output-path']
+    FRAMEWORK_SLUG = arguments.get('--framework')
+    LOT_SLUG = arguments.get('--lot')
     if not os.path.exists(OUTPUT_DIR):
         print("Creating {} directory".format(OUTPUT_DIR))
         os.makedirs(OUTPUT_DIR)
 
     schemas = [(schema_type, *schema) for schema_type in SCHEMAS for schema in SCHEMAS[schema_type]]
 
+    if FRAMEWORK_SLUG:
+        schemas = [schema for schema in schemas if schema[2] == FRAMEWORK_SLUG]
+
+    if LOT_SLUG:
+        schemas = [schema for schema in schemas if schema[3] == LOT_SLUG]
+
     with Pool(processes=5) as pool:
         results = pool.starmap(
             partial(

package/tests/test_content.py

@@ -34,7 +34,9 @@ MANIFEST_QUESTION_SET = {
     "download_results": "services",
 
     "evaluations": "additional-lot-questions",
-    "edit_additional_lot_questions": "additional-lot-questions"
+    "edit_additional_lot_questions": "additional-lot-questions",
+
+    "agreement": "agreements",
 }
 
 # `item` property wouldn't usually be part of a brief response but is included here as the dynamic list child question