From 58901140930280f7121102e430a2899db889abf0 Mon Sep 17 00:00:00 2001 From: MylesJarvis Date: Wed, 24 Apr 2024 14:37:28 +0100 Subject: [PATCH 1/8] Update show.html.erb --- .../schools/confirm_attendance/show.html.erb | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/app/views/schools/confirm_attendance/show.html.erb b/app/views/schools/confirm_attendance/show.html.erb index 75bfad2797..b0e6bd12ce 100644 --- a/app/views/schools/confirm_attendance/show.html.erb +++ b/app/views/schools/confirm_attendance/show.html.erb @@ -54,8 +54,13 @@ <%= pagination_bar @bookings %> -
- <%= f.govuk_submit 'Save and return to dashboard' %> +
+

+ <%= f.govuk_submit 'Save and return to dashboard' %> +

+

+ <%= link_to 'View earlier attendance records', schools_attendances_path %> +

<% end %> @@ -67,11 +72,14 @@ There are no bookings that need their attendance to be confirmed.

+

<%= govuk_link_to "Return to dashboard", schools_dashboard_path, secondary: true %>

+

+ <%= link_to 'View earlier attendance records', schools_attendances_path %> +

+
<% end %> -

- <%= link_to 'View earlier attendance records', schools_attendances_path %> -

+ From b975aa7a3e7c482677f261094fadc42e39e9dc65 Mon Sep 17 00:00:00 2001 From: MylesJarvis Date: Wed, 24 Apr 2024 15:04:47 +0100 Subject: [PATCH 2/8] Remove p tags in line with design system implementation --- app/views/schools/confirm_attendance/show.html.erb | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/app/views/schools/confirm_attendance/show.html.erb b/app/views/schools/confirm_attendance/show.html.erb index b0e6bd12ce..a3b60c251e 100644 --- a/app/views/schools/confirm_attendance/show.html.erb +++ b/app/views/schools/confirm_attendance/show.html.erb @@ -55,12 +55,11 @@ <%= pagination_bar @bookings %>
-

+ <%= f.govuk_submit 'Save and return to dashboard' %> -

-

+ <%= link_to 'View earlier attendance records', schools_attendances_path %> -

+
<% end %> @@ -73,12 +72,11 @@

-

+ <%= govuk_link_to "Return to dashboard", schools_dashboard_path, secondary: true %> -

-

+ <%= link_to 'View earlier attendance records', schools_attendances_path %> -

+
<% end %> From 396afe5aed0d96918aca5eab04e0efe5721f4895 Mon Sep 17 00:00:00 2001 From: MylesJarvis Date: Wed, 24 Apr 2024 15:11:54 +0100 Subject: [PATCH 3/8] Improve grouping in onboarding flow --- app/views/schools/on_boarding/profiles/editing.html.erb | 2 -- app/views/schools/on_boarding/profiles/onboarding.html.erb | 2 -- 2 files changed, 4 deletions(-) diff --git a/app/views/schools/on_boarding/profiles/editing.html.erb b/app/views/schools/on_boarding/profiles/editing.html.erb index 6399fa0dc8..f306cb1adf 100644 --- a/app/views/schools/on_boarding/profiles/editing.html.erb +++ b/app/views/schools/on_boarding/profiles/editing.html.erb @@ -54,9 +54,7 @@
<%= govuk_link_to 'Preview profile', schools_on_boarding_preview_path, secondary: true %> -
-
<%= govuk_link_to 'Return to dashboard', schools_dashboard_path, secondary: true %>
diff --git a/app/views/schools/on_boarding/profiles/onboarding.html.erb b/app/views/schools/on_boarding/profiles/onboarding.html.erb index 9f889a1cee..74a2afa665 100644 --- a/app/views/schools/on_boarding/profiles/onboarding.html.erb +++ b/app/views/schools/on_boarding/profiles/onboarding.html.erb @@ -49,9 +49,7 @@
<%= f.govuk_submit 'Accept and set up profile' %> <%= govuk_link_to 'Preview profile', schools_on_boarding_preview_path, secondary: true %> -
-
<%= govuk_link_to 'Return to dashboard', schools_dashboard_path, secondary: true %>
<% end %> From a5706a11d1060c198029d62dab45b19ce2426aef Mon Sep 17 00:00:00 2001 From: MylesJarvis Date: Wed, 24 Apr 2024 15:14:17 +0100 Subject: [PATCH 4/8] Add return link and group on the profile toggle page --- app/views/schools/toggle_enabled/edit.html.erb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/views/schools/toggle_enabled/edit.html.erb b/app/views/schools/toggle_enabled/edit.html.erb index 528719ee57..e9e1ea51fa 100644 --- a/app/views/schools/toggle_enabled/edit.html.erb +++ b/app/views/schools/toggle_enabled/edit.html.erb @@ -6,5 +6,9 @@ <%= f.govuk_radio_button :enabled, false, label: { text: "Turn profile off" }, hint: nil %> <% end %> +
<%= f.govuk_submit 'Continue' %> + <%= link_to 'Return to dashboard', schools_dashboard_path %> +
+ <% end %> From eb4ed9ea700cfb3f1a37333abefc3347c4ced82d Mon Sep 17 00:00:00 2001 From: MylesJarvis Date: Wed, 24 Apr 2024 15:19:17 +0100 Subject: [PATCH 5/8] Improve manage dates layout and group buttons --- app/views/schools/placement_dates/index.html.erb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app/views/schools/placement_dates/index.html.erb b/app/views/schools/placement_dates/index.html.erb index f5e1987ee9..1492fd9b0b 100644 --- a/app/views/schools/placement_dates/index.html.erb +++ b/app/views/schools/placement_dates/index.html.erb @@ -9,10 +9,6 @@

Manage dates

-
- <%= govuk_link_to "Add a date", new_schools_placement_date_path %> -
-
@@ -64,6 +60,7 @@ <%- end -%> + <%- else -%> <%= render partial: 'schools/dashboards/no_placement_dates_warning' %> <%- end -%> @@ -71,8 +68,8 @@
+
+ <%= govuk_link_to "Add a date", new_schools_placement_date_path %> - -
<%= govuk_link_to "Return to dashboard", schools_dashboard_path, secondary: true %>
From 4d8cbc74c868018638bc8e3c7e6733de317b86d7 Mon Sep 17 00:00:00 2001 From: MylesJarvis Date: Wed, 24 Apr 2024 15:40:45 +0100 Subject: [PATCH 6/8] Sort padding - warning element add dates page --- .../schools/dashboards/_no_placement_dates_warning.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/schools/dashboards/_no_placement_dates_warning.html.erb b/app/views/schools/dashboards/_no_placement_dates_warning.html.erb index 6d1ff06edf..d7c432c489 100644 --- a/app/views/schools/dashboards/_no_placement_dates_warning.html.erb +++ b/app/views/schools/dashboards/_no_placement_dates_warning.html.erb @@ -1,8 +1,8 @@ -
+
Warning You haven't entered any dates, your school will not appear in candidate - searches + searches.
From f1eaa696e6bdd6f4d85276475f2093512299e844 Mon Sep 17 00:00:00 2001 From: MylesJarvis <35870975+MylesJarvis@users.noreply.github.com> Date: Fri, 26 Apr 2024 13:31:48 +0100 Subject: [PATCH 7/8] Update app/views/schools/dashboards/_no_placement_dates_warning.html.erb Co-authored-by: Gemma Dallman <87642394+gemmadallmandfe@users.noreply.github.com> --- .../schools/dashboards/_no_placement_dates_warning.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/schools/dashboards/_no_placement_dates_warning.html.erb b/app/views/schools/dashboards/_no_placement_dates_warning.html.erb index d7c432c489..4eb26c967e 100644 --- a/app/views/schools/dashboards/_no_placement_dates_warning.html.erb +++ b/app/views/schools/dashboards/_no_placement_dates_warning.html.erb @@ -2,7 +2,7 @@ Warning - You haven't entered any dates, your school will not appear in candidate + You haven't entered any dates so your school will not appear in candidate searches.
From 80860a8e7da0ef02ee11d8f187111b1e78c3835a Mon Sep 17 00:00:00 2001 From: MylesJarvis Date: Fri, 26 Apr 2024 14:19:40 +0100 Subject: [PATCH 8/8] Fix failing test --- features/schools/placement_dates/index.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/schools/placement_dates/index.feature b/features/schools/placement_dates/index.feature index 055ee60008..8fed4797d5 100644 --- a/features/schools/placement_dates/index.feature +++ b/features/schools/placement_dates/index.feature @@ -38,7 +38,7 @@ Feature: Listing placement dates Scenario: Warning displayed when there are no dates Given my school has no placement dates When I am on the 'placement dates' page - Then there should be a "You haven't entered any dates, your school will not appear in candidate searches" warning + Then there should be a "You haven't entered any dates so your school will not appear in candidate searches" warning Scenario: The return to dashboard button Given I am on the 'placement dates' page