ccs-digitalmarketplace-frameworks 3.13.8 → 3.13.10

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

@@ -315,6 +315,8 @@
   editable: False
   questions:
     - minimumLeadTime
+    - maximumNumberOfParticipants
+    - pricePerHead
 
 - name: Incentives
   editable: False

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

@@ -343,6 +343,8 @@
   editable: True
   questions:
     - minimumLeadTime
+    - maximumNumberOfParticipants
+    - pricePerHead
 
 - name: Incentives
   editable: True

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

@@ -351,6 +351,8 @@
   editable: True
   questions:
     - minimumLeadTime
+    - maximumNumberOfParticipants
+    - pricePerHead
 
 - name: Incentives
   editable: True

package/frameworks/digital-outcomes-and-specialists-7/questions/declaration/confirmationConfirmation.yml

@@ -1,7 +1,9 @@
 name: Confirmation
 
 question: |
-  I confirm that:
+  <p class="govuk-body">
+    I confirm that:
+  </p>
   <ul class="govuk-list govuk-list--bullet">
     <li>to the best of my knowledge the answers submitted and information contained in this document are complete, accurate and not misleading</li>
 

package/frameworks/digital-outcomes-and-specialists-7/questions/declaration/confirmationPostalAddressBuilding.yml

@@ -1,4 +1,4 @@
-name: Town or city
+name: Building and street
 question: |
   <p class="govuk-label">
     Building and street

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

@@ -0,0 +1,25 @@
+name: Maximum number of participants
+question: What is the maximum number of participants you can recruit?
+
+depends:
+  - "on": lot
+    being:
+      - user-research-studios-and-participants
+
+
+type: number
+
+limits:
+  min_value: 1
+  max_value: 1000
+  integer_only: true
+
+depends_on_follow_up:
+  whatUserResearchServices:
+    - user-research-participants
+
+validations:
+  - name: answer_required
+    message: You must enter maximum number of participants, from 1 to 1000
+  - name: not_a_number
+    message: You must enter maximum number of participants, from 1 to 1000

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

@@ -11,9 +11,7 @@ fields:
   price: physicalStudioBookingCostPrice
   price_unit: physicalStudioBookingCostUnit
 
-limits:
-  price:
-    - greater_than_zero
+decimal_place_restriction: true
 
 units:
   - label: an hour

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

@@ -0,0 +1,29 @@
+name: Price per head
+question: What is the price per head (pounds sterling, excluding VAT) to recruit a member of the public from the UK population?
+hint: For example, £199.99
+
+depends:
+  - "on": lot
+    being:
+      - user-research-studios-and-participants
+
+type: pricing
+
+fields:
+  price: perHeadPrice
+
+decimal_place_restriction: true
+digit_limits:
+  price: 4
+
+depends_on_follow_up:
+  whatUserResearchServices:
+    - user-research-participants
+
+validations:
+  - name: answer_required
+    field: perHeadPrice
+    message: Enter the amount you will charge per head to recruit
+  - name: not_money_format
+    field: perHeadPrice
+    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/virtualStudioBookingCost.yml

@@ -11,9 +11,7 @@ fields:
   price: virtualStudioBookingCostPrice
   price_unit: virtualStudioBookingCostUnit
 
-limits:
-  price:
-    - greater_than_zero
+decimal_place_restriction: true
 
 units:
   - label: an hour

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

@@ -39,6 +39,10 @@ dependent_follow_up:
     - user-research-participants
   minimumLeadTime:
     - user-research-participants
+  maximumNumberOfParticipants:
+    - user-research-participants
+  perHeadPrice:
+    - user-research-participants
   incentivePayments:
     - user-research-participants
   howQuickToMakeIncentivePayments:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccs-digitalmarketplace-frameworks",
-  "version": "3.13.8",
+  "version": "3.13.10",
   "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

@@ -491,7 +491,7 @@ def boolean_list_property(question, _dependent_follow_up_map):
     }}
 
 
-def price_string(optional, decimal_place_restriction=False, digit_limit=None, limits=None):
+def price_string(optional, decimal_place_restriction=False, digit_limit=None):
     if digit_limit is None:
         digit_limit = 15
 
@@ -504,10 +504,7 @@ def price_string(optional, decimal_place_restriction=False, digit_limit=None, li
         pattern = restricted_pattern
     if optional:
         pattern = r"^$|" + pattern
-    if limits:
-        for limit in limits:
-            if limit == 'greater_than_zero':
-                pattern = '^(?!0(?:\\.0+)?$)' + pattern.split('^')[1]
+
     return {
         "type": "string",
         "pattern": pattern,
@@ -519,19 +516,14 @@ def pricing_property(question, _dependent_follow_up_map):
     for price_key in ['price', 'minimum_price', 'maximum_price']:
         if price_key in question.fields:
             digit_limit = None
-            limits = []
 
             if 'digit_limits' in question:
                 digit_limit = question['digit_limits'].get(price_key)
 
-            if 'limits' in question:
-                limits = question['limits'].get(price_key)
-
             pricing[question.fields[price_key]] = price_string(
                 price_key in question.get('optional_fields', []),
                 question.decimal_place_restriction,
                 digit_limit=digit_limit,
-                limits=limits,
             )
 
     if 'price_unit' in question.fields:

package/tests/test_generate_validation_schema.py

@@ -785,26 +785,6 @@ def test_pricing_property_custom_intervals():
     ]
 
 
-def test_pricing_property_limits_greater_than_zero():
-    manifest = {
-        "id": "Test",
-        "type": "pricing",
-        "fields": {
-            "price": "price",
-        },
-        "limits": {
-            "price": [
-                "greater_than_zero"
-            ]
-        }
-    }
-
-    cq = ContentQuestion(manifest)
-    result = pricing_property(cq, {})
-
-    assert '(?!0(?:\\.0+)?$)' in result['price']['pattern']
-
-
 @given(st.text())
 def test_number_property(id):
     actual = number_property({'id': id, 'type': 'number'}, {})