From 2cdf181489fa82025f32a84abfc961ef228df61a Mon Sep 17 00:00:00 2001 From: Jack S Date: Wed, 5 Oct 2022 16:46:07 +0100 Subject: [PATCH] [CLDC-1502] Add household wheelchair question --- .../form/sales/pages/household_wheelchair.rb | 15 +++++++++++++++ .../sales/questions/household_wheelchair.rb | 17 +++++++++++++++++ app/models/form/sales/sections/household.rb | 5 ++++- .../form/sales/subsections/household_needs.rb | 15 +++++++++++++++ .../20221005090129_add_wheel_to_sales_log.rb | 7 +++++++ db/schema.rb | 1 + spec/factories/sales_log.rb | 1 + .../form/sales/sections/household_spec.rb | 7 ++++++- spec/models/form_handler_spec.rb | 4 ++-- 9 files changed, 68 insertions(+), 4 deletions(-) create mode 100644 app/models/form/sales/pages/household_wheelchair.rb create mode 100644 app/models/form/sales/questions/household_wheelchair.rb create mode 100644 app/models/form/sales/subsections/household_needs.rb create mode 100644 db/migrate/20221005090129_add_wheel_to_sales_log.rb diff --git a/app/models/form/sales/pages/household_wheelchair.rb b/app/models/form/sales/pages/household_wheelchair.rb new file mode 100644 index 000000000..97d4abc52 --- /dev/null +++ b/app/models/form/sales/pages/household_wheelchair.rb @@ -0,0 +1,15 @@ +class Form::Sales::Pages::HouseholdWheelchair < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "household_wheelchair" + @header = "" + @description = "" + @subsection = subsection + end + + def questions + @questions ||= [ + Form::Sales::Questions::HouseholdWheelchair.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/questions/household_wheelchair.rb b/app/models/form/sales/questions/household_wheelchair.rb new file mode 100644 index 000000000..43acfcc24 --- /dev/null +++ b/app/models/form/sales/questions/household_wheelchair.rb @@ -0,0 +1,17 @@ +class Form::Sales::Questions::HouseholdWheelchair < ::Form::Question + def initialize(id, hsh, page) + super + @id = "wheel" + @header = "Does anyone in the household use a wheelchair?" + @type = "radio" + @answer_options = ANSWER_OPTIONS + @page = page + @hint_text = "This can be inside or outside the home" + end + + ANSWER_OPTIONS = { + "1" => { "value" => "Yes" }, + "2" => { "value" => "No" }, + "3" => { "value" => "Don't know" }, + }.freeze +end diff --git a/app/models/form/sales/sections/household.rb b/app/models/form/sales/sections/household.rb index b3432522e..e6f71a26d 100644 --- a/app/models/form/sales/sections/household.rb +++ b/app/models/form/sales/sections/household.rb @@ -5,6 +5,9 @@ class Form::Sales::Sections::Household < ::Form::Section @label = "About the household" @description = "" @form = form - @subsections = [Form::Sales::Subsections::HouseholdCharacteristics.new(nil, nil, self)] || [] + @subsections = [ + Form::Sales::Subsections::HouseholdCharacteristics.new(nil, nil, self), + Form::Sales::Subsections::HouseholdNeeds.new(nil, nil, self), + ] end end diff --git a/app/models/form/sales/subsections/household_needs.rb b/app/models/form/sales/subsections/household_needs.rb new file mode 100644 index 000000000..bf7a5df3a --- /dev/null +++ b/app/models/form/sales/subsections/household_needs.rb @@ -0,0 +1,15 @@ +class Form::Sales::Subsections::HouseholdNeeds < ::Form::Subsection + def initialize(id, hsh, section) + super + @id = "household_needs" + @label = "Household needs" + @section = section + @depends_on = [{ "setup" => "completed" }] + end + + def pages + @pages ||= [ + Form::Sales::Pages::HouseholdWheelchair.new(nil, nil, self), + ] + end +end diff --git a/db/migrate/20221005090129_add_wheel_to_sales_log.rb b/db/migrate/20221005090129_add_wheel_to_sales_log.rb new file mode 100644 index 000000000..33f08d7ff --- /dev/null +++ b/db/migrate/20221005090129_add_wheel_to_sales_log.rb @@ -0,0 +1,7 @@ +class AddWheelToSalesLog < ActiveRecord::Migration[7.0] + def change + change_table :sales_logs, bulk: true do |t| + t.column :wheel, :int + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 58ca51de5..7e6c34a26 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -355,6 +355,7 @@ ActiveRecord::Schema[7.0].define(version: 2022_10_05_150022) do t.integer "privacynotice" t.integer "ecstat1" t.integer "hholdcount" + t.integer "wheel" t.index ["created_by_id"], name: "index_sales_logs_on_created_by_id" t.index ["managing_organisation_id"], name: "index_sales_logs_on_managing_organisation_id" t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id" diff --git a/spec/factories/sales_log.rb b/spec/factories/sales_log.rb index ecf23a72e..321c9800f 100644 --- a/spec/factories/sales_log.rb +++ b/spec/factories/sales_log.rb @@ -38,6 +38,7 @@ FactoryBot.define do ecstat1 { "1" } ecstat2 { "1" } hholdcount { "1" } + wheel { 1 } end end end diff --git a/spec/models/form/sales/sections/household_spec.rb b/spec/models/form/sales/sections/household_spec.rb index 53d81f2fb..e415e8f0c 100644 --- a/spec/models/form/sales/sections/household_spec.rb +++ b/spec/models/form/sales/sections/household_spec.rb @@ -12,7 +12,12 @@ RSpec.describe Form::Sales::Sections::Household, type: :model do end it "has correct subsections" do - expect(household.subsections.map(&:id)).to eq(%w[household_characteristics]) + expect(household.subsections.map(&:id)).to eq( + %w[ + household_characteristics + household_needs + ], + ) end it "has the correct id" do diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index 4bd12ba7e..a53ca575f 100644 --- a/spec/models/form_handler_spec.rb +++ b/spec/models/form_handler_spec.rb @@ -61,14 +61,14 @@ RSpec.describe FormHandler do it "is able to load a current sales form" do form = form_handler.get_form("current_sales") expect(form).to be_a(Form) - expect(form.pages.count).to eq(34) + expect(form.pages.count).to eq(35) expect(form.name).to eq("2022_2023_sales") end it "is able to load a previous sales form" do form = form_handler.get_form("previous_sales") expect(form).to be_a(Form) - expect(form.pages.count).to eq(34) + expect(form.pages.count).to eq(35) expect(form.name).to eq("2021_2022_sales") end end