From de2cdc59670d8761fd3acfde13e7353d0d746129 Mon Sep 17 00:00:00 2001
From: JG <moarpheus@gmail.com>
Date: Wed, 15 Jun 2022 11:35:38 +0100
Subject: [PATCH] refactored views

---
 app/helpers/navigation_items_helper.rb | 14 +++++++-------
 app/views/schemes/locations.html.erb   |  4 +---
 app/views/schemes/show.html.erb        | 13 +++++--------
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/app/helpers/navigation_items_helper.rb b/app/helpers/navigation_items_helper.rb
index 0f3938ec2..50bfe3fc1 100644
--- a/app/helpers/navigation_items_helper.rb
+++ b/app/helpers/navigation_items_helper.rb
@@ -7,12 +7,12 @@ module NavigationItemsHelper
         NavigationItem.new("Organisations", organisations_path, organisations_current?(path)),
         NavigationItem.new("Users", "/users", users_current?(path)),
         NavigationItem.new("Logs", case_logs_path, logs_current?(path)),
-        NavigationItem.new("Schemes", "/schemes", supported_housing_current?(path)),
+        NavigationItem.new("Schemes", "/schemes", supported_housing_schemes_current?(path)),
       ]
     elsif current_user.data_coordinator?
       [
         NavigationItem.new("Logs", case_logs_path, logs_current?(path)),
-        NavigationItem.new("Schemes", "/schemes", subnav_supported_housing_path?(path)),
+        NavigationItem.new("Schemes", "/schemes", subnav_supported_housing_schemes_path?(path)),
         NavigationItem.new("Users", users_organisation_path(current_user.organisation), subnav_users_path?(path)),
         NavigationItem.new("About your organisation", "/organisations/#{current_user.organisation.id}", subnav_details_path?(path)),
       ]
@@ -28,16 +28,16 @@ module NavigationItemsHelper
   def secondary_items(path, current_organisation_id)
     [
       NavigationItem.new("Logs", "/organisations/#{current_organisation_id}/logs", subnav_logs_path?(path)),
-      NavigationItem.new("Schemes", "/organisations/#{current_organisation_id}/schemes", subnav_supported_housing_path?(path)),
+      NavigationItem.new("Schemes", "/organisations/#{current_organisation_id}/schemes", subnav_supported_housing_schemes_path?(path)),
       NavigationItem.new("Users", "/organisations/#{current_organisation_id}/users", subnav_users_path?(path)),
       NavigationItem.new("About this organisation", "/organisations/#{current_organisation_id}", subnav_details_path?(path)),
     ]
   end
 
-  def scheme_items(_path, current_scheme_id, count)
+  def scheme_items(path, current_scheme_id, title)
     [
-      NavigationItem.new("Scheme", "/schemes/#{current_scheme_id}", true),
-      NavigationItem.new("#{count} locations", "/schemes/#{current_scheme_id}/locations", false),
+      NavigationItem.new("Schemes", "/schemes/#{current_scheme_id}", !path.include?("locations")),
+      NavigationItem.new(title, "/schemes/#{current_scheme_id}/locations", path.include?("locations")),
     ]
   end
 
@@ -51,7 +51,7 @@ private
     path == "/users" || path.include?("/users/")
   end
 
-  def supported_housing_current?(path)
+  def supported_housing_schemes_current?(path)
     path == "/schemes" || path.include?("/schemes/")
   end
 
diff --git a/app/views/schemes/locations.html.erb b/app/views/schemes/locations.html.erb
index b08beb2f9..b9da65243 100644
--- a/app/views/schemes/locations.html.erb
+++ b/app/views/schemes/locations.html.erb
@@ -5,9 +5,7 @@
 
 <%= render partial: "organisations/headings", locals: { main: @scheme.service_name, sub: nil } %>
 
-<%= render SubNavigationComponent.new(
-  items: scheme_items(request.path, @scheme.id, @scheme.locations.count),
-) %>
+<%= render SubNavigationComponent.new(items: scheme_items(request.path, @scheme.id, @scheme.locations.count.eql?(1) ? "1 location" : "#{@scheme.locations.count} locations")) %>
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-three-quarters">
diff --git a/app/views/schemes/show.html.erb b/app/views/schemes/show.html.erb
index b255fa518..688cafbc0 100644
--- a/app/views/schemes/show.html.erb
+++ b/app/views/schemes/show.html.erb
@@ -5,20 +5,17 @@
 
 <%= render partial: "organisations/headings", locals: { main: @scheme.service_name, sub: nil } %>
 
-
-<%= render SubNavigationComponent.new(
-  items: scheme_items(request.path, @scheme.id, @scheme.locations.count),
-) %>
+<%= render SubNavigationComponent.new(items: scheme_items(request.path, @scheme.id, @scheme.locations.count.eql?(1) ? "1 location" : "#{@scheme.locations.count} locations")) %>
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
     <%= govuk_summary_list do |summary_list| %>
       <% @scheme.display_attributes.each do |attr| %>
-          <%= summary_list.row do |row| %>
-            <% row.key { attr[:name].to_s.humanize } %>
-            <% row.value { details_html(attr) } %>
-          <% end %>
+        <%= summary_list.row do |row| %>
+          <% row.key { attr[:name].to_s.humanize } %>
+          <% row.value { details_html(attr) } %>
         <% end %>
+      <% end %>
     <% end %>
   </div>
 </div>