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,