@@ -29,12 +31,12 @@
<%= form_with model: @case_log, url: form_case_log_path(@case_log), method: "post" do |f| %>
<%= f.govuk_error_summary %>
- <% @page.questions.map do |question| %>
+ <% @page.non_conditional_questions.map do |question| %>
<%= display_question_key_div(@page, question) %> >
<% if question.read_only? %>
<% end %>
- <%= render partial: "form/#{question.type}_question", locals: { question: question, caption: @subsection.label, page_header: @page.header, f: f } %>
+ <%= render partial: "form/#{question.type}_question", locals: { question: question, caption_text: @subsection.label, page_header: @page.header, f: f, conditional: false } %>
<% end %>
diff --git a/app/webpacker/controllers/conditional_question_controller.js b/app/webpacker/controllers/conditional_question_controller.js
index 53293543d..41bb3c45a 100644
--- a/app/webpacker/controllers/conditional_question_controller.js
+++ b/app/webpacker/controllers/conditional_question_controller.js
@@ -16,24 +16,30 @@ export default class extends Controller {
}
}
+ clearTextNumericInput(input) {
+ input.value = ""
+ }
+
+ clearDateInputs(inputs) {
+ inputs.forEach((input) => { input.value = "" })
+ }
+
displayConditionalRadio() {
if(this.element.checked) {
let selectedValue = this.element.value
let conditional_for = JSON.parse(this.element.dataset.info)
-
Object.entries(conditional_for).map(([targetQuestion, conditions]) => {
- let div = document.getElementById(targetQuestion + "_div")
- if(conditions.includes(selectedValue)) {
- div.style.display = "block"
- } else {
- div.style.display = "none"
- let buttons = document.getElementsByName(`case_log[${targetQuestion}]`);
- if (buttons.length == 0){
- buttons = document.getElementsByName(`case_log[${targetQuestion}][]`);
+ if(conditions.includes(selectedValue)) {
+ } else {
+ const textNumericInput = document.getElementById(`case-log-${targetQuestion.replaceAll("_","-")}-field`)
+ if (textNumericInput == null) {
+ const dateInputs = [1,2,3].map((idx) => {
+ return document.getElementById(`case_log_${targetQuestion}_${idx}i`)
+ })
+ this.clearDateInputs(dateInputs)
+ } else {
+ this.clearTextNumericInput(textNumericInput)
}
- Object.entries(buttons).map(([idx, button]) => {
- button.checked = false;
- })
}
})
}
diff --git a/app/webpacker/controllers/govukfrontend_controller.js b/app/webpacker/controllers/govukfrontend_controller.js
new file mode 100644
index 000000000..74af6408a
--- /dev/null
+++ b/app/webpacker/controllers/govukfrontend_controller.js
@@ -0,0 +1,8 @@
+import { initAll } from "govuk-frontend";
+import { Controller } from "@hotwired/stimulus";
+
+export default class extends Controller {
+ connect() {
+ initAll()
+ }
+}
diff --git a/app/webpacker/packs/application.js b/app/webpacker/packs/application.js
index dc909ede8..042a803cd 100644
--- a/app/webpacker/packs/application.js
+++ b/app/webpacker/packs/application.js
@@ -5,15 +5,11 @@
require.context('govuk-frontend/govuk/assets')
import '../styles/application.scss'
-import Rails from "@rails/ujs"
import * as ActiveStorage from "@rails/activestorage"
import "channels"
-import { initAll } from 'govuk-frontend'
+import "controllers"
import "@hotwired/turbo-rails"
+import { initAll } from 'govuk-frontend'
-
-Rails.start()
ActiveStorage.start()
initAll()
-
-import "controllers"
diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json
index 58647959e..8187a04f8 100644
--- a/config/forms/2021_2022.json
+++ b/config/forms/2021_2022.json
@@ -827,7 +827,7 @@
"type": "radio",
"answer_options": {
"0": "Yes - assessed as homeless by a local authority and owed a homelessness duty. Including if threatened with homelessness within 56 days",
- "1": "Yes - other homelessness ",
+ "1": "Yes - other homelessness",
"2": "No"
}
}
@@ -924,16 +924,15 @@
"2": "A spouse / civil partner of a UK Armed Forces member who has separated or been bereaved within the last 2 years",
"3": "No",
"4": "Tenant prefers not to say"
- },
- "conditional_for": {
- "leftreg": [
- "A current or former regular in the UK Armed Forces (excluding National Service)"
- ],
- "reservist": [
- "A current or former regular in the UK Armed Forces (excluding National Service)"
- ]
}
- },
+ }
+ }
+ },
+ "armed_forces_member": {
+ "header": "Experience of the UK Armed Forces",
+ "description": "",
+ "depends_on": [{ "armedforces": "A current or former regular in the UK Armed Forces (excluding National Service)" }],
+ "questions": {
"leftreg": {
"header": "Are they still serving?",
"hint_text": "",
@@ -3186,11 +3185,15 @@
"1": "No",
"divider": true,
"2": "Don’t know"
- },
- "conditional_for": {
- "reasonable_preference_reason": ["Yes"]
}
- },
+ }
+ }
+ },
+ "reasonable_preference_reason": {
+ "header": "Reason for reasonable preference being given",
+ "description": "",
+ "depends_on": [{ "reasonpref": "Yes" }],
+ "questions": {
"reasonable_preference_reason": {
"check_answer_label": "Reason for reasonable preference",
"header": "Why were they given reasonable preference?",
diff --git a/package.json b/package.json
index 56400d918..524c3406e 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,6 @@
"@hotwired/turbo-rails": "^7.1.0",
"@rails/actioncable": "^6.0.0",
"@rails/activestorage": "^6.0.0",
- "@rails/ujs": "^6.0.0",
"@rails/webpacker": "5.4.0",
"accessible-autocomplete": "^2.0.3",
"chart.js": "^3.6.0",
diff --git a/spec/features/form/conditional_questions_spec.rb b/spec/features/form/conditional_questions_spec.rb
index 96ed1e3c3..aa3194380 100644
--- a/spec/features/form/conditional_questions_spec.rb
+++ b/spec/features/form/conditional_questions_spec.rb
@@ -30,13 +30,11 @@ RSpec.describe "Form Conditional Questions" do
visit("/logs/#{id}/armed-forces")
# Something about our styling makes the selenium webdriver think the actual radio buttons are not visible so we allow label click here
choose("case-log-armedforces-a-current-or-former-regular-in-the-uk-armed-forces-excluding-national-service-field", allow_label_click: true)
- expect(page).to have_selector("#reservist_div")
- choose("case-log-reservist-no-field", allow_label_click: true)
- expect(page).to have_checked_field("case-log-reservist-no-field", visible: false)
+ fill_in("case-log-leftreg-field", with: "text")
choose("case-log-armedforces-no-field", allow_label_click: true)
- expect(page).not_to have_selector("#reservist_div")
+ expect(page).not_to have_field("case-log-leftreg-field")
choose("case-log-armedforces-a-current-or-former-regular-in-the-uk-armed-forces-excluding-national-service-field", allow_label_click: true)
- expect(page).to have_unchecked_field("case-log-reservist-no-field", visible: false)
+ expect(page).to have_field("case-log-leftreg-field", with: "")
end
end
end
diff --git a/spec/fixtures/forms/2021_2022.json b/spec/fixtures/forms/2021_2022.json
index fa3c24efd..73a988b13 100644
--- a/spec/fixtures/forms/2021_2022.json
+++ b/spec/fixtures/forms/2021_2022.json
@@ -124,32 +124,14 @@
"4": "Tenant prefers not to say"
},
"conditional_for": {
- "leftreg": ["A current or former regular in the UK Armed Forces (excluding National Service)"],
- "reservist": ["A current or former regular in the UK Armed Forces (excluding National Service)"]
+ "leftreg": ["A current or former regular in the UK Armed Forces (excluding National Service)"]
}
},
"leftreg": {
"header": "Are they still serving?",
"hint_text": "",
- "type": "radio",
- "check_answer_label": "When did they leave the Armed Forces?",
- "answer_options": {
- "0": "Yes",
- "1": "No - they left up to 5 years ago",
- "2": "No - they left more than 5 years ago",
- "3": "Prefer not to say"
- }
- },
- "reservist": {
- "header": "Were they seriously injured or ill as a result of their service?",
- "hint_text": "",
- "type": "radio",
- "check_answer_label": "Has anyone in the household been seriously injured or ill as a result of their service in the armed forces?",
- "answer_options": {
- "0": "Yes",
- "1": "No",
- "2": "Prefer not to say"
- }
+ "type": "text",
+ "check_answer_label": "When did they leave the Armed Forces?"
}
}
},
diff --git a/spec/helpers/conditional_questions_helper_spec.rb b/spec/helpers/conditional_questions_helper_spec.rb
index 84f078411..b3df41a43 100644
--- a/spec/helpers/conditional_questions_helper_spec.rb
+++ b/spec/helpers/conditional_questions_helper_spec.rb
@@ -5,15 +5,23 @@ RSpec.describe ConditionalQuestionsHelper do
let(:page) { case_log.form.get_page("armed_forces") }
describe "conditional questions for page" do
- let(:conditional_pages) { %w[leftreg reservist] }
+ let(:conditional_pages) { %w[leftreg] }
it "returns the question keys of all conditional questions on the given page" do
expect(conditional_questions_for_page(page)).to eq(conditional_pages)
end
end
+ describe "find conditional question" do
+ let(:question) { page.questions.find { |q| q.id == "armedforces" } }
+ let(:answer_value) { "A current or former regular in the UK Armed Forces (excluding National Service)" }
+ it "returns the conditional question for a given answer option" do
+ expect(find_conditional_question(page, question, answer_value))
+ end
+ end
+
describe "display question key div" do
- let(:conditional_question) { page.questions.find { |q| q.id == "reservist" } }
+ let(:conditional_question) { page.questions.find { |q| q.id == "leftreg" } }
it "returns a non visible div for conditional questions" do
expect(display_question_key_div(page, conditional_question)).to match("style='display:none;'")
diff --git a/spec/helpers/question_view_helper.rb b/spec/helpers/question_view_helper.rb
new file mode 100644
index 000000000..f34062a0d
--- /dev/null
+++ b/spec/helpers/question_view_helper.rb
@@ -0,0 +1,75 @@
+require "rails_helper"
+
+RSpec.describe QuestionViewHelper do
+ let(:page_header) { "Some Page Header" }
+ let(:conditional) { false }
+
+ describe "caption" do
+ let(:subject) { caption(caption_text, page_header, conditional) }
+ let(:caption_text) { "Some text" }
+ let(:caption_options_hash) { { text: caption_text.html_safe, size: "l" } }
+
+ context "a page without a header" do
+ let(:page_header) { nil }
+
+ it "returns an options hash" do
+ expect(subject).to eq(caption_options_hash)
+ end
+ end
+
+ context "a page with a header" do
+ it "returns nil" do
+ expect(subject).to be_nil
+ end
+ end
+
+ context "a conditional question" do
+ let(:conditional) { true }
+ it "returns nil" do
+ expect(subject).to be_nil
+ end
+ end
+
+ context "a question without a caption" do
+ let(:caption_text) { nil }
+
+ it "returns nil" do
+ expect(subject).to be_nil
+ end
+ end
+ end
+
+ describe "legend" do
+ let(:question) { OpenStruct.new(header: "Some question header") }
+ let(:subject) { legend(question, page_header, conditional) }
+ let(:size) { "m" }
+ let(:tag) { "h2" }
+ let(:legend_options_hash) do
+ { text: "Some question header".html_safe, size: size, tag: tag }
+ end
+
+ context "a page with a header" do
+ it "returns an options hash with a medium question header" do
+ expect(subject).to eq(legend_options_hash)
+ end
+ end
+
+ context "a page without a header" do
+ let(:page_header) { nil }
+ let(:size) { "l" }
+ let(:tag) { "h1" }
+
+ it "returns an options hash with a large question header" do
+ expect(subject).to eq(legend_options_hash)
+ end
+ end
+
+ context "a conditional question" do
+ let(:conditional) { true }
+
+ it "returns an options hash with a medium question header" do
+ expect(subject).to eq(legend_options_hash)
+ end
+ end
+ end
+end
diff --git a/spec/models/case_log_spec.rb b/spec/models/case_log_spec.rb
index 42c76ecf5..376641f78 100644
--- a/spec/models/case_log_spec.rb
+++ b/spec/models/case_log_spec.rb
@@ -73,19 +73,6 @@ RSpec.describe Form, type: :model do
end
context "reasonable preference is yes" do
- it "validates a reason must be selected" do
- expect {
- CaseLog.create!(reasonpref: "Yes",
- rp_homeless: nil,
- rp_insan_unsat: nil,
- rp_medwel: nil,
- rp_hardship: nil,
- rp_dontknow: nil,
- owning_organisation: owning_organisation,
- managing_organisation: managing_organisation)
- }.to raise_error(ActiveRecord::RecordInvalid)
- end
-
it "validates that previously homeless should be selected" do
expect {
CaseLog.create!(
@@ -153,16 +140,7 @@ RSpec.describe Form, type: :model do
end
context "armed forces injured validation" do
- it "must be answered if tenant was a regular or reserve in armed forces" do
- expect {
- CaseLog.create!(armedforces: "A current or former regular in the UK Armed Forces (excluding National Service)",
- reservist: nil,
- owning_organisation: owning_organisation,
- managing_organisation: managing_organisation)
- }.to raise_error(ActiveRecord::RecordInvalid)
- end
-
- it "must be answered if tenant was not a regular or reserve in armed forces" do
+ it "must not be answered if tenant was not a regular or reserve in armed forces" do
expect {
CaseLog.create!(armedforces: "No",
reservist: "Yes",
@@ -466,15 +444,6 @@ RSpec.describe Form, type: :model do
end
context "armed forces active validation" do
- it "must be answered if ever served in the forces as a regular" do
- expect {
- CaseLog.create!(armedforces: "A current or former regular in the UK Armed Forces (excluding National Service)",
- leftreg: nil,
- owning_organisation: owning_organisation,
- managing_organisation: managing_organisation)
- }.to raise_error(ActiveRecord::RecordInvalid)
- end
-
it "must not be answered if not ever served as a regular" do
expect {
CaseLog.create!(armedforces: "No",
diff --git a/spec/models/form/page_spec.rb b/spec/models/form/page_spec.rb
index 403227e83..ea0cb2860 100644
--- a/spec/models/form/page_spec.rb
+++ b/spec/models/form/page_spec.rb
@@ -44,6 +44,16 @@ RSpec.describe Form::Page, type: :model do
expect(subject.expected_responses.map(&:id)).to eq(expected_responses)
end
+ context "page with conditional questions" do
+ let(:page_id) { "housing_benefit" }
+
+ it "knows which questions are not conditional" do
+ expected_non_conditional_questions = %w[hb]
+ expect(subject.non_conditional_questions.map(&:id))
+ .to eq(expected_non_conditional_questions)
+ end
+ end
+
context "for a given case log" do
let(:case_log) { FactoryBot.build(:case_log, :in_progress) }
diff --git a/spec/models/form/question_spec.rb b/spec/models/form/question_spec.rb
index 32bea6032..2be973ddb 100644
--- a/spec/models/form/question_spec.rb
+++ b/spec/models/form/question_spec.rb
@@ -120,6 +120,11 @@ RSpec.describe Form::Question, type: :model do
case_log.mrcdate = Time.zone.local(2021, 10, 11)
expect(subject.answer_label(case_log)).to eq("11 October 2021")
end
+
+ it "can handle nils" do
+ case_log.mrcdate = nil
+ expect(subject.answer_label(case_log)).to eq("")
+ end
end
context "when type is checkbox" do
diff --git a/yarn.lock b/yarn.lock
index d13308c56..6d214eae2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -970,11 +970,6 @@
dependencies:
spark-md5 "^3.0.0"
-"@rails/ujs@^6.0.0":
- version "6.1.4"
- resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.1.4.tgz#093d5341595a02089ed309dec40f3c37da7b1b10"
- integrity sha512-O3lEzL5DYbxppMdsFSw36e4BHIlfz/xusynwXGv3l2lhSlvah41qviRpsoAlKXxl37nZAqK+UUF5cnGGK45Mfw==
-
"@rails/webpacker@5.4.0":
version "5.4.0"
resolved "https://registry.yarnpkg.com/@rails/webpacker/-/webpacker-5.4.0.tgz#2c64a9ea7e85d2a33e50e86319fe6751df0c47e8"