-
<% selection = [OpenStruct.new(id: "Yes", name: "Yes"), OpenStruct.new(id: "No", name: "No")] %>
-
<%= f.govuk_collection_radio_buttons :has_other_client_group,
selection,
:id,
diff --git a/app/views/schemes/details.html.erb b/app/views/schemes/details.html.erb
index b59f4ce37..4ae640208 100644
--- a/app/views/schemes/details.html.erb
+++ b/app/views/schemes/details.html.erb
@@ -1,79 +1,79 @@
<% content_for :title, "Create a new supported housing scheme" %>
- <% content_for :before_content do %>
- <%= govuk_back_link(
- text: "Back",
- href: :back,
- ) %>
- <% end %>
+<% content_for :before_content do %>
+ <%= govuk_back_link(
+ text: "Back",
+ href: :back,
+ ) %>
+<% end %>
- <%= render partial: "organisations/headings", locals: { main: "Create a new supported housing scheme", sub: nil } %>
+<%= render partial: "organisations/headings", locals: { main: "Create a new supported housing scheme", sub: nil } %>
- <%= form_for(@scheme, method: :patch) do |f| %>
-
-
- <%= f.govuk_error_summary %>
+<%= form_for(@scheme, method: :patch) do |f| %>
+
+
+ <%= f.govuk_error_summary %>
- <%= f.govuk_text_field :service_name,
- label: { text: "Scheme name", size: "m" },
- hint: { text: "This is how you’ll refer to this supported housing scheme within your organisation. For example, the name could relate to the address or location. You’ll be able to see the client group when selecting it." } %>
+ <%= f.govuk_text_field :service_name,
+ label: { text: "Scheme name", size: "m" },
+ hint: { text: "This is how you refer to this supported housing scheme within your organisation. For example, the name could relate to the address or location. You’ll be able to see the client group when selecting it." } %>
- <%= f.govuk_check_boxes_fieldset :sensitive,
- legend: nil do %>
- <%= f.govuk_check_box :sensitive,
- 1,
- 0,
- multiple: false,
- checked: @scheme.sensitive == "Yes",
- label: { text: "This scheme contains confidential information" } %>
- <% end %>
+ <%= f.govuk_check_boxes_fieldset :sensitive,
+ legend: nil do %>
+ <%= f.govuk_check_box :sensitive,
+ 1,
+ 0,
+ multiple: false,
+ checked: @scheme.sensitive == "Yes",
+ label: { text: "This scheme contains confidential information" } %>
+ <% end %>
- <% null_option = [OpenStruct.new(id: "", name: "Select an option")] %>
- <% organisations = Organisation.all.map { |org| OpenStruct.new(id: org.id, name: org.name) } %>
- <% managing_org_answer_options = null_option + organisations %>
+ <% null_option = [OpenStruct.new(id: "", name: "Select an option")] %>
+ <% organisations = Organisation.all.map { |org| OpenStruct.new(id: org.id, name: org.name) } %>
+ <% managing_org_answer_options = null_option + organisations %>
- <%= f.govuk_collection_select :managing_organisation_id,
- managing_org_answer_options,
- :id,
- :name,
- label: { text: "Which organisation manages this scheme?", size: "m" },
- options: { required: true },
- "data-controller": %w[accessible-autocomplete conditional-filter] %>
+ <%= f.govuk_collection_select :managing_organisation_id,
+ managing_org_answer_options,
+ :id,
+ :name,
+ label: { text: "Which organisation manages this scheme?", size: "m" },
+ options: { required: true },
+ "data-controller": %w[accessible-autocomplete conditional-filter] %>
- <% if current_user.support? %>
- <%= f.govuk_collection_select :owning_organisation_id,
- organisations,
- :id,
- :name,
- label: { text: "Which organisation owns the housing stock for this scheme?", size: "m" },
- "data-controller": %w[accessible-autocomplete conditional-filter] %>
- <% end %>
+ <% if current_user.support? %>
+ <%= f.govuk_collection_select :owning_organisation_id,
+ organisations,
+ :id,
+ :name,
+ label: { text: "Which organisation owns the housing stock for this scheme?", size: "m" },
+ "data-controller": %w[accessible-autocomplete conditional-filter] %>
+ <% end %>
- <% if current_user.data_coordinator? %>
- <%= f.hidden_field :owning_organisation_id, value: current_user.organisation.id %>
- <% end %>
+ <% if current_user.data_coordinator? %>
+ <%= f.hidden_field :owning_organisation_id, value: current_user.organisation.id %>
+ <% end %>
- <% scheme_types_selection = Scheme.scheme_types.keys.excluding("Missing").map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) } %>
+ <% scheme_types_selection = Scheme.scheme_types.keys.excluding("Missing").map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) } %>
- <%= f.govuk_collection_radio_buttons :scheme_type,
- scheme_types_selection,
- :id,
- :name,
- legend: { text: "What is this type of scheme?", size: "m" } %>
+ <%= f.govuk_collection_radio_buttons :scheme_type,
+ scheme_types_selection,
+ :id,
+ :name,
+ legend: { text: "What is this type of scheme?", size: "m" } %>
- <% care_acts_selection = Scheme.registered_under_care_acts.keys.reverse.map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) } %>
+ <% care_acts_selection = Scheme.registered_under_care_acts.keys.reverse.map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) } %>
- <%= f.govuk_collection_radio_buttons :registered_under_care_act,
- care_acts_selection,
- :id,
- :name,
- legend: { text: "Is this scheme registered under the Care Standards Act 2000?", size: "m" } %>
+ <%= f.govuk_collection_radio_buttons :registered_under_care_act,
+ care_acts_selection,
+ :id,
+ :name,
+ legend: { text: "Is this scheme registered under the Care Standards Act 2000?", size: "m" } %>
- <%= f.hidden_field :page, value: "details" %>
- <% if request.query_parameters["check_answers"] %>
- <%= f.hidden_field :check_answers, value: "true" %>
- <% end %>
- <%= f.govuk_submit "Save and continue" %>
-
-
- <% end %>
+ <%= f.hidden_field :page, value: "details" %>
+ <% if request.query_parameters["check_answers"] %>
+ <%= f.hidden_field :check_answers, value: "true" %>
+ <% end %>
+ <%= f.govuk_submit "Save and continue" %>
+
+
+<% end %>
diff --git a/app/views/schemes/edit_name.html.erb b/app/views/schemes/edit_name.html.erb
index d967c24a2..876e73a25 100644
--- a/app/views/schemes/edit_name.html.erb
+++ b/app/views/schemes/edit_name.html.erb
@@ -1,47 +1,46 @@
<% content_for :title, "Scheme details" %>
- <% content_for :before_content do %>
- <%= govuk_back_link(
- text: "Back",
- href: :back,
- ) %>
- <% end %>
-
- <%= render partial: "organisations/headings", locals: { main: "Scheme details", sub: @scheme.service_name } %>
-
- <%= form_for(@scheme, method: :patch) do |f| %>
-
-
- <%= f.govuk_error_summary %>
-
- <%= f.govuk_text_field :service_name,
- label: { text: "Scheme name", size: "m" },
- hint: { text: "This is how you’ll refer to this supported housing scheme within your organisation. For example, the name could relate to the address or location. You’ll be able to see the client group when selecting it." } %>
-
- <%= f.govuk_check_boxes_fieldset :sensitive,
- legend: nil do %>
- <%= f.govuk_check_box :sensitive,
- 1,
- 0,
- multiple: false,
- checked: @scheme.sensitive == "Yes",
- label: { text: "This scheme contains confidential information" } %>
- <% end %>
-
- <% organisations = Organisation.all.map { |org| OpenStruct.new(id: org.id, name: org.name) } %>
-
- <% if current_user.support? %>
- <%= f.govuk_collection_select :owning_organisation_id,
- organisations,
- :id,
- :name,
- label: { text: "Which organisation owns the housing stock for this scheme?", size: "m" },
- "data-controller": %w[accessible-autocomplete conditional-filter] %>
- <% end %>
-
- <%= f.hidden_field :page, value: "edit-name" %>
-
- <%= f.govuk_submit "Save changes" %>
-
-
- <% end %>
+<% content_for :before_content do %>
+ <%= govuk_back_link(
+ text: "Back",
+ href: :back,
+ ) %>
+<% end %>
+
+<%= render partial: "organisations/headings", locals: { main: "Scheme details", sub: @scheme.service_name } %>
+
+<%= form_for(@scheme, method: :patch) do |f| %>
+
+
+ <%= f.govuk_error_summary %>
+
+ <%= f.govuk_text_field :service_name,
+ label: { text: "Scheme name", size: "m" },
+ hint: { text: "This is how you refer to this supported housing scheme within your organisation. For example, the name could relate to the address or location. You’ll be able to see the client group when selecting it." } %>
+
+ <%= f.govuk_check_boxes_fieldset :sensitive,
+ legend: nil do %>
+ <%= f.govuk_check_box :sensitive,
+ 1,
+ 0,
+ multiple: false,
+ checked: @scheme.sensitive == "Yes",
+ label: { text: "This scheme contains confidential information" } %>
+ <% end %>
+
+ <% organisations = Organisation.all.map { |org| OpenStruct.new(id: org.id, name: org.name) } %>
+ <% if current_user.support? %>
+ <%= f.govuk_collection_select :owning_organisation_id,
+ organisations,
+ :id,
+ :name,
+ label: { text: "Which organisation owns the housing stock for this scheme?", size: "m" },
+ "data-controller": %w[accessible-autocomplete conditional-filter] %>
+ <% end %>
+
+ <%= f.hidden_field :page, value: "edit-name" %>
+
+ <%= f.govuk_submit "Save changes" %>
+
+
+<% end %>
diff --git a/app/views/schemes/new.html.erb b/app/views/schemes/new.html.erb
index b58e461c0..297af9cef 100644
--- a/app/views/schemes/new.html.erb
+++ b/app/views/schemes/new.html.erb
@@ -53,7 +53,6 @@
<% end %>
<% scheme_types_selection = Scheme.scheme_types.keys.excluding("Missing").map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) } %>
-
<%= f.govuk_collection_radio_buttons :scheme_type,
scheme_types_selection,
:id,
@@ -61,7 +60,6 @@
legend: { text: "What is this type of scheme?", size: "m" } %>
<% care_acts_selection = Scheme.registered_under_care_acts.keys.reverse.map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) } %>
-
<%= f.govuk_collection_radio_buttons :registered_under_care_act,
care_acts_selection,
:id,
diff --git a/app/views/schemes/primary_client_group.html.erb b/app/views/schemes/primary_client_group.html.erb
index af3ea80e5..893eaff59 100644
--- a/app/views/schemes/primary_client_group.html.erb
+++ b/app/views/schemes/primary_client_group.html.erb
@@ -14,9 +14,6 @@
<%= f.govuk_error_summary %>
-
-
<% primary_client_group_selection = Scheme.primary_client_groups.keys.excluding("Missing").map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) } %>
<%= f.govuk_collection_radio_buttons :primary_client_group,
primary_client_group_selection,
diff --git a/app/views/schemes/secondary_client_group.html.erb b/app/views/schemes/secondary_client_group.html.erb
index f785fb887..eb88881c4 100644
--- a/app/views/schemes/secondary_client_group.html.erb
+++ b/app/views/schemes/secondary_client_group.html.erb
@@ -14,9 +14,6 @@
<%= f.govuk_error_summary %>
-
-
<% secondary_client_group_selection = Scheme.secondary_client_groups.keys.excluding("Missing").map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) } %>
<%= f.govuk_collection_radio_buttons :secondary_client_group,
secondary_client_group_selection,
@@ -24,10 +21,10 @@
:name,
legend: nil %>
- <%= f.hidden_field :page, value: "secondary-client-group" %>
- <% if request.query_parameters["check_answers"] == "true" %>
- <%= f.hidden_field :check_answers, value: "true" %>
- <% end %>
+ <%= f.hidden_field :page, value: "secondary-client-group" %>
+ <% if request.query_parameters["check_answers"] == "true" %>
+ <%= f.hidden_field :check_answers, value: "true" %>
+ <% end %>
<%= f.govuk_submit "Save and continue" %>
diff --git a/app/views/schemes/show.html.erb b/app/views/schemes/show.html.erb
index dab90cd8a..8e091bc02 100644
--- a/app/views/schemes/show.html.erb
+++ b/app/views/schemes/show.html.erb
@@ -10,10 +10,10 @@
<%= render partial: "organisations/headings", locals: { main: @scheme.service_name, sub: nil } %>
-<%= render SubNavigationComponent.new(items: scheme_items(request.path, @scheme.id, @scheme.locations.count.eql?(1) ? "1 location" : "#{@scheme.locations.count} locations")) %>
+<%= render SubNavigationComponent.new(items: scheme_items(request.path, @scheme.id, "Locations")) %>
-
+
<%= govuk_summary_list do |summary_list| %>
<% @scheme.display_attributes.each do |attr| %>
<% next if current_user.data_coordinator? && attr[:name] == ("Housing stock owned by") %>
diff --git a/app/views/schemes/support.html.erb b/app/views/schemes/support.html.erb
index 317b1d4f1..b4482bf66 100644
--- a/app/views/schemes/support.html.erb
+++ b/app/views/schemes/support.html.erb
@@ -14,9 +14,6 @@
<%= f.govuk_error_summary %>
-
-
<% support_type_selection = Scheme.support_types.keys.excluding("Missing").map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) } %>
<%= f.govuk_collection_radio_buttons :support_type,
support_type_selection,
@@ -31,7 +28,7 @@
:name,
legend: { text: "Intended length of stay", size: "m" } %>
- <%= f.hidden_field :page, value: "support" %>
+ <%= f.hidden_field :page, value: "support" %>
<%= f.govuk_submit "Save and continue" %>
diff --git a/spec/features/schemes_spec.rb b/spec/features/schemes_spec.rb
index 43f966c1c..838b28801 100644
--- a/spec/features/schemes_spec.rb
+++ b/spec/features/schemes_spec.rb
@@ -198,12 +198,12 @@ RSpec.describe "Schemes scheme Features" do
it "shows service and locations tab" do
expect(page).to have_link("Scheme")
- expect(page).to have_link("#{scheme.locations.count} locations")
+ expect(page).to have_link("Locations")
end
context "when I click locations link" do
before do
- click_link("#{scheme.locations.count} locations")
+ click_link("Locations")
end
it "shows details of those locations" do
@@ -725,7 +725,7 @@ RSpec.describe "Schemes scheme Features" do
context "when I click to see locations" do
before do
- click_link "1 location"
+ click_link "Locations"
end
it "I see location details" do
diff --git a/spec/helpers/navigation_items_helper_spec.rb b/spec/helpers/navigation_items_helper_spec.rb
index 90a96017b..60d0f3d0e 100644
--- a/spec/helpers/navigation_items_helper_spec.rb
+++ b/spec/helpers/navigation_items_helper_spec.rb
@@ -190,13 +190,13 @@ RSpec.describe NavigationItemsHelper do
let(:expected_scheme_items) do
[
NavigationItemsHelper::NavigationItem.new("Scheme", "/schemes/1", true),
- NavigationItemsHelper::NavigationItem.new("1 location", "/schemes/1/locations", false),
+ NavigationItemsHelper::NavigationItem.new("Locations", "/schemes/1/locations", false),
]
end
it "returns navigation items with Schemes item set as current" do
expect(primary_items("/schemes/1", current_user)).to eq(expected_navigation_items)
- expect(scheme_items("/schemes/1", 1, "1 location")).to eq(expected_scheme_items)
+ expect(scheme_items("/schemes/1", 1, "Locations")).to eq(expected_scheme_items)
end
end
@@ -213,13 +213,13 @@ RSpec.describe NavigationItemsHelper do
let(:expected_scheme_items) do
[
NavigationItemsHelper::NavigationItem.new("Scheme", "/schemes/1", false),
- NavigationItemsHelper::NavigationItem.new("1 location", "/schemes/1/locations", true),
+ NavigationItemsHelper::NavigationItem.new("Locations", "/schemes/1/locations", true),
]
end
it "returns navigation items with Schemes item set as current" do
expect(primary_items("/schemes/1/locations", current_user)).to eq(expected_navigation_items)
- expect(scheme_items("/schemes/1/locations", 1, "1 location")).to eq(expected_scheme_items)
+ expect(scheme_items("/schemes/1/locations", 1, "Locations")).to eq(expected_scheme_items)
end
end
diff --git a/spec/requests/locations_controller_spec.rb b/spec/requests/locations_controller_spec.rb
index e3909e754..8d1fce823 100644
--- a/spec/requests/locations_controller_spec.rb
+++ b/spec/requests/locations_controller_spec.rb
@@ -418,7 +418,7 @@ RSpec.describe LocationsController, type: :request do
it "updates existing location for scheme with valid params and redirects to correct page" do
follow_redirect!
expect(response).to have_http_status(:ok)
- expect(page).to have_content("1 location")
+ expect(page).to have_content("Locations")
end
it "updates existing location for scheme with valid params" do
@@ -541,7 +541,7 @@ RSpec.describe LocationsController, type: :request do
it "updates existing location for scheme with valid params and redirects to correct page" do
follow_redirect!
expect(response).to have_http_status(:ok)
- expect(page).to have_content("1 location")
+ expect(page).to have_content("Locations")
end
it "updates existing location for scheme with valid params" do