From 9c370b77a2a1ebf0b371e2fb6506c6e468eec0b2 Mon Sep 17 00:00:00 2001 From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com> Date: Wed, 1 Nov 2023 17:17:37 +0000 Subject: [PATCH 1/4] Add new nominee website column to local assessment csv report --- app/models/reports/local_assessment_report.rb | 4 ++++ app/models/reports/nomination.rb | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/app/models/reports/local_assessment_report.rb b/app/models/reports/local_assessment_report.rb index 5e1e46737..3cdc9b847 100644 --- a/app/models/reports/local_assessment_report.rb +++ b/app/models/reports/local_assessment_report.rb @@ -25,6 +25,10 @@ class Reports::LocalAssessmentReport < Reports::QavsBase label: "Group leader email", method: :group_leader_email, }, + { + label: "Group leader website", + method: :nominee_website, + }, { label: "Group address building", method: :group_address_building, diff --git a/app/models/reports/nomination.rb b/app/models/reports/nomination.rb index e04c16012..0ccb64e5a 100644 --- a/app/models/reports/nomination.rb +++ b/app/models/reports/nomination.rb @@ -53,6 +53,10 @@ def group_leader_email doc["nominee_leader_email"] end + def nominee_website + doc["nominee_website"] + end + def group_address_building doc["nominee_address_building"] end From 66f46ff86cc1a6ee4341079398b7516c69660d94 Mon Sep 17 00:00:00 2001 From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com> Date: Thu, 2 Nov 2023 13:23:49 +0000 Subject: [PATCH 2/4] Update links --- .../lieutenant/dashboard/index.html.slim | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/app/views/lieutenant/dashboard/index.html.slim b/app/views/lieutenant/dashboard/index.html.slim index 3bb95e26e..cb95d0912 100644 --- a/app/views/lieutenant/dashboard/index.html.slim +++ b/app/views/lieutenant/dashboard/index.html.slim @@ -11,18 +11,27 @@ =< local_assessment_submission_deadline.decorate.formatted_trigger_time | . - p.govuk-body You can download the local assessment guide, which provides helpful tips on approaching the assessment and completing your report. + p.govuk-body You can also download an introductory summary for nominated groups that outlines the Award, what to expect at the local assessment and important information to gather. .govuk-body = link_to "Download KAVS local assessment guide (PDF)", - "https://storage.googleapis.com/lord-lieutenant-guidance/QAVS%20Guidance%20for%20LLs%202023.pdf", + "https://storage.googleapis.com/lord-lieutenant-guidance/KAVS%20Guidance%20for%20LLs%202024.pdf", + class: "download-link govuk-link govuk-link--no-visited-state", + rel: "noreferrer noopener", + target: :_blank + + p.govuk-body You can download the local assessment guide, which provides helpful tips on approaching the assessment and completing your report. + .govuk-body + = link_to "Download the local assessment summary for nominated groups", + "https://storage.googleapis.com/lord-lieutenant-guidance/KAVS%20LL%20introduction%20for%20nominated%20groups.pdf", class: "download-link govuk-link govuk-link--no-visited-state", rel: "noreferrer noopener", target: :_blank + hr.govuk-section-break.govuk-section-break--m p.govuk-body Each assessment report has to be submitted using an online form that is linked to that group. However, you may prefer to download a Word version of the form, which you can print off or save, and use as a template while you carry out your assessment. Once your assessment is complete, you can then copy and paste the final answers into the online form. .govuk-body = link_to "Download KAVS local assessment form 2023 (Word)", - "https://storage.googleapis.com/lord-lieutenant-guidance/QAVS%20local%20assessment%20form%202023%20download.docx", + "https://storage.googleapis.com/lord-lieutenant-guidance/KAVS%20local%20assessment%20form%202024%20Word%20version.docx", class: "download-link govuk-link govuk-link--no-visited-state" hr.govuk-section-break.govuk-section-break--m @@ -34,7 +43,7 @@ .govuk-details__text p.govuk-body If you use assistive technology, such as a screen reader, you can use an accessible PDF version of the local assessment form. = link_to "Download KAVS local assessment form 2022 (PDF)", - "https://storage.googleapis.com/lord-lieutenant-guidance/Accessible%20-%20QAVS%20local%20assessment%20form%202022%20download.pdf", + "https://storage.googleapis.com/lord-lieutenant-guidance/KAVS%20local%20assessment%20form%202024%20(Accessible).pdf", class: "download-link govuk-link govuk-link--no-visited-state", rel: "noreferrer noopener", target: :_blank @@ -54,7 +63,7 @@ | You can also download promotional materials to help raise awareness of the award. .govuk-body = link_to "Download the KAVS leaflet and other promotional materials", - "https://storage.googleapis.com/lord-lieutenant-guidance/QAVS%202022%20Leaflets%20(English%20and%20Welsh).pdf", + "https://storage.googleapis.com/lord-lieutenant-guidance/KAVS%202%20page%20flyer.pdf", class: "download-link govuk-link govuk-link--no-visited-state", rel: "noreferrer noopener", target: :_blank @@ -63,13 +72,13 @@ | We will share information with the successful groups directly. However, you can also find the materials to download below. .govuk-body = link_to "Download the media pack for the announcement", - "https://storage.googleapis.com/lord-lieutenant-guidance/Media%20pack%20for%20Lieutenancies%202022.pdf", + "https://storage.googleapis.com/lord-lieutenant-guidance/KAVS%20Media%20Pack%2023%20for%20Lieutenancies.docx.pdf", class: "download-link govuk-link govuk-link--no-visited-state", rel: "noreferrer noopener", target: :_blank .govuk-body = link_to "Download the KAVS logos and Guidelines", - "https://kavs.dcms.gov.uk/the-queens-award-for-voluntary-service-emblem-guidelines", + "https://kavs.dcms.gov.uk/the-kings-award-for-voluntary-service-emblem-guidelines", class: "download-link govuk-link govuk-link--no-visited-state", rel: "noreferrer noopener", target: :_blank @@ -81,7 +90,7 @@ .govuk-details__text p.govuk-body If you use assistive technology, such as a screen reader, you can use an accessible PDF version of the logo guidelines. = link_to "Download KAVS emblem guidelines 2022 (PDF)", - "https://storage.googleapis.com/lord-lieutenant-guidance/Accessible%20-%20QAVS%20Emblem%20Use%20Guidelines.pdf", + "https://storage.googleapis.com/lord-lieutenant-guidance/Accessible%20-%20KAVS%20Emblem%20Guidelines%202023.pdf", class: "download-link govuk-link govuk-link--no-visited-state", rel: "noreferrer noopener", target: :_blank From dbb8b5b9b347f0b3ee06f945279fe5de1264bd76 Mon Sep 17 00:00:00 2001 From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com> Date: Thu, 2 Nov 2023 13:34:35 +0000 Subject: [PATCH 3/4] Update year in copy --- app/views/lieutenant/dashboard/index.html.slim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/lieutenant/dashboard/index.html.slim b/app/views/lieutenant/dashboard/index.html.slim index cb95d0912..bd1c8bd2d 100644 --- a/app/views/lieutenant/dashboard/index.html.slim +++ b/app/views/lieutenant/dashboard/index.html.slim @@ -30,7 +30,7 @@ hr.govuk-section-break.govuk-section-break--m p.govuk-body Each assessment report has to be submitted using an online form that is linked to that group. However, you may prefer to download a Word version of the form, which you can print off or save, and use as a template while you carry out your assessment. Once your assessment is complete, you can then copy and paste the final answers into the online form. .govuk-body - = link_to "Download KAVS local assessment form 2023 (Word)", + = link_to "Download KAVS local assessment form 2024 (Word)", "https://storage.googleapis.com/lord-lieutenant-guidance/KAVS%20local%20assessment%20form%202024%20Word%20version.docx", class: "download-link govuk-link govuk-link--no-visited-state" @@ -42,7 +42,7 @@ | Get accessible format of the local assessment form .govuk-details__text p.govuk-body If you use assistive technology, such as a screen reader, you can use an accessible PDF version of the local assessment form. - = link_to "Download KAVS local assessment form 2022 (PDF)", + = link_to "Download KAVS local assessment form 2024 (PDF)", "https://storage.googleapis.com/lord-lieutenant-guidance/KAVS%20local%20assessment%20form%202024%20(Accessible).pdf", class: "download-link govuk-link govuk-link--no-visited-state", rel: "noreferrer noopener", @@ -89,7 +89,7 @@ | Get accessible format of the logo guidelines .govuk-details__text p.govuk-body If you use assistive technology, such as a screen reader, you can use an accessible PDF version of the logo guidelines. - = link_to "Download KAVS emblem guidelines 2022 (PDF)", + = link_to "Download KAVS emblem guidelines 2024 (PDF)", "https://storage.googleapis.com/lord-lieutenant-guidance/Accessible%20-%20KAVS%20Emblem%20Guidelines%202023.pdf", class: "download-link govuk-link govuk-link--no-visited-state", rel: "noreferrer noopener", From efec345572ff9478d518cbcd6646f99de09aa94a Mon Sep 17 00:00:00 2001 From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com> Date: Thu, 2 Nov 2023 15:35:41 +0000 Subject: [PATCH 4/4] Swap order of copy in lieutenant dashboard links --- app/views/lieutenant/dashboard/index.html.slim | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/lieutenant/dashboard/index.html.slim b/app/views/lieutenant/dashboard/index.html.slim index bd1c8bd2d..3e41dbb99 100644 --- a/app/views/lieutenant/dashboard/index.html.slim +++ b/app/views/lieutenant/dashboard/index.html.slim @@ -11,7 +11,7 @@ =< local_assessment_submission_deadline.decorate.formatted_trigger_time | . - p.govuk-body You can also download an introductory summary for nominated groups that outlines the Award, what to expect at the local assessment and important information to gather. + p.govuk-body You can download the local assessment guide, which provides helpful tips on approaching the assessment and completing your report. .govuk-body = link_to "Download KAVS local assessment guide (PDF)", "https://storage.googleapis.com/lord-lieutenant-guidance/KAVS%20Guidance%20for%20LLs%202024.pdf", @@ -19,7 +19,8 @@ rel: "noreferrer noopener", target: :_blank - p.govuk-body You can download the local assessment guide, which provides helpful tips on approaching the assessment and completing your report. + p.govuk-body You can also download an introductory summary for nominated groups that outlines the Award, what to expect at the local assessment and important information to gather. + .govuk-body = link_to "Download the local assessment summary for nominated groups", "https://storage.googleapis.com/lord-lieutenant-guidance/KAVS%20LL%20introduction%20for%20nominated%20groups.pdf",