diff --git a/app/helpers/schemes_helper.rb b/app/helpers/schemes_helper.rb index 3bd188343..444a3b936 100644 --- a/app/helpers/schemes_helper.rb +++ b/app/helpers/schemes_helper.rb @@ -14,7 +14,7 @@ module SchemesHelper { name: "Secondary client group", value: scheme.secondary_client_group }, { name: "Level of support given", value: scheme.support_type }, { name: "Intended length of stay", value: scheme.intended_stay }, - { name: "Availability", value: "Available from #{scheme.available_from.to_formatted_s(:govuk_date)} \nDeactivation date #{scheme.deactivation_date.to_formatted_s(:govuk_date)}" }, + { name: "Availability", value: availability_text(scheme)}, { name: "Status", value: status_tag(scheme_status(scheme)) }, ] @@ -24,6 +24,14 @@ module SchemesHelper base_attributes end + def availability_text(scheme) + base_text = "Available from #{scheme.available_from.to_formatted_s(:govuk_date)}" + if scheme.deactivation_date.present? + base_text += "\nDeactivation date #{scheme.deactivation_date.to_formatted_s(:govuk_date)}" + end + base_text + end + def scheme_status(scheme) now = Time.zone.now if scheme.deactivation_date.nil? diff --git a/app/views/schemes/toggle_active.html.erb b/app/views/schemes/toggle_active.html.erb index e69de29bb..7d0738cf1 100644 --- a/app/views/schemes/toggle_active.html.erb +++ b/app/views/schemes/toggle_active.html.erb @@ -0,0 +1,20 @@ +<%= form_with url: scheme_details_path(@scheme), method: "get", local: true do |f| %> + <% content_for :before_content do %> + <%= govuk_back_link(href: :back) %> + <% end %> +