diff --git a/app/frontend/styles/_table-group.scss b/app/frontend/styles/_table-group.scss
index c5ca328f3..dc99680d8 100644
--- a/app/frontend/styles/_table-group.scss
+++ b/app/frontend/styles/_table-group.scss
@@ -9,7 +9,6 @@
margin-bottom: -1px;
}
- .govuk-table__header,
.govuk-table__cell {
white-space: nowrap;
}
diff --git a/app/views/organisations/schemes.html.erb b/app/views/organisations/schemes.html.erb
index 20fc40886..37bc7ba44 100644
--- a/app/views/organisations/schemes.html.erb
+++ b/app/views/organisations/schemes.html.erb
@@ -23,7 +23,7 @@
) %>
<%= render partial: "schemes/scheme_filters" %>
- <%= render SearchComponent.new(current_user:, search_label: "Search by scheme name, code, postcode or location name", value: @searched) %>
+ <%= render SearchComponent.new(current_user:, search_label: "Search by postcode, scheme name, scheme code or location name", value: @searched) %>
diff --git a/app/views/schemes/_scheme_list.html.erb b/app/views/schemes/_scheme_list.html.erb
index 43e03cd65..f541f86b3 100644
--- a/app/views/schemes/_scheme_list.html.erb
+++ b/app/views/schemes/_scheme_list.html.erb
@@ -5,8 +5,9 @@
<% end %>
<%= table.head do |head| %>
<%= head.row do |row| %>
- <% row.cell(header: true, text: "Scheme", html_attributes: { scope: "col" }) %>
- <% row.cell(header: true, text: "Code", html_attributes: { scope: "col" }) %>
+ <% row.cell(header: true, text: "Scheme", html_attributes: { scope: "col", class: "govuk-!-width-one-quarter" }) %>
+ <% row.cell(header: true, text: "Stock owner", html_attributes: { scope: "col" }) %>
+ <% row.cell(header: true, text: "Scheme code", html_attributes: { scope: "col" }) %>
<% row.cell(header: true, text: "Locations", html_attributes: { scope: "col" }) %>
<% row.cell(header: true, text: "Status", html_attributes: { scope: "col" }) %>
<% end %>
@@ -15,6 +16,7 @@
<%= table.body do |body| %>
<%= body.row do |row| %>
<% row.cell(text: simple_format(scheme_cell(scheme), { class: "govuk-!-font-weight-bold" }, wrapper_tag: "div")) %>
+ <% row.cell(text: scheme.owning_organisation&.name) %>
<% row.cell(text: scheme.id_to_display) %>
<% row.cell(text: scheme.locations&.count) %>
<% row.cell(text: status_tag_from_resource(scheme)) %>
diff --git a/app/views/schemes/index.html.erb b/app/views/schemes/index.html.erb
index a1c2041ff..4f3218e7a 100644
--- a/app/views/schemes/index.html.erb
+++ b/app/views/schemes/index.html.erb
@@ -11,7 +11,7 @@
<%= render partial: "schemes/scheme_filters" %>
- <%= render SearchComponent.new(current_user:, search_label: "Search by scheme name, code, postcode or location name", value: @searched) %>
+ <%= render SearchComponent.new(current_user:, search_label: "Search by postcode, scheme name, scheme code or location name", value: @searched) %>
diff --git a/spec/features/schemes_spec.rb b/spec/features/schemes_spec.rb
index dd683312e..632cc7e83 100644
--- a/spec/features/schemes_spec.rb
+++ b/spec/features/schemes_spec.rb
@@ -34,7 +34,7 @@ RSpec.describe "Schemes scheme Features" do
context "when I search for a specific scheme" do
it "there is a search bar with a message and search button for schemes" do
expect(page).to have_field("search")
- expect(page).to have_content("Search by scheme name, code, postcode or location name")
+ expect(page).to have_content("Search by postcode, scheme name, scheme code or location name")
expect(page).to have_button("Search")
end
@@ -142,7 +142,7 @@ RSpec.describe "Schemes scheme Features" do
it "displays a search bar" do
expect(page).to have_field("search")
- expect(page).to have_content("Search by scheme name, code, postcode or location name")
+ expect(page).to have_content("Search by postcode, scheme name, scheme code or location name")
expect(page).to have_button("Search")
end