npm - ccs-digitalmarketplace-frameworks - Versions diffs - 4.0.4 → 4.0.6 - Mend

ccs-digitalmarketplace-frameworks 4.0.4 → 4.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

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

@@ -414,7 +414,7 @@
   editable: False
   questions:
     - physicalMinimumStudioTime
-    - physicalStudioBookingCost
+    - multiqPhysicalStudioBookingCost
     - physicalMinimumLeadTime
 - name: Physical user research studio - Capacity

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

@@ -442,7 +442,7 @@
   editable: True
   questions:
     - physicalMinimumStudioTime
-    - physicalStudioBookingCost
+    - multiqPhysicalStudioBookingCost
     - physicalMinimumLeadTime
 - name: Physical user research studio - Capacity

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

@@ -450,7 +450,7 @@
   editable: True
   questions:
     - physicalMinimumStudioTime
-    - physicalStudioBookingCost
+    - multiqPhysicalStudioBookingCost
     - physicalMinimumLeadTime
 - name: Physical user research studio - Capacity

package/frameworks/digital-outcomes-and-specialists-7/questions/declaration/mandatoryAwardQuestion.yml CHANGED Viewed

@@ -1,9 +1,15 @@
 name: Name of consortium
 question: If you are awarded a framework contract, will you deliver in full all mandatory service requirements in Framework Schedule 1 (Specification) for each Lot you have successfully tendered for?
-hint: |
+question_advice: >
+  <p class="govuk-body">
   This question is assessed as pass / fail.
+  </p>
+  <p class="govuk-body">
   Your tender will fail, if you do not answer yes to this question, as you will not satisfy this award question.
+  </p>
+  <p class="govuk-body">
   Your tender will be disqualified. We will tell you that your tender has been disqualified and why.
+  </p>
 type: boolean

package/frameworks/digital-outcomes-and-specialists-7/questions/declaration/tenderInfoAssociatedPersonPpon.yml CHANGED Viewed

@@ -1,5 +1,5 @@
 name: associated person PPON
-question: Please provide their 12 character public procurement organisation number (PPON) for this associated person
+question: Please provide the associated persons 12 character public procurement organisation number (PPON)
 question_advice: >
   This can be found within the Central Digital Platform, in the section called 'My account'.
@@ -19,4 +19,4 @@ validations:
   -
     name: under_character_limit
-    message: PPON must not exceed 14 characters
+    message: PPON must not exceed 12 characters

package/frameworks/digital-outcomes-and-specialists-7/questions/declaration/tenderInfoAssociatedPersonShareCode.yml CHANGED Viewed

@@ -1,5 +1,5 @@
 name: Associated person share code
-question: Please enter the associated person's share code from the CDP supplier information section
+question: Please enter the associated persons share code from the CDP supplier information section
 hint: Example share code from CDP - FW8G8KhC
 type: text

package/frameworks/digital-outcomes-and-specialists-7/questions/services/multiqPhysicalStudioBookingCost.yml ADDED Viewed

@@ -0,0 +1,20 @@
+name: Cost of booking a studio
+question: How much does it cost (excluding VAT) to book a studio?
+depends:
+  - "on": lot
+    being:
+      - user-research-studios-and-participants
+type: multiquestion
+depends_on_follow_up:
+  whatTypesOfUserResearchStudio:
+    - physical-location
+questions:
+  - physicalStudioBookingUnit
+  - physicalStudioBookingCostHour
+  - physicalStudioBookingCostHalfDay
+  - physicalStudioBookingCostDay
+  - physicalStudioBookingCostWeek

package/frameworks/digital-outcomes-and-specialists-7/questions/services/physicalStudioBookingCostDay.yml ADDED Viewed

@@ -0,0 +1,23 @@
+name: Cost of booking a studio per day
+question: What is th cost (excluding VAT) to book a studio per day?
+depends:
+  - "on": lot
+    being:
+      - user-research-studios-and-participants
+type: pricing
+fields:
+  price: physicalStudioBookingCostDayPrice
+hidden: true
+decimal_place_restriction: true
+validations:
+  - name: answer_required
+    field: physicalStudioBookingCostDayPrice
+    message: Enter how much it costs to book a studio per day
+  - name: not_money_format
+    field: physicalStudioBookingCostDayPrice
+    message: Price must be a number greater than 0, without units, eg 99.95

package/frameworks/digital-outcomes-and-specialists-7/questions/services/physicalStudioBookingCostHalfDay.yml ADDED Viewed

@@ -0,0 +1,23 @@
+name: Cost of booking a studio per half day
+question: What is th cost (excluding VAT) to book a studio per half day?
+depends:
+  - "on": lot
+    being:
+      - user-research-studios-and-participants
+hidden: true
+type: pricing
+fields:
+  price: physicalStudioBookingCostHalfDayPrice
+decimal_place_restriction: true
+validations:
+  - name: answer_required
+    field: physicalStudioBookingCostHalfDayPrice
+    message: Enter how much it costs to book a studio per half day
+  - name: not_money_format
+    field: physicalStudioBookingCostHalfDayPrice
+    message: Price must be a number greater than 0, without units, eg 99.95

package/frameworks/digital-outcomes-and-specialists-7/questions/services/physicalStudioBookingCostHour.yml ADDED Viewed

@@ -0,0 +1,23 @@
+name: Cost of booking a studio per hour
+question: What is th cost (excluding VAT) to book a studio per hour?
+depends:
+  - "on": lot
+    being:
+      - user-research-studios-and-participants
+hidden: true
+type: pricing
+fields:
+  price: physicalStudioBookingCostHourPrice
+decimal_place_restriction: true
+validations:
+  - name: answer_required
+    field: physicalStudioBookingCostHourPrice
+    message: Enter how much it costs to book a studio per hour
+  - name: not_money_format
+    field: physicalStudioBookingCostHourPrice
+    message: Price must be a number greater than 0, without units, eg 99.95

package/frameworks/digital-outcomes-and-specialists-7/questions/services/physicalStudioBookingCostWeek.yml ADDED Viewed

@@ -0,0 +1,23 @@
+name: Cost of booking a studio per week
+question: What is th cost (excluding VAT) to book a studio per week?
+depends:
+  - "on": lot
+    being:
+      - user-research-studios-and-participants
+type: pricing
+fields:
+  price: physicalStudioBookingCostWeekPrice
+hidden: true
+decimal_place_restriction: true
+validations:
+  - name: answer_required
+    field: physicalStudioBookingCostWeekPrice
+    message: Enter how much it costs to book a studio per week
+  - name: not_money_format
+    field: physicalStudioBookingCostWeekPrice
+    message: Price must be a number greater than 0, without units, eg 99.95

package/frameworks/digital-outcomes-and-specialists-7/questions/services/physicalStudioBookingUnit.yml ADDED Viewed

@@ -0,0 +1,37 @@
+name: Cost of booking a studio unit
+question: Select the unit's you would charge by
+depends:
+  - "on": lot
+    being:
+      - user-research-studios-and-participants
+type: checkboxes
+options:
+  - label: an hour
+    value: hour
+  - label: a half day
+    value: half_day
+  - label: a day
+    value: day
+  - label: a week
+    value: week
+depends_on_follow_up:
+  whatTypesOfUserResearchStudio:
+    - physical-location
+followup:
+  physicalStudioBookingCostHour:
+    - hour
+  physicalStudioBookingCostHalfDay:
+    - half_day
+  physicalStudioBookingCostDay:
+    - day
+  physicalStudioBookingCostWeek:
+    - week
+validations:
+  - name: answer_required
+    message: Select a unit option

package/frameworks/digital-outcomes-and-specialists-7/questions/services/whatTypesOfUserResearchStudio.yml CHANGED Viewed

@@ -56,9 +56,7 @@ dependent_follow_up:
     - virtual-studio
   physicalMinimumStudioTime:
     - physical-location
-  physicalStudioBookingCostPrice:
-    - physical-location
-  physicalStudioBookingCostUnit:
+  physicalStudioBookingUnit:
     - physical-location
   physicalMinimumLeadTime:
     - physical-location
@@ -133,6 +131,14 @@ dependent_follow_up_followup:
     - physical-location
   physicalStudioOtherBiometrics:
     - physical-location
+  physicalStudioBookingCostHourPrice:
+    - physical-location
+  physicalStudioBookingCostHalfDayPrice:
+    - physical-location
+  physicalStudioBookingCostDayPrice:
+    - physical-location
+  physicalStudioBookingCostWeekPrice:
+    - physical-location
 validations:
   -

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

@@ -87,9 +87,7 @@ dependent_follow_up:
     - user-research-studios
   physicalMinimumStudioTime:
     - user-research-studios
-  physicalStudioBookingCostPrice:
-    - user-research-studios
-  physicalStudioBookingCostUnit:
+  physicalStudioBookingUnit:
     - user-research-studios
   physicalMinimumLeadTime:
     - user-research-studios
@@ -169,6 +167,14 @@ dependent_follow_up_followup:
     - user-research-studios
   physicalStudioOtherBiometrics:
     - user-research-studios
+  physicalStudioBookingCostHourPrice:
+    - user-research-studios
+  physicalStudioBookingCostHalfDayPrice:
+    - user-research-studios
+  physicalStudioBookingCostDayPrice:
+    - user-research-studios
+  physicalStudioBookingCostWeekPrice:
+    - user-research-studios
 validations:
   -

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "ccs-digitalmarketplace-frameworks",
-  "version": "4.0.4",
+  "version": "4.0.6",
   "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/tests/test_content.py CHANGED Viewed

@@ -194,11 +194,12 @@ def test_dependent_follow_up_followup(framework, question_set, manifest):
                         if question_id not in expected_questions_with_dependent_follow_up_followup:
                             expected_questions_with_dependent_follow_up_followup[question_id] = {}
-                        expected_questions_with_dependent_follow_up_followup[
-                            question_id
-                        ][
-                            followup_question_id
-                        ] = question_values
+                        for form_field in loaded_content.get_question(followup_question_id).form_fields:
+                            expected_questions_with_dependent_follow_up_followup[
+                                question_id
+                            ][
+                                form_field
+                            ] = question_values
                     for dependent_follow_up_followup_id in question.get("dependent_follow_up_followup", {}).keys():
                         if question_id not in expected_questions_with_dependent_follow_up_followup:

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

@@ -1,39 +0,0 @@
-name: Cost of booking a studio
-question: How much does it cost (excluding VAT) to book a studio?
-depends:
-  - "on": lot
-    being:
-      - user-research-studios-and-participants
-type: pricing
-fields:
-  price: physicalStudioBookingCostPrice
-  price_unit: physicalStudioBookingCostUnit
-decimal_place_restriction: true
-units:
-  - label: an hour
-    value: Hour
-  - label: a half day
-    value: Half day
-  - label: a day
-    value: Day
-  - label: a week
-    value: Week
-depends_on_follow_up:
-  whatTypesOfUserResearchStudio:
-    - physical-location
-validations:
-  - name: answer_required
-    field: physicalStudioBookingCostPrice
-    message: Enter how much it costs to book a studio
-  - name: not_money_format
-    field: physicalStudioBookingCostPrice
-    message: Price must be a number greater than 0, without units, eg 99.95
-  - name: answer_required
-    field: physicalStudioBookingCostUnit
-    message: You must select the unit