Browse Source

Add field_for_person methods

pull/1094/head
Kat 4 years ago
parent
commit
ea101c9815
  1. 4
      app/models/form/sales/pages/person.rb
  2. 15
      app/models/form/sales/pages/person_age.rb
  3. 2
      app/models/form/sales/pages/person_working_situation.rb
  4. 4
      app/models/form/sales/questions/person.rb
  5. 2
      app/models/form/sales/questions/person_age.rb
  6. 6
      app/models/form/sales/questions/person_age_known.rb
  7. 8
      app/models/form/sales/questions/person_working_situation.rb

4
app/models/form/sales/pages/person.rb

@ -15,4 +15,8 @@ class Form::Sales::Pages::Person < ::Form::Page
def details_known_question_id def details_known_question_id
"details_known_#{person_display_number}" "details_known_#{person_display_number}"
end end
def field_for_person(field, suffix = "")
[field, @person_index, suffix].join
end
end end

15
app/models/form/sales/pages/person_age.rb

@ -9,21 +9,10 @@ class Form::Sales::Pages::PersonAge < Form::Sales::Pages::Person
] ]
end end
PERSON_INDEX = {
"person_1_age" => 2,
"person_2_age" => 3,
"person_3_age" => 4,
"person_4_age" => 5,
"person_1_age_joint_purchase" => 3,
"person_2_age_joint_purchase" => 4,
"person_3_age_joint_purchase" => 5,
"person_4_age_joint_purchase" => 6,
}.freeze
def questions def questions
@questions ||= [ @questions ||= [
Form::Sales::Questions::PersonAgeKnown.new("age#{@person_index}_known", nil, self, person_index: @person_index), Form::Sales::Questions::PersonAgeKnown.new(field_for_person("age", "_known"), nil, self, person_index: @person_index),
Form::Sales::Questions::PersonAge.new("age#{@person_index}", nil, self, person_index: @person_index), Form::Sales::Questions::PersonAge.new(field_for_person("age"), nil, self, person_index: @person_index),
] ]
end end
end end

2
app/models/form/sales/pages/person_working_situation.rb

@ -11,7 +11,7 @@ class Form::Sales::Pages::PersonWorkingSituation < Form::Sales::Pages::Person
def questions def questions
@questions ||= [ @questions ||= [
Form::Sales::Questions::PersonWorkingSituation.new("ecstat#{@person_index}", nil, self, person_index: @person_index), Form::Sales::Questions::PersonWorkingSituation.new(field_for_person("ecstat"), nil, self, person_index: @person_index),
] ]
end end
end end

4
app/models/form/sales/questions/person.rb

@ -11,4 +11,8 @@ class Form::Sales::Questions::Person < ::Form::Question
def joint_purchase? def joint_purchase?
page.id.include?("_joint_purchase") page.id.include?("_joint_purchase")
end end
def field_for_person(field, suffix = "")
[field, @person_index, suffix].join
end
end end

2
app/models/form/sales/questions/person_age.rb

@ -7,7 +7,7 @@ class Form::Sales::Questions::PersonAge < Form::Sales::Questions::Person
@page = page @page = page
@width = 3 @width = 3
@inferred_check_answers_value = { @inferred_check_answers_value = {
"condition" => { "age#{person_index}_known" => 1 }, "condition" => { field_for_person("age", "_known") => 1 },
"value" => "Not known", "value" => "Not known",
} }
@check_answers_card_number = person_index @check_answers_card_number = person_index

6
app/models/form/sales/questions/person_age_known.rb

@ -8,15 +8,15 @@ class Form::Sales::Questions::PersonAgeKnown < ::Form::Sales::Questions::Person
@page = page @page = page
@hint_text = "" @hint_text = ""
@conditional_for = { @conditional_for = {
"age#{@person_index}" => [0], field_for_person("age") => [0],
} }
@hidden_in_check_answers = { @hidden_in_check_answers = {
"depends_on" => [ "depends_on" => [
{ {
"age#{@person_index}_known" => 0, field_for_person("age", "_known") => 0,
}, },
{ {
"age#{@person_index}_known" => 1, field_for_person("age", "_known") => 1,
}, },
], ],
} }

8
app/models/form/sales/questions/person_working_situation.rb

@ -22,12 +22,4 @@ class Form::Sales::Questions::PersonWorkingSituation < ::Form::Sales::Questions:
"7" => { "value" => "Full-time student" }, "7" => { "value" => "Full-time student" },
"9" => { "value" => "Child under 16" }, "9" => { "value" => "Child under 16" },
}.freeze }.freeze
PERSON_INDEX = {
"ecstat2" => 2,
"ecstat3" => 3,
"ecstat4" => 4,
"ecstat5" => 5,
"ecstat6" => 6,
}.freeze
end end

Loading…
Cancel
Save