Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Staging > production #622

Merged
merged 8 commits into from
Nov 6, 2023
Merged

Staging > production #622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9c370b7
Add new nominee website column to local assessment csv report
DaniBitZesty Nov 1, 2023
66f46ff
Update links
DaniBitZesty Nov 2, 2023
355dc12
Merge pull request #618 from bitzesty/add-website-column-to-local-ass…
DaniBitZesty Nov 2, 2023
dbb8b5b
Update year in copy
DaniBitZesty Nov 2, 2023
a7e118e
Merge pull request #619 from bitzesty/update-lieutenants-dashboard
DaniBitZesty Nov 2, 2023
efec345
Swap order of copy in lieutenant dashboard links
DaniBitZesty Nov 2, 2023
7033c12
Merge pull request #620 from bitzesty/update-lieutenants-dashboard
DaniBitZesty Nov 2, 2023
b4c070e
Merge pull request #621 from bitzesty/main
DaniBitZesty Nov 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/models/reports/local_assessment_report.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 4 additions & 0 deletions app/models/reports/nomination.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
30 changes: 20 additions & 10 deletions app/views/lieutenant/dashboard/index.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,25 @@
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/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 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",
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",
= 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"

hr.govuk-section-break.govuk-section-break--m
Expand All @@ -33,8 +43,8 @@
| 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)",
"https://storage.googleapis.com/lord-lieutenant-guidance/Accessible%20-%20QAVS%20local%20assessment%20form%202022%20download.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",
target: :_blank
Expand All @@ -54,7 +64,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
Expand All @@ -63,13 +73,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
Expand All @@ -80,8 +90,8 @@
| 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)",
"https://storage.googleapis.com/lord-lieutenant-guidance/Accessible%20-%20QAVS%20Emblem%20Use%20Guidelines.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",
target: :_blank
Loading