From b307f43462ef3af7f976d231738e8e71eee28049 Mon Sep 17 00:00:00 2001 From: Vahid Ahmadi Date: Thu, 13 Feb 2025 21:49:38 +0100 Subject: [PATCH] Apply Nikhil's comments --- .../dwp/universal_childcare_entitlement/funding_rate.yaml | 4 ++-- .../gov/dwp/universal_childcare_entitlement/hours.yaml | 7 +++++-- .../universal_free_childcare.yaml | 2 +- .../universal_childcare_entitlement.py | 5 +---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/policyengine_uk/parameters/gov/dwp/universal_childcare_entitlement/funding_rate.yaml b/policyengine_uk/parameters/gov/dwp/universal_childcare_entitlement/funding_rate.yaml index e2b58fcd..075f9281 100644 --- a/policyengine_uk/parameters/gov/dwp/universal_childcare_entitlement/funding_rate.yaml +++ b/policyengine_uk/parameters/gov/dwp/universal_childcare_entitlement/funding_rate.yaml @@ -1,9 +1,9 @@ -description: The Department for Education converts childcare hours into expenses for extended childcare entitlement at these rates. +description: The Department for Education converts childcare hours into expenses for universal childcare entitlement at this rate. metadata: type: single_amount threshold_unit: year amount_unit: currency-GBP - label: Extended childcare entitlement hourly rates + label: universal childcare entitlement hourly rates reference: - title: House of Commons Library href: https://commonslibrary.parliament.uk/research-briefings/cbp-8052/ diff --git a/policyengine_uk/parameters/gov/dwp/universal_childcare_entitlement/hours.yaml b/policyengine_uk/parameters/gov/dwp/universal_childcare_entitlement/hours.yaml index b1beb030..66f2fffb 100644 --- a/policyengine_uk/parameters/gov/dwp/universal_childcare_entitlement/hours.yaml +++ b/policyengine_uk/parameters/gov/dwp/universal_childcare_entitlement/hours.yaml @@ -3,10 +3,13 @@ metadata: type: single_amount threshold_unit: year amount_unit: hour - label: Universal childcare entitlement hours + label: universal childcare entitlement hours reference: - title: Childcare (Early Years Provision Free of Charge) (Extended Entitlement) Regulations 2016 - Regulation 35(3) href: https://www.legislation.gov.uk/uksi/2016/1257/part/4/made + - title: Education Act 1996 - Section 8 (Compulsory School Age) + href: https://www.legislation.gov.uk/ukpga/1996/56/section/8 + # In England, children are eligible for universal childcare entitlement from age 3 until they reach compulsory school age, which is defined as the start of the term after their fifth birthday. brackets: - threshold: 2015-01-01: 0 @@ -19,4 +22,4 @@ brackets: - threshold: 2015-01-01: 5 amount: - 2015-01-01: 0 \ No newline at end of file + 2015-01-01: 0 diff --git a/policyengine_uk/tests/policy/baseline/gov/dwp/universal_childcare_entitlement/universal_free_childcare.yaml b/policyengine_uk/tests/policy/baseline/gov/dwp/universal_childcare_entitlement/universal_free_childcare.yaml index e7c262e3..3e9c241b 100644 --- a/policyengine_uk/tests/policy/baseline/gov/dwp/universal_childcare_entitlement/universal_free_childcare.yaml +++ b/policyengine_uk/tests/policy/baseline/gov/dwp/universal_childcare_entitlement/universal_free_childcare.yaml @@ -36,7 +36,7 @@ output: universal_childcare_entitlement: [3351.60] -- name: Multiple children different ages +- name: Multiple children different ages, some eligible period: 2024 input: people: diff --git a/policyengine_uk/variables/gov/dwp/universal_childcare_entitlement/universal_childcare_entitlement.py b/policyengine_uk/variables/gov/dwp/universal_childcare_entitlement/universal_childcare_entitlement.py index 7769b692..29b04b6a 100644 --- a/policyengine_uk/variables/gov/dwp/universal_childcare_entitlement/universal_childcare_entitlement.py +++ b/policyengine_uk/variables/gov/dwp/universal_childcare_entitlement/universal_childcare_entitlement.py @@ -15,7 +15,4 @@ def formula(person, period, parameters): # Get the funding rate from parameters p = parameters(period).gov.dwp.universal_childcare_entitlement rate = p.funding_rate - - # Calculate total funding amount - total_entitlement = hours * rate - return total_entitlement + return hours * rate