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

Move get answers with prefix and suffix to a question method; 

\
pull/228/head
Kat 4 years ago
parent
1b8f3dac66
commit
03a2329c63
3 changed files with 30 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      app/models/form/question.rb
  2. 4
      app/views/form/_check_answers_table.html.erb
  3. 48
      config/forms/2021_2022.json

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

@ -33,6 +33,11 @@ class Form::Question
delegate :subsection, to: :page
delegate :form, to: :subsection
def get_answer_label(case_log)
answer = answer_label(case_log)
answer.present? ? [prefix, answer_label(case_log), suffix].join("") : ""
end
def answer_label(case_log)
return checkbox_answer_label(case_log) if type == "checkbox"
return case_log[id].strftime("%d %b %Y") if type == "date"

4
app/views/form/_check_answers_table.html.erb
Unescape View File

@ -3,9 +3,7 @@
<%= question.check_answer_label.to_s.present? ? question.check_answer_label.to_s : question.header.to_s %>
<dt>
<dd class="govuk-summary-list__value">
<%= question.prefix.present? ? " " + question.prefix : ""%>
<%= question.answer_label(@case_log) %>
<%= question.suffix.present? ? " " + question.suffix : "" %><br/>
<%= question.get_answer_label(@case_log) %><br/>
<% question.get_inferred_answers(@case_log).each do |inferred_answer| %>
<span class="govuk-!-font-weight-regular app-!-colour-muted"><%= inferred_answer %></span><br/>
<% end %>

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

@ -1872,7 +1872,7 @@
"step": "1",
"width": 5,
"prefix": "£",
"suffix": "every week"
"suffix": " every week"
}
},
"soft_validations": {
@ -1899,7 +1899,7 @@
"step": "1",
"width": 5,
"prefix": "£",
"suffix": "every month"
"suffix": " every month"
}
},
"soft_validations": {
@ -1926,7 +1926,7 @@
"step": "1",
"width": 5,
"prefix": "£",
"suffix": "every year"
"suffix": " every year"
}
},
"soft_validations": {
@ -2049,7 +2049,7 @@
"type": "numeric",
"width": 5,
"prefix": "£",
"suffix": "every week"
"suffix": " every week"
}
},
"depends_on" : [{
@ -2227,7 +2227,7 @@
"step": 1,
"width": 5,
"prefix": "£",
"suffix": "every week",
"suffix": " every week",
"fields-to-add": ["brent", "scharge", "pscharge", "supcharg"],
"result-field": "tcharge"
},
@ -2240,7 +2240,7 @@
"step": 1,
"width": 5,
"prefix": "£",
"suffix": "every week",
"suffix": " every week",
"fields-to-add": ["brent", "scharge", "pscharge", "supcharg"],
"result-field": "tcharge"
},
@ -2253,7 +2253,7 @@
"step": 1,
"width": 5,
"prefix": "£",
"suffix": "every week",
"suffix": " every week",
"fields-to-add": ["brent", "scharge", "pscharge", "supcharg"],
"result-field": "tcharge"
},
@ -2266,7 +2266,7 @@
"step": 1,
"width": 5,
"prefix": "£",
"suffix": "every week",
"suffix": " every week",
"fields-to-add": ["brent", "scharge", "pscharge", "supcharg"],
"result-field": "tcharge"
},
@ -2279,7 +2279,7 @@
"step": 1,
"width": 5,
"prefix": "£",
"suffix": "every week",
"suffix": " every week",
"readonly": true,
"requires_js": true
}
@ -2397,7 +2397,7 @@
"step": 1,
"width": 5,
"prefix": "£",
"suffix": "every 2 weeks",
"suffix": " every 2 weeks",
"fields-to-add": ["brent", "scharge", "pscharge", "supcharg"],
"result-field": "tcharge"
},
@ -2410,7 +2410,7 @@
"step": 1,
"width": 5,
"prefix": "£",
"suffix": "every 2 weeks",
"suffix": " every 2 weeks",
"fields-to-add": ["brent", "scharge", "pscharge", "supcharg"],
"result-field": "tcharge"
},
@ -2423,7 +2423,7 @@
"step": 1,
"width": 5,
"prefix": "£",
"suffix": "every 2 weeks",
"suffix": " every 2 weeks",
"fields-to-add": ["brent", "scharge", "pscharge", "supcharg"],
"result-field": "tcharge"
},
@ -2436,7 +2436,7 @@
"step": 1,
"width": 5,
"prefix": "£",
"suffix": "every 2 weeks",
"suffix": " every 2 weeks",
"fields-to-add": ["brent", "scharge", "pscharge", "supcharg"],
"result-field": "tcharge"
},
@ -2449,7 +2449,7 @@
"step": 1,
"width": 5,
"prefix": "£",
"suffix": "every 2 weeks",
"suffix": " every 2 weeks",
"readonly": true,
"requires_js": true
}
@ -2486,7 +2486,7 @@
"step": 1,
"width": 5,
"prefix": "£",
"suffix": "every 4 weeks",
"suffix": " every 4 weeks",
"fields-to-add": ["brent", "scharge", "pscharge", "supcharg"],
"result-field": "tcharge"
},
@ -2499,7 +2499,7 @@
"step": 1,
"width": 5,
"prefix": "£",
"suffix": "every 4 weeks",
"suffix": " every 4 weeks",
"fields-to-add": ["brent", "scharge", "pscharge", "supcharg"],
"result-field": "tcharge"
},
@ -2512,7 +2512,7 @@
"step": 1,
"width": 5,
"prefix": "£",
"suffix": "every 4 weeks",
"suffix": " every 4 weeks",
"fields-to-add": ["brent", "scharge", "pscharge", "supcharg"],
"result-field": "tcharge"
},
@ -2525,7 +2525,7 @@
"step": 1,
"width": 5,
"prefix": "£",
"suffix": "every 4 weeks",
"suffix": " every 4 weeks",
"fields-to-add": ["brent", "scharge", "pscharge", "supcharg"],
"result-field": "tcharge"
},
@ -2538,7 +2538,7 @@
"step": 1,
"width": 5,
"prefix": "£",
"suffix": "every 4 weeks",
"suffix": " every 4 weeks",
"readonly": true,
"requires_js": true
}
@ -2575,7 +2575,7 @@
"step": 1,
"width": 5,
"prefix": "£",
"suffix": "every month",
"suffix": " every month",
"fields-to-add": ["brent", "scharge", "pscharge", "supcharg"],
"result-field": "tcharge"
},
@ -2588,7 +2588,7 @@
"step": 1,
"width": 5,
"prefix": "£",
"suffix": "every month",
"suffix": " every month",
"fields-to-add": ["brent", "scharge", "pscharge", "supcharg"],
"result-field": "tcharge"
},
@ -2601,7 +2601,7 @@
"step": 1,
"width": 5,
"prefix": "£",
"suffix": "every month",
"suffix": " every month",
"fields-to-add": ["brent", "scharge", "pscharge", "supcharg"],
"result-field": "tcharge"
},
@ -2614,7 +2614,7 @@
"step": 1,
"width": 5,
"prefix": "£",
"suffix": "every month",
"suffix": " every month",
"fields-to-add": ["brent", "scharge", "pscharge", "supcharg"],
"result-field": "tcharge"
},
@ -2627,7 +2627,7 @@
"step": 1,
"width": 5,
"prefix": "£",
"suffix": "every month",
"suffix": " every month",
"readonly": true,
"requires_js": true
}

Write Preview
Loading…
Cancel
Save