baarkerlounger
/
submit-social-housing-lettings-and-sales-data
mirror of https://github.com/communitiesuk/submit-social-housing-lettings-and-sales-data.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

update content

pull/570/head
Dushan Despotovic 3 years ago
parent
7b421de698
commit
631efff0b4
7 changed files with 422 additions and 135 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      app/helpers/interruption_screen_helper.rb
  2. 15
      app/models/case_log.rb
  3. 2
      app/views/form/_interruption_screen_question.html.erb
  4. 240
      config/forms/2021_2022.json
  5. 244
      config/forms/2022_2023.json
  6. 11
      config/locales/en.yml
  7. 27
      spec/helpers/interruption_screen_helper_spec.rb

18
app/helpers/interruption_screen_helper.rb
Unescape View File

@ -20,4 +20,22 @@ module InterruptionScreenHelper
"" ""
end end
end end
def display_title_text(title_text, case_log)
if title_text["arguments"]
translation_params = {}
title_text["arguments"].each do |argument|
value = if argument["label"]
case_log.form.get_question(argument["key"], case_log).answer_label(case_log).downcase
else
case_log.public_send(argument["key"])
end
translation_params[argument["i18n_template"].to_sym] = value
end
translation = I18n.t(title_text["translation"], **translation_params)
else
translation = I18n.t(title_text)
end
translation.to_s
end
end end

15
app/models/case_log.rb
Unescape View File

@ -380,6 +380,10 @@ class CaseLog < ApplicationRecord
define_method("retirement_age_for_person_#{person_num}") do define_method("retirement_age_for_person_#{person_num}") do
retirement_age_for_person(person_num) retirement_age_for_person(person_num)
end end
define_method("plural_gender_for_person_#{person_num}") do
plural_gender_for_person(person_num)
end
end end
def retirement_age_for_person(person_num) def retirement_age_for_person(person_num)
@ -389,6 +393,17 @@ class CaseLog < ApplicationRecord
RETIREMENT_AGES[gender] RETIREMENT_AGES[gender]
end end
def plural_gender_for_person(person_num)
gender = public_send("sex#{person_num}".to_sym)
return unless gender
if gender == "M" || gender == "X"
return "men and non-binary people"
elsif gender == "F"
return "women"
end
end
private private
PIO = Postcodes::IO.new PIO = Postcodes::IO.new

2
app/views/form/_interruption_screen_question.html.erb
Unescape View File

@ -1,5 +1,5 @@
<%= govuk_panel( <%= govuk_panel(
title_text: I18n.t(title_text), title_text: display_title_text(title_text, case_log),
classes: "app-panel--interruption", classes: "app-panel--interruption",
) do %> ) do %>
<p class="govuk-panel__body"><%= display_informative_text(informative_text, case_log) %></p> <p class="govuk-panel__body"><%= display_informative_text(informative_text, case_log) %></p>

240
config/forms/2021_2022.json
Unescape View File

@ -1531,12 +1531,19 @@
}, },
"lead_tenant_under_retirement_value_check": { "lead_tenant_under_retirement_value_check": {
"depends_on": [{ "person_1_retired_under_soft_min_age?": true }], "depends_on": [{ "person_1_retired_under_soft_min_age?": true }],
"title_text": "soft_validations.retirement.min.title", "title_text": {
"translation": "soft_validations.retirement.min.title",
"arguments": [{
"key": "retirement_age_for_person_1",
"label": false,
"i18n_template": "age"
}]
},
"informative_text": { "informative_text": {
"translation": "soft_validations.retirement.min.hint_text", "translation": "soft_validations.retirement.min.hint_text",
"arguments": [{ "arguments": [{
"key": "sex1", "key": "plural_gender_for_person_1",
"label": true, "label": false,
"i18n_template": "gender" "i18n_template": "gender"
}, },
{ {
@ -1549,7 +1556,7 @@
"retirement_value_check": { "retirement_value_check": {
"check_answer_label": "Retirement age soft validation", "check_answer_label": "Retirement age soft validation",
"hidden_in_check_answers": true, "hidden_in_check_answers": true,
"header": "Are you sure this is correct?", "header": "Are you sure this person isn’t retired?",
"type": "interruption_screen", "type": "interruption_screen",
"answer_options": { "answer_options": {
"0": { "0": {
@ -1564,12 +1571,19 @@
}, },
"lead_tenant_over_retirement_value_check": { "lead_tenant_over_retirement_value_check": {
"depends_on": [{ "person_1_not_retired_over_soft_max_age?": true }], "depends_on": [{ "person_1_not_retired_over_soft_max_age?": true }],
"title_text": "soft_validations.retirement.max.title", "title_text": {
"translation": "soft_validations.retirement.max.title",
"arguments": [{
"key": "retirement_age_for_person_1",
"label": false,
"i18n_template": "age"
}]
},
"informative_text": { "informative_text": {
"translation": "soft_validations.retirement.max.hint_text", "translation": "soft_validations.retirement.max.hint_text",
"arguments": [{ "arguments": [{
"key": "sex1", "key": "plural_gender_for_person_1",
"label": true, "label": false,
"i18n_template": "gender" "i18n_template": "gender"
}, },
{ {
@ -1582,7 +1596,7 @@
"retirement_value_check": { "retirement_value_check": {
"check_answer_label": "Retirement age soft validation", "check_answer_label": "Retirement age soft validation",
"hidden_in_check_answers": true, "hidden_in_check_answers": true,
"header": "Are you sure this is correct?", "header": "Are you sure this person isn’t retired??",
"type": "interruption_screen", "type": "interruption_screen",
"answer_options": { "answer_options": {
"0": { "0": {
@ -1822,12 +1836,19 @@
}, },
"person_2_under_retirement_value_check": { "person_2_under_retirement_value_check": {
"depends_on": [{ "person_2_retired_under_soft_min_age?": true }], "depends_on": [{ "person_2_retired_under_soft_min_age?": true }],
"title_text": "soft_validations.retirement.min.title", "title_text": {
"translation": "soft_validations.retirement.min.title",
"arguments": [{
"key": "retirement_age_for_person_2",
"label": false,
"i18n_template": "age"
}]
},
"informative_text": { "informative_text": {
"translation": "soft_validations.retirement.min.hint_text", "translation": "soft_validations.retirement.min.hint_text",
"arguments": [{ "arguments": [{
"key": "sex2", "key": "plural_gender_for_person_2",
"label": true, "label": false,
"i18n_template": "gender" "i18n_template": "gender"
}, },
{ {
@ -1840,7 +1861,7 @@
"retirement_value_check": { "retirement_value_check": {
"check_answer_label": "Retirement age soft validation", "check_answer_label": "Retirement age soft validation",
"hidden_in_check_answers": true, "hidden_in_check_answers": true,
"header": "Are you sure this is correct?", "header": "Are you sure this person isn’t retired?",
"type": "interruption_screen", "type": "interruption_screen",
"answer_options": { "answer_options": {
"0": { "0": {
@ -1855,12 +1876,19 @@
}, },
"person_2_over_retirement_value_check": { "person_2_over_retirement_value_check": {
"depends_on": [{ "person_2_not_retired_over_soft_max_age?": true }], "depends_on": [{ "person_2_not_retired_over_soft_max_age?": true }],
"title_text": "soft_validations.retirement.max.title", "title_text": {
"translation": "soft_validations.retirement.max.title",
"arguments": [{
"key": "retirement_age_for_person_2",
"label": false,
"i18n_template": "age"
}]
},
"informative_text": { "informative_text": {
"translation": "soft_validations.retirement.max.hint_text", "translation": "soft_validations.retirement.max.hint_text",
"arguments": [{ "arguments": [{
"key": "sex2", "key": "plural_gender_for_person_2",
"label": true, "label": false,
"i18n_template": "gender" "i18n_template": "gender"
}, },
{ {
@ -1873,7 +1901,7 @@
"retirement_value_check": { "retirement_value_check": {
"check_answer_label": "Retirement age soft validation", "check_answer_label": "Retirement age soft validation",
"hidden_in_check_answers": true, "hidden_in_check_answers": true,
"header": "Are you sure this is correct?", "header": "Are you sure this person isn’t retired??",
"type": "interruption_screen", "type": "interruption_screen",
"answer_options": { "answer_options": {
"0": { "0": {
@ -2110,12 +2138,19 @@
}, },
"person_3_under_retirement_value_check": { "person_3_under_retirement_value_check": {
"depends_on": [{ "person_3_retired_under_soft_min_age?": true }], "depends_on": [{ "person_3_retired_under_soft_min_age?": true }],
"title_text": "soft_validations.retirement.min.title", "title_text": {
"translation": "soft_validations.retirement.min.title",
"arguments": [{
"key": "retirement_age_for_person_3",
"label": false,
"i18n_template": "age"
}]
},
"informative_text": { "informative_text": {
"translation": "soft_validations.retirement.min.hint_text", "translation": "soft_validations.retirement.min.hint_text",
"arguments": [{ "arguments": [{
"key": "sex3", "key": "plural_gender_for_person_3",
"label": true, "label": false,
"i18n_template": "gender" "i18n_template": "gender"
}, },
{ {
@ -2128,7 +2163,7 @@
"retirement_value_check": { "retirement_value_check": {
"check_answer_label": "Retirement age soft validation", "check_answer_label": "Retirement age soft validation",
"hidden_in_check_answers": true, "hidden_in_check_answers": true,
"header": "Are you sure this is correct?", "header": "Are you sure this person isn’t retired?",
"type": "interruption_screen", "type": "interruption_screen",
"answer_options": { "answer_options": {
"0": { "0": {
@ -2143,12 +2178,19 @@
}, },
"person_3_over_retirement_value_check": { "person_3_over_retirement_value_check": {
"depends_on": [{ "person_3_not_retired_over_soft_max_age?": true }], "depends_on": [{ "person_3_not_retired_over_soft_max_age?": true }],
"title_text": "soft_validations.retirement.max.title", "title_text": {
"translation": "soft_validations.retirement.max.title",
"arguments": [{
"key": "retirement_age_for_person_3",
"label": false,
"i18n_template": "age"
}]
},
"informative_text": { "informative_text": {
"translation": "soft_validations.retirement.max.hint_text", "translation": "soft_validations.retirement.max.hint_text",
"arguments": [{ "arguments": [{
"key": "sex3", "key": "plural_gender_for_person_3",
"label": true, "label": false,
"i18n_template": "gender" "i18n_template": "gender"
}, },
{ {
@ -2161,7 +2203,7 @@
"retirement_value_check": { "retirement_value_check": {
"check_answer_label": "Retirement age soft validation", "check_answer_label": "Retirement age soft validation",
"hidden_in_check_answers": true, "hidden_in_check_answers": true,
"header": "Are you sure this is correct?", "header": "Are you sure this person isn’t retired??",
"type": "interruption_screen", "type": "interruption_screen",
"answer_options": { "answer_options": {
"0": { "0": {
@ -2395,12 +2437,19 @@
}, },
"person_4_under_retirement_value_check": { "person_4_under_retirement_value_check": {
"depends_on": [{ "person_4_retired_under_soft_min_age?": true }], "depends_on": [{ "person_4_retired_under_soft_min_age?": true }],
"title_text": "soft_validations.retirement.min.title", "title_text": {
"translation": "soft_validations.retirement.min.title",
"arguments": [{
"key": "retirement_age_for_person_4",
"label": false,
"i18n_template": "age"
}]
},
"informative_text": { "informative_text": {
"translation": "soft_validations.retirement.min.hint_text", "translation": "soft_validations.retirement.min.hint_text",
"arguments": [{ "arguments": [{
"key": "sex4", "key": "plural_gender_for_person_4",
"label": true, "label": false,
"i18n_template": "gender" "i18n_template": "gender"
}, },
{ {
@ -2413,7 +2462,7 @@
"retirement_value_check": { "retirement_value_check": {
"check_answer_label": "Retirement age soft validation", "check_answer_label": "Retirement age soft validation",
"hidden_in_check_answers": true, "hidden_in_check_answers": true,
"header": "Are you sure this is correct?", "header": "Are you sure this person isn’t retired?",
"type": "interruption_screen", "type": "interruption_screen",
"answer_options": { "answer_options": {
"0": { "0": {
@ -2428,12 +2477,19 @@
}, },
"person_4_over_retirement_value_check": { "person_4_over_retirement_value_check": {
"depends_on": [{ "person_4_not_retired_over_soft_max_age?": true }], "depends_on": [{ "person_4_not_retired_over_soft_max_age?": true }],
"title_text": "soft_validations.retirement.max.title", "title_text": {
"translation": "soft_validations.retirement.max.title",
"arguments": [{
"key": "retirement_age_for_person_4",
"label": false,
"i18n_template": "age"
}]
},
"informative_text": { "informative_text": {
"translation": "soft_validations.retirement.max.hint_text", "translation": "soft_validations.retirement.max.hint_text",
"arguments": [{ "arguments": [{
"key": "sex4", "key": "plural_gender_for_person_4",
"label": true, "label": false,
"i18n_template": "gender" "i18n_template": "gender"
}, },
{ {
@ -2446,7 +2502,7 @@
"retirement_value_check": { "retirement_value_check": {
"check_answer_label": "Retirement age soft validation", "check_answer_label": "Retirement age soft validation",
"hidden_in_check_answers": true, "hidden_in_check_answers": true,
"header": "Are you sure this is correct?", "header": "Are you sure this person isn’t retired??",
"type": "interruption_screen", "type": "interruption_screen",
"answer_options": { "answer_options": {
"0": { "0": {
@ -2677,12 +2733,19 @@
}, },
"person_5_under_retirement_value_check": { "person_5_under_retirement_value_check": {
"depends_on": [{ "person_5_retired_under_soft_min_age?": true }], "depends_on": [{ "person_5_retired_under_soft_min_age?": true }],
"title_text": "soft_validations.retirement.min.title", "title_text": {
"translation": "soft_validations.retirement.min.title",
"arguments": [{
"key": "retirement_age_for_person_5",
"label": false,
"i18n_template": "age"
}]
},
"informative_text": { "informative_text": {
"translation": "soft_validations.retirement.min.hint_text", "translation": "soft_validations.retirement.min.hint_text",
"arguments": [{ "arguments": [{
"key": "sex5", "key": "plural_gender_for_person_5",
"label": true, "label": false,
"i18n_template": "gender" "i18n_template": "gender"
}, },
{ {
@ -2695,7 +2758,7 @@
"retirement_value_check": { "retirement_value_check": {
"check_answer_label": "Retirement age soft validation", "check_answer_label": "Retirement age soft validation",
"hidden_in_check_answers": true, "hidden_in_check_answers": true,
"header": "Are you sure this is correct?", "header": "Are you sure this person isn’t retired?",
"type": "interruption_screen", "type": "interruption_screen",
"answer_options": { "answer_options": {
"0": { "0": {
@ -2710,12 +2773,19 @@
}, },
"person_5_over_retirement_value_check": { "person_5_over_retirement_value_check": {
"depends_on": [{ "person_5_not_retired_over_soft_max_age?": true }], "depends_on": [{ "person_5_not_retired_over_soft_max_age?": true }],
"title_text": "soft_validations.retirement.max.title", "title_text": {
"translation": "soft_validations.retirement.max.title",
"arguments": [{
"key": "retirement_age_for_person_5",
"label": false,
"i18n_template": "age"
}]
},
"informative_text": { "informative_text": {
"translation": "soft_validations.retirement.max.hint_text", "translation": "soft_validations.retirement.max.hint_text",
"arguments": [{ "arguments": [{
"key": "sex5", "key": "plural_gender_for_person_5",
"label": true, "label": false,
"i18n_template": "gender" "i18n_template": "gender"
}, },
{ {
@ -2728,7 +2798,7 @@
"retirement_value_check": { "retirement_value_check": {
"check_answer_label": "Retirement age soft validation", "check_answer_label": "Retirement age soft validation",
"hidden_in_check_answers": true, "hidden_in_check_answers": true,
"header": "Are you sure this is correct?", "header": "Are you sure this person isn’t retired??",
"type": "interruption_screen", "type": "interruption_screen",
"answer_options": { "answer_options": {
"0": { "0": {
@ -2956,12 +3026,19 @@
}, },
"person_6_under_retirement_value_check": { "person_6_under_retirement_value_check": {
"depends_on": [{ "person_6_retired_under_soft_min_age?": true }], "depends_on": [{ "person_6_retired_under_soft_min_age?": true }],
"title_text": "soft_validations.retirement.min.title", "title_text": {
"translation": "soft_validations.retirement.min.title",
"arguments": [{
"key": "retirement_age_for_person_6",
"label": false,
"i18n_template": "age"
}]
},
"informative_text": { "informative_text": {
"translation": "soft_validations.retirement.min.hint_text", "translation": "soft_validations.retirement.min.hint_text",
"arguments": [{ "arguments": [{
"key": "sex6", "key": "plural_gender_for_person_6",
"label": true, "label": false,
"i18n_template": "gender" "i18n_template": "gender"
}, },
{ {
@ -2974,7 +3051,7 @@
"retirement_value_check": { "retirement_value_check": {
"check_answer_label": "Retirement age soft validation", "check_answer_label": "Retirement age soft validation",
"hidden_in_check_answers": true, "hidden_in_check_answers": true,
"header": "Are you sure this is correct?", "header": "Are you sure this person isn’t retired?",
"type": "interruption_screen", "type": "interruption_screen",
"answer_options": { "answer_options": {
"0": { "0": {
@ -2989,12 +3066,19 @@
}, },
"person_6_over_retirement_value_check": { "person_6_over_retirement_value_check": {
"depends_on": [{ "person_6_not_retired_over_soft_max_age?": true }], "depends_on": [{ "person_6_not_retired_over_soft_max_age?": true }],
"title_text": "soft_validations.retirement.max.title", "title_text": {
"translation": "soft_validations.retirement.max.title",
"arguments": [{
"key": "retirement_age_for_person_6",
"label": false,
"i18n_template": "age"
}]
},
"informative_text": { "informative_text": {
"translation": "soft_validations.retirement.max.hint_text", "translation": "soft_validations.retirement.max.hint_text",
"arguments": [{ "arguments": [{
"key": "sex6", "key": "plural_gender_for_person_6",
"label": true, "label": false,
"i18n_template": "gender" "i18n_template": "gender"
}, },
{ {
@ -3007,7 +3091,7 @@
"retirement_value_check": { "retirement_value_check": {
"check_answer_label": "Retirement age soft validation", "check_answer_label": "Retirement age soft validation",
"hidden_in_check_answers": true, "hidden_in_check_answers": true,
"header": "Are you sure this is correct?", "header": "Are you sure this person isn’t retired??",
"type": "interruption_screen", "type": "interruption_screen",
"answer_options": { "answer_options": {
"0": { "0": {
@ -3232,12 +3316,19 @@
}, },
"person_7_under_retirement_value_check": { "person_7_under_retirement_value_check": {
"depends_on": [{ "person_7_retired_under_soft_min_age?": true }], "depends_on": [{ "person_7_retired_under_soft_min_age?": true }],
"title_text": "soft_validations.retirement.min.title", "title_text": {
"translation": "soft_validations.retirement.min.title",
"arguments": [{
"key": "retirement_age_for_person_7",
"label": false,
"i18n_template": "age"
}]
},
"informative_text": { "informative_text": {
"translation": "soft_validations.retirement.min.hint_text", "translation": "soft_validations.retirement.min.hint_text",
"arguments": [{ "arguments": [{
"key": "sex7", "key": "plural_gender_for_person_7",
"label": true, "label": false,
"i18n_template": "gender" "i18n_template": "gender"
}, },
{ {
@ -3250,7 +3341,7 @@
"retirement_value_check": { "retirement_value_check": {
"check_answer_label": "Retirement age soft validation", "check_answer_label": "Retirement age soft validation",
"hidden_in_check_answers": true, "hidden_in_check_answers": true,
"header": "Are you sure this is correct?", "header": "Are you sure this person isn’t retired?",
"type": "interruption_screen", "type": "interruption_screen",
"answer_options": { "answer_options": {
"0": { "0": {
@ -3265,12 +3356,19 @@
}, },
"person_7_over_retirement_value_check": { "person_7_over_retirement_value_check": {
"depends_on": [{ "person_7_not_retired_over_soft_max_age?": true }], "depends_on": [{ "person_7_not_retired_over_soft_max_age?": true }],
"title_text": "soft_validations.retirement.max.title", "title_text": {
"translation": "soft_validations.retirement.max.title",
"arguments": [{
"key": "retirement_age_for_person_7",
"label": false,
"i18n_template": "age"
}]
},
"informative_text": { "informative_text": {
"translation": "soft_validations.retirement.max.hint_text", "translation": "soft_validations.retirement.max.hint_text",
"arguments": [{ "arguments": [{
"key": "sex7", "key": "plural_gender_for_person_7",
"label": true, "label": false,
"i18n_template": "gender" "i18n_template": "gender"
}, },
{ {
@ -3283,7 +3381,7 @@
"retirement_value_check": { "retirement_value_check": {
"check_answer_label": "Retirement age soft validation", "check_answer_label": "Retirement age soft validation",
"hidden_in_check_answers": true, "hidden_in_check_answers": true,
"header": "Are you sure this is correct?", "header": "Are you sure this person isn’t retired??",
"type": "interruption_screen", "type": "interruption_screen",
"answer_options": { "answer_options": {
"0": { "0": {
@ -3505,12 +3603,19 @@
}, },
"person_8_under_retirement_value_check": { "person_8_under_retirement_value_check": {
"depends_on": [{ "person_8_retired_under_soft_min_age?": true }], "depends_on": [{ "person_8_retired_under_soft_min_age?": true }],
"title_text": "soft_validations.retirement.min.title", "title_text": {
"translation": "soft_validations.retirement.min.title",
"arguments": [{
"key": "retirement_age_for_person_8",
"label": false,
"i18n_template": "age"
}]
},
"informative_text": { "informative_text": {
"translation": "soft_validations.retirement.min.hint_text", "translation": "soft_validations.retirement.min.hint_text",
"arguments": [{ "arguments": [{
"key": "sex8", "key": "plural_gender_for_person_8",
"label": true, "label": false,
"i18n_template": "gender" "i18n_template": "gender"
}, },
{ {
@ -3523,7 +3628,7 @@
"retirement_value_check": { "retirement_value_check": {
"check_answer_label": "Retirement age soft validation", "check_answer_label": "Retirement age soft validation",
"hidden_in_check_answers": true, "hidden_in_check_answers": true,
"header": "Are you sure this is correct?", "header": "Are you sure this person isn’t retired?",
"type": "interruption_screen", "type": "interruption_screen",
"answer_options": { "answer_options": {
"0": { "0": {
@ -3538,12 +3643,19 @@
}, },
"person_8_over_retirement_value_check": { "person_8_over_retirement_value_check": {
"depends_on": [{ "person_8_not_retired_over_soft_max_age?": true }], "depends_on": [{ "person_8_not_retired_over_soft_max_age?": true }],
"title_text": "soft_validations.retirement.max.title", "title_text": {
"translation": "soft_validations.retirement.max.title",
"arguments": [{
"key": "retirement_age_for_person_8",
"label": false,
"i18n_template": "age"
}]
},
"informative_text": { "informative_text": {
"translation": "soft_validations.retirement.max.hint_text", "translation": "soft_validations.retirement.max.hint_text",
"arguments": [{ "arguments": [{
"key": "sex8", "key": "plural_gender_for_person_8",
"label": true, "label": false,
"i18n_template": "gender" "i18n_template": "gender"
}, },
{ {
@ -3556,7 +3668,7 @@
"retirement_value_check": { "retirement_value_check": {
"check_answer_label": "Retirement age soft validation", "check_answer_label": "Retirement age soft validation",
"hidden_in_check_answers": true, "hidden_in_check_answers": true,
"header": "Are you sure this is correct?", "header": "Are you sure this person isn’t retired??",
"type": "interruption_screen", "type": "interruption_screen",
"answer_options": { "answer_options": {
"0": { "0": {

244
config/forms/2022_2023.json
Unescape View File

@ -1525,12 +1525,19 @@
}, },
"lead_tenant_under_retirement_value_check": { "lead_tenant_under_retirement_value_check": {
"depends_on": [{ "person_1_retired_under_soft_min_age?": true }], "depends_on": [{ "person_1_retired_under_soft_min_age?": true }],
"title_text": "soft_validations.retirement.min.title", "title_text": {
"translation": "soft_validations.retirement.min.title",
"arguments": [{
"key": "retirement_age_for_person_1",
"label": false,
"i18n_template": "age"
}]
},
"informative_text": { "informative_text": {
"translation": "soft_validations.retirement.min.hint_text", "translation": "soft_validations.retirement.min.hint_text",
"arguments": [{ "arguments": [{
"key": "sex1", "key": "plural_gender_for_person_1",
"label": true, "label": false,
"i18n_template": "gender" "i18n_template": "gender"
}, },
{ {
@ -1543,7 +1550,7 @@
"retirement_value_check": { "retirement_value_check": {
"check_answer_label": "Retirement age soft validation", "check_answer_label": "Retirement age soft validation",
"hidden_in_check_answers": true, "hidden_in_check_answers": true,
"header": "Are you sure this is correct?", "header": "Are you sure this person isn’t retired?",
"type": "interruption_screen", "type": "interruption_screen",
"answer_options": { "answer_options": {
"0": { "0": {
@ -1558,12 +1565,19 @@
}, },
"lead_tenant_over_retirement_value_check": { "lead_tenant_over_retirement_value_check": {
"depends_on": [{ "person_1_not_retired_over_soft_max_age?": true }], "depends_on": [{ "person_1_not_retired_over_soft_max_age?": true }],
"title_text": "soft_validations.retirement.max.title", "title_text": {
"translation": "soft_validations.retirement.max.title",
"arguments": [{
"key": "retirement_age_for_person_1",
"label": false,
"i18n_template": "age"
}]
},
"informative_text": { "informative_text": {
"translation": "soft_validations.retirement.max.hint_text", "translation": "soft_validations.retirement.max.hint_text",
"arguments": [{ "arguments": [{
"key": "sex1", "key": "plural_gender_for_person_1",
"label": true, "label": false,
"i18n_template": "gender" "i18n_template": "gender"
}, },
{ {
@ -1576,7 +1590,7 @@
"retirement_value_check": { "retirement_value_check": {
"check_answer_label": "Retirement age soft validation", "check_answer_label": "Retirement age soft validation",
"hidden_in_check_answers": true, "hidden_in_check_answers": true,
"header": "Are you sure this is correct?", "header": "Are you sure this person isn’t retired??",
"type": "interruption_screen", "type": "interruption_screen",
"answer_options": { "answer_options": {
"0": { "0": {
@ -1821,14 +1835,21 @@
} }
] ]
}, },
"person_2_under_retirement_value_check": { "person_2_under_retirement_value_check": {
"depends_on": [{ "person_2_retired_under_soft_min_age?": true }], "depends_on": [{ "person_2_retired_under_soft_min_age?": true }],
"title_text": "soft_validations.retirement.min.title", "title_text": {
"translation": "soft_validations.retirement.min.title",
"arguments": [{
"key": "retirement_age_for_person_2",
"label": false,
"i18n_template": "age"
}]
},
"informative_text": { "informative_text": {
"translation": "soft_validations.retirement.min.hint_text", "translation": "soft_validations.retirement.min.hint_text",
"arguments": [{ "arguments": [{
"key": "sex2", "key": "plural_gender_for_person_2",
"label": true, "label": false,
"i18n_template": "gender" "i18n_template": "gender"
}, },
{ {
@ -1841,7 +1862,7 @@
"retirement_value_check": { "retirement_value_check": {
"check_answer_label": "Retirement age soft validation", "check_answer_label": "Retirement age soft validation",
"hidden_in_check_answers": true, "hidden_in_check_answers": true,
"header": "Are you sure this is correct?", "header": "Are you sure this person isn’t retired?",
"type": "interruption_screen", "type": "interruption_screen",
"answer_options": { "answer_options": {
"0": { "0": {
@ -1856,12 +1877,19 @@
}, },
"person_2_over_retirement_value_check": { "person_2_over_retirement_value_check": {
"depends_on": [{ "person_2_not_retired_over_soft_max_age?": true }], "depends_on": [{ "person_2_not_retired_over_soft_max_age?": true }],
"title_text": "soft_validations.retirement.max.title", "title_text": {
"translation": "soft_validations.retirement.max.title",
"arguments": [{
"key": "retirement_age_for_person_2",
"label": false,
"i18n_template": "age"
}]
},
"informative_text": { "informative_text": {
"translation": "soft_validations.retirement.max.hint_text", "translation": "soft_validations.retirement.max.hint_text",
"arguments": [{ "arguments": [{
"key": "sex2", "key": "plural_gender_for_person_2",
"label": true, "label": false,
"i18n_template": "gender" "i18n_template": "gender"
}, },
{ {
@ -1874,7 +1902,7 @@
"retirement_value_check": { "retirement_value_check": {
"check_answer_label": "Retirement age soft validation", "check_answer_label": "Retirement age soft validation",
"hidden_in_check_answers": true, "hidden_in_check_answers": true,
"header": "Are you sure this is correct?", "header": "Are you sure this person isn’t retired??",
"type": "interruption_screen", "type": "interruption_screen",
"answer_options": { "answer_options": {
"0": { "0": {
@ -2118,12 +2146,19 @@
}, },
"person_3_under_retirement_value_check": { "person_3_under_retirement_value_check": {
"depends_on": [{ "person_3_retired_under_soft_min_age?": true }], "depends_on": [{ "person_3_retired_under_soft_min_age?": true }],
"title_text": "soft_validations.retirement.min.title", "title_text": {
"translation": "soft_validations.retirement.min.title",
"arguments": [{
"key": "retirement_age_for_person_3",
"label": false,
"i18n_template": "age"
}]
},
"informative_text": { "informative_text": {
"translation": "soft_validations.retirement.min.hint_text", "translation": "soft_validations.retirement.min.hint_text",
"arguments": [{ "arguments": [{
"key": "sex3", "key": "plural_gender_for_person_3",
"label": true, "label": false,
"i18n_template": "gender" "i18n_template": "gender"
}, },
{ {
@ -2136,7 +2171,7 @@
"retirement_value_check": { "retirement_value_check": {
"check_answer_label": "Retirement age soft validation", "check_answer_label": "Retirement age soft validation",
"hidden_in_check_answers": true, "hidden_in_check_answers": true,
"header": "Are you sure this is correct?", "header": "Are you sure this person isn’t retired?",
"type": "interruption_screen", "type": "interruption_screen",
"answer_options": { "answer_options": {
"0": { "0": {
@ -2151,12 +2186,19 @@
}, },
"person_3_over_retirement_value_check": { "person_3_over_retirement_value_check": {
"depends_on": [{ "person_3_not_retired_over_soft_max_age?": true }], "depends_on": [{ "person_3_not_retired_over_soft_max_age?": true }],
"title_text": "soft_validations.retirement.max.title", "title_text": {
"translation": "soft_validations.retirement.max.title",
"arguments": [{
"key": "retirement_age_for_person_3",
"label": false,
"i18n_template": "age"
}]
},
"informative_text": { "informative_text": {
"translation": "soft_validations.retirement.max.hint_text", "translation": "soft_validations.retirement.max.hint_text",
"arguments": [{ "arguments": [{
"key": "sex3", "key": "plural_gender_for_person_3",
"label": true, "label": false,
"i18n_template": "gender" "i18n_template": "gender"
}, },
{ {
@ -2169,7 +2211,7 @@
"retirement_value_check": { "retirement_value_check": {
"check_answer_label": "Retirement age soft validation", "check_answer_label": "Retirement age soft validation",
"hidden_in_check_answers": true, "hidden_in_check_answers": true,
"header": "Are you sure this is correct?", "header": "Are you sure this person isn’t retired??",
"type": "interruption_screen", "type": "interruption_screen",
"answer_options": { "answer_options": {
"0": { "0": {
@ -2410,12 +2452,19 @@
}, },
"person_4_under_retirement_value_check": { "person_4_under_retirement_value_check": {
"depends_on": [{ "person_4_retired_under_soft_min_age?": true }], "depends_on": [{ "person_4_retired_under_soft_min_age?": true }],
"title_text": "soft_validations.retirement.min.title", "title_text": {
"translation": "soft_validations.retirement.min.title",
"arguments": [{
"key": "retirement_age_for_person_4",
"label": false,
"i18n_template": "age"
}]
},
"informative_text": { "informative_text": {
"translation": "soft_validations.retirement.min.hint_text", "translation": "soft_validations.retirement.min.hint_text",
"arguments": [{ "arguments": [{
"key": "sex4", "key": "plural_gender_for_person_4",
"label": true, "label": false,
"i18n_template": "gender" "i18n_template": "gender"
}, },
{ {
@ -2428,7 +2477,7 @@
"retirement_value_check": { "retirement_value_check": {
"check_answer_label": "Retirement age soft validation", "check_answer_label": "Retirement age soft validation",
"hidden_in_check_answers": true, "hidden_in_check_answers": true,
"header": "Are you sure this is correct?", "header": "Are you sure this person isn’t retired?",
"type": "interruption_screen", "type": "interruption_screen",
"answer_options": { "answer_options": {
"0": { "0": {
@ -2443,12 +2492,19 @@
}, },
"person_4_over_retirement_value_check": { "person_4_over_retirement_value_check": {
"depends_on": [{ "person_4_not_retired_over_soft_max_age?": true }], "depends_on": [{ "person_4_not_retired_over_soft_max_age?": true }],
"title_text": "soft_validations.retirement.max.title", "title_text": {
"translation": "soft_validations.retirement.max.title",
"arguments": [{
"key": "retirement_age_for_person_4",
"label": false,
"i18n_template": "age"
}]
},
"informative_text": { "informative_text": {
"translation": "soft_validations.retirement.max.hint_text", "translation": "soft_validations.retirement.max.hint_text",
"arguments": [{ "arguments": [{
"key": "sex4", "key": "plural_gender_for_person_4",
"label": true, "label": false,
"i18n_template": "gender" "i18n_template": "gender"
}, },
{ {
@ -2461,7 +2517,7 @@
"retirement_value_check": { "retirement_value_check": {
"check_answer_label": "Retirement age soft validation", "check_answer_label": "Retirement age soft validation",
"hidden_in_check_answers": true, "hidden_in_check_answers": true,
"header": "Are you sure this is correct?", "header": "Are you sure this person isn’t retired??",
"type": "interruption_screen", "type": "interruption_screen",
"answer_options": { "answer_options": {
"0": { "0": {
@ -2699,12 +2755,19 @@
}, },
"person_5_under_retirement_value_check": { "person_5_under_retirement_value_check": {
"depends_on": [{ "person_5_retired_under_soft_min_age?": true }], "depends_on": [{ "person_5_retired_under_soft_min_age?": true }],
"title_text": "soft_validations.retirement.min.title", "title_text": {
"translation": "soft_validations.retirement.min.title",
"arguments": [{
"key": "retirement_age_for_person_5",
"label": false,
"i18n_template": "age"
}]
},
"informative_text": { "informative_text": {
"translation": "soft_validations.retirement.min.hint_text", "translation": "soft_validations.retirement.min.hint_text",
"arguments": [{ "arguments": [{
"key": "sex5", "key": "plural_gender_for_person_5",
"label": true, "label": false,
"i18n_template": "gender" "i18n_template": "gender"
}, },
{ {
@ -2717,7 +2780,7 @@
"retirement_value_check": { "retirement_value_check": {
"check_answer_label": "Retirement age soft validation", "check_answer_label": "Retirement age soft validation",
"hidden_in_check_answers": true, "hidden_in_check_answers": true,
"header": "Are you sure this is correct?", "header": "Are you sure this person isn’t retired?",
"type": "interruption_screen", "type": "interruption_screen",
"answer_options": { "answer_options": {
"0": { "0": {
@ -2732,12 +2795,19 @@
}, },
"person_5_over_retirement_value_check": { "person_5_over_retirement_value_check": {
"depends_on": [{ "person_5_not_retired_over_soft_max_age?": true }], "depends_on": [{ "person_5_not_retired_over_soft_max_age?": true }],
"title_text": "soft_validations.retirement.max.title", "title_text": {
"translation": "soft_validations.retirement.max.title",
"arguments": [{
"key": "retirement_age_for_person_5",
"label": false,
"i18n_template": "age"
}]
},
"informative_text": { "informative_text": {
"translation": "soft_validations.retirement.max.hint_text", "translation": "soft_validations.retirement.max.hint_text",
"arguments": [{ "arguments": [{
"key": "sex5", "key": "plural_gender_for_person_5",
"label": true, "label": false,
"i18n_template": "gender" "i18n_template": "gender"
}, },
{ {
@ -2750,7 +2820,7 @@
"retirement_value_check": { "retirement_value_check": {
"check_answer_label": "Retirement age soft validation", "check_answer_label": "Retirement age soft validation",
"hidden_in_check_answers": true, "hidden_in_check_answers": true,
"header": "Are you sure this is correct?", "header": "Are you sure this person isn’t retired??",
"type": "interruption_screen", "type": "interruption_screen",
"answer_options": { "answer_options": {
"0": { "0": {
@ -2985,12 +3055,19 @@
}, },
"person_6_under_retirement_value_check": { "person_6_under_retirement_value_check": {
"depends_on": [{ "person_6_retired_under_soft_min_age?": true }], "depends_on": [{ "person_6_retired_under_soft_min_age?": true }],
"title_text": "soft_validations.retirement.min.title", "title_text": {
"translation": "soft_validations.retirement.min.title",
"arguments": [{
"key": "retirement_age_for_person_6",
"label": false,
"i18n_template": "age"
}]
},
"informative_text": { "informative_text": {
"translation": "soft_validations.retirement.min.hint_text", "translation": "soft_validations.retirement.min.hint_text",
"arguments": [{ "arguments": [{
"key": "sex6", "key": "plural_gender_for_person_6",
"label": true, "label": false,
"i18n_template": "gender" "i18n_template": "gender"
}, },
{ {
@ -3003,7 +3080,7 @@
"retirement_value_check": { "retirement_value_check": {
"check_answer_label": "Retirement age soft validation", "check_answer_label": "Retirement age soft validation",
"hidden_in_check_answers": true, "hidden_in_check_answers": true,
"header": "Are you sure this is correct?", "header": "Are you sure this person isn’t retired?",
"type": "interruption_screen", "type": "interruption_screen",
"answer_options": { "answer_options": {
"0": { "0": {
@ -3018,12 +3095,19 @@
}, },
"person_6_over_retirement_value_check": { "person_6_over_retirement_value_check": {
"depends_on": [{ "person_6_not_retired_over_soft_max_age?": true }], "depends_on": [{ "person_6_not_retired_over_soft_max_age?": true }],
"title_text": "soft_validations.retirement.max.title", "title_text": {
"translation": "soft_validations.retirement.max.title",
"arguments": [{
"key": "retirement_age_for_person_6",
"label": false,
"i18n_template": "age"
}]
},
"informative_text": { "informative_text": {
"translation": "soft_validations.retirement.max.hint_text", "translation": "soft_validations.retirement.max.hint_text",
"arguments": [{ "arguments": [{
"key": "sex6", "key": "plural_gender_for_person_6",
"label": true, "label": false,
"i18n_template": "gender" "i18n_template": "gender"
}, },
{ {
@ -3036,7 +3120,7 @@
"retirement_value_check": { "retirement_value_check": {
"check_answer_label": "Retirement age soft validation", "check_answer_label": "Retirement age soft validation",
"hidden_in_check_answers": true, "hidden_in_check_answers": true,
"header": "Are you sure this is correct?", "header": "Are you sure this person isn’t retired??",
"type": "interruption_screen", "type": "interruption_screen",
"answer_options": { "answer_options": {
"0": { "0": {
@ -3048,7 +3132,7 @@
} }
} }
} }
}, },
"person_7_known": { "person_7_known": {
"header": "You’ve given us the details for 7 people in the household", "header": "You’ve given us the details for 7 people in the household",
"description": "", "description": "",
@ -3268,12 +3352,19 @@
}, },
"person_7_under_retirement_value_check": { "person_7_under_retirement_value_check": {
"depends_on": [{ "person_7_retired_under_soft_min_age?": true }], "depends_on": [{ "person_7_retired_under_soft_min_age?": true }],
"title_text": "soft_validations.retirement.min.title", "title_text": {
"translation": "soft_validations.retirement.min.title",
"arguments": [{
"key": "retirement_age_for_person_7",
"label": false,
"i18n_template": "age"
}]
},
"informative_text": { "informative_text": {
"translation": "soft_validations.retirement.min.hint_text", "translation": "soft_validations.retirement.min.hint_text",
"arguments": [{ "arguments": [{
"key": "sex7", "key": "plural_gender_for_person_7",
"label": true, "label": false,
"i18n_template": "gender" "i18n_template": "gender"
}, },
{ {
@ -3286,7 +3377,7 @@
"retirement_value_check": { "retirement_value_check": {
"check_answer_label": "Retirement age soft validation", "check_answer_label": "Retirement age soft validation",
"hidden_in_check_answers": true, "hidden_in_check_answers": true,
"header": "Are you sure this is correct?", "header": "Are you sure this person isn’t retired?",
"type": "interruption_screen", "type": "interruption_screen",
"answer_options": { "answer_options": {
"0": { "0": {
@ -3301,12 +3392,19 @@
}, },
"person_7_over_retirement_value_check": { "person_7_over_retirement_value_check": {
"depends_on": [{ "person_7_not_retired_over_soft_max_age?": true }], "depends_on": [{ "person_7_not_retired_over_soft_max_age?": true }],
"title_text": "soft_validations.retirement.max.title", "title_text": {
"translation": "soft_validations.retirement.max.title",
"arguments": [{
"key": "retirement_age_for_person_7",
"label": false,
"i18n_template": "age"
}]
},
"informative_text": { "informative_text": {
"translation": "soft_validations.retirement.max.hint_text", "translation": "soft_validations.retirement.max.hint_text",
"arguments": [{ "arguments": [{
"key": "sex7", "key": "plural_gender_for_person_7",
"label": true, "label": false,
"i18n_template": "gender" "i18n_template": "gender"
}, },
{ {
@ -3319,7 +3417,7 @@
"retirement_value_check": { "retirement_value_check": {
"check_answer_label": "Retirement age soft validation", "check_answer_label": "Retirement age soft validation",
"hidden_in_check_answers": true, "hidden_in_check_answers": true,
"header": "Are you sure this is correct?", "header": "Are you sure this person isn’t retired??",
"type": "interruption_screen", "type": "interruption_screen",
"answer_options": { "answer_options": {
"0": { "0": {
@ -3548,12 +3646,19 @@
}, },
"person_8_under_retirement_value_check": { "person_8_under_retirement_value_check": {
"depends_on": [{ "person_8_retired_under_soft_min_age?": true }], "depends_on": [{ "person_8_retired_under_soft_min_age?": true }],
"title_text": "soft_validations.retirement.min.title", "title_text": {
"translation": "soft_validations.retirement.min.title",
"arguments": [{
"key": "retirement_age_for_person_8",
"label": false,
"i18n_template": "age"
}]
},
"informative_text": { "informative_text": {
"translation": "soft_validations.retirement.min.hint_text", "translation": "soft_validations.retirement.min.hint_text",
"arguments": [{ "arguments": [{
"key": "sex8", "key": "plural_gender_for_person_8",
"label": true, "label": false,
"i18n_template": "gender" "i18n_template": "gender"
}, },
{ {
@ -3566,7 +3671,7 @@
"retirement_value_check": { "retirement_value_check": {
"check_answer_label": "Retirement age soft validation", "check_answer_label": "Retirement age soft validation",
"hidden_in_check_answers": true, "hidden_in_check_answers": true,
"header": "Are you sure this is correct?", "header": "Are you sure this person isn’t retired?",
"type": "interruption_screen", "type": "interruption_screen",
"answer_options": { "answer_options": {
"0": { "0": {
@ -3581,12 +3686,19 @@
}, },
"person_8_over_retirement_value_check": { "person_8_over_retirement_value_check": {
"depends_on": [{ "person_8_not_retired_over_soft_max_age?": true }], "depends_on": [{ "person_8_not_retired_over_soft_max_age?": true }],
"title_text": "soft_validations.retirement.max.title", "title_text": {
"translation": "soft_validations.retirement.max.title",
"arguments": [{
"key": "retirement_age_for_person_8",
"label": false,
"i18n_template": "age"
}]
},
"informative_text": { "informative_text": {
"translation": "soft_validations.retirement.max.hint_text", "translation": "soft_validations.retirement.max.hint_text",
"arguments": [{ "arguments": [{
"key": "sex8", "key": "plural_gender_for_person_8",
"label": true, "label": false,
"i18n_template": "gender" "i18n_template": "gender"
}, },
{ {
@ -3599,7 +3711,7 @@
"retirement_value_check": { "retirement_value_check": {
"check_answer_label": "Retirement age soft validation", "check_answer_label": "Retirement age soft validation",
"hidden_in_check_answers": true, "hidden_in_check_answers": true,
"header": "Are you sure this is correct?", "header": "Are you sure this person isn’t retired??",
"type": "interruption_screen", "type": "interruption_screen",
"answer_options": { "answer_options": {
"0": { "0": {

11
config/locales/en.yml
Unescape View File

@ -243,11 +243,11 @@ en:
hint_text: "<h1 class=\"govuk-heading-l app-panel--interruption\">You told us the rent is %{brent}</h1><p>The maximum rent for this type of property in %{la} is £%{soft_max_for_period}.</p>" hint_text: "<h1 class=\"govuk-heading-l app-panel--interruption\">You told us the rent is %{brent}</h1><p>The maximum rent for this type of property in %{la} is £%{soft_max_for_period}.</p>"
retirement: retirement:
min: min:
title: "Age is below the expected range based on the person being retired" title: "You told us this person is under %{age} and retired"
hint_text: "This person cannot be retired as you told us they're %{gender} and under %{age}" hint_text: "The minimum expected retirement age for %{gender} in England is %{age}."
max: max:
title: "Age is above the expected range based on the person not being retired" title: "You told us this person is %{age} or over and not retired"
hint_text: "This person must be retired as you told us they're %{gender} and over %{age}" hint_text: "The minimum expected retirement age for %{gender} in England is %{age}"
devise: devise:
two_factor_authentication: two_factor_authentication:
@ -262,3 +262,6 @@ en:
test: test:
one_argument: "This is based on the tenant’s work situation: %{ecstat1}" one_argument: "This is based on the tenant’s work situation: %{ecstat1}"
title_text:
no_argument: "Some test text"
one_argument: "You said this: %{ecstat1}"

27
spec/helpers/interruption_screen_helper_spec.rb
Unescape View File

@ -96,4 +96,31 @@ RSpec.describe InterruptionScreenHelper do
end end
end end
end end
describe "display_title_text" do
context "when title text has no arguments" do
it "returns the correct title text" do
title_text = "test.title_text.no_argument"
expect(display_title_text(title_text, case_log))
.to eq(I18n.t("test.title_text.no_argument"))
end
end
context "when title text has arguments" do
it "returns the correct title text" do
title_text = {
"translation" => "test.title_text.one_argument",
"arguments" => [
{
"key" => "ecstat1",
"label" => true,
"i18n_template" => "ecstat1",
},
],
}
expect(display_title_text(title_text, case_log))
.to eq(I18n.t("test.title_text.one_argument", ecstat1: case_log.form.get_question("ecstat1", case_log).answer_label(case_log).downcase))
end
end
end
end end

Write Preview
Loading…
Cancel
Save