From c278523dc1dcb99537d1e119421e1dfbfe8e06be Mon Sep 17 00:00:00 2001
From: Thomas Leese <thomas@leese.io>
Date: Wed, 8 Nov 2023 12:55:58 +0000
Subject: [PATCH] Reduce duplicate in survey research

This reduces duplication by using a single view for the research
content, with an optional argument for showing the extra content that
was visible on one page.
---
 .../_help_us_to_improve_this_service.html.erb    |  8 ++++++++
 .../application_forms/show/_complete.html.erb    | 16 +---------------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/app/views/shared/_help_us_to_improve_this_service.html.erb b/app/views/shared/_help_us_to_improve_this_service.html.erb
index 4f797de9d3..901403c911 100644
--- a/app/views/shared/_help_us_to_improve_this_service.html.erb
+++ b/app/views/shared/_help_us_to_improve_this_service.html.erb
@@ -1,6 +1,14 @@
+<% show_feedback ||= false %>
+
 <aside class="govuk-!-margin-top-6">
   <h2 class="govuk-heading-s">Help us to improve this service</h2>
 
+  <% if show_feedback %>
+    <p class="govuk-body">
+      Please <%= govuk_link_to "give us feedback", t("service.form.feedback") %> about your experience of using this service. It should take less than 2 minutes to complete.
+    </p>
+  <% end %>
+
   <p class="govuk-body">
     We're always trying to improve this service and boost teacher recruitment from overseas. So we'd like to talk to people about their experience of using this service.
   </p>
diff --git a/app/views/teacher_interface/application_forms/show/_complete.html.erb b/app/views/teacher_interface/application_forms/show/_complete.html.erb
index 72ac2bec9f..9f4c05fddf 100644
--- a/app/views/teacher_interface/application_forms/show/_complete.html.erb
+++ b/app/views/teacher_interface/application_forms/show/_complete.html.erb
@@ -21,21 +21,7 @@
   <%= render "shared/employment_warning" %>
 <% end %>
 
-<h2 class="govuk-heading-s">Help us to improve this service</h2>
-
-<p class="govuk-body">
-  Please <%= govuk_link_to "give us feedback", t("service.form.feedback") %> about your experience of using this service. It should take less than 2 minutes to complete.
-</p>
-
-<p class="govuk-body">
-  We’re always trying to improve this service and boost teacher recruitment from overseas. So we’d like to talk to people about their experience of using this service.
-</p>
-
-<p class="govuk-body">
-  If you'd like to help, please <%= govuk_link_to "complete this form", t("service.form.research") %>.
-</p>
-
-<p class="govuk-body">If you match our search criteria, we'll invite you to take part in research.</p>
+<%= render "shared/help_us_to_improve_this_service", show_feedback: true %>
 
 <h2 class="govuk-heading-s">If you have any questions, contact:</h2>
 <p class="govuk-body"><%= govuk_link_to t("service.email.enquiries"), "mailto:#{t("service.email.enquiries")}" %></p>