From b943abb1aac727e5ed5f47731d9d7368ff55eb44 Mon Sep 17 00:00:00 2001 From: Kat Date: Tue, 17 Oct 2023 15:16:51 +0100 Subject: [PATCH] Update content, add back button --- app/models/form/lettings/questions/scheme_id.rb | 2 +- app/views/form/guidance/_scheme_selection.html.erb | 2 +- app/views/schemes/changes.html.erb | 6 +++++- spec/models/form/lettings/questions/scheme_id_spec.rb | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/models/form/lettings/questions/scheme_id.rb b/app/models/form/lettings/questions/scheme_id.rb index dcb951374..8d906f134 100644 --- a/app/models/form/lettings/questions/scheme_id.rb +++ b/app/models/form/lettings/questions/scheme_id.rb @@ -3,7 +3,7 @@ class Form::Lettings::Questions::SchemeId < ::Form::Question super("scheme_id", hsh, page) @check_answer_label = "Scheme name" @header = "What scheme is this log for?" - @hint_text = "Enter scheme name or postcode" + @hint_text = "Enter postcode or scheme name" @type = "select" @answer_options = answer_options @top_guidance_partial = "finding_scheme" diff --git a/app/views/form/guidance/_scheme_selection.html.erb b/app/views/form/guidance/_scheme_selection.html.erb index 561071cc1..c13edb05b 100644 --- a/app/views/form/guidance/_scheme_selection.html.erb +++ b/app/views/form/guidance/_scheme_selection.html.erb @@ -1,5 +1,5 @@ <% if current_user.data_provider? %> -

If you can’t find the supported housing service you’re looking for or not sure which to choose, contact a data coordinator at <%= current_user.organisation.name %>.

+

If you’re not sure which scheme to choose, ask a data coordinator. Find your data coordinators on the <%= govuk_link_to("users page", users_path) %>.

<% elsif current_user.data_coordinator? %>

<%= govuk_link_to "Create a new supported housing scheme", new_scheme_path %>

<% end %> diff --git a/app/views/schemes/changes.html.erb b/app/views/schemes/changes.html.erb index 65dd937b9..850cc63ce 100644 --- a/app/views/schemes/changes.html.erb +++ b/app/views/schemes/changes.html.erb @@ -1,3 +1,7 @@ +<% content_for :before_content do %> + <%= govuk_back_link(href: :back) %> +<% end %> +

Schemes and locations

@@ -24,6 +28,6 @@

If you upload logs in bulk, you can use either the new or old scheme codes in your template.

If you can’t find a scheme

You should be able to recognise a scheme migrated from old CORE by viewing its details or locations. Try searching for it by postcode.

-

If you still can’t find a scheme that was migrated from old CORE, either create a new one if you know the details, or <%= govuk_link_to("contact the service desk", "https://dluhcdigital.atlassian.net/servicedesk/customer/portal/6/group/11", rel: "noreferrer noopener", target: "_blank") %> to report the problem. Only data coordinators can create and edit schemes.

+

If you still can’t find a scheme that was migrated from old CORE, either create a new one if you know the details, or <%= govuk_link_to("contact the helpdesk", "https://dluhcdigital.atlassian.net/servicedesk/customer/portal/6/group/11", rel: "noreferrer noopener", target: "_blank") %> to report the problem. Only data coordinators can create and edit schemes.

diff --git a/spec/models/form/lettings/questions/scheme_id_spec.rb b/spec/models/form/lettings/questions/scheme_id_spec.rb index 140b23020..b1e628612 100644 --- a/spec/models/form/lettings/questions/scheme_id_spec.rb +++ b/spec/models/form/lettings/questions/scheme_id_spec.rb @@ -28,7 +28,7 @@ RSpec.describe Form::Lettings::Questions::SchemeId, type: :model do end it "has the correct hint_text" do - expect(question.hint_text).to eq("Enter scheme name or postcode") + expect(question.hint_text).to eq("Enter postcode or scheme name") end it "has the correct conditional_for" do