From 53537f146f5c7548e26ad241131450172c205de6 Mon Sep 17 00:00:00 2001 From: Sam Seed Date: Fri, 18 Nov 2022 15:22:06 +0000 Subject: [PATCH] feat: move logic from views/schemes/show into schemes_helper --- app/helpers/schemes_helper.rb | 6 +++++- app/views/schemes/show.html.erb | 5 ++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/helpers/schemes_helper.rb b/app/helpers/schemes_helper.rb index 10a33cab6..d4b91444a 100644 --- a/app/helpers/schemes_helper.rb +++ b/app/helpers/schemes_helper.rb @@ -18,7 +18,11 @@ module SchemesHelper ] if FeatureToggle.scheme_toggle_enabled? - base_attributes.append({ name: "Status", value: scheme.status }) + base_attributes.append({ name: "Status", value: status_tag(scheme.status) }) + end + + if current_user.data_coordinator? + base_attributes.delete_if {|item| item[:name] == "Housing stock owned by"} end if scheme.arrangement_type_same? diff --git a/app/views/schemes/show.html.erb b/app/views/schemes/show.html.erb index d6a8ce129..e25e07831 100644 --- a/app/views/schemes/show.html.erb +++ b/app/views/schemes/show.html.erb @@ -20,10 +20,9 @@ <%= govuk_summary_list do |summary_list| %> <% display_scheme_attributes(@scheme).each do |attr| %> - <% next if current_user.data_coordinator? && attr[:name] == ("Housing stock owned by") %> <%= summary_list.row do |row| %> - <% row.key { attr[:name].eql?("Registered under Care Standards Act 2000") ? "Registered under Care Standards Act 2000" : attr[:name].to_s.humanize } %> - <% row.value { attr[:name].eql?("Status") ? status_tag(attr[:value]) : details_html(attr) } %> + <% row.key { attr[:name] } %> + <% row.value { details_html(attr) } %> <% row.action(text: "Change", href: scheme_edit_name_path(scheme_id: @scheme.id)) if attr[:edit] %> <% end %> <% end %>