Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Childcare subsidies documentation #1011

Open
wants to merge 45 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
adf96a0
Implement tax free childcare
vahid-ahmadi Jan 10, 2025
ee24d61
Parameterize values
vahid-ahmadi Jan 13, 2025
12d24be
Reformatting to pass the tests
vahid-ahmadi Jan 13, 2025
235fd08
Reformatting with black
vahid-ahmadi Jan 13, 2025
b3b1967
Reformatting with black
vahid-ahmadi Jan 13, 2025
55ce6c3
Format code with black
vahid-ahmadi Jan 13, 2025
9952ed9
Format code with black using 79-char line length
vahid-ahmadi Jan 13, 2025
d6b22e5
Fix YAML structure
vahid-ahmadi Jan 13, 2025
b06a47c
Fix age condition YAML file
vahid-ahmadi Jan 13, 2025
90eb823
Fix age condition YAML file
vahid-ahmadi Jan 13, 2025
0c871a5
Fix other YAML files
vahid-ahmadi Jan 13, 2025
b28b5f8
Edit parameterization
vahid-ahmadi Jan 13, 2025
ff1f456
Fix formatting
vahid-ahmadi Jan 13, 2025
d3ad685
Edit age in YAML files
vahid-ahmadi Jan 13, 2025
5c6d359
Replace if with where
vahid-ahmadi Jan 13, 2025
e0221f8
Format with black
vahid-ahmadi Jan 13, 2025
fc83a03
Edit for test passing
vahid-ahmadi Jan 13, 2025
4421154
Edit format with black
vahid-ahmadi Jan 13, 2025
b4e8d1a
Edit format of benefit py file
vahid-ahmadi Jan 13, 2025
cf7f6e6
Edit child as not being boolean
vahid-ahmadi Jan 13, 2025
d4ff3b2
Change if to where
vahid-ahmadi Jan 14, 2025
0058402
Change disability definition
vahid-ahmadi Jan 14, 2025
37c7228
Solve .values problem
vahid-ahmadi Jan 14, 2025
af96f3a
Edit .values error
vahid-ahmadi Jan 14, 2025
e96bc2e
Edit vectorization problem
vahid-ahmadi Jan 14, 2025
153c2f6
Change folder from hmrc to dwp
vahid-ahmadi Jan 14, 2025
c9fbd0c
Use is_disabled_for_benefits variable
vahid-ahmadi Jan 14, 2025
a2f73d2
Add .astype(bool) to fix error
vahid-ahmadi Jan 14, 2025
a061877
Fix bitwise AND operation error
vahid-ahmadi Jan 14, 2025
a9ca8a7
Add .astype(bool) to conditions
vahid-ahmadi Jan 14, 2025
c7c6762
Add unit tests
vahid-ahmadi Jan 14, 2025
59e1b78
Reformat with black
vahid-ahmadi Jan 14, 2025
cebaace
Fix the folders
vahid-ahmadi Jan 15, 2025
c1a5cf0
Fix the folders
vahid-ahmadi Jan 15, 2025
49ec556
Merge branch 'tax-free-childcare-new' of https://github.com/policyeng…
vahid-ahmadi Jan 15, 2025
4a5cad5
Implement free childcare program
vahid-ahmadi Jan 15, 2025
4432db2
Format with black
vahid-ahmadi Jan 15, 2025
c7c1998
Change tests
vahid-ahmadi Jan 15, 2025
789f676
Edit format based on Pavel's comments
vahid-ahmadi Jan 17, 2025
cd3ff72
Implement universal 15-hours free childcare
vahid-ahmadi Jan 17, 2025
ea6cc99
Write childcare subsidies documentation
vahid-ahmadi Jan 17, 2025
bd6a32e
Write childcare subsidies documentation
vahid-ahmadi Jan 17, 2025
2bb9c19
Delete redundant files
vahid-ahmadi Jan 31, 2025
1a835b8
Make seperate docs
vahid-ahmadi Jan 31, 2025
acd806b
Edit _toc file
vahid-ahmadi Jan 31, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix formatting
  • Loading branch information
vahid-ahmadi committed Jan 13, 2025
commit ff1f45678595464accb608fac9af51fd96d4263f
Original file line number Diff line number Diff line change
@@ -26,7 +26,9 @@ def formula(person, period, parameters):
disability_age_limit = age_limits.disability.values

# Check disability conditions
gc = parameters(period).gov.dwp.pension_credit.guarantee_credit.child.disability
gc = parameters(
period
).gov.dwp.pension_credit.guarantee_credit.child.disability
standard_disability_benefits = gc.eligibility
severe_disability_benefits = gc.severe.eligibility

@@ -40,6 +42,4 @@ def formula(person, period, parameters):
age_under_disability_limit = age < disability_age_limit

# Combine conditions
return basic_age_condition | (
age_under_disability_limit & is_disabled
)
return basic_age_condition | (age_under_disability_limit & is_disabled)
Original file line number Diff line number Diff line change
@@ -49,17 +49,20 @@ def formula(person, period, parameters):
meets_young_adult_condition = (
(age >= income_limits.young_adult.min_age.values)
& (age <= income_limits.young_adult.max_age.values)
& (quarterly_income >= income_limits.young_adult.quarterly_income.values)
& (
quarterly_income
>= income_limits.young_adult.quarterly_income.values
)
)

# Age < 18
meets_youth_condition = (age < income_limits.young_adult.min_age.values) & (
quarterly_income >= income_limits.youth.quarterly_income.values
)
meets_youth_condition = (
age < income_limits.young_adult.min_age.values
) & (quarterly_income >= income_limits.youth.quarterly_income.values)

# Combine all conditions
return (
meets_adult_condition
| meets_young_adult_condition
| meets_youth_condition
)
)
Original file line number Diff line number Diff line change
@@ -46,4 +46,4 @@ def formula(benunit, period, parameters):
else:
max_amount = p.standard_child.values

return where(is_eligible, max_amount, 0)
return where(is_eligible, max_amount, 0)
Loading