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

Rename pay-leave-for-parents question pages #2018

Merged
merged 14 commits into from
Oct 19, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ You’ll need to know:

^ You’ll need the same information about your partner if you plan to share the care of the child with them.^

[start: circumstances]
[start: two_carers]
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
Read about [employment statuses](/employment-status) if you aren’t sure which one applies.

* two_carers is 'no'
* employment_status_of_mother in {employee worker} => employment_details_of_mother_1a
* employment_status_of_mother in {self-employed unemployed} => employment_details_of_mother_2a
* employment_status_of_mother in {employee worker} => mother_started_working_before_continuity_start_date
* employment_status_of_mother in {self-employed unemployed} => mother_worked_at_least_26_weeks
* two_carers is 'yes' => employment_status_of_partner
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@

Read about [employment statuses](/employment-status) if you aren’t sure which one applies.

* employment_status_of_mother in {employee worker} => employment_details_of_mother_1a
* employment_status_of_mother in {self-employed unemployed} => employment_details_of_mother_2a
* employment_status_of_mother in {employee worker} => mother_started_working_before_continuity_start_date
* employment_status_of_mother in {self-employed unemployed} => mother_worked_at_least_26_weeks
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@
The 13 weeks don’t need to be in a row.

* two_carers is 'no'
* earnings_employment(mother_earned_at_least_390 mother_worked_at_least_26_weeks) => employment_details_of_mother_3
* earnings_employment(mother_earned_at_least_390 mother_worked_at_least_26_weeks) => salary_1_66_weeks
* employment_status_of_mother is 'employee'
* mother_still_working_on_continuity_end_date is 'yes' => outcome_mat-leave
* mother_still_working_on_continuity_end_date is 'no' => outcome_single-birth-nothing
* employment_status_of_mother in {worker self-employed unemployed} => outcome_single-birth-nothing
* two_carers is 'yes'
* earnings_employment(mother_earned_at_least_390 mother_worked_at_least_26_weeks) => employment_details_of_mother_3
* employment_status_of_partner in {employee worker} => employment_details_of_partner_1a
* earnings_employment(mother_earned_at_least_390 mother_worked_at_least_26_weeks) => salary_1_66_weeks
* employment_status_of_partner in {employee worker} => partner_started_working_before_continuity_start_date
* employment_status_of_partner in {self-employed unemployed}
* employment_status_of_mother is 'employee'
* continuity(mother_started_working_before_continuity_start_date mother_still_working_on_continuity_end_date) AND due_date >= '2015-4-5' => employment_details_of_partner_2a
* continuity(mother_started_working_before_continuity_start_date mother_still_working_on_continuity_end_date) AND due_date >= '2015-4-5' => partner_worked_at_least_26_weeks
* mother_still_working_on_continuity_end_date is 'yes' => outcome_mat-leave
* mother_still_working_on_continuity_end_date is 'no' => outcome_birth-nothing
* employment_status_of_mother in {worker self-employed} => outcome_birth-nothing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
* employment_status_of_mother is 'employee' => outcome_mat-leave_mat-pay
* employment_status_of_mother is 'worker' => outcome_mat-pay
* two_carers is 'yes'
* employment_status_of_partner in {employee worker} => employment_details_of_partner_1a
* employment_status_of_partner in {employee worker} => partner_started_working_before_continuity_start_date
* employment_status_of_partner in {self-employed unemployed}
* due_date >= '2015-4-5' => employment_details_of_partner_2a
* due_date >= '2015-4-5' => partner_worked_at_least_26_weeks
* due_date < '2015-4-5'
* employment_status_of_mother is 'employee' => outcome_mat-leave_mat-pay
* employment_status_of_mother is 'worker' => outcome_mat-pay
* NOT continuity(mother_started_working_before_continuity_start_date mother_still_working_on_continuity_end_date) OR NOT lower_earnings(mother_earned_more_than_lower_earnings_limit) => employment_details_of_mother_2a
* NOT continuity(mother_started_working_before_continuity_start_date mother_still_working_on_continuity_end_date) OR NOT lower_earnings(mother_earned_more_than_lower_earnings_limit) => mother_worked_at_least_26_weeks
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@

This is her total take-home pay before any deductions, eg tax.

* otherwise => employment_details_of_mother_1d
* otherwise => mother_earned_more_than_lower_earnings_limit
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
* yes: Yes
* no: No

* otherwise => employment_details_of_mother_1b
* otherwise => mother_still_working_on_continuity_end_date
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
* yes: Yes
* no: No

* otherwise => employment_details_of_mother_1c
* otherwise => mother_salary
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@

The 26 weeks don’t need to be in a row. They can be full or part weeks.

* otherwise => employment_details_of_mother_2b
* otherwise => mother_earned_at_least_390
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@
* continuity(partner_started_working_before_continuity_start_date partner_still_working_on_continuity_end_date)
* employment_status_of_mother is 'employee'
* continuity(mother_started_working_before_continuity_start_date mother_still_working_on_continuity_end_date) AND lower_earnings(mother_earned_more_than_lower_earnings_limit)
* due_date >= '2015-4-5' => employment_details_of_partner_2a
* due_date >= '2015-4-5' => partner_worked_at_least_26_weeks
* due_date < '2015-4-5' => outcome_mat-leave_mat-pay_pat-leave_additional-pat-leave
* continuity(mother_started_working_before_continuity_start_date mother_still_working_on_continuity_end_date)
* due_date >= '2015-4-5' => employment_details_of_partner_2a
* due_date >= '2015-4-5' => partner_worked_at_least_26_weeks
* due_date < '2015-4-5'
* earnings_employment(mother_earned_at_least_390 mother_worked_at_least_26_weeks) => outcome_mat-allowance_mat-leave_pat-leave_additional-pat-leave
* NOT earnings_employment(mother_earned_at_least_390 mother_worked_at_least_26_weeks) => outcome_mat-leave_pat-leave_additional-pat-leave
Expand All @@ -73,7 +73,7 @@
* NOT earnings_employment(mother_earned_at_least_390 mother_worked_at_least_26_weeks) => outcome_pat-leave
* employment_status_of_mother is 'worker'
* continuity(mother_started_working_before_continuity_start_date mother_still_working_on_continuity_end_date) AND lower_earnings(mother_earned_more_than_lower_earnings_limit)
* due_date >= '2015-4-5' => employment_details_of_partner_2a
* due_date >= '2015-4-5' => partner_worked_at_least_26_weeks
* due_date < '2015-4-5' => outcome_mat-pay_pat-leave_additional-pat-leave
* NOT continuity(mother_started_working_before_continuity_start_date mother_still_working_on_continuity_end_date) OR NOT lower_earnings(mother_earned_more_than_lower_earnings_limit)
* earnings_employment(mother_earned_at_least_390 mother_worked_at_least_26_weeks)
Expand All @@ -89,7 +89,7 @@
* employment_status_of_mother is 'employee'
* mother_still_working_on_continuity_end_date is 'yes'
* due_date >= '2015-4-5'
* continuity(mother_started_working_before_continuity_start_date mother_still_working_on_continuity_end_date) => employment_details_of_partner_2a
* continuity(mother_started_working_before_continuity_start_date mother_still_working_on_continuity_end_date) => partner_worked_at_least_26_weeks
* otherwise
* earnings_employment(mother_earned_at_least_390 mother_worked_at_least_26_weeks) => outcome_mat-allowance_mat-leave
* NOT earnings_employment(mother_earned_at_least_390 mother_worked_at_least_26_weeks) => outcome_mat-leave
Expand All @@ -103,7 +103,7 @@
* NOT earnings_employment(mother_earned_at_least_390 mother_worked_at_least_26_weeks) => outcome_birth-nothing
* employment_status_of_mother is 'worker'
* continuity(mother_started_working_before_continuity_start_date mother_still_working_on_continuity_end_date) AND lower_earnings(mother_earned_more_than_lower_earnings_limit)
* due_date >= '2015-4-5' => employment_details_of_partner_2a
* due_date >= '2015-4-5' => partner_worked_at_least_26_weeks
* due_date < '2015-4-5' => outcome_mat-pay
* NOT continuity(mother_started_working_before_continuity_start_date mother_still_working_on_continuity_end_date) OR NOT lower_earnings(mother_earned_more_than_lower_earnings_limit)
* earnings_employment(mother_earned_at_least_390 mother_worked_at_least_26_weeks) => outcome_mat-allowance
Expand Down Expand Up @@ -153,11 +153,11 @@
* continuity(partner_started_working_before_continuity_start_date partner_still_working_on_continuity_end_date)
* employment_status_of_mother is 'employee'
* continuity(mother_started_working_before_continuity_start_date mother_still_working_on_continuity_end_date) AND lower_earnings(mother_earned_more_than_lower_earnings_limit)
* due_date >= '2015-4-5' => employment_details_of_partner_2a
* due_date >= '2015-4-5' => partner_worked_at_least_26_weeks
* due_date < '2015-4-5' => outcome_mat-leave_mat-pay
* NOT continuity(mother_started_working_before_continuity_start_date mother_still_working_on_continuity_end_date) OR NOT lower_earnings(mother_earned_more_than_lower_earnings_limit)
* continuity(mother_started_working_before_continuity_start_date mother_still_working_on_continuity_end_date)
* due_date >= '2015-4-5' => employment_details_of_partner_2a
* due_date >= '2015-4-5' => partner_worked_at_least_26_weeks
* due_date < '2015-4-5' AND earnings_employment(mother_earned_at_least_390 mother_worked_at_least_26_weeks) => outcome_mat-allowance_mat-leave
* due_date < '2015-4-5' AND NOT earnings_employment(mother_earned_at_least_390 mother_worked_at_least_26_weeks) => outcome_mat-leave
* mother_still_working_on_continuity_end_date is 'yes'
Expand All @@ -168,7 +168,7 @@
* NOT earnings_employment(mother_earned_at_least_390 mother_worked_at_least_26_weeks) => outcome_birth-nothing
* employment_status_of_mother is 'worker'
* continuity(mother_started_working_before_continuity_start_date mother_still_working_on_continuity_end_date) AND lower_earnings(mother_earned_more_than_lower_earnings_limit)
* due_date >= '2015-4-5' => employment_details_of_partner_2a
* due_date >= '2015-4-5' => partner_worked_at_least_26_weeks
* due_date < '2015-4-5' => outcome_mat-pay_pat-pay_additional-pat-pay
* NOT continuity(mother_started_working_before_continuity_start_date mother_still_working_on_continuity_end_date) OR NOT lower_earnings(mother_earned_more_than_lower_earnings_limit)
* earnings_employment(mother_earned_at_least_390 mother_worked_at_least_26_weeks) => outcome_mat-allowance
Expand All @@ -180,7 +180,7 @@
* employment_status_of_mother is 'employee'
* mother_still_working_on_continuity_end_date is 'yes'
* due_date >= '2015-4-5'
* continuity(mother_started_working_before_continuity_start_date mother_still_working_on_continuity_end_date) => employment_details_of_partner_2a
* continuity(mother_started_working_before_continuity_start_date mother_still_working_on_continuity_end_date) => partner_worked_at_least_26_weeks
* NOT continuity(mother_started_working_before_continuity_start_date mother_still_working_on_continuity_end_date)
* earnings_employment(mother_earned_at_least_390 mother_worked_at_least_26_weeks) => outcome_mat-allowance_mat-leave
* NOT earnings_employment(mother_earned_at_least_390 mother_worked_at_least_26_weeks) => outcome_mat-leave
Expand All @@ -194,7 +194,7 @@
* NOT earnings_employment(mother_earned_at_least_390 mother_worked_at_least_26_weeks) => outcome_birth-nothing
* employment_status_of_mother is 'worker'
* continuity(mother_started_working_before_continuity_start_date mother_still_working_on_continuity_end_date) AND lower_earnings(mother_earned_more_than_lower_earnings_limit)
* due_date >= '2015-4-5' => employment_details_of_partner_2a
* due_date >= '2015-4-5' => partner_worked_at_least_26_weeks
* due_date < '2015-4-5' => outcome_mat-pay
* NOT continuity(mother_started_working_before_continuity_start_date mother_still_working_on_continuity_end_date) OR NOT lower_earnings(mother_earned_more_than_lower_earnings_limit)
* earnings_employment(mother_earned_at_least_390 mother_worked_at_least_26_weeks) => outcome_mat-allowance
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@

This is their total take-home pay before any deductions, eg tax.

* otherwise => employment_details_of_partner_1d
* otherwise => partner_earned_more_than_lower_earnings_limit
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
* yes: Yes
* no: No

* otherwise => employment_details_of_partner_1b
* otherwise => partner_still_working_on_continuity_end_date
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
* yes: Yes
* no: No

* otherwise => employment_details_of_partner_1c
* otherwise => partner_salary
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@

The 26 weeks don’t need to be in a row. They can be full or part weeks.

* otherwise => employment_details_of_partner_2b
* otherwise => partner_earned_at_least_390
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
* mother_still_working_on_continuity_end_date is 'no' => outcome_mat-allowance
* employment_status_of_mother in {worker self-employed unemployed} => outcome_mat-allowance
* two_carers is 'yes'
* employment_status_of_partner in {employee worker} => employment_details_of_partner_1a
* employment_status_of_partner in {employee worker} => partner_started_working_before_continuity_start_date
* employment_status_of_partner in {self-employed unemployed}
* employment_status_of_mother is 'employee'
* continuity(mother_started_working_before_continuity_start_date mother_still_working_on_continuity_end_date) AND due_date >= '2015-4-5' => employment_details_of_partner_2a
* continuity(mother_started_working_before_continuity_start_date mother_still_working_on_continuity_end_date) AND due_date >= '2015-4-5' => partner_worked_at_least_26_weeks
* mother_still_working_on_continuity_end_date is 'yes' => outcome_mat-allowance_mat-leave
* mother_still_working_on_continuity_end_date is 'no' => outcome_mat-allowance
* employment_status_of_mother in {worker self-employed unemployed} => outcome_mat-allowance
34 changes: 17 additions & 17 deletions test/data/pay-leave-for-parents-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,23 +59,23 @@ lib/smartdown_flows/pay-leave-for-parents/outcomes/outcome_pat-leave.txt: db84f9
lib/smartdown_flows/pay-leave-for-parents/outcomes/outcome_pat-leave_pat-pay.txt: d1451d6ed450754c4a2ae978dce68c72
lib/smartdown_flows/pay-leave-for-parents/outcomes/outcome_pat-pay.txt: 1e36ba5edb2125597bf4ef636ff4857d
lib/smartdown_flows/pay-leave-for-parents/outcomes/outcome_single-birth-nothing.txt: a790c21af6f30c66abc10b6f19411826
lib/smartdown_flows/pay-leave-for-parents/questions/circumstances.txt: c4d3c47628027c658db685737bf597c8
lib/smartdown_flows/pay-leave-for-parents/questions/due_date.txt: b4ec73a7cb9091d0de8258ce404f08fa
lib/smartdown_flows/pay-leave-for-parents/questions/employment_details_of_mother_1a.txt: 6b931cb48add2fa995af3754b43f41cf
lib/smartdown_flows/pay-leave-for-parents/questions/employment_details_of_mother_1b.txt: 8a9aac043436042988b9363e73b8a84a
lib/smartdown_flows/pay-leave-for-parents/questions/employment_details_of_mother_1c.txt: 9484f631c61aeff96b2f8ed2161dd79c
lib/smartdown_flows/pay-leave-for-parents/questions/employment_details_of_mother_1d.txt: 6bf3d1c9d16f603f4fc9d0de268ea2db
lib/smartdown_flows/pay-leave-for-parents/questions/employment_details_of_mother_2a.txt: eb6823c3808cbbecad214c7b6827fb11
lib/smartdown_flows/pay-leave-for-parents/questions/employment_details_of_mother_2b.txt: b39c1433004f54b33371320dde6c9f9c
lib/smartdown_flows/pay-leave-for-parents/questions/employment_details_of_mother_3.txt: b45a4259abe5e584558b727a7be9eb63
lib/smartdown_flows/pay-leave-for-parents/questions/employment_details_of_partner_1a.txt: 77a22047308cad01a320e85de7c41df7
lib/smartdown_flows/pay-leave-for-parents/questions/employment_details_of_partner_1b.txt: 4269804b95ab9c952bf321d12c090386
lib/smartdown_flows/pay-leave-for-parents/questions/employment_details_of_partner_1c.txt: 0fc961f4a7d8ccdfa1ab5d74a39a6a22
lib/smartdown_flows/pay-leave-for-parents/questions/employment_details_of_partner_1d.txt: 82e386562af7a535ad59882527d9101d
lib/smartdown_flows/pay-leave-for-parents/questions/employment_details_of_partner_2a.txt: 1f864a23d421c70258d5fbb6b05f88ba
lib/smartdown_flows/pay-leave-for-parents/questions/employment_details_of_partner_2b.txt: 108d6f77c324095341d00e0d92706e1d
lib/smartdown_flows/pay-leave-for-parents/questions/employment_status_of_mother.txt: f574b971ac90e4d840180a3e3d3ea1e9
lib/smartdown_flows/pay-leave-for-parents/questions/employment_status_of_partner.txt: 942682704828fb70b18633f1cfe23883
lib/smartdown_flows/pay-leave-for-parents/questions/employment_status_of_mother.txt: 40569287d98d00cd0bb30219a7581292
lib/smartdown_flows/pay-leave-for-parents/questions/employment_status_of_partner.txt: 02371a16eb568b544e2b26fae5fa5118
lib/smartdown_flows/pay-leave-for-parents/questions/mother_earned_at_least_390.txt: ebc0b3507a979be383c983806e39e43d
lib/smartdown_flows/pay-leave-for-parents/questions/mother_earned_more_than_lower_earnings_limit.txt: 1722f2a2ed4c7544eddc17b078beb198
lib/smartdown_flows/pay-leave-for-parents/questions/mother_salary.txt: 7ec904bacc28555ceb46e0dde9248ec7
lib/smartdown_flows/pay-leave-for-parents/questions/mother_started_working_before_continuity_start_date.txt: db9119c2dcd89c53cc0e23d558223e15
lib/smartdown_flows/pay-leave-for-parents/questions/mother_still_working_on_continuity_end_date.txt: a8f17a95b79f622ee82586b568bd1e81
lib/smartdown_flows/pay-leave-for-parents/questions/mother_worked_at_least_26_weeks.txt: 0b29f5378c869042b8859df203c41ccd
lib/smartdown_flows/pay-leave-for-parents/questions/partner_earned_at_least_390.txt: 108d6f77c324095341d00e0d92706e1d
lib/smartdown_flows/pay-leave-for-parents/questions/partner_earned_more_than_lower_earnings_limit.txt: 08d669f9c844d39c73d7efbf7c223f62
lib/smartdown_flows/pay-leave-for-parents/questions/partner_salary.txt: 94e336fcd4161d0a59fbcd1b53753287
lib/smartdown_flows/pay-leave-for-parents/questions/partner_started_working_before_continuity_start_date.txt: b1fc4f3a3e6f2de90e5a2cc142cbb047
lib/smartdown_flows/pay-leave-for-parents/questions/partner_still_working_on_continuity_end_date.txt: e2caf4cace0cba8310a23d7ae9af368d
lib/smartdown_flows/pay-leave-for-parents/questions/partner_worked_at_least_26_weeks.txt: 688d111dd6125a006c73eaf49419005f
lib/smartdown_flows/pay-leave-for-parents/questions/salary_1_66_weeks.txt: 924be99648aa3ec2107dd01de6c7bc33
lib/smartdown_flows/pay-leave-for-parents/questions/two_carers.txt: c4d3c47628027c658db685737bf597c8
lib/smartdown_flows/pay-leave-for-parents/snippets/additional-pat-leave.txt: dcede84d936f876a3c91c1457c3afc01
lib/smartdown_flows/pay-leave-for-parents/snippets/additional-pat-pay.txt: b615038e98f7a56db68a1b3b06fb6cf7
lib/smartdown_flows/pay-leave-for-parents/snippets/birth-nothing.txt: b550c42385547ccb1eab92cb3b3bff0b
Expand All @@ -93,4 +93,4 @@ lib/smartdown_flows/pay-leave-for-parents/snippets/pat-pay.txt: 015527205be6500f
lib/smartdown_flows/pay-leave-for-parents/snippets/pat-shared-leave.txt: 8a866beb5a6fb6fd3301185dfa7c9098
lib/smartdown_flows/pay-leave-for-parents/snippets/pat-shared-pay.txt: 93e79818e0904212a90c966523f3b2d8
lib/smartdown_flows/pay-leave-for-parents/snippets/single-birth-nothing.txt: a62e26a33835b11b26320bcb09b193d6
lib/smartdown_flows/pay-leave-for-parents/pay-leave-for-parents.txt: 35e42940969e2530c034e58d006eb0a6
lib/smartdown_flows/pay-leave-for-parents/pay-leave-for-parents.txt: cb4f11bf8078169a7bab04d436b17e6c