npm - ccs-digitalmarketplace-frameworks - Versions diffs - 4.0.3 → 4.0.5 - Mend

ccs-digitalmarketplace-frameworks 4.0.3 → 4.0.5

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 (16) 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/services/confirmServicesLot3.yml CHANGED Viewed

@@ -2,7 +2,7 @@ name: Confirm services you can provide
 question: >
   <p class="govuk-body">
-  Do you confirm that you can provide at least 1 service capability, 1 digital role and 1 location (as defined in the Specification, section 3.1 and Annexes 1, 2 and 3)?
+  Do you confirm that you can provide at least 1 digital role at 1 location (as defined in the Specification, section 3.3 and Annexes 2 and 3)?
   </p>
   <p class="govuk-body">
   <b>Disclaimer</b>: as part of your application for Digital Outcomes and Specialists 7 the questions in this section will be assessed. Failure to comply may mean that your application fails to meet the requirements for the framework agreement.

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

@@ -2,7 +2,7 @@ name: Confirm services you can provide
 question: >
   <p class="govuk-body">
-  Do you confirm that you can provide at least 1 service capability, 1 digital role and 1 location (as defined in the Specification, section 3.1 and Annexes 1, 2 and 3)?
+  Do you confirm that you can provide at least 1 of the services: user research studios and / or user research participants (as defined in the Specification, section 3.4 and Annex 3)?
   </p>
   <p class="govuk-body">
   <b>Disclaimer</b>: as part of your application for Digital Outcomes and Specialists 7 the questions in this section will be assessed. Failure to comply may mean that your application fails to meet the requirements for the framework agreement.

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.3",
+  "version": "4.0.5",
   "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