ccs-digitalmarketplace-frameworks 3.12.18 → 3.12.21

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

@@ -1,3 +1,11 @@
+-
+  name: Connected Persons
+  slug: connected-persons
+  editable: True
+  prefill: False
+  questions:
+    - multiqConnectedPerson
+
 -
   name: Immediate parent company
   slug: immediate-parent-company

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

@@ -0,0 +1,14 @@
+name: Connected person at risk
+question: >
+  Will disclosure of information about any of your connected persons place that person or anyone living with them at risk?
+type: boolean
+hint: When publishing the contract award notice, we have a duty to publish information about your connected persons (as set out in regulation 11). Depending on the type of connected person, this may include their name, date of birth, nationality and service address (which could be the same as their personal address). In most instances, this information will already be available on Companies House and therefore there should be no sensitivity around its publication.
+
+followup:
+  connectedPersonAtRiskNameList:
+    - true
+
+validations:
+  -
+    name: answer_required
+    message: 'You must select an option'

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

@@ -0,0 +1,19 @@
+name: Name
+question: | 
+  Tell us who the connected persons is/are. 
+  Please ensure you enter the name as submitted as part of your core information 
+question_advice: Regulation 27(4-6) makes provision for circumstances where disclosure of information about a connected person could place that person or anyone living with them at risk. These provisions are modelled on the Register of People with Significant Control Regulations 2016 (the ‘2016 Regulations’) but apply to all connected persons under the Act.
+hidden: true
+
+number_of_items: 100
+type: list
+
+validations:
+  - name: answer_required
+    message: Add connected person name
+
+  - name: max_items_limit
+    message: You can add a maximum of 100 connected persons
+
+  - name: not_unique
+    message: Each connected person's name must be unique

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

@@ -0,0 +1,8 @@
+
+name: Connected Persons
+question: ""
+
+type: multiquestion
+questions:
+    - connectedPersonAtRisk
+    - connectedPersonAtRiskNameList

package/package.json

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

@@ -108,7 +108,7 @@ govuk-country-register==0.5.0
     # via
     #   -r requirements.txt
     #   ccs-digitalmarketplace-utils
-hypothesis==6.125.3
+hypothesis==6.127.1
     # via -r requirements-dev.in
 idna==3.7
     # via

package/schema_generator/validation.py

@@ -507,7 +507,7 @@ def price_string(optional, decimal_place_restriction=False, digit_limit=None, li
     if limits:
         for limit in limits:
             if limit == 'greater_than_zero':
-                pattern = '^(?!0$)' + pattern.split('^')[1]
+                pattern = '^(?!0(?:\\.0+)?$)' + pattern.split('^')[1]
     return {
         "type": "string",
         "pattern": pattern,

package/tests/test_generate_validation_schema.py

@@ -802,7 +802,7 @@ def test_pricing_property_limits_greater_than_zero():
     cq = ContentQuestion(manifest)
     result = pricing_property(cq, {})
 
-    assert '(?!0$)' in result['price']['pattern']
+    assert '(?!0(?:\\.0+)?$)' in result['price']['pattern']
 
 
 @given(st.text())