Scheme tweaks (#723)

app/views/locations/edit.html.erb

@@ -30,7 +30,6 @@
                                autofocus: true %>
 
       <% type_of_units_selection = Location.type_of_units.keys.map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) } %>
-
       <%= f.govuk_collection_radio_buttons :type_of_unit,
                                            type_of_units_selection,
                                            :id,
@@ -38,7 +37,6 @@
                                            legend: { text: "What is this type of scheme?", size: "m" } %>
 
       <% wheelchair_user_selection = Location.wheelchair_adaptations.keys.map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) } %>
-
       <%= f.govuk_collection_radio_buttons :wheelchair_adaptation,
                                            wheelchair_user_selection,
                                            :id,
@@ -49,7 +47,6 @@
       <%= govuk_section_break(visible: true, size: "m") %>
 
       <% another_location_selection = %w[Yes no].map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) } %>
-
       <%= f.govuk_collection_radio_buttons :add_another_location,
                                            another_location_selection,
                                            :id,

app/views/locations/index.html.erb

@@ -1,20 +1,20 @@
 <% title = @scheme.service_name %>
 <% content_for :title, title %>
+
 <% content_for :before_content do %>
   <%= govuk_back_link(
     text: "Back",
     href: "/schemes/#{@scheme.id}",
   ) %>
 <% end %>
+
 <%= render partial: "organisations/headings", locals: { main: @scheme.service_name, sub: nil } %>
-<% location_caption = @scheme.locations.count.eql?(1) ? "1 location" : "#{@scheme.locations.count} locations" %>
-<%= render SubNavigationComponent.new(items: scheme_items(request.path, @scheme.id, location_caption)) %>
 
-<div class="govuk-grid-row">
-  <div class="govuk-grid-column-three-quarters">
-    <%= govuk_table do |table| %>
+<%= render SubNavigationComponent.new(items: scheme_items(request.path, @scheme.id, "Locations")) %>
+
+<%= govuk_table do |table| %>
   <%= table.caption(classes: %w[govuk-!-font-size-19 govuk-!-font-weight-regular]) do |caption| %>
-        <strong><%= @scheme.locations.count %></strong> <%= @scheme.locations.count.eql?(1) ? "location" : "locations" %>.
+    <strong><%= @scheme.locations.count %></strong> <%= @scheme.locations.count.eql?(1) ? "location" : "locations" %>
   <% end %>
   <%= table.head do |head| %>
     <%= head.row do |row| %>
@@ -42,8 +42,6 @@
       <% end %>
     <% end %>
   <% end %>
-    <% end %>
-  </div>
-</div>
+<% end %>
 
 <%== render partial: "pagy/nav", locals: { pagy: @pagy, item_name: "locations" } %>

app/views/schemes/check_answers.html.erb

@@ -2,8 +2,6 @@
 
 <%= render partial: "organisations/headings", locals: { main: "Check your changes before creating this scheme", sub: @scheme.service_name } %>
 
-<% location_caption = @scheme.locations.count.eql?(1) ? "1 location" : "#{@scheme.locations.count} locations" %>
-
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-three-quarters-from-desktop">
     <%= govuk_tabs(title: "Check your answers before creating this scheme") do |component| %>

app/views/schemes/confirm_secondary.html.erb

@@ -12,9 +12,7 @@
 <%= form_for(@scheme, method: :patch) do |f| %>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
-
       <% selection = [OpenStruct.new(id: "Yes", name: "Yes"), OpenStruct.new(id: "No", name: "No")] %>
-
       <%= f.govuk_collection_radio_buttons :has_other_client_group,
         selection,
         :id,

app/views/schemes/details.html.erb

@@ -1,22 +1,22 @@
 <% content_for :title, "Create a new supported housing scheme" %>
 
- <% content_for :before_content do %>
+<% content_for :before_content do %>
   <%= govuk_back_link(
     text: "Back",
     href: :back,
   ) %>
- <% end %>
+<% 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| %>
+<%= form_for(@scheme, method: :patch) do |f| %>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
       <%= 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." } %>
+        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 %>
@@ -76,4 +76,4 @@
       <%= f.govuk_submit "Save and continue" %>
     </div>
   </div>
- <% end %>
+<% end %>

app/views/schemes/edit_name.html.erb

@@ -1,22 +1,22 @@
 <% content_for :title, "Scheme details" %>
 
- <% content_for :before_content do %>
+<% content_for :before_content do %>
   <%= govuk_back_link(
     text: "Back",
     href: :back,
   ) %>
- <% end %>
+<% end %>
 
- <%= render partial: "organisations/headings", locals: { main: "Scheme details", sub: @scheme.service_name } %>
+<%= render partial: "organisations/headings", locals: { main: "Scheme details", sub: @scheme.service_name } %>
 
- <%= form_for(@scheme, method: :patch) do |f| %>
+<%= form_for(@scheme, method: :patch) do |f| %>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
       <%= 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." } %>
+        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 %>
@@ -29,7 +29,6 @@
       <% 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,
@@ -44,4 +43,4 @@
       <%= f.govuk_submit "Save changes" %>
     </div>
   </div>
- <% end %>
+<% end %>

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,

app/views/schemes/primary_client_group.html.erb

@@ -14,9 +14,6 @@
     <div class="govuk-grid-column-two-thirds">
       <%= f.govuk_error_summary %>
 
-      <legend class="govuk-fieldset__legend">
-      </legend>
-
       <% 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,

app/views/schemes/secondary_client_group.html.erb

@@ -14,9 +14,6 @@
     <div class="govuk-grid-column-two-thirds">
       <%= f.govuk_error_summary %>
 
-      <legend class="govuk-fieldset__legend">
-      </legend>
-
       <% 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,

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")) %>
 
 <div class="govuk-grid-row">
-  <div class="govuk-grid-column-two-thirds">
+  <div class="govuk-grid-column-three-quarters-from-desktop">
     <%= govuk_summary_list do |summary_list| %>
       <% @scheme.display_attributes.each do |attr| %>
         <% next if current_user.data_coordinator? && attr[:name] == ("Housing stock owned by") %>

app/views/schemes/support.html.erb

@@ -14,9 +14,6 @@
     <div class="govuk-grid-column-two-thirds">
       <%= f.govuk_error_summary %>
 
-      <legend class="govuk-fieldset__legend">
-      </legend>
-
       <% 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,

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

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
 

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