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

Merge pull request #129 from communitiesuk/question-fixes 

Show correct headings and captions on question pages, add width option to schema
pull/137/head
Paul Robert Lloyd 3 years ago committed by GitHub
parent
4b67e20f64 532c6b3216
commit
36cf329011
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 170 additions and 137 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. 1
      README.md
  2. 3
      app/models/form/question.rb
  3. 3
      app/views/form/_checkbox_question.html.erb
  4. 3
      app/views/form/_date_question.html.erb
  5. 5
      app/views/form/_numeric_question.html.erb
  6. 6
      app/views/form/_radio_question.html.erb
  7. 3
      app/views/form/_select_question.html.erb
  8. 5
      app/views/form/_text_question.html.erb
  9. 5
      app/views/form/check_answers.html.erb
  10. 6
      app/views/form/page.html.erb
  11. 219
      config/forms/2021_2022.json
  12. 4
      config/forms/schema/2021_2022.json
  13. 2
      spec/features/form/check_answers_page_spec.rb
  14. 28
      spec/fixtures/forms/test_form.json

1
README.md
Unescape View File

@ -123,6 +123,7 @@ The JSON should follow the structure:
"min": Integer, // numeric only "min": Integer, // numeric only
"max": Integer, // numeric only "max": Integer, // numeric only
"step": Integer, // numeric only "step": Integer, // numeric only
"width": 2 / 3 / 4 / 5 / 10 / 20, // text and numeric only
"answer_options": { // checkbox and radio only "answer_options": { // checkbox and radio only
"0": String, "0": String,
"1": String "1": String

3
app/models/form/question.rb
Unescape View File

@ -1,6 +1,6 @@
class Form::Question class Form::Question
attr_accessor :id, :header, :hint_text, :description, :questions, attr_accessor :id, :header, :hint_text, :description, :questions,
:type, :min, :max, :step, :fields_to_add, :result_field, :type, :min, :max, :step, :width, :fields_to_add, :result_field,
:conditional_for, :readonly, :answer_options, :page, :check_answer_label :conditional_for, :readonly, :answer_options, :page, :check_answer_label
def initialize(id, hsh, page) def initialize(id, hsh, page)
@ -12,6 +12,7 @@ class Form::Question
@min = hsh["min"] @min = hsh["min"]
@max = hsh["max"] @max = hsh["max"]
@step = hsh["step"] @step = hsh["step"]
@width = hsh["width"]
@fields_to_add = hsh["fields-to-add"] @fields_to_add = hsh["fields-to-add"]
@result_field = hsh["result-field"] @result_field = hsh["result-field"]
@readonly = hsh["readonly"] @readonly = hsh["readonly"]

3
app/views/form/_checkbox_question.html.erb
Unescape View File

@ -1,5 +1,6 @@
<%= f.govuk_check_boxes_fieldset question.id.to_sym, <%= f.govuk_check_boxes_fieldset question.id.to_sym,
legend: { text: question.header.html_safe, size: page_header.nil? ? "l" : "m", tag: page_header.nil? ? "h2" : "h1" }, caption: caption && !page_header.present? ? { text: caption.html_safe, size: "l" } : nil,
legend: { text: question.header.html_safe, size: !page_header.present? ? "l" : "m", tag: !page_header.present? ? "h1" : "h2" },
hint: { text: question.hint_text } do %> hint: { text: question.hint_text } do %>
<% question.answer_options.map do |key, val| %> <% question.answer_options.map do |key, val| %>

3
app/views/form/_date_question.html.erb
Unescape View File

@ -1,6 +1,7 @@
<%= f.govuk_date_field question.id.to_sym, <%= f.govuk_date_field question.id.to_sym,
caption: caption && !page_header.present? ? { text: caption.html_safe, size: "l" } : nil,
legend: { text: question.header.html_safe, size: !page_header.present? ? "l" : "m", tag: !page_header.present? ? "h1" : "h2" },
hint: { text: question.hint_text }, hint: { text: question.hint_text },
legend: { text: question.header.html_safe, size: page_header.nil? ? "l" : "m", tag: page_header.nil? ? "h2" : "h1" },
width: 20, width: 20,
**stimulus_html_attributes(question) **stimulus_html_attributes(question)
%> %>

5
app/views/form/_numeric_question.html.erb
Unescape View File

@ -1,7 +1,8 @@
<%= f.govuk_number_field question.id.to_sym, <%= f.govuk_number_field question.id.to_sym,
caption: caption && !page_header.present? ? { text: caption.html_safe, size: "l" } : nil,
label: { text: question.header.html_safe, size: !page_header.present? ? "l" : "m", tag: !page_header.present? ? "h1" : "h2" },
hint: { text: question.hint_text }, hint: { text: question.hint_text },
label: { text: question.header.html_safe, size: page_header.nil? ? "l" : "m", tag: page_header.nil? ? "h2" : "h1" },
min: question.min, max: question.max, step: question.step, min: question.min, max: question.max, step: question.step,
width: 20, :readonly => question.read_only?, width: question.width, :readonly => question.read_only?,
**stimulus_html_attributes(question) **stimulus_html_attributes(question)
%> %>

6
app/views/form/_radio_question.html.erb
Unescape View File

@ -1,7 +1,7 @@
<%= f.govuk_radio_buttons_fieldset question.id.to_sym, <%= f.govuk_radio_buttons_fieldset question.id.to_sym,
legend: { text: question.header.html_safe, size: page_header.nil? ? "l" : "m", tag: page_header.nil? ? "h2" : "h1" }, caption: caption && !page_header.present? ? { text: caption.html_safe, size: "l" } : nil,
hint: { text: question.hint_text }, legend: { text: question.header.html_safe, size: !page_header.present? ? "l" : "m", tag: !page_header.present? ? "h1" : "h2" },
small: (question.answer_options.size > 5) do %> hint: { text: question.hint_text } do %>
<% question.answer_options.map do |key, val| %> <% question.answer_options.map do |key, val| %>
<% if key.starts_with?("divider") %> <% if key.starts_with?("divider") %>

3
app/views/form/_select_question.html.erb
Unescape View File

@ -3,6 +3,7 @@
answers, answers,
:name, :name,
:name, :name,
label: { text: question.header, size: page_header.nil? ? "l" : "m", tag: page_header.nil? ? "h2" : "h1" }, caption: caption && !page_header.present? ? { text: caption.html_safe, size: "l" } : nil,
label: { text: question.header, size: !page_header.present? ? "l" : "m", tag: !page_header.present? ? "h1" : "h2" },
hint: { text: question.hint_text } hint: { text: question.hint_text }
%> %>

5
app/views/form/_text_question.html.erb
Unescape View File

@ -1,6 +1,7 @@
<%= f.govuk_text_field question.id.to_sym, <%= f.govuk_text_field question.id.to_sym,
caption: caption && !page_header.present? ? { text: caption.html_safe, size: "l" } : nil,
label: { text: question.header.html_safe, size: !page_header.present? ? "l" : "m", tag: !page_header.present? ? "h1" : "h2" },
hint: { text: question.hint_text }, hint: { text: question.hint_text },
label: { text: question.header.html_safe, size: page_header.nil? ? "l" : "m", tag: page_header.nil? ? "h2" : "h1" }, width: question.width ? question.width : nil,
width: 20,
**stimulus_html_attributes(question) **stimulus_html_attributes(question)
%> %>

5
app/views/form/check_answers.html.erb
Unescape View File

@ -2,7 +2,10 @@
<%= turbo_frame_tag "case_log_form", target: "_top" do %> <%= turbo_frame_tag "case_log_form", target: "_top" do %>
<div class="govuk-grid-row"> <div class="govuk-grid-row">
<div class="govuk-grid-column-three-quarters-from-desktop"> <div class="govuk-grid-column-three-quarters-from-desktop">
<h1 class="govuk-heading-l">Check the answers you gave for <%= subsection.id.humanize(capitalize: false) %></h1> <h1 class="govuk-heading-l">
<span class="govuk-caption-l"><%= subsection.id.humanize %></span>
Check your answers
</h1>
<%= display_answered_questions_summary(subsection, @case_log) %> <%= display_answered_questions_summary(subsection, @case_log) %>
<dl class="govuk-summary-list govuk-!-margin-bottom-9"> <dl class="govuk-summary-list govuk-!-margin-bottom-9">
<% subsection.applicable_questions(@case_log).each do |question| %> <% subsection.applicable_questions(@case_log).each do |question| %>

6
app/views/form/page.html.erb
Unescape View File

@ -10,11 +10,9 @@
<%= turbo_frame_tag "case_log_form", target: "_top" do %> <%= turbo_frame_tag "case_log_form", target: "_top" do %>
<div class="govuk-grid-row"> <div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds-from-desktop"> <div class="govuk-grid-column-two-thirds-from-desktop">
<span class="govuk-caption-l">
<%= subsection %>
</span>
<% if page.header.present? %> <% if page.header.present? %>
<h1 class="govuk-heading-l"> <h1 class="govuk-heading-l">
<span class="govuk-caption-l"><%= subsection %></span>
<%= page.header %> <%= page.header %>
</h1> </h1>
<% end %> <% end %>
@ -22,7 +20,7 @@
<%= f.govuk_error_summary %> <%= f.govuk_error_summary %>
<% page.questions.map do |question| %> <% page.questions.map do |question| %>
<div id=<%= question.id + "_div " %><%= display_question_key_div(page, question) %> > <div id=<%= question.id + "_div " %><%= display_question_key_div(page, question) %> >
<%= render partial: "form/#{question.type}_question", locals: { question: question, page_header: page.header, f: f } %> <%= render partial: "form/#{question.type}_question", locals: { question: question, caption: subsection, page_header: page.header, f: f } %>
</div> </div>
<% end %> <% end %>

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

@ -10,11 +10,11 @@
"label": "About this log", "label": "About this log",
"pages": { "pages": {
"gdpr_acceptance": { "gdpr_acceptance": {
"header": "DLUHC Privacy Notice Acceptance", "header": "",
"description": "", "description": "",
"questions": { "questions": {
"gdpr_acceptance": { "gdpr_acceptance": {
"check_answer_label": "GDPR acceptance", "check_answer_label": "Privacy notice seen",
"header": "Has the tenant or buyer seen the DLUHC privacy notice?", "header": "Has the tenant or buyer seen the DLUHC privacy notice?",
"hint_text": "", "hint_text": "",
"type": "radio", "type": "radio",
@ -34,11 +34,11 @@
"depends_on": { "gdpr_acceptance": "No" } "depends_on": { "gdpr_acceptance": "No" }
}, },
"organisation_details": { "organisation_details": {
"header": "About this log", "header": "Organisation details",
"description": "Organisation Details", "description": "",
"questions": { "questions": {
"property_owner_organisation": { "property_owner_organisation": {
"check_answer_label": "", "check_answer_label": "Owning organisation",
"header": "Which organisation owns this property?", "header": "Which organisation owns this property?",
"hint_text": "", "hint_text": "",
"type": "radio", "type": "radio",
@ -48,7 +48,7 @@
} }
}, },
"property_manager_organisation": { "property_manager_organisation": {
"check_answer_label": "", "check_answer_label": "Managing organisation",
"header": "Which organisation manages this property?", "header": "Which organisation manages this property?",
"hint_text": "", "hint_text": "",
"type": "radio", "type": "radio",
@ -61,11 +61,11 @@
"depends_on": { "gdpr_acceptance": "Yes" } "depends_on": { "gdpr_acceptance": "Yes" }
}, },
"sale_or_letting": { "sale_or_letting": {
"header": "About this log", "header": "",
"description": "Is this a sale or a letting?", "description": "",
"questions": { "questions": {
"sale_or_letting": { "sale_or_letting": {
"check_answer_label": "", "check_answer_label": "Sale or letting",
"header": "Is this a sale or a letting?", "header": "Is this a sale or a letting?",
"hint_text": "", "hint_text": "",
"type": "radio", "type": "radio",
@ -78,11 +78,11 @@
"depends_on": { "gdpr_acceptance": "Yes" } "depends_on": { "gdpr_acceptance": "Yes" }
}, },
"tenant_same_property_renewal": { "tenant_same_property_renewal": {
"header": "About this log", "header": "",
"description": "Is this a renewal to the same tenant in the same property?", "description": "",
"questions": { "questions": {
"tenant_same_property_renewal": { "tenant_same_property_renewal": {
"check_answer_label": "", "check_answer_label": "Property renewal",
"header": "Is this a renewal to the same tenant in the same property?", "header": "Is this a renewal to the same tenant in the same property?",
"hint_text": "", "hint_text": "",
"type": "radio", "type": "radio",
@ -95,11 +95,11 @@
"depends_on": { "gdpr_acceptance": "Yes", "sale_or_letting": "Letting" } "depends_on": { "gdpr_acceptance": "Yes", "sale_or_letting": "Letting" }
}, },
"startdate": { "startdate": {
"header": "About this log", "header": "",
"description": "", "description": "",
"questions": { "questions": {
"startdate": { "startdate": {
"check_answer_label": "When is the tenancy start date?", "check_answer_label": "Tenancy start date",
"header": "What is the tenancy start date?", "header": "What is the tenancy start date?",
"hint_text": "For example, 27 3 2007", "hint_text": "For example, 27 3 2007",
"type": "date" "type": "date"
@ -112,35 +112,35 @@
"description": "", "description": "",
"questions": { "questions": {
"rent_type": { "rent_type": {
"check_answer_label": "What is the rent type?", "check_answer_label": "Rent type",
"header": "What is the rent type?", "header": "What is the rent type?",
"hint_text": "", "hint_text": "",
"type": "select", "type": "radio",
"answer_options": { "answer_options": {
"0": "Social Rent", "0": "Social rent",
"1": "Affordable Rent", "1": "Affordable rent",
"2": "London Affordable Rent", "2": "London Affordable rent",
"3": "Rent To Buy", "3": "Rent to buy",
"4": "London Living Rent", "4": "London living rent",
"5": "Other Intermediate Rent Product" "5": "Other intermediate rent product"
}, },
"conditional_for": { "conditional_for": {
"intermediate_rent_product_name": ["Other Intermediate Rent Product"] "intermediate_rent_product_name": ["Other intermediate rent product"]
} }
}, },
"intermediate_rent_product_name": { "intermediate_rent_product_name": {
"check_answer_label": "Enter the product name", "check_answer_label": "Product name",
"header": "What is intermediate rent product name?", "header": "What is intermediate rent product name?",
"type": "text" "type": "text"
}, },
"needstype": { "needstype": {
"check_answer_label": "What is the needs type?", "check_answer_label": "Needs type",
"header": "What is the needs type?", "header": "What is the needs type?",
"hint_text": "", "hint_text": "",
"type": "select", "type": "radio",
"answer_options": { "answer_options": {
"0": "Supported Housing", "0": "Supported housing",
"1": "General Needs" "1": "General needs"
} }
} }
}, },
@ -154,13 +154,14 @@
"check_answer_label": "Tenant code", "check_answer_label": "Tenant code",
"header": "What is the tenant code?", "header": "What is the tenant code?",
"hint_text": "", "hint_text": "",
"type": "text" "type": "text",
"width": 10
} }
}, },
"depends_on": { "gdpr_acceptance": "Yes", "sale_or_letting": "Letting" } "depends_on": { "gdpr_acceptance": "Yes", "sale_or_letting": "Letting" }
}, },
"sale_completion_date": { "sale_completion_date": {
"header": "Sale Completion Date", "header": "",
"description": "", "description": "",
"questions": { "questions": {
"sale_completion_date": { "sale_completion_date": {
@ -173,14 +174,15 @@
"depends_on": { "gdpr_acceptance": "Yes", "sale_or_letting": "Sale" } "depends_on": { "gdpr_acceptance": "Yes", "sale_or_letting": "Sale" }
}, },
"purchaser_code": { "purchaser_code": {
"header": "About this log", "header": "",
"description": "", "description": "",
"questions": { "questions": {
"purchaser_code": { "purchaser_code": {
"check_answer_label": "What is the purchaser code?", "check_answer_label": "Purchaser code",
"header": "What is the purchaser code?", "header": "What is the purchaser code?",
"hint_text": "", "hint_text": "",
"type": "text" "type": "text",
"width": 10
} }
}, },
"depends_on": { "gdpr_acceptance": "Yes", "sale_or_letting": "Sale" } "depends_on": { "gdpr_acceptance": "Yes", "sale_or_letting": "Sale" }
@ -201,13 +203,14 @@
"description": "", "description": "",
"questions": { "questions": {
"age1": { "age1": {
"check_answer_label": "Tenant's age", "check_answer_label": "Tenant’s age",
"header": "What is the tenant's age?", "header": "What is the tenant’s age?",
"hint_text": "", "hint_text": "",
"type": "numeric", "type": "numeric",
"min": 0, "min": 0,
"max": 120, "max": 120,
"step": 1 "step": 1,
"width": 2
} }
} }
}, },
@ -216,8 +219,8 @@
"description": "", "description": "",
"questions": { "questions": {
"sex1": { "sex1": {
"check_answer_label": "Tenant's gender", "check_answer_label": "Tenant’s gender",
"header": "Which of these best describes the tenant's gender identity?", "header": "Which of these best describes the tenant’s gender identity?",
"hint_text": "", "hint_text": "",
"type": "radio", "type": "radio",
"answer_options": { "answer_options": {
@ -235,7 +238,7 @@
"questions": { "questions": {
"ethnic": { "ethnic": {
"check_answer_label": "Ethnicity", "check_answer_label": "Ethnicity",
"header": "What is the tenant's ethnic group?", "header": "What is the tenant’s ethnic group?",
"hint_text": "", "hint_text": "",
"type": "radio", "type": "radio",
"answer_options": { "answer_options": {
@ -268,7 +271,7 @@
"questions": { "questions": {
"national": { "national": {
"check_answer_label": "Nationality", "check_answer_label": "Nationality",
"header": "What is the tenant's nationality?", "header": "What is the tenant’s nationality?",
"hint_text": "", "hint_text": "",
"type": "radio", "type": "radio",
"answer_options": { "answer_options": {
@ -300,7 +303,7 @@
"questions": { "questions": {
"ecstat1": { "ecstat1": {
"check_answer_label": "Work", "check_answer_label": "Work",
"header": "Which of these best describes the tenant's working situation?", "header": "Which of these best describes the tenant’s working situation?",
"hint_text": "", "hint_text": "",
"type": "radio", "type": "radio",
"answer_options": { "answer_options": {
@ -333,13 +336,14 @@
"description": "", "description": "",
"questions": { "questions": {
"other_hhmemb": { "other_hhmemb": {
"check_answer_label": "Number of Other Household Members", "check_answer_label": "Number of other household members",
"header": "How many other people are there in the household?", "header": "How many other people are there in the household?",
"hint_text": "The maximum number of others is 7", "hint_text": "The maximum number of others is 7",
"type": "numeric", "type": "numeric",
"min": 0, "min": 0,
"max": 7, "max": 7,
"step": 1, "step": 1,
"width": 2,
"conditional_for": { "conditional_for": {
"relat2": ">0", "relat2": ">0",
"age2": ">0", "age2": ">0",
@ -372,8 +376,8 @@
} }
}, },
"relat2": { "relat2": {
"check_answer_label": "Person 2's relationship to lead tenant", "check_answer_label": "Person 2’s relationship to lead tenant",
"header": "What's person 2's relationship to lead tenant", "header": "What’s person 2’s relationship to lead tenant",
"hint_text": "", "hint_text": "",
"type": "radio", "type": "radio",
"answer_options": { "answer_options": {
@ -384,8 +388,8 @@
} }
}, },
"age2": { "age2": {
"check_answer_label": "Person 2's age", "check_answer_label": "Person 2’s age",
"header": "What's person 2's age", "header": "What’s person 2’s age",
"hint_text": "", "hint_text": "",
"type": "numeric", "type": "numeric",
"min": 0, "min": 0,
@ -393,8 +397,8 @@
"step": 1 "step": 1
}, },
"sex2": { "sex2": {
"check_answer_label": "Person 2's gender", "check_answer_label": "Person 2’s gender",
"header": "Which of these best describes person 2's gender identity?", "header": "Which of these best describes person 2’s gender identity?",
"hint_text": "", "hint_text": "",
"type": "radio", "type": "radio",
"answer_options": { "answer_options": {
@ -405,8 +409,8 @@
} }
}, },
"ecstat2": { "ecstat2": {
"check_answer_label": "Person 2's Work", "check_answer_label": "Person 2’s Work",
"header": "Which of these best describes person 2's working situation?", "header": "Which of these best describes person 2’s working situation?",
"hint_text": "", "hint_text": "",
"type": "radio", "type": "radio",
"answer_options": { "answer_options": {
@ -424,8 +428,8 @@
} }
}, },
"relat3": { "relat3": {
"check_answer_label": "Person 3's relationship to lead tenant", "check_answer_label": "Person 3’s relationship to lead tenant",
"header": "What's person 3's relationship to lead tenant", "header": "What’s person 3’s relationship to lead tenant",
"hint_text": "", "hint_text": "",
"type": "radio", "type": "radio",
"answer_options": { "answer_options": {
@ -436,8 +440,8 @@
} }
}, },
"age3": { "age3": {
"check_answer_label": "Person 3's age", "check_answer_label": "Person 3’s age",
"header": "What's person 3's age", "header": "What’s person 3’s age",
"hint_text": "", "hint_text": "",
"type": "numeric", "type": "numeric",
"min": 0, "min": 0,
@ -445,8 +449,8 @@
"step": 1 "step": 1
}, },
"sex3": { "sex3": {
"check_answer_label": "Person 3's gender", "check_answer_label": "Person 3’s gender",
"header": "Which of these best describes person 3's gender identity?", "header": "Which of these best describes person 3’s gender identity?",
"hint_text": "", "hint_text": "",
"type": "radio", "type": "radio",
"answer_options": { "answer_options": {
@ -457,8 +461,8 @@
} }
}, },
"ecstat3": { "ecstat3": {
"check_answer_label": "Person 3's Work", "check_answer_label": "Person 3’s Work",
"header": "Which of these best describes person 3's working situation?", "header": "Which of these best describes person 3’s working situation?",
"hint_text": "", "hint_text": "",
"type": "radio", "type": "radio",
"answer_options": { "answer_options": {
@ -476,8 +480,8 @@
} }
}, },
"relat4": { "relat4": {
"check_answer_label": "Person 4's relationship to lead tenant", "check_answer_label": "Person 4’s relationship to lead tenant",
"header": "What's person 4's relationship to lead tenant", "header": "What’s person 4’s relationship to lead tenant",
"hint_text": "", "hint_text": "",
"type": "radio", "type": "radio",
"answer_options": { "answer_options": {
@ -488,8 +492,8 @@
} }
}, },
"age4": { "age4": {
"check_answer_label": "Person 4's age", "check_answer_label": "Person 4’s age",
"header": "What's person 4's age", "header": "What’s person 4’s age",
"hint_text": "", "hint_text": "",
"type": "numeric", "type": "numeric",
"min": 0, "min": 0,
@ -497,8 +501,8 @@
"step": 1 "step": 1
}, },
"sex4": { "sex4": {
"check_answer_label": "Person 4's gender", "check_answer_label": "Person 4’s gender",
"header": "Which of these best describes person 4's gender identity?", "header": "Which of these best describes person 4’s gender identity?",
"hint_text": "", "hint_text": "",
"type": "radio", "type": "radio",
"answer_options": { "answer_options": {
@ -509,8 +513,8 @@
} }
}, },
"ecstat4": { "ecstat4": {
"check_answer_label": "Person 4's Work", "check_answer_label": "Person 4’s Work",
"header": "Which of these best describes person 4's working situation?", "header": "Which of these best describes person 4’s working situation?",
"hint_text": "", "hint_text": "",
"type": "radio", "type": "radio",
"answer_options": { "answer_options": {
@ -528,8 +532,8 @@
} }
}, },
"relat5": { "relat5": {
"check_answer_label": "Person 5's relationship to lead tenant", "check_answer_label": "Person 5’s relationship to lead tenant",
"header": "What's person 5's relationship to lead tenant", "header": "What’s person 5’s relationship to lead tenant",
"hint_text": "", "hint_text": "",
"type": "radio", "type": "radio",
"answer_options": { "answer_options": {
@ -540,8 +544,8 @@
} }
}, },
"age5": { "age5": {
"check_answer_label": "Person 5's age", "check_answer_label": "Person 5’s age",
"header": "What's person 5's age", "header": "What’s person 5’s age",
"hint_text": "", "hint_text": "",
"type": "numeric", "type": "numeric",
"min": 0, "min": 0,
@ -549,8 +553,8 @@
"step": 1 "step": 1
}, },
"sex5": { "sex5": {
"check_answer_label": "Person 5's gender", "check_answer_label": "Person 5’s gender",
"header": "Which of these best describes person 5's gender identity?", "header": "Which of these best describes person 5’s gender identity?",
"hint_text": "", "hint_text": "",
"type": "radio", "type": "radio",
"answer_options": { "answer_options": {
@ -561,8 +565,8 @@
} }
}, },
"ecstat5": { "ecstat5": {
"check_answer_label": "Person 5's Work", "check_answer_label": "Person 5’s Work",
"header": "Which of these best describes person 5's working situation?", "header": "Which of these best describes person 5’s working situation?",
"hint_text": "", "hint_text": "",
"type": "radio", "type": "radio",
"answer_options": { "answer_options": {
@ -580,8 +584,8 @@
} }
}, },
"relat6": { "relat6": {
"check_answer_label": "Person 6's relationship to lead tenant", "check_answer_label": "Person 6’s relationship to lead tenant",
"header": "What's person 6's relationship to lead tenant", "header": "What’s person 6’s relationship to lead tenant",
"hint_text": "", "hint_text": "",
"type": "radio", "type": "radio",
"answer_options": { "answer_options": {
@ -592,8 +596,8 @@
} }
}, },
"age6": { "age6": {
"check_answer_label": "Person 6's age", "check_answer_label": "Person 6’s age",
"header": "What's person 6's age", "header": "What’s person 6’s age",
"hint_text": "", "hint_text": "",
"type": "numeric", "type": "numeric",
"min": 0, "min": 0,
@ -601,8 +605,8 @@
"step": 1 "step": 1
}, },
"sex6": { "sex6": {
"check_answer_label": "Person 6's gender", "check_answer_label": "Person 6’s gender",
"header": "Which of these best describes person 6's gender identity?", "header": "Which of these best describes person 6’s gender identity?",
"hint_text": "", "hint_text": "",
"type": "radio", "type": "radio",
"answer_options": { "answer_options": {
@ -613,8 +617,8 @@
} }
}, },
"ecstat6": { "ecstat6": {
"check_answer_label": "Person 6's Work", "check_answer_label": "Person 6’s Work",
"header": "Which of these best describes person 6's working situation?", "header": "Which of these best describes person 6’s working situation?",
"hint_text": "", "hint_text": "",
"type": "radio", "type": "radio",
"answer_options": { "answer_options": {
@ -632,8 +636,8 @@
} }
}, },
"relat7": { "relat7": {
"check_answer_label": "Person 7's relationship to lead tenant", "check_answer_label": "Person 7’s relationship to lead tenant",
"header": "What's person 7's relationship to lead tenant", "header": "What’s person 7’s relationship to lead tenant",
"hint_text": "", "hint_text": "",
"type": "radio", "type": "radio",
"answer_options": { "answer_options": {
@ -644,8 +648,8 @@
} }
}, },
"age7": { "age7": {
"check_answer_label": "Person 7's age", "check_answer_label": "Person 7’s age",
"header": "What's person 7's age", "header": "What’s person 7’s age",
"hint_text": "", "hint_text": "",
"type": "numeric", "type": "numeric",
"min": 0, "min": 0,
@ -653,8 +657,8 @@
"step": 1 "step": 1
}, },
"sex7": { "sex7": {
"check_answer_label": "Person 7's gender", "check_answer_label": "Person 7’s gender",
"header": "Which of these best describes person 7's gender identity?", "header": "Which of these best describes person 7’s gender identity?",
"hint_text": "", "hint_text": "",
"type": "radio", "type": "radio",
"answer_options": { "answer_options": {
@ -665,8 +669,8 @@
} }
}, },
"ecstat7": { "ecstat7": {
"check_answer_label": "Person 7's Work", "check_answer_label": "Person 7’s Work",
"header": "Which of these best describes person 7's working situation?", "header": "Which of these best describes person 7’s working situation?",
"hint_text": "", "hint_text": "",
"type": "radio", "type": "radio",
"answer_options": { "answer_options": {
@ -684,8 +688,8 @@
} }
}, },
"relat8": { "relat8": {
"check_answer_label": "Person 8's relationship to lead tenant", "check_answer_label": "Person 8’s relationship to lead tenant",
"header": "What's person 8's relationship to lead tenant", "header": "What’s person 8’s relationship to lead tenant",
"hint_text": "", "hint_text": "",
"type": "radio", "type": "radio",
"answer_options": { "answer_options": {
@ -696,8 +700,8 @@
} }
}, },
"age8": { "age8": {
"check_answer_label": "Person 8's age", "check_answer_label": "Person 8’s age",
"header": "What's person 8's age", "header": "What’s person 8’s age",
"hint_text": "", "hint_text": "",
"type": "numeric", "type": "numeric",
"min": 0, "min": 0,
@ -705,8 +709,8 @@
"step": 1 "step": 1
}, },
"sex8": { "sex8": {
"check_answer_label": "Person 8's gender", "check_answer_label": "Person 8’s gender",
"header": "Which of these best describes person 8's gender identity?", "header": "Which of these best describes person 8’s gender identity?",
"hint_text": "", "hint_text": "",
"type": "radio", "type": "radio",
"answer_options": { "answer_options": {
@ -717,8 +721,8 @@
} }
}, },
"ecstat8": { "ecstat8": {
"check_answer_label": "Person 8's Work", "check_answer_label": "Person 8’s Work",
"header": "Which of these best describes person 8's working situation?", "header": "Which of these best describes person 8’s working situation?",
"hint_text": "", "hint_text": "",
"type": "radio", "type": "radio",
"answer_options": { "answer_options": {
@ -814,9 +818,9 @@
"7": "Other problems with neighbours", "7": "Other problems with neighbours",
"8": "Property unsuitable because of overcrowding", "8": "Property unsuitable because of overcrowding",
"9": "End of assured shorthold tenancy - no fault", "9": "End of assured shorthold tenancy - no fault",
"10": "End of assured shorthold tenancy - tenant's fault", "10": "End of assured shorthold tenancy - tenant’s fault",
"11": "End of fixed term tenancy - no fault", "11": "End of fixed term tenancy - no fault",
"12": "End of fixed term tenancy - tenant's fault", "12": "End of fixed term tenancy - tenant’s fault",
"13": "Repossession", "13": "Repossession",
"14": "Under occupation - offered incentive to downsize", "14": "Under occupation - offered incentive to downsize",
"15": "Under occupation - no incentive", "15": "Under occupation - no incentive",
@ -1034,7 +1038,8 @@
"type": "numeric", "type": "numeric",
"min": 0, "min": 0,
"max": 150, "max": 150,
"step": 1 "step": 1,
"width": 4
} }
} }
}, },
@ -1093,9 +1098,10 @@
"questions": { "questions": {
"propcode": { "propcode": {
"check_answer_label": "What’s the property reference?", "check_answer_label": "What’s the property reference?",
"header": "What's the property reference?", "header": "What’s the property reference?",
"hint_text": "", "hint_text": "",
"type": "text" "type": "text",
"width": 10
} }
} }
}, },
@ -1120,7 +1126,8 @@
"check_answer_label": "", "check_answer_label": "",
"header": "", "header": "",
"hint_text": "", "hint_text": "",
"type": "text" "type": "text",
"width": 5
} }
} }
}, },
@ -1474,7 +1481,7 @@
"questions": { "questions": {
"why_dont_you_know_la": { "why_dont_you_know_la": {
"check_answer_label": "Reason for not knowing local authority", "check_answer_label": "Reason for not knowing local authority",
"header": "Give a reason why you don't know the postcode or local authority", "header": "Give a reason why you don’t know the postcode or local authority",
"hint_text": "", "hint_text": "",
"type": "text" "type": "text"
} }
@ -1743,7 +1750,7 @@
"questions": { "questions": {
"net_income_known": { "net_income_known": {
"check_answer_label": "Income known", "check_answer_label": "Income known",
"header": "Do you know the tenant and their partner's net income?", "header": "Do you know the tenant and their partner’s net income?",
"hint_text": "", "hint_text": "",
"type": "radio", "type": "radio",
"answer_options": { "answer_options": {

4
config/forms/schema/2021_2022.json
Unescape View File

@ -80,6 +80,10 @@
"description": "", "description": "",
"type": "string" "type": "string"
}, },
"width": {
"description": "",
"type": "integer"
},
"answer_options": { "answer_options": {
"description": "", "description": "",
"type": "object" "type": "object"

2
spec/features/form/check_answers_page_spec.rb
Unescape View File

@ -31,7 +31,7 @@ RSpec.describe "Form Check Answers Page" do
context "when the user needs to check their answers for a subsection" do context "when the user needs to check their answers for a subsection" do
it "can be visited by URL" do it "can be visited by URL" do
visit("case-logs/#{id}/#{subsection}/check-answers") visit("case-logs/#{id}/#{subsection}/check-answers")
expect(page).to have_content("Check the answers you gave for #{subsection.tr('-', ' ')}") expect(page).to have_content("#{subsection.tr('-', ' ').humanize} Check your answers")
end end
let(:last_question_for_subsection) { "household-number-of-other-members" } let(:last_question_for_subsection) { "household-number-of-other-members" }

28
spec/fixtures/forms/test_form.json vendored
Unescape View File

@ -12,7 +12,8 @@
"tenant_code": { "tenant_code": {
"check_answer_label": "Tenant code", "check_answer_label": "Tenant code",
"header": "What is the tenant code?", "header": "What is the tenant code?",
"type": "text" "type": "text",
"width": 10
} }
} }
}, },
@ -24,7 +25,8 @@
"type": "numeric", "type": "numeric",
"min": 0, "min": 0,
"max": 150, "max": 150,
"step": 1 "step": 1,
"width": 2
} }
} }
}, },
@ -53,6 +55,7 @@
"min": 0, "min": 0,
"max": 1, "max": 1,
"step": 1, "step": 1,
"width": 2,
"conditional_for": { "conditional_for": {
"relat2": ">0", "relat2": ">0",
"age2": ">0", "age2": ">0",
@ -75,7 +78,8 @@
"type": "numeric", "type": "numeric",
"min": 0, "min": 0,
"max": 150, "max": 150,
"step": 1 "step": 1,
"width": 2
}, },
"sex2": { "sex2": {
"check_answer_label": "Person 2's gender", "check_answer_label": "Person 2's gender",
@ -210,7 +214,8 @@
"tenancy_code": { "tenancy_code": {
"check_answer_label": "What is the tenancy code?", "check_answer_label": "What is the tenancy code?",
"header": "What is the tenancy code?", "header": "What is the tenancy code?",
"type": "text" "type": "text",
"width": 10
} }
} }
} }
@ -311,7 +316,8 @@
"header": "What is the tenant’s /and partner’s combined income after tax?", "header": "What is the tenant’s /and partner’s combined income after tax?",
"type": "numeric", "type": "numeric",
"min": 0, "min": 0,
"step": 1 "step": 1,
"width": 5
}, },
"incfreq": { "incfreq": {
"check_answer_label": "Income Frequency", "check_answer_label": "Income Frequency",
@ -409,6 +415,7 @@
"type": "numeric", "type": "numeric",
"min": 0, "min": 0,
"step": 1, "step": 1,
"width": 4,
"fields-to-add": [ "fields-to-add": [
"brent", "brent",
"scharge", "scharge",
@ -424,6 +431,7 @@
"type": "numeric", "type": "numeric",
"min": 0, "min": 0,
"step": 1, "step": 1,
"width": 4,
"fields-to-add": [ "fields-to-add": [
"brent", "brent",
"scharge", "scharge",
@ -439,6 +447,7 @@
"type": "numeric", "type": "numeric",
"min": 0, "min": 0,
"step": 1, "step": 1,
"width": 4,
"fields-to-add": [ "fields-to-add": [
"brent", "brent",
"scharge", "scharge",
@ -454,6 +463,7 @@
"type": "numeric", "type": "numeric",
"min": 0, "min": 0,
"step": 1, "step": 1,
"width": 4,
"fields-to-add": [ "fields-to-add": [
"brent", "brent",
"scharge", "scharge",
@ -469,6 +479,7 @@
"type": "numeric", "type": "numeric",
"min": 0, "min": 0,
"step": 1, "step": 1,
"width": 4,
"readonly": true "readonly": true
} }
} }
@ -528,13 +539,15 @@
"header": "Postcode for the previous accommodation", "header": "Postcode for the previous accommodation",
"hint_text": "If the household has moved from settled accommodation immediately prior to being re-housed", "hint_text": "If the household has moved from settled accommodation immediately prior to being re-housed",
"type": "text", "type": "text",
"width": 5,
"conditional_for": { "faake_key": "fake_condition" } "conditional_for": { "faake_key": "fake_condition" }
}, },
"previous_postcode": { "previous_postcode": {
"check_answer_label": "Postcode of previous accomodation if the household has moved from settled accommodation", "check_answer_label": "Postcode of previous accomodation if the household has moved from settled accommodation",
"header": "Postcode for the previous accommodation", "header": "Postcode for the previous accommodation",
"hint_text": "If the household has moved from settled accommodation immediately prior to being re-housed", "hint_text": "If the household has moved from settled accommodation immediately prior to being re-housed",
"type": "text" "type": "text",
"width": 5
} }
} }
}, },
@ -572,7 +585,8 @@
"declaration": { "declaration": {
"check_answer_label": "", "check_answer_label": "",
"header": "What is the tenant code?", "header": "What is the tenant code?",
"type": "text" "type": "text",
"width": 10
} }
} }
} }

Write Preview
Loading…
Cancel
Save