Browse Source

feat: simplify housing_providers view

pull/950/head
natdeanlewissoftwire 3 years ago
parent
commit
6409f6b62d
  1. 6
      app/controllers/organisation_relationships_controller.rb
  2. 19
      app/views/organisation_relationships/housing_providers.erb
  3. 8
      app/views/organisation_relationships/housing_providers.html.erb

6
app/controllers/organisation_relationships_controller.rb

@ -19,11 +19,7 @@ class OrganisationRelationshipsController < ApplicationController
@pagy, @housing_providers = pagy(unpaginated_filtered_housing_providers)
@searched = search_term.presence
@total_count = housing_providers.size
if current_user.support?
render "organisations/housing_providers", layout: "application"
else
render "organisation_relationships/housing_providers"
end
render "organisation_relationships/housing_providers", layout: "application"
end
end
end

19
app/views/organisation_relationships/housing_providers.erb

@ -1,19 +0,0 @@
<% item_label = format_label(@pagy.count, "housing provider") %>
<% title = "Housing Providers" %>
<% content_for :title, title %>
<%= render partial: "organisations/headings", locals: { main: "Your housing providers", sub: nil } %>
<p class="govuk-body">Your organisation can submit logs for its housing providers.</p>
<% if @total_count == 0 %>
<p class="govuk-body">You do not currently have any housing providers.</p>
<% end %>
<% if current_user.data_coordinator? || current_user.support? %>
<%= govuk_button_link_to "Add a housing provider", housing_providers_organisation_path, html: { method: :get } %>
<% end %>
<% if @total_count != 0 %>
<%= render SearchComponent.new(current_user:, search_label: "Search for a housing provider", value: @searched) %>
<%= govuk_section_break(visible: true, size: "m") %>
<%= render partial: "organisation_relationships/housing_provider_list", locals: { index: @housing_providers, title: "Housing providers", pagy: @pagy, searched: @searched, item_label:, total_count: @total_count } %>
<%== render partial: "pagy/nav", locals: { pagy: @pagy, item_name: "housing providers" } %>
<% end %>

8
app/views/organisations/housing_providers.html.erb → app/views/organisation_relationships/housing_providers.html.erb

@ -1,15 +1,19 @@
<% item_label = format_label(@pagy.count, "housing provider") %>
<% title = "Housing Providers" %>
<% content_for :title, title %>
<%= render partial: "organisations/headings", locals: { main: @organisation.name, sub: nil } %>
<% if current_user.support? %>
<%= render partial: "organisations/headings", locals: { main: @organisation.name, sub: nil } %>
<%= render SubNavigationComponent.new(
items: secondary_items(request.path, @organisation.id),
) %>
<h2 class="govuk-visually-hidden">Housing Providers</h2>
<p class="govuk-body">This organisation can submit logs for its housing providers.</p>
<% else %>
<%= render partial: "organisations/headings", locals: { main: "Your housing providers", sub: nil } %>
<p class="govuk-body">Your organisation can submit logs for its housing providers.</p>
<% end %>
<p class="govuk-body">This organisation can submit logs for its housing providers.</p>
<% if @total_count == 0 %>
<p class="govuk-body">This organisation does not currently have any housing providers.</p>
Loading…
Cancel
Save