ccs-digitalmarketplace-frameworks 4.4.43 → 4.4.45

package/frameworks/digital-outcomes-and-specialists-7/questions/fvra/consortiumRecentDraftAccounts5aURL.yml

@@ -1,8 +1,7 @@
 name: Supporting Information
-question: >
-  <p class="govuk-label--m">
-    Please upload any supporting information relevant to your consortium member's Attachment 5a - Lot 2 (Gold) FVRA submission that is not accessible via the Central Digital Platform.
-  </p>
+question: Please upload any supporting information relevant to your consortium member's Attachment 5a - Lot 2 (Gold) FVRA submission that is not accessible via the Central Digital Platform
+
+question_advice: > 
   <p class="govuk-body">
     This may include:
   </p>
@@ -17,8 +16,9 @@ question: >
       Any additional supporting information, that you have chosen to provide in support of your Attachment 5a - Lot 2 (Gold) FVRA Tool, for example, recent draft accounts.
     </li>
   </ul>
-
-question_advice: In line with Attachment 5 - Financial Viability Risk Assessment instructions, any qualified accounts will receive additional scrutiny.
+   <p class="govuk-body">
+    In line with Attachment 5 - Financial Viability Risk Assessment instructions, any qualified accounts will receive additional scrutiny.
+  </p>
 
 hint: >
   <p class="govuk-hint">

package/frameworks/digital-outcomes-and-specialists-7/questions/fvra/consortiumRecentDraftAccounts5bURL.yml

@@ -1,8 +1,7 @@
 name: Recent draft accounts - 5b
-question: >
-  <p class="govuk-label--m">
-    Please upload any supporting information relevant to your consortium member's Attachment 5b - Lots 1/3/4 (Silver) FVRA submission that is not accessible via the Central Digital Platform.
-  </p>
+question: Please upload any supporting information relevant to your consortium member's Attachment 5b - Lots 1/3/4 (Silver) FVRA submission that is not accessible via the Central Digital Platform
+  
+question_advice: >  
   <p class="govuk-body">
     This may include:
   </p>
@@ -14,12 +13,13 @@ question: >
       Statement of your financial position
     </li>
     <li>
-      Any additional supporting information, that you have chosen to provide in support of your Attachment 5b - Lots 1/3/4 (Silver)  FVRA Tool, for example, recent draft accounts.
+      Any additional supporting information, that you have chosen to provide in support of your Attachment 5b - Lots 1/3/4 (Silver) FVRA Tool, for example, recent draft accounts.
     </li>
   </ul>
-
-question_advice: In line with Attachment 5 - Financial Viability Risk Assessment instructions, any qualified accounts will receive additional scrutiny.
-
+   <p class="govuk-body">
+    In line with Attachment 5 - Financial Viability Risk Assessment instructions, any qualified accounts will receive additional scrutiny.
+  </p>
+  
 hint: >
   <p class="govuk-hint">
     The following file types are acceptable:

package/frameworks/digital-outcomes-and-specialists-7/questions/fvra/recentDraftAccounts5aURL.yml

@@ -1,8 +1,7 @@
 name: Supporting Information
-question: >
-  <p class="govuk-label--m">
-    Please upload any supporting information relevant to your Attachment 5a - Lot 2 (Gold) FVRA submission that is not accessible via the Central Digital Platform.
-  </p>
+question: Please upload any supporting information relevant to your consortium member's Attachment 5a - Lot 2 (Gold) FVRA submission that is not accessible via the Central Digital Platform
+
+question_advice: > 
   <p class="govuk-body">
     This may include:
   </p>
@@ -17,8 +16,9 @@ question: >
       Any additional supporting information, that you have chosen to provide in support of your Attachment 5a - Lot 2 (Gold) FVRA Tool, for example, recent draft accounts.
     </li>
   </ul>
-
-question_advice: In line with Attachment 5 - Financial Viability Risk Assessment instructions, any qualified accounts will receive additional scrutiny.
+  <p class="govuk-body">
+    In line with Attachment 5 - Financial Viability Risk Assessment instructions, any qualified accounts will receive additional scrutiny.
+  </p>
 
 hint: >
   <p class="govuk-hint">

package/frameworks/digital-outcomes-and-specialists-7/questions/fvra/recentDraftAccounts5bURL.yml

@@ -1,8 +1,7 @@
 name: Recent draft accounts - 5b
-question: >
-  <p class="govuk-label--m">
-    Please upload any supporting information relevant to your Attachment 5b - Lots 1/3/4 (Silver) FVRA submission that is not accessible via the Central Digital Platform.
-  </p>
+question: Please upload any supporting information relevant to your Attachment 5b - Lots 1/3/4 (Silver) FVRA submission that is not accessible via the Central Digital Platform
+
+question_advice: > 
   <p class="govuk-body">
     This may include:
   </p>
@@ -14,11 +13,12 @@ question: >
       Statement of your financial position
     </li>
     <li>
-      Any additional supporting information, that you have chosen to provide in support of your Attachment 5b - Lots 1/3/4 (Silver)  FVRA Tool, for example, recent draft accounts.
+      Any additional supporting information, that you have chosen to provide in support of your Attachment 5b - Lots 1/3/4 (Silver) FVRA Tool, for example, recent draft accounts.
     </li>
   </ul>
-
-question_advice: In line with Attachment 5 - Financial Viability Risk Assessment instructions, any qualified accounts will receive additional scrutiny.
+  <p class="govuk-body">
+    In line with Attachment 5 - Financial Viability Risk Assessment instructions, any qualified accounts will receive additional scrutiny.
+  </p>
 
 hint: >
   <p class="govuk-hint">

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

@@ -4,21 +4,19 @@ question: >
    <p class="govuk-label--m">Please confirm the Scope 1 to 3 emissions detailed in your carbon reduction plan</p>
 
    <p class="govuk-hint">tCO2e (Tonne of carbon dioxide equivalent) must be entered for each field as a numeric value, e.g. 20.3</p>
-    
+
    <p class="govuk-hint">If you are unable to provide any emissions data for your baseline and/or your current/reporting year, please enter a 0.</p>
 
    <p class="govuk-label--m">Baseline Year Scope 1 Emissions (tCO2e)</p>
-   
-type: number
-unit_in_full: "tCO2e (tonne of carbon dioxide equivalent)"
-unit_position: "before"
-limits:
-  decimal : 0.01
+
+type: text
+
+pattern: "^(0|[1-9]\\d{0,4})(\\.\\d{1,2})?$"
 
 validations:
   -
     name: answer_required
-    message: You must select an option
-  -
-    name: not_a_number
     message: You must enter an emissions value with a maximum of 2 decimal places, e.g. 15.23
+  -
+    name: invalid_format
+    message: You must enter an emissions value between 0.00 and 99999.99, with a maximum of 2 decimal places, e.g. 15.23

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

@@ -1,19 +1,14 @@
 name: Baseline Year Scope 2 Emissions (tCO2e)
-
 question: Baseline Year Scope 2 Emissions (tCO2e)
 
-type: number
-unit_in_full: "tCO2e (tonne of carbon dioxide equivalent)"
-unit_position: "before"
-limits:
-  decimal : 0.01
-  
+type: text
+
+pattern: "^(0|[1-9]\\d{0,4})(\\.\\d{1,2})?$"
+
 validations:
   -
     name: answer_required
-    message: You must select an option
-
-  -
-    name: not_a_number
     message: You must enter an emissions value with a maximum of 2 decimal places, e.g. 15.23
-
+  -
+    name: invalid_format
+    message: You must enter an emissions value between 0.00 and 99999.99, with a maximum of 2 decimal places, e.g. 15.23

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

@@ -1,18 +1,14 @@
 name: Baseline Year Scope 3 Emissions (tCO2e)
-
 question: Baseline Year Scope 3 Emissions (tCO2e)
 
-type: number
-unit_in_full: "tCO2e (tonne of carbon dioxide equivalent)"
-unit_position: "before"
-limits:
-  decimal : 0.01
-  
+type: text
+
+pattern: "^(0|[1-9]\\d{0,4})(\\.\\d{1,2})?$"
+
 validations:
   -
     name: answer_required
-    message: You must select an option
-
-  -
-    name: not_a_number
     message: You must enter an emissions value with a maximum of 2 decimal places, e.g. 15.23
+  -
+    name: invalid_format
+    message: You must enter an emissions value between 0.00 and 99999.99, with a maximum of 2 decimal places, e.g. 15.23

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

@@ -1,18 +1,14 @@
 name: 'Current / Most Recent Reporting Year Scope 1 Emissions (tCO2e)'
-
 question: 'Current / Most Recent Reporting Year Scope 1 Emissions (tCO2e)'
 
-type: number
-unit_in_full: "tCO2e (tonne of carbon dioxide equivalent)"
-unit_position: "before"
-limits:
-  decimal : 0.01
-  
+type: text
+
+pattern: "^(0|[1-9]\\d{0,4})(\\.\\d{1,2})?$"
+
 validations:
   -
     name: answer_required
-    message: You must select an option
-
-  -
-    name: not_a_number
     message: You must enter an emissions value with a maximum of 2 decimal places, e.g. 15.23
+  -
+    name: invalid_format
+    message: You must enter an emissions value between 0.00 and 99999.99, with a maximum of 2 decimal places, e.g. 15.23

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

@@ -1,19 +1,14 @@
 name: 'Current / Most Recent Reporting Year Scope 2 Emissions (tCO2e)'
-
 question: 'Current / Most Recent Reporting Year Scope 2 Emissions (tCO2e)'
 
-type: number
-unit_in_full: "tCO2e (tonne of carbon dioxide equivalent)"
-unit_position: "before"
-limits:
-  decimal : 0.01
-  
+type: text
+
+pattern: "^(0|[1-9]\\d{0,4})(\\.\\d{1,2})?$"
+
 validations:
   -
     name: answer_required
-    message: You must select an option
-
-  -
-    name: not_a_number
     message: You must enter an emissions value with a maximum of 2 decimal places, e.g. 15.23
-
+  -
+    name: invalid_format
+    message: You must enter an emissions value between 0.00 and 99999.99, with a maximum of 2 decimal places, e.g. 15.23

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

@@ -1,19 +1,14 @@
 name: 'Current / Most Recent Reporting Year Scope 3 Emissions (tCO2e)'
-
 question: 'Current / Most Recent Reporting Year Scope 3 Emissions (tCO2e)'
 
-type: number
-unit_in_full: "tCO2e (tonne of carbon dioxide equivalent)"
-unit_position: "before"
-limits:
-  decimal : 0.01
-  
+type: text
+
+pattern: "^(0|[1-9]\\d{0,4})(\\.\\d{1,2})?$"
+
 validations:
   -
     name: answer_required
-    message: You must select an option
-
-  -
-    name: not_a_number
     message: You must enter an emissions value with a maximum of 2 decimal places, e.g. 15.23
-
+  -
+    name: invalid_format
+    message: You must enter an emissions value between 0.00 and 99999.99, with a maximum of 2 decimal places, e.g. 15.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccs-digitalmarketplace-frameworks",
-  "version": "4.4.43",
+  "version": "4.4.45",
   "description": "Data files for Digital Marketplace’s procurement frameworks",
   "repository": {
     "type": "git",