Skip to content

Edit childcare programs' interactions and edit is_parent variable#1106

Merged
nikhilwoodruff merged 42 commits into
masterfrom
universal-free-childcare-without-tests
Apr 15, 2025
Merged

Edit childcare programs' interactions and edit is_parent variable#1106
nikhilwoodruff merged 42 commits into
masterfrom
universal-free-childcare-without-tests

Conversation

@vahid-ahmadi
Copy link
Copy Markdown
Collaborator

@vahid-ahmadi vahid-ahmadi commented Apr 8, 2025

Edit the logic of childcare programs:

  1. Corrected the is_parent variable to properly identify parents.
  2. Fixed the logic in childcare programs by adding interaction between childcare program conditions to ensure accurate calculations.

Fixes #1089
Fixes #1101

@vahid-ahmadi vahid-ahmadi changed the title Universal free childcare implementation (without test changes) Edit logic of childcare programs Apr 8, 2025
@vahid-ahmadi vahid-ahmadi self-assigned this Apr 8, 2025
Comment thread changelog_entry.yaml Outdated
Comment thread changelog_entry.yaml Outdated
@nikhilwoodruff
Copy link
Copy Markdown
Collaborator

The title of this PR is too vague- please always title PRs so that people know what they're doing without having to look at the code or PR body.

@vahid-ahmadi vahid-ahmadi changed the title Edit logic of childcare programs Edit childcare programs' interactions and edit is_parent variable Apr 8, 2025
@nikhilwoodruff
Copy link
Copy Markdown
Collaborator

We also need to add max_free_entitlement_hours_used which we'll fill from the data- default to 30.

@vahid-ahmadi
Copy link
Copy Markdown
Collaborator Author

We also need to add max_free_entitlement_hours_used which we'll fill from the data- default to 30.

Done. But I didn't specify it to any childcare program. I created a general max free entitlement hours variable.

Copy link
Copy Markdown
Collaborator

@nikhilwoodruff nikhilwoodruff left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks- could you add a few tests for the max hours used?

@nikhilwoodruff nikhilwoodruff merged commit 719d713 into master Apr 15, 2025
3 checks passed
@nikhilwoodruff nikhilwoodruff deleted the universal-free-childcare-without-tests branch April 15, 2025 14:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Set extended and targeted childcare entitlements to not be in addition to the universal entitlement Check the childcare interactions

2 participants