From a92c2402560f871d96217a82ac8f9213eda31032 Mon Sep 17 00:00:00 2001 From: Louis Kirkham Date: Tue, 6 Aug 2024 08:57:58 +0100 Subject: [PATCH 1/7] Copy changes to the process guide page Signed-off-by: Louis Kirkham https://app.asana.com/0/1199154381249427/1207978380074941/f --- Gemfile.lock | 1 + app/views/content_only/_award_nickname.html.slim | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0078f2f09..13d98f567 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -765,6 +765,7 @@ PLATFORMS arm64-darwin-21 arm64-darwin-23 x86_64-darwin-22 + x86_64-darwin-23 x86_64-linux DEPENDENCIES diff --git a/app/views/content_only/_award_nickname.html.slim b/app/views/content_only/_award_nickname.html.slim index 871916346..66f5ec6db 100644 --- a/app/views/content_only/_award_nickname.html.slim +++ b/app/views/content_only/_award_nickname.html.slim @@ -8,15 +8,14 @@ p.govuk-body Complete the eligibility questionnaire ul.govuk-list.govuk-list--bullet li This is to help us check whether the volunteering group meets the basic eligibility criteria for an award. - li It will take about 10 minutes to complete. + li It will take about 5 minutes to complete. li p.govuk-body Complete the form ul.govuk-list.govuk-list--bullet li The form can be completed over a number of days. li You can save and return to the form at any point before submitting it. - li It will ask for some basic facts about the group as well as brief descriptions of the group's work and the ways in which the volunteers are outstanding. - li You will be given more detailed instructions after the eligibility questionnaire. + li It will ask for some information across 4 sections: basic facts about the group, why the group/volunteers are outstanding, letters of support upload, and nominator details. li p.govuk-body From bbe60e5319c43c8c2a3b1801301174f74850c026 Mon Sep 17 00:00:00 2001 From: Louis Kirkham Date: Tue, 6 Aug 2024 09:11:23 +0100 Subject: [PATCH 2/7] Copy updates to eligibity --- app/models/eligibility/basic.rb | 12 +++++++++--- .../basic_questions/_involved_with_group.html.slim | 3 +++ app/views/form_award_eligibilities/show.html.slim | 4 +++- spec/factories/eligibility.rb | 1 + .../users/eligibility_form_fulfillment_spec.rb | 2 +- spec/models/eligibility/basic_spec.rb | 5 ++++- 6 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 app/views/form_award_eligibilities/basic_questions/_involved_with_group.html.slim diff --git a/app/models/eligibility/basic.rb b/app/models/eligibility/basic.rb index f7e1ae4c3..a98f9f39e 100644 --- a/app/models/eligibility/basic.rb +++ b/app/models/eligibility/basic.rb @@ -2,6 +2,11 @@ class Eligibility::Basic < Eligibility AWARD_NAME = 'General' after_save :set_passed + property :involved_with_group, + boolean: true, + label: "Are you a volunteer, employee or trustee of the group, or in any way involved with the running of the organisation?", + accept: :false + property :based_in_uk, boolean: true, label: "Is the group based in the UK, the Channel Islands or the Isle of Man?", @@ -30,7 +35,7 @@ class Eligibility::Basic < Eligibility property :local_area, boolean: true, - label: "Does it focus on benefitting a local area?", + label: "Does the group provide a specific and direct benefit to the local community?", hint: "Please note, KAVS is for local volunteer groups.", accept: :true @@ -41,12 +46,12 @@ class Eligibility::Basic < Eligibility property :benefits_animals_only, boolean: true, - label: "Does it only benefit animals rather than people?", + label: "Is its main focus benefiting animals rather than people?", accept: :false property :current_holder, values: %w[yes no i_dont_know], - label: "Has the group received a KAVS in the past?", + label: "Has the group received a KAVS/QAVS in the past?", accept: :not_yes def save_as_eligible! @@ -59,6 +64,7 @@ def save_as_eligible! self.provide_grants = false self.benefits_animals_only = false self.current_holder = "i_dont_know" + self.involved_with_group = false save end diff --git a/app/views/form_award_eligibilities/basic_questions/_involved_with_group.html.slim b/app/views/form_award_eligibilities/basic_questions/_involved_with_group.html.slim new file mode 100644 index 000000000..13022dade --- /dev/null +++ b/app/views/form_award_eligibilities/basic_questions/_involved_with_group.html.slim @@ -0,0 +1,3 @@ +.question-body + = f.input :involved_with_group, as: :radio_buttons, label: @eligibility.class.label(step).html_safe + span.clear diff --git a/app/views/form_award_eligibilities/show.html.slim b/app/views/form_award_eligibilities/show.html.slim index f0fb1e2eb..32861ace1 100644 --- a/app/views/form_award_eligibilities/show.html.slim +++ b/app/views/form_award_eligibilities/show.html.slim @@ -20,7 +20,9 @@ h1.govuk-heading-xl King's Award for Voluntary Service Nomination - if @form_answer.eligible? .eligibility-passed role="alert" p.govuk-body-l Thank you. Based on your answers, the group meets the basic eligibility citeria. You can proceed with nominating. - p.govuk-body-l Please note, we will also evaluate the nomination after submission referring to the more detailed criteria outlined on our website. + p.govuk-body-l Please note, we will also evaluate the nomination after submission referring to the more detailed criteria outlined on our + =< link_to "website", "https://kavs.dcms.gov.uk/make-a-nomination/eligibility/", target: "_blank", title: "opens in a new tab/window" + | . - if (!step || step.to_s == "wicked_finish") br diff --git a/spec/factories/eligibility.rb b/spec/factories/eligibility.rb index 59193f56c..bd5acf8f9 100644 --- a/spec/factories/eligibility.rb +++ b/spec/factories/eligibility.rb @@ -12,6 +12,7 @@ current_step { :current_holder } answers { { kind: "application", + involved_with_group: false, based_in_uk: true, are_majority_volunteers: true, has_at_least_three_people: true, diff --git a/spec/features/users/eligibility_form_fulfillment_spec.rb b/spec/features/users/eligibility_form_fulfillment_spec.rb index 50e9aa54f..7e449f382 100644 --- a/spec/features/users/eligibility_form_fulfillment_spec.rb +++ b/spec/features/users/eligibility_form_fulfillment_spec.rb @@ -17,7 +17,7 @@ click_link("Start a new nomination") click_button("Start eligibility questionnaire") - form_choice(%w[Yes]) + form_choice(%w[No Yes]) expect(page).to have_content("How many years has the group been in operation?") fill_in("How many years has the group been in operation?", with: 3) click_button "Continue" diff --git a/spec/models/eligibility/basic_spec.rb b/spec/models/eligibility/basic_spec.rb index e7ef3f5fc..b2198ca90 100644 --- a/spec/models/eligibility/basic_spec.rb +++ b/spec/models/eligibility/basic_spec.rb @@ -26,7 +26,8 @@ expect(eligibility).not_to be_eligible end - it 'is eligible in the middle of the survey' do + it 'is not eligible in the middle of the survey' do + eligibility.involved_with_group = false eligibility.current_step = :based_in_uk eligibility.national_organisation = false eligibility.based_in_uk = true @@ -35,6 +36,7 @@ end it 'is eligible when all questions are answered correctly' do + eligibility.involved_with_group = false eligibility.based_in_uk = true eligibility.are_majority_volunteers = true eligibility.benefits_animals_only = false @@ -73,6 +75,7 @@ it 'returns all questions for new eligibility' do expect(eligibility.questions).to eq([ + :involved_with_group, :based_in_uk, :years_operating, :has_at_least_three_people, From 9817331a64be1bb970be70690069a73257bc152d Mon Sep 17 00:00:00 2001 From: Louis Kirkham Date: Tue, 6 Aug 2024 09:56:55 +0100 Subject: [PATCH 3/7] Add bold to useful information --- app/views/content_only/award_info_qavs.html.slim | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/views/content_only/award_info_qavs.html.slim b/app/views/content_only/award_info_qavs.html.slim index b9108b190..2d05512ec 100644 --- a/app/views/content_only/award_info_qavs.html.slim +++ b/app/views/content_only/award_info_qavs.html.slim @@ -14,9 +14,10 @@ h1.govuk-heading-xl h2.govuk-heading-l Useful Nomination Info Before You Begin p.govuk-body - ' The deadline for nominations is - = submission_deadline.decorate.formatted_trigger_time - ' . + strong + | The deadline for nominations is + =<> submission_deadline.decorate.formatted_trigger_time + | . = render "content_only/pdf_link" From 8d2c7415c2c995154d40987884ff10d3085098fd Mon Sep 17 00:00:00 2001 From: Louis Kirkham Date: Tue, 6 Aug 2024 10:40:43 +0100 Subject: [PATCH 4/7] Copy changes to step A of application --- forms/award_years/v2025/qavs/qavs_step1.rb | 7 ++++--- forms/award_years/v2025/qavs/qavs_step2.rb | 8 +++++++- .../admin/form_answers/filtering_by_status_spec.rb | 5 +++-- spec/features/assessor/filtering_spec.rb | 3 ++- spec/features/lieutenant/filtering_spec.rb | 3 ++- spec/fixtures/form_answer_qavs.json | 1 + spec/fixtures/form_answer_qavs_with_la.json | 1 + spec/models/form_answer_spec.rb | 2 +- 8 files changed, 21 insertions(+), 9 deletions(-) diff --git a/forms/award_years/v2025/qavs/qavs_step1.rb b/forms/award_years/v2025/qavs/qavs_step1.rb index 2d336fc61..eb106e902 100644 --- a/forms/award_years/v2025/qavs/qavs_step1.rb +++ b/forms/award_years/v2025/qavs/qavs_step1.rb @@ -14,7 +14,7 @@ def qavs_step1 text :nominee_name, "Name of group" do sub_ref "A 1.1" required - form_hint "It is important that the name is accurate and spelt correctly, as this will appear on the Award certificate if your nomination succeeds. You do not need to add a charity number." + form_hint "It is important that the name is accurate and spelt correctly, as this will appear on the Award certificate if your nomination succeeds. Please do not capitalise the group's name, include charity numbers, or include special characters.".html_safe style "large" end @@ -31,8 +31,9 @@ def qavs_step1 nominee_activities end - dropdown :secondary_activity, "Please select the group's secondary area of activity (optional)" do + dropdown :secondary_activity, "Please select the group's secondary area of activity" do sub_ref "A 1.4" + required option "", "" nominee_activities end @@ -62,7 +63,7 @@ def qavs_step1 textarea :social_media, "Social media" do sub_ref "A 1.8" - form_hint "Social media accounts if known" + form_hint "If known, please insert a link to the group's social media below (Facebook, Instagram, Twitter, Linkedin)" words_max 100 rows 2 end diff --git a/forms/award_years/v2025/qavs/qavs_step2.rb b/forms/award_years/v2025/qavs/qavs_step2.rb index a5bb68861..0c9ad2ac9 100644 --- a/forms/award_years/v2025/qavs/qavs_step2.rb +++ b/forms/award_years/v2025/qavs/qavs_step2.rb @@ -10,7 +10,13 @@ def qavs_step2 header :recommendation, "About this section" do help "About this section", %(

- In this section, please explain how the nominated group has made a significant contribution in its area of activity. We are looking for groups that have given excellent service to their beneficiaries and communities; have delivered their service in innovative ways, and have shown other examples of selfless voluntary service that distinguish their work. + In this section, please explain how the nominated group has made a significant contribution in its area of activity. We are looking for groups that: +

  • Give excellent service to their beneficiaries and communities
    • +
  • Deliver their service in innovative ways,
    • +
  • Show other examples of selfless voluntary service that distinguish their work.
    • + + Please avoid using 'we' or 'our' in this section as this gives an indication that the person making the nomination is involved in the running of the group's work. It is recommended that you use 'their' or 'the group's work'. + Please answer each question, noting the word limits, explaining what achievements make the nominated group stand out from others.

    ) diff --git a/spec/features/admin/form_answers/filtering_by_status_spec.rb b/spec/features/admin/form_answers/filtering_by_status_spec.rb index 82ceef340..d003d9f96 100644 --- a/spec/features/admin/form_answers/filtering_by_status_spec.rb +++ b/spec/features/admin/form_answers/filtering_by_status_spec.rb @@ -125,8 +125,9 @@ assert_results_number(4) assign_activity(@forms.first, "ART") - # Untick sport activity filter - click_status_option("Sport") + # Untick sport(primary) and disability(secondary) activity filter + click_status_option "Sport" + click_status_option "Disability" assert_results_number(1) end end diff --git a/spec/features/assessor/filtering_spec.rb b/spec/features/assessor/filtering_spec.rb index 03f3c2cd5..19b63fa8b 100644 --- a/spec/features/assessor/filtering_spec.rb +++ b/spec/features/assessor/filtering_spec.rb @@ -26,8 +26,9 @@ it "filters by activity" do assert_results_number(4) assign_activity(@forms.first, "ART") - # Untick sport activity filter + # Untick sport(primary) and disability(secondary) activity filter click_status_option "Sport" + click_status_option "Disability" assert_results_number(1) end diff --git a/spec/features/lieutenant/filtering_spec.rb b/spec/features/lieutenant/filtering_spec.rb index 0887751de..377c4d711 100644 --- a/spec/features/lieutenant/filtering_spec.rb +++ b/spec/features/lieutenant/filtering_spec.rb @@ -25,8 +25,9 @@ it "filters by activity" do assert_results_number(4) assign_activity(@forms.first, "ART") - # Untick sport activity filter + # Untick sport(primary) and disability(secondary) activity filter click_status_option "Sport" + click_status_option "Disability" assert_results_number(1) end end diff --git a/spec/fixtures/form_answer_qavs.json b/spec/fixtures/form_answer_qavs.json index d87fcc9d9..19e27317c 100644 --- a/spec/fixtures/form_answer_qavs.json +++ b/spec/fixtures/form_answer_qavs.json @@ -74,6 +74,7 @@ "nominee_name": "Bit Zesty", "nominee_established_date": "2010", "nominee_activity": "SPO", + "secondary_activity": "DIS", "nominee_address_building": "94", "nominee_address_street": "White Lion Street", "nominee_address_city": "London", diff --git a/spec/fixtures/form_answer_qavs_with_la.json b/spec/fixtures/form_answer_qavs_with_la.json index 2bafd9811..d15867cb7 100644 --- a/spec/fixtures/form_answer_qavs_with_la.json +++ b/spec/fixtures/form_answer_qavs_with_la.json @@ -74,6 +74,7 @@ "nominee_name": "Bit Zesty", "nominee_established_date": "2010", "nominee_activity": "SPO", + "secondary_activity": "DIS", "nominee_address_building": "94", "nominee_address_street": "White Lion Street", "nominee_address_city": "London", diff --git a/spec/models/form_answer_spec.rb b/spec/models/form_answer_spec.rb index 3c9a50c5e..1db8384f9 100644 --- a/spec/models/form_answer_spec.rb +++ b/spec/models/form_answer_spec.rb @@ -122,7 +122,7 @@ form_answer.document = form_answer.document.merge(nominee_name: nil) form_answer.save! - expect(form_answer.fill_progress.round(2)).to eq(0.95) + expect(form_answer.fill_progress.round(2)).to eq(0.96) end end end From 5b1d4830c4358a7a098638f70728d4852feb7fcf Mon Sep 17 00:00:00 2001 From: Louis Kirkham Date: Tue, 6 Aug 2024 11:25:43 +0100 Subject: [PATCH 5/7] Copy changes to D section --- forms/award_years/v2025/qavs/qavs_step4.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forms/award_years/v2025/qavs/qavs_step4.rb b/forms/award_years/v2025/qavs/qavs_step4.rb index 86f6c4ab1..526fb5457 100644 --- a/forms/award_years/v2025/qavs/qavs_step4.rb +++ b/forms/award_years/v2025/qavs/qavs_step4.rb @@ -57,7 +57,7 @@ def qavs_step4 required text -> do %( - I am neither a volunteer nor a paid member of the group. + I am neither a volunteer, employee or trustee of the group, or in any way involved with the running of the organisation ) end end @@ -87,7 +87,7 @@ def qavs_step4 required text -> do %( - I confirm that, to the best of my knowledge and belief, the information in this form is true and correct. I have discussed the nomination with the group. It is happy to be nominated and is aware that it will be contacted by representatives of the Award and asked for further information, as part of the assessment process. + I confirm that, to the best of my knowledge and belief, the information in this form is true and correct. I have discussed the nomination with the group. It is happy to be nominated and is aware that it will be contacted by representatives of the Award and asked for further information, as part of the assessment process. I acknowledge that any false information provided may result in the withdrawal of this nomination from the Award. ) end end From c42f083402178b6900f24dcf1b541a25aa1553f4 Mon Sep 17 00:00:00 2001 From: Louis Kirkham Date: Tue, 6 Aug 2024 14:02:31 +0100 Subject: [PATCH 6/7] Copy changes to useful information page --- app/helpers/application_helper.rb | 5 ++++ .../accounts/useful_information.html.slim | 23 ++++++++++--------- app/views/layouts/application.html.slim | 2 +- forms/award_years/v2025/qavs/qavs_step2.rb | 14 +++++++---- 4 files changed, 27 insertions(+), 17 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 74fe1fb88..1f743a479 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -65,9 +65,14 @@ def landing_page? apply_for_queens_award_for_enterprise privacy cookies + useful_information ].include?(action_name) end + def exclude_footer? + %w[useful_information].include?(action_name) + end + def show_navigation_links? current_user end diff --git a/app/views/accounts/useful_information.html.slim b/app/views/accounts/useful_information.html.slim index 055ab024d..57e34714e 100644 --- a/app/views/accounts/useful_information.html.slim +++ b/app/views/accounts/useful_information.html.slim @@ -7,19 +7,20 @@ .article-container article.group role="article" h2.govuk-heading-l Nomination guidance: - ul.govuk-list.govuk-list--bullet - li = "The deadline for submissions is #{Settings.current_submission_deadline.decorate.formatted_trigger_time}".html_safe - li = "Start #{link_to('a nomination', dashboard_path)} to see if you meet the eligibility criteria.".html_safe - li If you meet the eligibility criteria, you will be able to download a PDF version of the form. Please note, the PDF version of the form is for your reference only, you will have to fill in and submit the online version of the form. - li You do not need to complete the online nomination in one go, it is saved as you go and you can come back to it later. + p.govuk-body = "The deadline for submissions is #{Settings.current_submission_deadline.decorate.formatted_trigger_time}".html_safe + p.govuk-body = "Start #{link_to('a nomination', dashboard_path)} to see if you meet the eligibility criteria.".html_safe + p.govuk-body If you meet the eligibility criteria, you will be able to download a PDF version of the form. Please note, the PDF version of the form is for your reference only, you will have to fill in and submit the online version of the form. + p.govuk-body You do not need to complete the online nomination in one go, it is saved as you go and you can come back to it later. + p.govuk-body = "Once you have submitted your nomination, you will find out the outcome of your nomination when the award is announced on 14th November 2025. The Award will provide no update until then.".html_safe - h2.govuk-heading-l Need help? + h2.govuk-heading-l Lord-Lieutenants - h3.govuk-heading-m The King's Award for Voluntary Service Team - p.govuk-body If you need digital assistance with filling in the form or have any questions, please feel free to get in touch with The King's Award for Voluntary Service Team: - p.govuk-body = "By emailing #{mail_to('kingsaward@dcms.gov.uk')}".html_safe - - h3.govuk-heading-m Lord-Lieutenants p.govuk-body The King's Award for Voluntary Service Team works closely with Lord-Lieutenants. They are His Majesty's representatives in each lieutenancy area of the United Kingdom. p.govuk-body You can get in touch with your local Lieutenancy to see how they can help you with your nomination. p.govuk-body To get up to date contact details, we recommend that you google your local county lieutenancy. + + h2.govuk-heading-l Need help? + + p.govuk-body = "Visit the #{link_to("FAQs page", "https://kavs.dcms.gov.uk/make-a-nomination/faqs/", target: "_blank")} on our website".html_safe + p.govuk-body If you need digital assistance with filling in the form or have any questions, please feel free to get in touch with The King's Award for Voluntary Service Team: + p.govuk-body = "By emailing #{mail_to('kingsaward@dcms.gov.uk')}".html_safe diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim index 9299ef8ae..265e12244 100644 --- a/app/views/layouts/application.html.slim +++ b/app/views/layouts/application.html.slim @@ -73,7 +73,7 @@ = yield - - unless landing_page? + - unless landing_page? || exclude_footer? p.footer-helpline.govuk-body ' Need help? Email us at = link_to "kingsaward@dcms.gov.uk", "mailto:kingsaward@dcms.gov.uk", class: 'govuk-link' diff --git a/forms/award_years/v2025/qavs/qavs_step2.rb b/forms/award_years/v2025/qavs/qavs_step2.rb index 0c9ad2ac9..fc2126553 100644 --- a/forms/award_years/v2025/qavs/qavs_step2.rb +++ b/forms/award_years/v2025/qavs/qavs_step2.rb @@ -11,12 +11,16 @@ def qavs_step2 help "About this section", %(

    In this section, please explain how the nominated group has made a significant contribution in its area of activity. We are looking for groups that: -

  • Give excellent service to their beneficiaries and communities
    • -
  • Deliver their service in innovative ways,
    • -
  • Show other examples of selfless voluntary service that distinguish their work.
    • - +
      +
    • Give excellent service to their beneficiaries and communities
      • +
    • Deliver their service in innovative ways,
      • +
    • Show other examples of selfless voluntary service that distinguish their work.
      • +
    +

    +

    Please avoid using 'we' or 'our' in this section as this gives an indication that the person making the nomination is involved in the running of the group's work. It is recommended that you use 'their' or 'the group's work'. - +

    +

    Please answer each question, noting the word limits, explaining what achievements make the nominated group stand out from others.

    ) From c3e7ea36691031fb32c582e2f3630a3cee7ea59f Mon Sep 17 00:00:00 2001 From: Louis Kirkham Date: Tue, 6 Aug 2024 14:05:29 +0100 Subject: [PATCH 7/7] Update dates on what happens next --- app/helpers/application_helper.rb | 1 - app/views/content_only/_award_nickname.html.slim | 2 +- app/views/form_award_eligibilities/show.html.slim | 4 +--- app/views/qae_form/confirm.html.slim | 14 ++++++++------ 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 1f743a479..50cc58c1b 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -65,7 +65,6 @@ def landing_page? apply_for_queens_award_for_enterprise privacy cookies - useful_information ].include?(action_name) end diff --git a/app/views/content_only/_award_nickname.html.slim b/app/views/content_only/_award_nickname.html.slim index 66f5ec6db..614368d58 100644 --- a/app/views/content_only/_award_nickname.html.slim +++ b/app/views/content_only/_award_nickname.html.slim @@ -15,7 +15,7 @@ ul.govuk-list.govuk-list--bullet li The form can be completed over a number of days. li You can save and return to the form at any point before submitting it. - li It will ask for some information across 4 sections: basic facts about the group, why the group/volunteers are outstanding, letters of support upload, and nominator details. + li It will ask for some information across 4 sections: basic facts about the group, why the group/volunteers are outstanding, letters of support upload, and nominator details. li p.govuk-body diff --git a/app/views/form_award_eligibilities/show.html.slim b/app/views/form_award_eligibilities/show.html.slim index 32861ace1..1a61513e4 100644 --- a/app/views/form_award_eligibilities/show.html.slim +++ b/app/views/form_award_eligibilities/show.html.slim @@ -20,9 +20,7 @@ h1.govuk-heading-xl King's Award for Voluntary Service Nomination - if @form_answer.eligible? .eligibility-passed role="alert" p.govuk-body-l Thank you. Based on your answers, the group meets the basic eligibility citeria. You can proceed with nominating. - p.govuk-body-l Please note, we will also evaluate the nomination after submission referring to the more detailed criteria outlined on our - =< link_to "website", "https://kavs.dcms.gov.uk/make-a-nomination/eligibility/", target: "_blank", title: "opens in a new tab/window" - | . + p.govuk-body-l = "Please note, we will also evaluate the nomination after submission referring to the more detailed criteria outlined on our #{link_to('website', 'https://kavs.dcms.gov.uk/make-a-nomination/eligibility/', target: '_blank', title: 'opens in a new tab/window')}.".html_safe - if (!step || step.to_s == "wicked_finish") br diff --git a/app/views/qae_form/confirm.html.slim b/app/views/qae_form/confirm.html.slim index 017591c8d..57ca11a6e 100644 --- a/app/views/qae_form/confirm.html.slim +++ b/app/views/qae_form/confirm.html.slim @@ -16,6 +16,8 @@ br p.govuk-body We have sent you an email confirming your submission. + p.govuk-body Thank you for submitting your nomination to the King's Award for Voluntary Service and helping to celebrate the outstanding work of local volunteer groups across the UK. + p.govuk-body | You can still edit your submitted nomination up until =< application_deadline(:submission_end) @@ -28,27 +30,27 @@ h2.govuk-heading-l ' What happens next - h3.govuk-heading-m September 2023 + h3.govuk-heading-m December 2024 p.govuk-body Eligibility of submitted nominations is checked. - h3.govuk-heading-m December 2023 - March 2024 + h3.govuk-heading-m January 2025 - April 2025 p.govuk-body Local Lieutenancies conduct due diligence and visit eligible groups. - h3.govuk-heading-m April 2024 - May 2024 + h3.govuk-heading-m April 2025 - June 2025 p.govuk-body National Assessors consider recommended groups and decide on a shortlist. - h3.govuk-heading-m July 2024 + h3.govuk-heading-m July 2025 p.govuk-body Royal Approval of shortlisted groups. - h3.govuk-heading-m 14 November 2024 + h3.govuk-heading-m 14 November 2025 p.govuk-body Awards are officially announced on His Majesty The King's Birthday in The Gazette, GOV.UK and on the KAVS website. - h3.govuk-heading-m December 2024 - May 2025 + h3.govuk-heading-m December 2025 - May 2026 p.govuk-body Local Lieutenancies present Awards and awarded groups are invited to the Royal Garden Parties.