Edit labels

policyengine_uk/parameters/gov/dwp/extended_childcare_entitlement/age/lower_limit_for_first_entitlement.yaml

@@ -0,0 +1,12 @@
+description: The department for education provides the extended childcare entitlement program eligibility to children from this minimum age.
+metadata:
+  unit: year
+  period: year
+  label: minimum age eligibility for extended childcare entitlement program (15 hours of free childcare)
+  reference:
+    - title: The Childcare (Free of Charge for Working Parents) (England) Regulations 2022 - Regulations 13
+      href: https://www.legislation.gov.uk/uksi/2022/1134/regulation/13
+    - title: Extended childcare entitlement guidance
+      href: https://www.gov.uk/check-eligible-free-childcare-if-youre-working?step-by-step-nav=f517cd57-3c18-4bb9-aa8b-1b907e279bf9
+values:
+  2015-01-01: 0.75

policyengine_uk/parameters/gov/dwp/extended_childcare_entitlement/age/lower_limit_for_second_entitlement.yaml

@@ -0,0 +1,12 @@
+description: The department for education provides the extended childcare entitlement program eligibility to children from this minimum age.
+metadata:
+  unit: year
+  period: year
+  label: minimum age eligibility for extended childcare entitlement program (30 hours of free childcare)
+  reference:
+    - title: The Childcare (Free of Charge for Working Parents) (England) Regulations 2022 - Regulations 14 and section 7(1)(b) of the 2006 Act
+      href: https://www.legislation.gov.uk/uksi/2014/2147/regulation/3/made
+    - title: Extended childcare entitlement guidance
+      href: https://www.gov.uk/check-eligible-free-childcare-if-youre-working?step-by-step-nav=f517cd57-3c18-4bb9-aa8b-1b907e279bf9
+values:
+  2015-01-01: 3

policyengine_uk/parameters/gov/dwp/extended_childcare_entitlement/age/upper_limit_for_first_entitlement.yaml

@@ -0,0 +1,12 @@
+description: The department for education provides the extended childcare entitlement program eligibility to children up to this maximum age.
+metadata:
+  unit: year
+  period: year
+  label: maximum age eligibility for extended childcare entitlement program (15 hours of free childcare)
+  reference:
+    - title: The Childcare (Free of Charge for Working Parents) (England) Regulations 2022 - Regulations 14 and section 7(1)(b) of the 2006 Act
+      href: https://www.legislation.gov.uk/uksi/2014/2147/regulation/3/made
+    - title: Extended childcare entitlement guidance
+      href: https://www.gov.uk/check-eligible-free-childcare-if-youre-working?step-by-step-nav=f517cd57-3c18-4bb9-aa8b-1b907e279bf9
+values:
+  2015-01-01: 3

policyengine_uk/parameters/gov/dwp/extended_childcare_entitlement/age/upper_limit_for_second_entitlement.yaml

@@ -0,0 +1,12 @@
+description: The department for education provides the extended childcare entitlement program eligibility to children up to this maximum age.
+metadata:
+  unit: year
+  period: year
+  label: maximum age eligibility for extended childcare entitlement program (30 hours of free childcare)
+  reference:
+    - title: The Childcare (Free of Charge for Working Parents) (England) Regulations 2022 - Regulations 14 and section 7(1)(b) of the 2006 Act
+      href: https://www.legislation.gov.uk/uksi/2014/2147/regulation/3/made
+    - title: Extended childcare entitlement guidance
+      href: https://www.gov.uk/check-eligible-free-childcare-if-youre-working?step-by-step-nav=f517cd57-3c18-4bb9-aa8b-1b907e279bf9
+values:
+  2015-01-01: 4

policyengine_uk/parameters/gov/dwp/extended_childcare_entitlement/income_thresholds.yaml

@@ -1,12 +1,15 @@
-description: Income thresholds for tax-free childcare eligibility
+description: The department for education requires minimum earnings thresholds for extended childcare entitlement eligibility based on the age of parents.
 metadata:
   period: year
-  label: Income thresholds for tax-free childcare eligibility
+  type: single_amount 
+  amount_unit: currency-GBP
+  threshold_unit: year
+  label: Extended childcare entitlement minimum earnings threshold
   reference:
-    - title: Childcare Payments Act
-      href: https://www.legislation.gov.uk/ukdsi/2015/9780111127063
-    - title: Tax-Free Childcare Guidance
-      href: https://www.gov.uk/tax-free-childcare?step-by-step-nav=d78aeaf6-1747-4d72-9619-f16efb4dd89d
+    - title: Childcare Payments Act 2014 - c. 28 - section 9 (national minimum wage for 8 hours a week)
+      href: https://www.legislation.gov.uk/ukpga/2014/28/notes/division/6/3/4
+    - title: Extended childcare entitlement guidance
+      href: https://www.gov.uk/check-eligible-free-childcare-if-youre-working?step-by-step-nav=f517cd57-3c18-4bb9-aa8b-1b907e279bf9
 
 brackets:
   - threshold:

policyengine_uk/parameters/gov/dwp/extended_childcare_entitlement/max_income_thresholds.yaml

@@ -1,12 +1,12 @@
-description: max income threshold
+description: The department for education limits extended childcare entitlement eligibility to households where individual adjusted income does not exceed this yearly threshold.
 metadata:
-  unit: year
+  unit: currency-GBP
   period: year
-  label: max income threshold
+  label: Extended childcare entitlement maximum adjusted income threshold
   reference:
-    - title: Childcare Act
-      href: https://www.legislation.gov.uk/uksi/2017/1160/pdfs/uksiem_20171160_en.pdf
-    - title: Tax-Free Childcare Guidance
+    - title: The Childcare Payments (Eligibility) Regulations 2015 - Regulation 15
+      href: https://www.legislation.gov.uk/uksi/2015/448/regulation/15#commentary-key-e27c923eee152accd495af8425536e29
+    - title: Extended childcare entitlement guidance
       href: https://www.gov.uk/check-eligible-free-childcare-if-youre-working?step-by-step-nav=f517cd57-3c18-4bb9-aa8b-1b907e279bf9
 values:
   2015-01-01: 100_000

policyengine_uk/variables/gov/dwp/extended_childcare_entitlement/conditions/age_child_condition_15_hours.py → policyengine_uk/variables/gov/dwp/extended_childcare_entitlement/conditions/extended_childcare_entitlement_15_hours.py

@@ -1,33 +1,33 @@
 from policyengine_uk.model_api import *
 
 
-class free_childcare_15_hours(Variable):
+class extended_childcare_entitlement_15_hours(Variable):
     value_type = bool
     entity = Person
     label = "Free childcare 15 hours eligibility"
-    documentation = "Whether this child meets the age requirements for 15 hours of free childcare"
+    documentation = "Whether this child meets the age requirements for 15 hours of extended childcare entitlement"
     definition_period = YEAR  # Evaluate eligibility on a yearly basis
 
     def formula(person, period, parameters):
         """
-        Determine if a child is eligible for 15 hours of free childcare based on age.
+        Determine if a child is eligible for 15 hours of extended childcare entitlement based on age.
 
         Returns:
             bool: True if the child is eligible for 15 hours, False otherwise.
         """
         # Get the child's age
         age = person("age", period)
 
-        # Retrieve age thresholds for 15 hours eligibility
+        # Retrieve age thresholds
         age_limits = parameters(
             period
         ).gov.dwp.extended_childcare_entitlement.age
-        lower_limit_9_months = age_limits.lower_limit_9_months
-        upper_limit_3_years = age_limits.upper_limit_3_years
+        lower_limit = age_limits.lower_limit_for_first_entitlement
+        upper_limit = age_limits.upper_limit_for_first_entitlement
 
-        # Check if the child is eligible for 15 hours (between 3 and 4 years old)
-        eligible_15_hours = (age >= lower_limit_9_months) & (
-            age <= upper_limit_3_years
+        # Check if the child is eligible
+        eligible_15_hours = (age >= lower_limit) & (
+            age <= upper_limit
         )
 
         # Return the eligibility status