Browse Source

feat: add extra person known pages

pull/944/head
natdeanlewissoftwire 3 years ago
parent
commit
5d9659b36c
  1. 4
      app/models/form.rb
  2. 4
      app/models/form/page.rb
  3. 8
      app/models/form/sales/pages/person2_known.rb
  4. 20
      app/models/form/sales/pages/person3_known.rb
  5. 6
      app/models/form/sales/questions/person2_known.rb
  6. 24
      app/models/form/sales/questions/person3_known.rb
  7. 3
      app/models/form/sales/subsections/household_characteristics.rb
  8. 1
      app/views/form/headers/_person_2_known_page.erb
  9. 1
      app/views/form/headers/_person_3_known_page.erb
  10. 1
      app/views/form/headers/_person_x_known_page.erb
  11. 2
      app/views/form/page.html.erb

4
app/models/form.rb

@ -60,8 +60,8 @@ class Form
page_index = page_ids.index(page.id) 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) 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) previous_page(page_ids, page_index, log, current_user)
elsif page.id == ("person_x_known") elsif page.id == ("person_2_known")
"person_1_age" "person_2_age"
else else
page_ids[page_index + 1] page_ids[page_index + 1]
end end

4
app/models/form/page.rb

@ -41,8 +41,4 @@ private
q.conditional_for.keys if q.type == "radio" q.conditional_for.keys if q.type == "radio"
}.compact }.compact
end end
def person_x_known_id
"person_x_known"
end
end end

8
app/models/form/sales/pages/person_x_known.rb → 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) def initialize(id, hsh, subsection)
super super
@id = person_x_known_id @id = "person_2_known"
@header_partial = "person_x_known_page" @header_partial = "person_2_known_page"
@header = "" @header = ""
@description = "" @description = ""
@subsection = subsection @subsection = subsection
@ -15,7 +15,7 @@ class Form::Sales::Pages::PersonXKnown < ::Form::Page
def questions def questions
@questions ||= [ @questions ||= [
Form::Sales::Questions::PersonXKnown.new(nil, nil, self), Form::Sales::Questions::Person2Known.new(nil, nil, self),
] ]
end end
end end

20
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

6
app/models/form/sales/questions/person_x_known.rb → 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) def initialize(id, hsh, page)
super super
@id = "details_known_2" @id = "details_known_2"
@check_answer_label = "Details known for person X" @check_answer_label = "Details known for person 2"
@header = "Do you know the details for person X?" @header = "Do you know the details for person 2?"
@type = "radio" @type = "radio"
@answer_options = ANSWER_OPTIONS @answer_options = ANSWER_OPTIONS
@page = page @page = page

24
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

3
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::Buyer2LiveInProperty.new(nil, nil, self),
Form::Sales::Pages::NumberOfOthersInProperty.new(nil, nil, self), Form::Sales::Pages::NumberOfOthersInProperty.new(nil, nil, self),
Form::Sales::Pages::Person1Age.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::Person2Age.new(nil, nil, self),
Form::Sales::Pages::PersonXKnown.new(nil, nil, self), Form::Sales::Pages::Person3Known.new(nil, nil, self),
] ]
end end
end end

1
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

1
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

1
app/views/form/headers/_person_x_known_page.erb

@ -1 +0,0 @@
You have given us the details for X of the <%= hholdcount %> other people in the household

2
app/views/form/page.html.erb

@ -17,7 +17,7 @@
<span class="govuk-caption-l"><%= @subsection.label %></span> <span class="govuk-caption-l"><%= @subsection.label %></span>
<% end %> <% end %>
<%if @page.header_partial.present? %> <%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 %> <% end %>
<%= @page.header %> <%= @page.header %>
</h1> </h1>

Loading…
Cancel
Save