diff --git a/app/models/form.rb b/app/models/form.rb index ce45da1d9..7e39b94aa 100644 --- a/app/models/form.rb +++ b/app/models/form.rb @@ -60,8 +60,8 @@ class Form page_index = page_ids.index(page.id) page_id = if page.id.include?("value_check") && log[page.questions[0].id] == 1 && page.routed_to?(log, current_user) previous_page(page_ids, page_index, log, current_user) - elsif page.id == ("person_x_known") - "person_1_age" + elsif page.id == ("person_2_known") + "person_2_age" else page_ids[page_index + 1] end diff --git a/app/models/form/page.rb b/app/models/form/page.rb index a04fe759d..5bf1e1618 100644 --- a/app/models/form/page.rb +++ b/app/models/form/page.rb @@ -41,8 +41,4 @@ private q.conditional_for.keys if q.type == "radio" }.compact end - - def person_x_known_id - "person_x_known" - end end diff --git a/app/models/form/sales/pages/person_x_known.rb b/app/models/form/sales/pages/person2_known.rb similarity index 60% rename from app/models/form/sales/pages/person_x_known.rb rename to app/models/form/sales/pages/person2_known.rb index 59931f951..c1eeebf20 100644 --- a/app/models/form/sales/pages/person_x_known.rb +++ b/app/models/form/sales/pages/person2_known.rb @@ -1,8 +1,8 @@ -class Form::Sales::Pages::PersonXKnown < ::Form::Page +class Form::Sales::Pages::Person2Known < ::Form::Page def initialize(id, hsh, subsection) super - @id = person_x_known_id - @header_partial = "person_x_known_page" + @id = "person_2_known" + @header_partial = "person_2_known_page" @header = "" @description = "" @subsection = subsection @@ -15,7 +15,7 @@ class Form::Sales::Pages::PersonXKnown < ::Form::Page def questions @questions ||= [ - Form::Sales::Questions::PersonXKnown.new(nil, nil, self), + Form::Sales::Questions::Person2Known.new(nil, nil, self), ] end end diff --git a/app/models/form/sales/pages/person3_known.rb b/app/models/form/sales/pages/person3_known.rb new file mode 100644 index 000000000..60b344034 --- /dev/null +++ b/app/models/form/sales/pages/person3_known.rb @@ -0,0 +1,20 @@ +class Form::Sales::Pages::Person3Known < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "person_3_known" + @header_partial = "person_3_known_page" + @header = "" + @description = "" + @subsection = subsection + @depends_on = [ + { "hholdcount" => 3 }, + { "hholdcount" => 4 }, + ] + end + + def questions + @questions ||= [ + Form::Sales::Questions::Person3Known.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/questions/person_x_known.rb b/app/models/form/sales/questions/person2_known.rb similarity index 70% rename from app/models/form/sales/questions/person_x_known.rb rename to app/models/form/sales/questions/person2_known.rb index 6427be1e3..be298c3e5 100644 --- a/app/models/form/sales/questions/person_x_known.rb +++ b/app/models/form/sales/questions/person2_known.rb @@ -1,9 +1,9 @@ -class Form::Sales::Questions::PersonXKnown < ::Form::Question +class Form::Sales::Questions::Person2Known < ::Form::Question def initialize(id, hsh, page) super @id = "details_known_2" - @check_answer_label = "Details known for person X" - @header = "Do you know the details for person X?" + @check_answer_label = "Details known for person 2" + @header = "Do you know the details for person 2?" @type = "radio" @answer_options = ANSWER_OPTIONS @page = page diff --git a/app/models/form/sales/questions/person3_known.rb b/app/models/form/sales/questions/person3_known.rb new file mode 100644 index 000000000..e8caab40a --- /dev/null +++ b/app/models/form/sales/questions/person3_known.rb @@ -0,0 +1,24 @@ +class Form::Sales::Questions::Person3Known < ::Form::Question + def initialize(id, hsh, page) + super + @id = "details_known_3" + @check_answer_label = "Details known for person 3" + @header = "Do you know the details for person 3?" + @type = "radio" + @answer_options = ANSWER_OPTIONS + @page = page + @hint_text = "" + @hidden_in_check_answers = { + "depends_on" => [ + { + "details_known_3" => 1, + }, + ], + } + end + + ANSWER_OPTIONS = { + "1" => { "value" => "Yes" }, + "2" => { "value" => "No" }, + }.freeze +end diff --git a/app/models/form/sales/subsections/household_characteristics.rb b/app/models/form/sales/subsections/household_characteristics.rb index c8a2012b0..1aed98ad6 100644 --- a/app/models/form/sales/subsections/household_characteristics.rb +++ b/app/models/form/sales/subsections/household_characteristics.rb @@ -29,8 +29,9 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection Form::Sales::Pages::Buyer2LiveInProperty.new(nil, nil, self), Form::Sales::Pages::NumberOfOthersInProperty.new(nil, nil, self), Form::Sales::Pages::Person1Age.new(nil, nil, self), + Form::Sales::Pages::Person2Known.new(nil, nil, self), Form::Sales::Pages::Person2Age.new(nil, nil, self), - Form::Sales::Pages::PersonXKnown.new(nil, nil, self), + Form::Sales::Pages::Person3Known.new(nil, nil, self), ] end end diff --git a/app/views/form/headers/_person_2_known_page.erb b/app/views/form/headers/_person_2_known_page.erb new file mode 100644 index 000000000..197750515 --- /dev/null +++ b/app/views/form/headers/_person_2_known_page.erb @@ -0,0 +1 @@ +You have given us the details for 1 of the <%= hholdcount %> other people in the household diff --git a/app/views/form/headers/_person_3_known_page.erb b/app/views/form/headers/_person_3_known_page.erb new file mode 100644 index 000000000..7f2b33ee2 --- /dev/null +++ b/app/views/form/headers/_person_3_known_page.erb @@ -0,0 +1 @@ +You have given us the details for 2 of the <%= hholdcount %> other people in the household diff --git a/app/views/form/headers/_person_x_known_page.erb b/app/views/form/headers/_person_x_known_page.erb deleted file mode 100644 index 291d2b469..000000000 --- a/app/views/form/headers/_person_x_known_page.erb +++ /dev/null @@ -1 +0,0 @@ -You have given us the details for X of the <%= hholdcount %> other people in the household diff --git a/app/views/form/page.html.erb b/app/views/form/page.html.erb index 686e2d947..57296b5ba 100644 --- a/app/views/form/page.html.erb +++ b/app/views/form/page.html.erb @@ -17,7 +17,7 @@ <%= @subsection.label %> <% end %> <%if @page.header_partial.present? %> - <% @page.header = render partial: "form/headers/#{@page.header_partial}", locals: {hholdcount: @log.hholdcount} %> + <% @page.header = render partial: "form/headers/#{@page.header_partial}", locals: { hholdcount: @log.hholdcount } %> <% end %> <%= @page.header %>