From c1c589289a3ee0d7497b3cf9822c84fdae0f002b Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Mon, 15 Jan 2024 17:22:55 +0000 Subject: [PATCH] feat: formatting improvements --- .../bulk_upload_lettings_results/deletion_report.html.erb | 2 +- app/views/bulk_upload_lettings_resume/confirm.html.erb | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/views/bulk_upload_lettings_results/deletion_report.html.erb b/app/views/bulk_upload_lettings_results/deletion_report.html.erb index c91be8554..eed82a98d 100644 --- a/app/views/bulk_upload_lettings_results/deletion_report.html.erb +++ b/app/views/bulk_upload_lettings_results/deletion_report.html.erb @@ -1,7 +1,7 @@
Bulk upload for lettings (<%= @bulk_upload.year_combo %>) -

<%= @bulk_upload.bulk_upload_errors.count == 1 ? "This" : "These" %> <%= pluralize(@bulk_upload.bulk_upload_errors.count, "answer") %> will be deleted if you upload the logs

+

<%= @bulk_upload.bulk_upload_errors.uniq { |e| e.field }.count == 1 ? "This" : "These" %> <%= pluralize(@bulk_upload.bulk_upload_errors.uniq { |e| e.field }.count, "answer") %> will be deleted if you upload the <%= "log".pluralize(@bulk_upload.logs.count) %>

The following cells contain data this is incorrect.

If you upload the logs, these answers will be deleted. You will have to re-enter the data on the site and resolve these errors.

diff --git a/app/views/bulk_upload_lettings_resume/confirm.html.erb b/app/views/bulk_upload_lettings_resume/confirm.html.erb index b2fce604e..cd7b0b4ed 100644 --- a/app/views/bulk_upload_lettings_resume/confirm.html.erb +++ b/app/views/bulk_upload_lettings_resume/confirm.html.erb @@ -13,7 +13,10 @@

- <%= govuk_warning_text text: deleted_errors_warning_text(@bulk_upload) %> + <%= govuk_warning_text do %> + <%= deleted_errors_warning_text(@bulk_upload) %> + <%= govuk_link_to "See which answers will be deleted", deletion_report_bulk_upload_lettings_result_path %> + <% end %> <%= form_with model: @form, scope: :form, url: page_bulk_upload_lettings_resume_path(@bulk_upload, page: "confirm"), method: :patch do |f| %> <%= f.govuk_submit "Confirm" %>