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

Updated answer labels for Household characteristics

pull/349/head
Paul Robert Lloyd 3 years ago
parent
d6036ca6a1
commit
14497a6794
4 changed files with 28 additions and 29 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. 2
      Gemfile.lock
  2. 47
      config/forms/2021_2022.json
  3. 2
      spec/features/form/check_answers_page_spec.rb
  4. 6
      spec/fixtures/forms/2021_2022.json

2
Gemfile.lock
Unescape View File

@ -111,7 +111,7 @@ GEM
ruby2_keywords (>= 0.0.2, < 1.0) ruby2_keywords (>= 0.0.2, < 1.0)
ast (2.4.2) ast (2.4.2)
aws-eventstream (1.2.0) aws-eventstream (1.2.0)
aws-partitions (1.559.0) aws-partitions (1.562.0)
aws-sdk-core (3.127.0) aws-sdk-core (3.127.0)
aws-eventstream (~> 1, >= 1.0.2) aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0) aws-partitions (~> 1, >= 1.525.0)

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

@ -1166,7 +1166,7 @@
"description": "", "description": "",
"questions": { "questions": {
"sex1": { "sex1": {
"check_answer_label": "Tenant’s gender", "check_answer_label": "Lead tenant’s gender identity",
"header": "Which of these best describes the lead tenant’s gender identity?", "header": "Which of these best describes the lead tenant’s gender identity?",
"hint_text": "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.", "hint_text": "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.",
"type": "radio", "type": "radio",
@ -1192,7 +1192,7 @@
"description": "", "description": "",
"questions": { "questions": {
"ethnic_group": { "ethnic_group": {
"check_answer_label": "Ethnicity", "check_answer_label": "Lead tenant’s ethnic group",
"header": "What is the lead tenant’s ethnic group?", "header": "What is the lead tenant’s ethnic group?",
"hint_text": "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.", "hint_text": "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.",
"type": "radio", "type": "radio",
@ -1227,7 +1227,7 @@
"description": "", "description": "",
"questions": { "questions": {
"ethnic": { "ethnic": {
"check_answer_label": "Ethnicity", "check_answer_label": "Lead tenant’s ethnic background",
"header": "Which of the following best describes the lead tenant’s Arab background?", "header": "Which of the following best describes the lead tenant’s Arab background?",
"hint_text": "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.", "hint_text": "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.",
"type": "radio", "type": "radio",
@ -1263,7 +1263,7 @@
"description": "", "description": "",
"questions": { "questions": {
"ethnic": { "ethnic": {
"check_answer_label": "Ethnicity", "check_answer_label": "Lead tenant’s ethnic background",
"header": "Which of the following best describes the lead tenant’s Asian or Asian British background?", "header": "Which of the following best describes the lead tenant’s Asian or Asian British background?",
"hint_text": "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.", "hint_text": "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.",
"type": "radio", "type": "radio",
@ -1307,7 +1307,7 @@
"description": "", "description": "",
"questions": { "questions": {
"ethnic": { "ethnic": {
"check_answer_label": "Ethnicity", "check_answer_label": "Lead tenant’s ethnic background",
"header": "Which of the following best describes the lead tenant’s Black, African, Caribbean or Black British background?", "header": "Which of the following best describes the lead tenant’s Black, African, Caribbean or Black British background?",
"hint_text": "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.", "hint_text": "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.",
"type": "radio", "type": "radio",
@ -1345,7 +1345,7 @@
"description": "", "description": "",
"questions": { "questions": {
"ethnic": { "ethnic": {
"check_answer_label": "Ethnicity", "check_answer_label": "Lead tenant’s ethnic background",
"header": "Which of the following best describes the lead tenant’s Mixed or Multiple ethnic groups background?", "header": "Which of the following best describes the lead tenant’s Mixed or Multiple ethnic groups background?",
"hint_text": "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.", "hint_text": "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.",
"type": "radio", "type": "radio",
@ -1383,7 +1383,7 @@
"description": "", "description": "",
"questions": { "questions": {
"ethnic": { "ethnic": {
"check_answer_label": "Ethnicity", "check_answer_label": "Lead tenant’s ethnic background",
"header": "Which of the following best describes the lead tenant’s White background?", "header": "Which of the following best describes the lead tenant’s White background?",
"hint_text": "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.", "hint_text": "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.",
"type": "radio", "type": "radio",
@ -1430,7 +1430,7 @@
"description": "", "description": "",
"questions": { "questions": {
"national": { "national": {
"check_answer_label": "Nationality", "check_answer_label": "Lead tenant’s nationality",
"header": "What is the lead tenant’s nationality?", "header": "What is the lead tenant’s nationality?",
"hint_text": "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.", "hint_text": "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.",
"type": "radio", "type": "radio",
@ -1496,7 +1496,7 @@
"description": "", "description": "",
"questions": { "questions": {
"ecstat1": { "ecstat1": {
"check_answer_label": "Work", "check_answer_label": "Lead tenant’s working situation",
"header": "Which of these best describes the lead tenant’s working situation?", "header": "Which of these best describes the lead tenant’s working situation?",
"hint_text": "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.", "hint_text": "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.",
"type": "radio", "type": "radio",
@ -1588,7 +1588,6 @@
} }
] ]
}, },
"person_2_relationship": { "person_2_relationship": {
"header": "", "header": "",
"description": "", "description": "",
@ -1708,7 +1707,7 @@
"description": "", "description": "",
"questions": { "questions": {
"sex2": { "sex2": {
"check_answer_label": "Person 2’s gender", "check_answer_label": "Person 2’s gender identity",
"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",
@ -1737,7 +1736,7 @@
"description": "", "description": "",
"questions": { "questions": {
"ecstat2": { "ecstat2": {
"check_answer_label": "Person 2’s Work", "check_answer_label": "Person 2’s working situation",
"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",
@ -1890,7 +1889,7 @@
"description": "", "description": "",
"questions": { "questions": {
"sex2": { "sex2": {
"check_answer_label": "Person 3’s gender", "check_answer_label": "Person 3’s gender identity",
"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",
@ -1919,7 +1918,7 @@
"description": "", "description": "",
"questions": { "questions": {
"ecstat2": { "ecstat2": {
"check_answer_label": "Person 3’s Work", "check_answer_label": "Person 3’s working situation",
"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",
@ -2071,7 +2070,7 @@
"description": "", "description": "",
"questions": { "questions": {
"sex4": { "sex4": {
"check_answer_label": "Person 4’s gender", "check_answer_label": "Person 4’s gender identity",
"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",
@ -2100,7 +2099,7 @@
"description": "", "description": "",
"questions": { "questions": {
"ecstat2": { "ecstat2": {
"check_answer_label": "Person 4’s Work", "check_answer_label": "Person 4’s working situation",
"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",
@ -2246,7 +2245,7 @@
"description": "", "description": "",
"questions": { "questions": {
"sex5": { "sex5": {
"check_answer_label": "Person 5’s gender", "check_answer_label": "Person 5’s gender identity",
"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",
@ -2275,7 +2274,7 @@
"description": "", "description": "",
"questions": { "questions": {
"ecstat5": { "ecstat5": {
"check_answer_label": "Person 5’s Work", "check_answer_label": "Person 5’s working situation",
"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",
@ -2417,7 +2416,7 @@
"description": "", "description": "",
"questions": { "questions": {
"sex6": { "sex6": {
"check_answer_label": "Person 6’s gender", "check_answer_label": "Person 6’s gender identity",
"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",
@ -2446,7 +2445,7 @@
"description": "", "description": "",
"questions": { "questions": {
"ecstat6": { "ecstat6": {
"check_answer_label": "Person 6’s Work", "check_answer_label": "Person 6’s working situation",
"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",
@ -2585,7 +2584,7 @@
"description": "", "description": "",
"questions": { "questions": {
"sex7": { "sex7": {
"check_answer_label": "Person 7’s gender", "check_answer_label": "Person 7’s gender identity",
"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",
@ -2614,7 +2613,7 @@
"description": "", "description": "",
"questions": { "questions": {
"ecstat7": { "ecstat7": {
"check_answer_label": "Person 7’s Work", "check_answer_label": "Person 7’s working situation",
"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",
@ -2750,7 +2749,7 @@
"description": "", "description": "",
"questions": { "questions": {
"sex8": { "sex8": {
"check_answer_label": "Person 8’s gender", "check_answer_label": "Person 8’s gender identity",
"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",
@ -2779,7 +2778,7 @@
"description": "", "description": "",
"questions": { "questions": {
"ecstat8": { "ecstat8": {
"check_answer_label": "Person 8’s Work", "check_answer_label": "Person 8’s working situation",
"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",

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

@ -53,7 +53,7 @@ RSpec.describe "Form Check Answers Page" do
it "has question headings based on the subsection" do it "has question headings based on the subsection" do
visit("/logs/#{id}/#{subsection}/check-answers") visit("/logs/#{id}/#{subsection}/check-answers")
question_labels = ["Tenant code", "Tenant’s age", "Tenant’s gender", "Number of Other Household Members"] question_labels = ["Tenant code", "Lead tenant’s age", "Lead tenant’s gender identity", "Number of Other Household Members"]
question_labels.each do |label| question_labels.each do |label|
expect(page).to have_content(label) expect(page).to have_content(label)
end end

6
spec/fixtures/forms/2021_2022.json vendored
Unescape View File

@ -31,7 +31,7 @@
"person_1_age": { "person_1_age": {
"questions": { "questions": {
"age1": { "age1": {
"check_answer_label": "Tenant’s age", "check_answer_label": "Lead tenant’s age",
"header": "What is the tenant’s age?", "header": "What is the tenant’s age?",
"type": "numeric", "type": "numeric",
"min": 0, "min": 0,
@ -44,7 +44,7 @@
"person_1_gender": { "person_1_gender": {
"questions": { "questions": {
"sex1": { "sex1": {
"check_answer_label": "Tenant’s gender", "check_answer_label": "Lead tenant’s gender identity",
"header": "Which of these best describes the tenant’s gender identity?", "header": "Which of these best describes the tenant’s gender identity?",
"type": "radio", "type": "radio",
"answer_options": { "answer_options": {
@ -105,7 +105,7 @@
"width": 2 "width": 2
}, },
"sex2": { "sex2": {
"check_answer_label": "Person 2’s gender", "check_answer_label": "Person 2’s gender identity",
"header": "Which of these best describes person 2’s gender identity?", "header": "Which of these best describes person 2’s gender identity?",
"type": "radio", "type": "radio",
"answer_options": { "answer_options": {

Write Preview
Loading…
Cancel
Save