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.

Sign up for GitHub

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

CLDC-3344: Sales CSV download ecstat2 child label bug fix #2801

Merged
merged 15 commits into from
Dec 9, 2024
Merged

CLDC-3344: Sales CSV download ecstat2 child label bug fix #2801

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
09ea76a
Add missing answer option
Dinssa Nov 20, 2024
4b52690
Update tests
Dinssa Nov 20, 2024
e08dc01
Allow user to change the age of a person if they're not actually unde…
Dinssa Nov 20, 2024
6d85b60
Update displayed answer options
Dinssa Nov 21, 2024
cb318b1
Add tests
Dinssa Nov 21, 2024
c12259b
Fix lint
Dinssa Nov 21, 2024
5e75fa3
Clear only when age is not known
Dinssa Dec 2, 2024
2cf84df
Merge branch 'main' into CLDC-3344-Sales-csv-download-label-bug-for-p…
Dinssa Dec 2, 2024
ed9eca4
Lint
Dinssa Dec 2, 2024
94125f4
Use existing method
Dinssa Dec 2, 2024
1d08006
Update tests
Dinssa Dec 2, 2024
8090774
Merge branch 'main' into CLDC-3344-Sales-csv-download-label-bug-for-p…
Dinssa Dec 2, 2024
5b54aa8
Merge branch 'main' into CLDC-3344-Sales-csv-download-label-bug-for-p…
Dinssa Dec 4, 2024
b8bf4d2
Revert changes in derived variables
Dinssa Dec 9, 2024
7764d96
Update sales_log_spec.rb
Dinssa Dec 9, 2024
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
2 changes: 2 additions & 0 deletions app/models/derived_variables/sales_log_variables.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,8 @@ def child_under_16_constraints!
(start_index..6).each do |idx|
if age_under_16?(idx)
self["ecstat#{idx}"] = 9
elsif self["ecstat#{idx}"] == 9
self["ecstat#{idx}"] = nil
end
end
Copy link
Contributor Author

@Dinssa Dinssa Nov 20, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I've added this so a user can change the age of a person that was first set as under 16 to another age above 16. At the moment should they want to do that they would get an error:
Answer cannot be over 16 as person’s 2 working situation is ‘child under 16‘.

As the working situation question for a child is not one they can access they'd get stuck. Now should they change the age e.g. to 17, the next question will be to choose the working situation.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Can we add some tests for this to make sure it doesn't clear it when we don't want it to?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure, added

end
Expand Down
18 changes: 18 additions & 0 deletions app/models/form/sales/questions/buyer2_working_situation.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,15 @@ def answer_options
"6" => { "value" => "Not seeking work" },
"7" => { "value" => "Full-time student" },
"8" => { "value" => "Unable to work due to long term sick or disability" },
"9" => {
"value" => "Child under 16",
"depends_on" => [
{ "saledate" => { "operator" => "<", "operand" => Time.zone.local(2024, 4, 1) } },
Copy link
Collaborator

Choose a reason for hiding this comment

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

If form.start_year_2025_or_later? the saledate can't be before 2024?

Maybe it's worth having answer_options and displayed_answer_options as we do on some other questions?

{ "age2_known" => 1 },
{ "age2_known" => nil },
{ "age2" => { "operator" => "<", "operand" => 16 } },
],
},
"0" => { "value" => "Other" },
"10" => { "value" => "Buyer prefers not to say" },
}.freeze
Expand All @@ -41,6 +50,15 @@ def answer_options
"0" => { "value" => "Other" },
"10" => { "value" => "Buyer prefers not to say" },
"7" => { "value" => "Full-time student" },
"9" => {
"value" => "Child under 16",
"depends_on" => [
{ "saledate" => { "operator" => "<", "operand" => Time.zone.local(2024, 4, 1) } },
{ "age2_known" => 1 },
{ "age2_known" => nil },
{ "age2" => { "operator" => "<", "operand" => 16 } },
],
},
}.freeze
end
end
Expand Down
13 changes: 11 additions & 2 deletions spec/models/form/sales/questions/buyer2_working_situation_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,22 +36,31 @@
"0" => { "value" => "Other" },
"10" => { "value" => "Buyer prefers not to say" },
"7" => { "value" => "Full-time student" },
"9" => {
"value" => "Child under 16",
"depends_on" => [
{ "saledate" => { "operator" => "<", "operand" => Time.zone.local(2024, 4, 1) } },
{ "age2_known" => 1 },
{ "age2_known" => nil },
{ "age2" => { "operator" => "<", "operand" => 16 } },
],
},
})
end

context "with start year before 2025" do
let(:form) { instance_double(Form, start_date: Time.zone.local(2024, 4, 1), start_year_2025_or_later?: false) }

it "uses the old ordering for answer options" do
expect(question.answer_options.keys).to eq(%w[1 2 3 4 6 8 5 0 10 7])
expect(question.answer_options.keys).to eq(%w[1 2 3 4 6 8 5 0 10 7 9])
end
end

context "with start year from 2025" do
let(:form) { instance_double(Form, start_date: Time.zone.local(2025, 4, 1), start_year_2025_or_later?: true) }

it "uses the new ordering for answer options" do
expect(question.answer_options.keys).to eq(%w[1 2 3 4 5 6 7 8 0 10])
expect(question.answer_options.keys).to eq(%w[1 2 3 4 5 6 7 8 9 0 10])
end
end

Expand Down
Loading