Skip to content

Commit

Permalink
Merge pull request #622 from bitzesty/staging
Browse files Browse the repository at this point in the history 
Staging > production
  • Loading branch information
@TheDancingClown
TheDancingClown authored Nov 6, 2023
2 parents 1346865 + b4c070e commit 7156cad
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 10 deletions.
4 changes: 4 additions & 0 deletions app/models/reports/local_assessment_report.rb
View file
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
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
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

0 comments on commit 7156cad

Please sign in to comment.