From e4d6b35b606f1bbcfa47ee3c4f62d8d68822a006 Mon Sep 17 00:00:00 2001 From: Samuel Young Date: Wed, 14 Jan 2026 16:17:07 +0000 Subject: [PATCH 01/13] CLDC-4156: Update Scheme Care options now uses 1,2,5 as options --- app/models/scheme.rb | 9 ++++----- app/views/schemes/details.html.erb | 6 +----- app/views/schemes/new.html.erb | 6 +----- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/app/models/scheme.rb b/app/models/scheme.rb index f563573b5..50f94bbbc 100644 --- a/app/models/scheme.rb +++ b/app/models/scheme.rb @@ -148,9 +148,8 @@ class Scheme < ApplicationRecord enum :sensitive, SENSITIVE, suffix: true REGISTERED_UNDER_CARE_ACT = { - "Yes – registered care home providing nursing care": 4, - "Yes – registered care home providing personal care": 3, - "Yes – part registered as a care home": 2, + "Yes": 5, + "Partially - some but not all units in the scheme are regulated by the CQC": 2, "No": 1, }.freeze @@ -262,10 +261,10 @@ class Scheme < ApplicationRecord ] end - def care_acts_options_with_hints + def self.care_acts_options_with_hints hints = { "Yes – part registered as a care home": "A proportion of units are registered as being a care home." } - Scheme.registered_under_care_acts.keys.map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize, description: hints[key.to_sym]) } + Scheme.registered_under_care_acts.keys.map { |key, _| OpenStruct.new(id: key, name: key.to_s, description: hints[key.to_sym]) } end def support_level_options_with_hints diff --git a/app/views/schemes/details.html.erb b/app/views/schemes/details.html.erb index d1943cabe..6a459263f 100644 --- a/app/views/schemes/details.html.erb +++ b/app/views/schemes/details.html.erb @@ -38,12 +38,8 @@ :name, legend: { text: "What is this type of scheme?", size: "m" } %> - <% care_acts_options_hints = { "Yes – part registered as a care home": "A proportion of units are registered as being a care home." } %> - - <% care_acts_options_with_hints = Scheme.registered_under_care_acts.keys.map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize, description: care_acts_options_hints[key.to_sym]) } %> - <%= f.govuk_collection_radio_buttons :registered_under_care_act, - care_acts_options_with_hints, + Scheme.care_acts_options_with_hints, :id, :name, :description, diff --git a/app/views/schemes/new.html.erb b/app/views/schemes/new.html.erb index 1be0f7f74..1869e6ee3 100644 --- a/app/views/schemes/new.html.erb +++ b/app/views/schemes/new.html.erb @@ -33,12 +33,8 @@ :name, legend: { text: "What is this type of scheme?", size: "m" } %> - <% care_acts_options_hints = { "Yes – part registered as a care home": "A proportion of units are registered as being a care home." } %> - - <% care_acts_options_with_hints = Scheme.registered_under_care_acts.keys.map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize, description: care_acts_options_hints[key.to_sym]) } %> - <%= f.govuk_collection_radio_buttons :registered_under_care_act, - care_acts_options_with_hints, + Scheme.care_acts_options_with_hints, :id, :name, :description, From 6ce98ae04a993878ce0bac5145e84c0c6f724025 Mon Sep 17 00:00:00 2001 From: Samuel Young Date: Wed, 14 Jan 2026 16:17:23 +0000 Subject: [PATCH 02/13] CLDC-4156: Migrate existing scheme options --- .../20260114160036_update_scheme_care_standards_values.rb | 5 +++++ db/schema.rb | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20260114160036_update_scheme_care_standards_values.rb diff --git a/db/migrate/20260114160036_update_scheme_care_standards_values.rb b/db/migrate/20260114160036_update_scheme_care_standards_values.rb new file mode 100644 index 000000000..f1a256962 --- /dev/null +++ b/db/migrate/20260114160036_update_scheme_care_standards_values.rb @@ -0,0 +1,5 @@ +class UpdateSchemeCareStandardsValues < ActiveRecord::Migration[7.2] + def change + Scheme.where(registered_under_care_act: [3, 4]).update!(registered_under_care_act: 5) + end +end diff --git a/db/schema.rb b/db/schema.rb index 50aa1a81d..20cfe5a43 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.2].define(version: 2025_04_16_111741) do +ActiveRecord::Schema[7.2].define(version: 2026_01_14_160036) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -84,7 +84,7 @@ ActiveRecord::Schema[7.2].define(version: 2025_04_16_111741) do t.datetime "last_accessed" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.check_constraint "log_type::text = ANY (ARRAY['lettings'::character varying, 'sales'::character varying]::text[])", name: "log_type_check" + t.check_constraint "log_type::text = ANY (ARRAY['lettings'::character varying::text, 'sales'::character varying::text])", name: "log_type_check" t.check_constraint "year >= 2000 AND year <= 2099", name: "year_check" end From 3fce118b575cbdef7da9a74d5703d8d933bf4de8 Mon Sep 17 00:00:00 2001 From: Samuel Young Date: Wed, 14 Jan 2026 16:38:36 +0000 Subject: [PATCH 03/13] CLDC-4156: Update tests --- spec/lib/tasks/update_schemes_and_locations_from_csv_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/lib/tasks/update_schemes_and_locations_from_csv_spec.rb b/spec/lib/tasks/update_schemes_and_locations_from_csv_spec.rb index c397b456a..7fce53bfd 100644 --- a/spec/lib/tasks/update_schemes_and_locations_from_csv_spec.rb +++ b/spec/lib/tasks/update_schemes_and_locations_from_csv_spec.rb @@ -57,7 +57,7 @@ RSpec.describe "bulk_update" do 3, service_name: "Test name", sensitive: 1, - registered_under_care_act: 4, + registered_under_care_act: 5, support_type: 4, scheme_type: 7, arrangement_type: "D", From 3c29b63e65dda0b8467758566374c1f0a61cb7ec Mon Sep 17 00:00:00 2001 From: Samuel Young Date: Wed, 14 Jan 2026 16:53:24 +0000 Subject: [PATCH 04/13] fixup! CLDC-4156: Update tests replace old Yes options --- spec/features/schemes_helpers.rb | 2 +- spec/fixtures/files/original_schemes.csv | 10 +++++----- spec/fixtures/files/updated_schemes.csv | 4 ++-- .../update_schemes_and_locations_from_csv_spec.rb | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/spec/features/schemes_helpers.rb b/spec/features/schemes_helpers.rb index 0b99d54de..e14c65cbf 100644 --- a/spec/features/schemes_helpers.rb +++ b/spec/features/schemes_helpers.rb @@ -29,7 +29,7 @@ module SchemesHelpers fill_in "Scheme name", with: "FooBar" check "This scheme contains confidential information" choose "Direct access hostel" - choose "Yes – registered care home providing nursing care" + choose "Yes" select organisation_name, from: "scheme-owning-organisation-id-field" choose answers["housing_stock_owners"].presence || "The same organisation that owns the housing stock" click_button "Save and continue" diff --git a/spec/fixtures/files/original_schemes.csv b/spec/fixtures/files/original_schemes.csv index f28bbedbb..a068a132c 100644 --- a/spec/fixtures/files/original_schemes.csv +++ b/spec/fixtures/files/original_schemes.csv @@ -1,6 +1,6 @@ scheme_code,scheme_service_name,scheme_status,scheme_confidential,scheme_type,scheme_registered_under_care_act,scheme_owning_organisation_name,scheme_support_services_provided_by,scheme_primary_client_group,scheme_has_other_client_group,scheme_secondary_client_group,scheme_support_type,scheme_intended_stay,scheme_created_at,scheme_active_dates -{id1},Test name,active,Yes,Housing for older people,Yes – registered care home providing nursing care,MHCLG,The same organisation that owns the housing stock,People with alcohol problems,Yes,Older people with support needs,High level,Medium stay,2021-04-01T00:00:00+01:00,"Active from 1 April 2020" -{id2},Test name,active,Yes,Housing for older people,Yes – registered care home providing nursing care,MHCLG,The same organisation that owns the housing stock,People with alcohol problems,Yes,Older people with support needs,High level,Medium stay,2021-04-01T00:00:00+01:00,"Active from 1 April 2020" -{id3},Test name,active,Yes,Housing for older people,Yes – registered care home providing nursing care,MHCLG,The same organisation that owns the housing stock,People with alcohol problems,Yes,Older people with support needs,High level,Medium stay,2021-04-01T00:00:00+01:00,"Active from 1 April 2020" -{id4},Incomplete scheme,incomplete,Yes,Housing for older people,Yes – registered care home providing nursing care,MHCLG,The same organisation that owns the housing stock,People with alcohol problems,,,,,2021-04-01T00:00:00+01:00,"Active from 1 April 2020" -SWrong_id,Incomplete scheme,incomplete,Yes,Housing for older people,Yes – registered care home providing nursing care,MHCLG,The same organisation that owns the housing stock,People with alcohol problems,,,,,2021-04-01T00:00:00+01:00,"Active from 1 April 2020" +{id1},Test name,active,Yes,Housing for older people,Yes,MHCLG,The same organisation that owns the housing stock,People with alcohol problems,Yes,Older people with support needs,High level,Medium stay,2021-04-01T00:00:00+01:00,"Active from 1 April 2020" +{id2},Test name,active,Yes,Housing for older people,Yes,MHCLG,The same organisation that owns the housing stock,People with alcohol problems,Yes,Older people with support needs,High level,Medium stay,2021-04-01T00:00:00+01:00,"Active from 1 April 2020" +{id3},Test name,active,Yes,Housing for older people,Yes,MHCLG,The same organisation that owns the housing stock,People with alcohol problems,Yes,Older people with support needs,High level,Medium stay,2021-04-01T00:00:00+01:00,"Active from 1 April 2020" +{id4},Incomplete scheme,incomplete,Yes,Housing for older people,Yes,MHCLG,The same organisation that owns the housing stock,People with alcohol problems,,,,,2021-04-01T00:00:00+01:00,"Active from 1 April 2020" +SWrong_id,Incomplete scheme,incomplete,Yes,Housing for older people,Yes,MHCLG,The same organisation that owns the housing stock,People with alcohol problems,,,,,2021-04-01T00:00:00+01:00,"Active from 1 April 2020" diff --git a/spec/fixtures/files/updated_schemes.csv b/spec/fixtures/files/updated_schemes.csv index 5f4631a02..5091ea2de 100644 --- a/spec/fixtures/files/updated_schemes.csv +++ b/spec/fixtures/files/updated_schemes.csv @@ -1,6 +1,6 @@ scheme_code,scheme_service_name,scheme_status,scheme_confidential,scheme_type,scheme_registered_under_care_act,scheme_owning_organisation_name,scheme_support_services_provided_by,scheme_primary_client_group,scheme_has_other_client_group,scheme_secondary_client_group,scheme_support_type,scheme_intended_stay,scheme_created_at,scheme_active_dates {id1},Updated test name,incomplete,No,Direct Access Hostel,No,Different organisation,Another registered stock owner,People with drug problems,No,Older people with support needs,Low level,Permanent,2022-04-01T00:00:00+01:00,"Active from 2 April 2020" -{id2},Test name,active,Yes,Housing for older people,Yes – registered care home providing nursing care,MHCLG,The same organisation that owns the housing stock,People with alcohol problems,Yes,Older people with support needs,High level,Medium stay,2021-04-01T00:00:00+01:00,"Active from 1 April 2020" -{id3}, ,active,Yse,Direct access Hostel,Yes – registered care home providing nursing care,non existing org,wrong answer,FD,no,lder people with support needs,high,Permanent ,2021-04-01T00:00:00+01:00,"Active from 1 April 2020" +{id2},Test name,active,Yes,Housing for older people,Yes,MHCLG,The same organisation that owns the housing stock,People with alcohol problems,Yes,Older people with support needs,High level,Medium stay,2021-04-01T00:00:00+01:00,"Active from 1 April 2020" +{id3}, ,active,Yse,Direct access Hostel,Yes,non existing org,wrong answer,FD,no,lder people with support needs,high,Permanent ,2021-04-01T00:00:00+01:00,"Active from 1 April 2020" Wrong_id,Incomplete scheme,incomplete,Yes,Housing for older people,No,MHCLG,The same organisation that owns the housing stock,People with alcohol problems,,,,,2021-04-01T00:00:00+01:00,"Active from 1 April 2020" SWrong_id,Incomplete scheme,incomplete,Yes,Housing for older people,No,MHCLG,The same organisation that owns the housing stock,People with alcohol problems,,,,,2021-04-01T00:00:00+01:00,"Active from 1 April 2020" diff --git a/spec/lib/tasks/update_schemes_and_locations_from_csv_spec.rb b/spec/lib/tasks/update_schemes_and_locations_from_csv_spec.rb index 7fce53bfd..6c8aa25ed 100644 --- a/spec/lib/tasks/update_schemes_and_locations_from_csv_spec.rb +++ b/spec/lib/tasks/update_schemes_and_locations_from_csv_spec.rb @@ -123,7 +123,7 @@ RSpec.describe "bulk_update" do schemes[1].reload expect(schemes[1].service_name).to eq("Test name") expect(schemes[1].sensitive).to eq("Yes") - expect(schemes[1].registered_under_care_act).to eq("Yes – registered care home providing nursing care") + expect(schemes[1].registered_under_care_act).to eq("Yes") expect(schemes[1].support_type).to eq("High level") expect(schemes[1].scheme_type).to eq("Housing for older people") expect(schemes[1].arrangement_type).to eq("The same organisation that owns the housing stock") @@ -141,7 +141,7 @@ RSpec.describe "bulk_update" do schemes[2].reload expect(schemes[2].service_name).to eq("Test name") expect(schemes[2].sensitive).to eq("Yes") - expect(schemes[2].registered_under_care_act).to eq("Yes – registered care home providing nursing care") + expect(schemes[2].registered_under_care_act).to eq("Yes") expect(schemes[2].support_type).to eq("High level") expect(schemes[2].scheme_type).to eq("Housing for older people") expect(schemes[2].arrangement_type).to eq("The same organisation that owns the housing stock") From adbe1cc56414f7f7e8a1349098e9c8a3e1c75be8 Mon Sep 17 00:00:00 2001 From: Samuel Young Date: Mon, 19 Jan 2026 12:25:07 +0000 Subject: [PATCH 05/13] Revert "CLDC-4156: Migrate existing scheme options" This reverts commit b81ac1c7e467cef551d103b11e05d4276a75c77f. --- .../20260114160036_update_scheme_care_standards_values.rb | 5 ----- db/schema.rb | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 db/migrate/20260114160036_update_scheme_care_standards_values.rb diff --git a/db/migrate/20260114160036_update_scheme_care_standards_values.rb b/db/migrate/20260114160036_update_scheme_care_standards_values.rb deleted file mode 100644 index f1a256962..000000000 --- a/db/migrate/20260114160036_update_scheme_care_standards_values.rb +++ /dev/null @@ -1,5 +0,0 @@ -class UpdateSchemeCareStandardsValues < ActiveRecord::Migration[7.2] - def change - Scheme.where(registered_under_care_act: [3, 4]).update!(registered_under_care_act: 5) - end -end diff --git a/db/schema.rb b/db/schema.rb index 20cfe5a43..50aa1a81d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.2].define(version: 2026_01_14_160036) do +ActiveRecord::Schema[7.2].define(version: 2025_04_16_111741) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -84,7 +84,7 @@ ActiveRecord::Schema[7.2].define(version: 2026_01_14_160036) do t.datetime "last_accessed" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.check_constraint "log_type::text = ANY (ARRAY['lettings'::character varying::text, 'sales'::character varying::text])", name: "log_type_check" + t.check_constraint "log_type::text = ANY (ARRAY['lettings'::character varying, 'sales'::character varying]::text[])", name: "log_type_check" t.check_constraint "year >= 2000 AND year <= 2099", name: "year_check" end From bf2b3e0a44d27533a0290847d23a04271f24be4d Mon Sep 17 00:00:00 2001 From: Samuel Young Date: Mon, 19 Jan 2026 13:38:25 +0000 Subject: [PATCH 06/13] CLDC-4156: Add rake to migrate schemes --- lib/tasks/correct_scheme_registered_under_care_value.rake | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 lib/tasks/correct_scheme_registered_under_care_value.rake diff --git a/lib/tasks/correct_scheme_registered_under_care_value.rake b/lib/tasks/correct_scheme_registered_under_care_value.rake new file mode 100644 index 000000000..823811a25 --- /dev/null +++ b/lib/tasks/correct_scheme_registered_under_care_value.rake @@ -0,0 +1,4 @@ +desc "Alter registered under care act values for lettings logs in the database to 5 if they are 3 or 4, as these options are being deprecated" +task correct_scheme_registered_under_care_value: :environment do + Scheme.where(registered_under_care_act: [3, 4]).update!(registered_under_care_act: 5) +end From 492d8780ce701663108f8073c61e7e5e6266d8aa Mon Sep 17 00:00:00 2001 From: Samuel Young Date: Wed, 21 Jan 2026 09:47:54 +0000 Subject: [PATCH 07/13] CLDC-4156: Update rake name --- ...alue.rake => update_scheme_registered_under_care_value.rake} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename lib/tasks/{correct_scheme_registered_under_care_value.rake => update_scheme_registered_under_care_value.rake} (78%) diff --git a/lib/tasks/correct_scheme_registered_under_care_value.rake b/lib/tasks/update_scheme_registered_under_care_value.rake similarity index 78% rename from lib/tasks/correct_scheme_registered_under_care_value.rake rename to lib/tasks/update_scheme_registered_under_care_value.rake index 823811a25..1082ffde8 100644 --- a/lib/tasks/correct_scheme_registered_under_care_value.rake +++ b/lib/tasks/update_scheme_registered_under_care_value.rake @@ -1,4 +1,4 @@ desc "Alter registered under care act values for lettings logs in the database to 5 if they are 3 or 4, as these options are being deprecated" -task correct_scheme_registered_under_care_value: :environment do +task update_scheme_registered_under_care_value: :environment do Scheme.where(registered_under_care_act: [3, 4]).update!(registered_under_care_act: 5) end From 7998a739ef32eca032050d2569016091cf3b41fc Mon Sep 17 00:00:00 2001 From: Samuel Young Date: Wed, 21 Jan 2026 09:50:17 +0000 Subject: [PATCH 08/13] fixup! CLDC-4156: Add rake to migrate schemes use update_all over update! --- lib/tasks/update_scheme_registered_under_care_value.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tasks/update_scheme_registered_under_care_value.rake b/lib/tasks/update_scheme_registered_under_care_value.rake index 1082ffde8..6c0827a04 100644 --- a/lib/tasks/update_scheme_registered_under_care_value.rake +++ b/lib/tasks/update_scheme_registered_under_care_value.rake @@ -1,4 +1,4 @@ desc "Alter registered under care act values for lettings logs in the database to 5 if they are 3 or 4, as these options are being deprecated" task update_scheme_registered_under_care_value: :environment do - Scheme.where(registered_under_care_act: [3, 4]).update!(registered_under_care_act: 5) + Scheme.where(registered_under_care_act: [3, 4]).update_all(registered_under_care_act: 5) end From 94cadc74b524dc0eaabeeeeb452b44c8a8f2d185 Mon Sep 17 00:00:00 2001 From: Samuel Young Date: Wed, 21 Jan 2026 09:51:05 +0000 Subject: [PATCH 09/13] fixup! CLDC-4156: Add rake to migrate schemes fix rake desc --- lib/tasks/update_scheme_registered_under_care_value.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tasks/update_scheme_registered_under_care_value.rake b/lib/tasks/update_scheme_registered_under_care_value.rake index 6c0827a04..f29b9e1dd 100644 --- a/lib/tasks/update_scheme_registered_under_care_value.rake +++ b/lib/tasks/update_scheme_registered_under_care_value.rake @@ -1,4 +1,4 @@ -desc "Alter registered under care act values for lettings logs in the database to 5 if they are 3 or 4, as these options are being deprecated" +desc "Alter registered under care act values for schemes in the database to 5 if they are 3 or 4, as these options are being deprecated" task update_scheme_registered_under_care_value: :environment do Scheme.where(registered_under_care_act: [3, 4]).update_all(registered_under_care_act: 5) end From 1eb7faa7e76d7d13b305335158d0add8fb904347 Mon Sep 17 00:00:00 2001 From: Samuel Young Date: Wed, 21 Jan 2026 09:58:16 +0000 Subject: [PATCH 10/13] CLDC-4156: Add new question wording --- app/models/scheme.rb | 2 +- app/views/schemes/details.html.erb | 2 +- app/views/schemes/new.html.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/scheme.rb b/app/models/scheme.rb index 50f94bbbc..2397f8451 100644 --- a/app/models/scheme.rb +++ b/app/models/scheme.rb @@ -250,7 +250,7 @@ class Scheme < ApplicationRecord { name: "Status", value: status, id: "status" }, { name: "Confidential information", value: sensitive, id: "sensitive", edit: true }, { name: "Type of scheme", value: scheme_type, id: "scheme_type", edit: true }, - { name: "Registered under Care Standards Act 2000", value: registered_under_care_act, id: "registered_under_care_act", edit: true }, + { name: "Regulated by the Care Quality Commission", value: registered_under_care_act, id: "registered_under_care_act", edit: true }, { name: "Housing stock owned by", value: owning_organisation.name, id: "owning_organisation_id", edit: true }, { name: "Support services provided by", value: arrangement_type, id: "arrangement_type", edit: true }, { name: "Primary client group", value: primary_client_group, id: "primary_client_group", edit: true }, diff --git a/app/views/schemes/details.html.erb b/app/views/schemes/details.html.erb index 6a459263f..e346cafdd 100644 --- a/app/views/schemes/details.html.erb +++ b/app/views/schemes/details.html.erb @@ -43,7 +43,7 @@ :id, :name, :description, - legend: { text: "Is this scheme registered under the Care Standards Act 2000?", size: "m" } %> + legend: { text: "Is the scheme regulated by the Care Quality Commission (CQC)?", size: "m" } %> <% scheme_owning_organisation_options = owning_organisation_options(current_user) %> diff --git a/app/views/schemes/new.html.erb b/app/views/schemes/new.html.erb index 1869e6ee3..2af655d8f 100644 --- a/app/views/schemes/new.html.erb +++ b/app/views/schemes/new.html.erb @@ -38,7 +38,7 @@ :id, :name, :description, - legend: { text: "Is this scheme registered under the Care Standards Act 2000?", size: "m" } %> + legend: { text: "Is the scheme regulated by the Care Quality Commission (CQC)?", size: "m" } %> <% if current_user.data_coordinator? && current_user.organisation.stock_owners.count.zero? && !current_user.organisation.has_recent_absorbed_organisations? %> <%= f.hidden_field :owning_organisation_id, value: current_user.organisation.id %> From 725b27c6c5c16663ef317c5c6a97ebbc0beab264 Mon Sep 17 00:00:00 2001 From: Samuel Young Date: Wed, 21 Jan 2026 10:00:19 +0000 Subject: [PATCH 11/13] fixup! CLDC-4156: Update Scheme Care options remove unused descriptions --- app/models/scheme.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/models/scheme.rb b/app/models/scheme.rb index 2397f8451..c39bf9a47 100644 --- a/app/models/scheme.rb +++ b/app/models/scheme.rb @@ -262,9 +262,7 @@ class Scheme < ApplicationRecord end def self.care_acts_options_with_hints - hints = { "Yes – part registered as a care home": "A proportion of units are registered as being a care home." } - - Scheme.registered_under_care_acts.keys.map { |key, _| OpenStruct.new(id: key, name: key.to_s, description: hints[key.to_sym]) } + Scheme.registered_under_care_acts.keys.map { |key, _| OpenStruct.new(id: key, name: key.to_s) } end def support_level_options_with_hints From 065b8d6dc08416013bc04b1586d35217f6bfe16c Mon Sep 17 00:00:00 2001 From: Samuel Young Date: Wed, 21 Jan 2026 10:22:58 +0000 Subject: [PATCH 12/13] fixup! CLDC-4156: Add new question wording --- spec/features/schemes_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/features/schemes_spec.rb b/spec/features/schemes_spec.rb index e9cb23770..ec053b615 100644 --- a/spec/features/schemes_spec.rb +++ b/spec/features/schemes_spec.rb @@ -446,7 +446,7 @@ RSpec.describe "Schemes scheme Features" do expect(page).to have_content "This scheme contains confidential information" expect(page).to have_content "Which organisation owns the housing stock for this scheme?" expect(page).to have_content "What is this type of scheme?" - expect(page).to have_content "Is this scheme registered under the Care Standards Act 2000?" + expect(page).to have_content "Is the scheme regulated by the Care Quality Commission (CQC)?" expect(page).to have_content "Who provides the support services used by this scheme?" end @@ -463,7 +463,7 @@ RSpec.describe "Schemes scheme Features" do expect(page).to have_content "This scheme contains confidential information" expect(page).to have_content "What is this type of scheme?" expect(page).to have_content "Who provides the support services used by this scheme?" - expect(page).to have_content "Is this scheme registered under the Care Standards Act 2000?" + expect(page).to have_content "Is the scheme regulated by the Care Quality Commission (CQC)?" end it "returns to the primary client group question after amending scheme details" do From d9fe00339d72e2abbaa8f6b15ceec3805d4e4739 Mon Sep 17 00:00:00 2001 From: Samuel Young Date: Wed, 21 Jan 2026 15:34:33 +0000 Subject: [PATCH 13/13] fixup! CLDC-4156: Add new question wording remove hints from function name --- app/models/scheme.rb | 2 +- app/views/schemes/details.html.erb | 2 +- app/views/schemes/new.html.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/scheme.rb b/app/models/scheme.rb index c39bf9a47..cf13ff29d 100644 --- a/app/models/scheme.rb +++ b/app/models/scheme.rb @@ -261,7 +261,7 @@ class Scheme < ApplicationRecord ] end - def self.care_acts_options_with_hints + def self.care_acts_options Scheme.registered_under_care_acts.keys.map { |key, _| OpenStruct.new(id: key, name: key.to_s) } end diff --git a/app/views/schemes/details.html.erb b/app/views/schemes/details.html.erb index e346cafdd..722e58883 100644 --- a/app/views/schemes/details.html.erb +++ b/app/views/schemes/details.html.erb @@ -39,7 +39,7 @@ legend: { text: "What is this type of scheme?", size: "m" } %> <%= f.govuk_collection_radio_buttons :registered_under_care_act, - Scheme.care_acts_options_with_hints, + Scheme.care_acts_options, :id, :name, :description, diff --git a/app/views/schemes/new.html.erb b/app/views/schemes/new.html.erb index 2af655d8f..88bddacd5 100644 --- a/app/views/schemes/new.html.erb +++ b/app/views/schemes/new.html.erb @@ -34,7 +34,7 @@ legend: { text: "What is this type of scheme?", size: "m" } %> <%= f.govuk_collection_radio_buttons :registered_under_care_act, - Scheme.care_acts_options_with_hints, + Scheme.care_acts_options, :id, :name, :description,