From a641fbb54e0d56d7ddd442fbfed92e768d05e1c3 Mon Sep 17 00:00:00 2001 From: Louis Kirkham Date: Thu, 10 Oct 2024 08:19:29 +0100 Subject: [PATCH 1/6] chore: Update date and year in dashboard index.html.slim Signed-off-by: Louis Kirkham --- .../group_leader/dashboard/index.html.slim | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/app/views/group_leader/dashboard/index.html.slim b/app/views/group_leader/dashboard/index.html.slim index 3239cdf40..1e75caddb 100644 --- a/app/views/group_leader/dashboard/index.html.slim +++ b/app/views/group_leader/dashboard/index.html.slim @@ -53,7 +53,8 @@ hr.govuk-section-break.govuk-section-break--l h3.govuk-heading-s - | Between 1 October and 14 November 2023 + | Between 1 October and 14 November + =<> @award_year.year - 1 | — prepare press coverage p.govuk-body | This is a great opportunity to get plenty of local publicity for your group. We hope you will be able to prepare some eye-catching posts for social media and invite local journalists to write about your news. Nothing should be publicised or published before the morning of 14 November, but it will be fine to agree embargoed articles with local journalists beforehand. @@ -84,16 +85,21 @@ hr.govuk-section-break.govuk-section-break--l.govuk-section-break--visible h3.govuk-heading-s - | 14 November 2023 + | 14 November + =<> @award_year.year - 1 | — Awards officially announced p.govuk-body | Successful groups, including your group, will be announced in The Gazette, GOV.UK and on the =< link_to("KAVS website", "https://kavs.dcms.gov.uk/") - | . We will also be promoting it widely on our social media pages and sharing your posts too. Please join in and make sure you use the hashtag #KAVS2023 and tag us @KingsAwardVS. + | . We will also be promoting it widely on our social media pages and sharing your posts too. Please join in and make sure you use the hashtag #KAVS + => @award_year.year - 1 + | and tag us @KingsAwardVS. hr.govuk-section-break.govuk-section-break--l.govuk-section-break--visible h3.govuk-heading-s - | November - March + | Mid December + =<> @award_year.year - 1 + | - April =<> @award_year.year | — Lord-Lieutenant presents the Award p.govuk-body @@ -113,7 +119,9 @@ p.govuk-body | Two representatives from the awarded groups will be invited to attend a Royal Garden Party at Buckingham Palace or The Palace of Holyroodhouse in Edinburgh in =< @award_year.year - | . We will contact you in January/February 2024 to request the contact details for these two guests. + | . We will contact you in February + =<> @award_year.year + | to request the contact details for these two guests. strong.text-underline< | No action is needed now. / NOTE for devs: When enabling the button, please also uncomment the tests in 'palace_invite_spec.rb' From bf3d0f3ed0db0a2511208faa6f866a1404c1f35e Mon Sep 17 00:00:00 2001 From: Louis Kirkham Date: Thu, 10 Oct 2024 10:46:28 +0100 Subject: [PATCH 2/6] chore: Update year in dashboard index.html.slim Signed-off-by: Louis Kirkham --- .../group_leader/dashboard/index.html.slim | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/views/group_leader/dashboard/index.html.slim b/app/views/group_leader/dashboard/index.html.slim index 1e75caddb..2cccee001 100644 --- a/app/views/group_leader/dashboard/index.html.slim +++ b/app/views/group_leader/dashboard/index.html.slim @@ -54,7 +54,7 @@ h3.govuk-heading-s | Between 1 October and 14 November - =<> @award_year.year - 1 + =<> @award_year.year | — prepare press coverage p.govuk-body | This is a great opportunity to get plenty of local publicity for your group. We hope you will be able to prepare some eye-catching posts for social media and invite local journalists to write about your news. Nothing should be publicised or published before the morning of 14 November, but it will be fine to agree embargoed articles with local journalists beforehand. @@ -86,21 +86,21 @@ h3.govuk-heading-s | 14 November - =<> @award_year.year - 1 + =<> @award_year.year | — Awards officially announced p.govuk-body | Successful groups, including your group, will be announced in The Gazette, GOV.UK and on the =< link_to("KAVS website", "https://kavs.dcms.gov.uk/") | . We will also be promoting it widely on our social media pages and sharing your posts too. Please join in and make sure you use the hashtag #KAVS - => @award_year.year - 1 + => @award_year.year | and tag us @KingsAwardVS. hr.govuk-section-break.govuk-section-break--l.govuk-section-break--visible h3.govuk-heading-s | Mid December - =<> @award_year.year - 1 - | - April =<> @award_year.year + | - April + =<> @award_year.year + 1 | — Lord-Lieutenant presents the Award p.govuk-body | The Lord-Lieutenant for your local county, as The King's representative, will present your group with a certificate and a commemorative crystal at a local ceremony. The Lieutenancy office will be in touch to arrange a suitable date and time for this. @@ -118,9 +118,9 @@ | Incomplete p.govuk-body | Two representatives from the awarded groups will be invited to attend a Royal Garden Party at Buckingham Palace or The Palace of Holyroodhouse in Edinburgh in - =< @award_year.year + =< @award_year.year + 1 | . We will contact you in February - =<> @award_year.year + =<> @award_year.year + 1 | to request the contact details for these two guests. strong.text-underline< | No action is needed now. @@ -130,9 +130,9 @@ h3.govuk-heading-s | May to July - =<> @award_year.year + =<> @award_year.year + 1 | — Royal Garden Party p.govuk-body | We will let you know the precise dates when we contact you about this in early - =< @award_year.year + =< @award_year.year + 1 | . From ce4fa26c8bffa08a5bc84a97e775ad4c7eafa856 Mon Sep 17 00:00:00 2001 From: Louis Kirkham Date: Thu, 10 Oct 2024 13:33:04 +0100 Subject: [PATCH 3/6] chore: Update variable for award year in group leader citations edit page Signed-off-by: Louis Kirkham --- app/views/group_leader/citations/edit.html.slim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/group_leader/citations/edit.html.slim b/app/views/group_leader/citations/edit.html.slim index d9a9ea52f..5fc8aaf00 100644 --- a/app/views/group_leader/citations/edit.html.slim +++ b/app/views/group_leader/citations/edit.html.slim @@ -10,7 +10,7 @@ legend.govuk-fieldset__legend.govuk-fieldset__legend--m h1.govuk-fieldset__heading | Do you accept the King's Award for Voluntary Service (KAVS) - =<> AwardYear.current.year + =<> @award_year.year | on behalf of your group? .govuk-radios.govuk-radios--inline .govuk-radios__item From 1a9369ecae76a6932a17b79514e045c59e550079 Mon Sep 17 00:00:00 2001 From: Louis Kirkham Date: Thu, 10 Oct 2024 14:14:33 +0100 Subject: [PATCH 4/6] chore: Update variable for citation award year in group leader citations edit page Signed-off-by: Louis Kirkham --- app/views/group_leader/citations/edit.html.slim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/group_leader/citations/edit.html.slim b/app/views/group_leader/citations/edit.html.slim index 5fc8aaf00..5eb8d9b0c 100644 --- a/app/views/group_leader/citations/edit.html.slim +++ b/app/views/group_leader/citations/edit.html.slim @@ -10,7 +10,7 @@ legend.govuk-fieldset__legend.govuk-fieldset__legend--m h1.govuk-fieldset__heading | Do you accept the King's Award for Voluntary Service (KAVS) - =<> @award_year.year + =<> @citation.form_answer.award_year.year | on behalf of your group? .govuk-radios.govuk-radios--inline .govuk-radios__item From dbcbcb444355835b1bc29ccf0cf1a1bf53b12534 Mon Sep 17 00:00:00 2001 From: Louis Kirkham Date: Thu, 10 Oct 2024 15:58:04 +0100 Subject: [PATCH 5/6] chore: Update media pack links for award years Signed-off-by: Louis Kirkham --- app/views/group_leader/dashboard/index.html.slim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/group_leader/dashboard/index.html.slim b/app/views/group_leader/dashboard/index.html.slim index 2cccee001..fb0578818 100644 --- a/app/views/group_leader/dashboard/index.html.slim +++ b/app/views/group_leader/dashboard/index.html.slim @@ -67,13 +67,13 @@ .govuk-details__text ul.govuk-list li - = link_to "The King's Award for Voluntary Service awardees' media pack 2023", - "https://storage.googleapis.com/emblem-files-and-guidance/Media%20pack%20for%20KAVS%20Awardees%202023.pdf", + = link_to "The King's Award for Voluntary Service awardees' media pack #{@award_year.year}", + "https://storage.googleapis.com/emblem-files-and-guidance/Media%20pack%20for%20#{@award_year.year >= 2023 ? "KAVS" : "QAVS"}%20Awardees%20#{@award_year.year}.pdf", rel: "noreferrer noopener", target: :_blank li = link_to "The King's Award for Voluntary Service media pack materials", - "https://storage.googleapis.com/emblem-files-and-guidance/KAVS%202023%20Media%20Pack%20Materials.pptx", + "https://storage.googleapis.com/emblem-files-and-guidance/#{@award_year.year >= 2023 ? "KAVS" : "QAVS"}%20#{@award_year.year}%20Media%20Pack%20Materials.pptx", rel: "noreferrer noopener", target: :_blank li From 9488c0a29279457642c0371ae36a87b25c358bf9 Mon Sep 17 00:00:00 2001 From: Louis Kirkham Date: Thu, 10 Oct 2024 15:59:13 +0100 Subject: [PATCH 6/6] chore: Update date range in group leader dashboard Signed-off-by: Louis Kirkham --- app/views/group_leader/dashboard/index.html.slim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/group_leader/dashboard/index.html.slim b/app/views/group_leader/dashboard/index.html.slim index fb0578818..e905c1966 100644 --- a/app/views/group_leader/dashboard/index.html.slim +++ b/app/views/group_leader/dashboard/index.html.slim @@ -99,7 +99,7 @@ h3.govuk-heading-s | Mid December =<> @award_year.year - | - April + | to April =<> @award_year.year + 1 | — Lord-Lieutenant presents the Award p.govuk-body