From c37d6950cf8c3efb0c2a5532ae1b477bf644e9e9 Mon Sep 17 00:00:00 2001 From: starswan Date: Thu, 5 Dec 2024 12:01:50 +0000 Subject: [PATCH 1/5] Faith schools candidate rework --- .../catholic_religious_information_section.rb | 4 +- ..._catholic_religious_information_section.rb | 4 +- .../job_applications/build_controller.rb | 6 +- .../jobseekers/job_applications_controller.rb | 6 +- .../catholic_following_religion_form.rb | 4 ++ .../following_religion_form.rb | 2 +- .../non_catholic_following_religion_form.rb | 4 ++ app/helpers/status_tag_helper.rb | 65 ++++++++----------- ...b_application_from_previous_application.rb | 3 +- .../catholic_following_religion.html.slim | 4 +- .../non_catholic_following_religion.html.slim | 4 +- .../_catholic_religious_information.html.slim | 9 ++- ...n_catholic_religious_information.html.slim | 6 +- config/locales/activerecord.yml | 12 +++- config/locales/forms.yml | 51 --------------- .../jobseekers/job_applications/religion.yml | 61 +++++++++++++++++ ...mplete_a_religious_job_application_spec.rb | 4 +- 17 files changed, 130 insertions(+), 119 deletions(-) create mode 100644 app/form_models/jobseekers/job_application/catholic_following_religion_form.rb create mode 100644 app/form_models/jobseekers/job_application/non_catholic_following_religion_form.rb create mode 100644 config/locales/jobseekers/job_applications/religion.yml diff --git a/app/components/job_application_review_component/catholic_religious_information_section.rb b/app/components/job_application_review_component/catholic_religious_information_section.rb index 4582cb570b..0855cb0f8c 100644 --- a/app/components/job_application_review_component/catholic_religious_information_section.rb +++ b/app/components/job_application_review_component/catholic_religious_information_section.rb @@ -2,9 +2,9 @@ class JobApplicationReviewComponent::CatholicReligiousInformationSection < JobAp def initialize(job_application, allow_edit:, name:) # only include the details form if we follow a religion forms = if job_application.following_religion - %w[FollowingReligionForm CatholicReligionDetailsForm] + %w[CatholicFollowingReligionForm CatholicReligionDetailsForm] else - %w[FollowingReligionForm] + %w[CatholicFollowingReligionForm] end super(job_application, forms: forms, name: name, allow_edit: allow_edit) end diff --git a/app/components/job_application_review_component/non_catholic_religious_information_section.rb b/app/components/job_application_review_component/non_catholic_religious_information_section.rb index b94b67c49c..b7fa97197e 100644 --- a/app/components/job_application_review_component/non_catholic_religious_information_section.rb +++ b/app/components/job_application_review_component/non_catholic_religious_information_section.rb @@ -4,9 +4,9 @@ class JobApplicationReviewComponent::NonCatholicReligiousInformationSection < Jo def initialize(job_application, allow_edit:, name:) # only include the details form if we follow a religion forms = if job_application.following_religion - %w[SchoolEthosForm FollowingReligionForm NonCatholicReligionDetailsForm] + %w[SchoolEthosForm NonCatholicFollowingReligionForm NonCatholicReligionDetailsForm] else - %w[SchoolEthosForm FollowingReligionForm] + %w[SchoolEthosForm NonCatholicFollowingReligionForm] end super(job_application, forms: forms, name: name, allow_edit: allow_edit) end diff --git a/app/controllers/jobseekers/job_applications/build_controller.rb b/app/controllers/jobseekers/job_applications/build_controller.rb index 466865b503..6968adb761 100644 --- a/app/controllers/jobseekers/job_applications/build_controller.rb +++ b/app/controllers/jobseekers/job_applications/build_controller.rb @@ -45,11 +45,7 @@ def form end def form_class - if step.in? %i[catholic_following_religion non_catholic_following_religion] - Jobseekers::JobApplication::FollowingReligionForm - else - "jobseekers/job_application/#{step}_form".camelize.constantize - end + "jobseekers/job_application/#{step}_form".camelize.constantize end def form_attributes diff --git a/app/controllers/jobseekers/job_applications_controller.rb b/app/controllers/jobseekers/job_applications_controller.rb index 1ccf46d38f..73b0fed299 100644 --- a/app/controllers/jobseekers/job_applications_controller.rb +++ b/app/controllers/jobseekers/job_applications_controller.rb @@ -124,11 +124,7 @@ def all_steps_valid? end def step_valid?(step) - form_class = if step.in? %i[catholic_following_religion non_catholic_following_religion] - Jobseekers::JobApplication::FollowingReligionForm - else - "jobseekers/job_application/#{step}_form".camelize.constantize - end + form_class = "jobseekers/job_application/#{step}_form".camelize.constantize attributes = form_class.storable_fields.index_with do |field| case field diff --git a/app/form_models/jobseekers/job_application/catholic_following_religion_form.rb b/app/form_models/jobseekers/job_application/catholic_following_religion_form.rb new file mode 100644 index 0000000000..16904f61cb --- /dev/null +++ b/app/form_models/jobseekers/job_application/catholic_following_religion_form.rb @@ -0,0 +1,4 @@ +# frozen_string_literal: true + +class Jobseekers::JobApplication::CatholicFollowingReligionForm < Jobseekers::JobApplication::FollowingReligionForm +end diff --git a/app/form_models/jobseekers/job_application/following_religion_form.rb b/app/form_models/jobseekers/job_application/following_religion_form.rb index d6784df6d3..04e5612440 100644 --- a/app/form_models/jobseekers/job_application/following_religion_form.rb +++ b/app/form_models/jobseekers/job_application/following_religion_form.rb @@ -7,5 +7,5 @@ def self.fields end attribute :following_religion, :boolean - validates :following_religion, inclusion: { in: [true, false] } + validates :following_religion, inclusion: { in: [true, false], allow_nil: false } end diff --git a/app/form_models/jobseekers/job_application/non_catholic_following_religion_form.rb b/app/form_models/jobseekers/job_application/non_catholic_following_religion_form.rb new file mode 100644 index 0000000000..680b58c201 --- /dev/null +++ b/app/form_models/jobseekers/job_application/non_catholic_following_religion_form.rb @@ -0,0 +1,4 @@ +# frozen_string_literal: true + +class Jobseekers::JobApplication::NonCatholicFollowingReligionForm < Jobseekers::JobApplication::FollowingReligionForm +end diff --git a/app/helpers/status_tag_helper.rb b/app/helpers/status_tag_helper.rb index 0dfd1c82ed..b805505481 100644 --- a/app/helpers/status_tag_helper.rb +++ b/app/helpers/status_tag_helper.rb @@ -1,19 +1,32 @@ module StatusTagHelper + STATUS_COLOURS = { + optional: "grey", + not_started: "grey", + action_required: "red", + complete: "green", + in_progress: "yellow", + imported: "blue", + }.freeze + # rubocop:disable Lint/DuplicateBranch def review_section_tag(resource, steps, form_classes) - if resource.is_a?(JobApplication) && steps.all? { |step| job_application_step_imported?(resource, step) } - imported - elsif form_classes.all?(&:optional?) - optional - elsif resource.is_a?(JobApplication) && steps.all? { |step| job_application_step_in_progress?(resource, step) } - in_progress - elsif steps.none? { |step| step_completed?(resource, step) } - not_started - elsif step_forms_contain_errors?(resource, form_classes) - action_required - else - complete - end - end + status = if resource.is_a?(JobApplication) && steps.all? { |step| job_application_step_imported?(resource, step) } + :imported + elsif form_classes.all?(&:optional?) + :optional + elsif resource.is_a?(JobApplication) && steps.all? { |step| job_application_step_in_progress?(resource, step) } + :in_progress + elsif steps.none? { |step| step_completed?(resource, step) } + :not_started + elsif step_forms_contain_errors?(resource, form_classes) + :action_required + elsif steps.all? { |step| step_completed?(resource, step) } + :complete + else + :in_progress + end + govuk_tag(text: t("shared.status_tags.#{status}"), colour: STATUS_COLOURS.fetch(status)) + end + # rubocop:enable Lint/DuplicateBranch private @@ -26,28 +39,4 @@ def step_forms_contain_errors?(resource, form_classes) form_class.fields.any? { |field| resource.errors.include?(field) } end end - - def optional - govuk_tag(text: t("shared.status_tags.optional"), colour: "grey") - end - - def not_started - govuk_tag(text: t("shared.status_tags.not_started"), colour: "grey") - end - - def action_required - govuk_tag(text: t("shared.status_tags.action_required"), colour: "red") - end - - def complete - govuk_tag(text: t("shared.status_tags.complete"), colour: "green") - end - - def in_progress - govuk_tag(text: t("shared.status_tags.in_progress"), colour: "yellow") - end - - def imported - govuk_tag(text: t("shared.status_tags.imported"), colour: "blue") - end end diff --git a/app/services/jobseekers/job_applications/prefill_job_application_from_previous_application.rb b/app/services/jobseekers/job_applications/prefill_job_application_from_previous_application.rb index ee10621a6d..582695f62e 100644 --- a/app/services/jobseekers/job_applications/prefill_job_application_from_previous_application.rb +++ b/app/services/jobseekers/job_applications/prefill_job_application_from_previous_application.rb @@ -44,7 +44,8 @@ def attributes_to_copy professional_status ask_for_support personal_statement - following_religion + catholic_following_religion + non_catholic_following_religion catholic_religion_details school_ethos non_catholic_religion_details] diff --git a/app/views/jobseekers/job_applications/build/catholic_following_religion.html.slim b/app/views/jobseekers/job_applications/build/catholic_following_religion.html.slim index 89069e8f40..d3d81196dc 100644 --- a/app/views/jobseekers/job_applications/build/catholic_following_religion.html.slim +++ b/app/views/jobseekers/job_applications/build/catholic_following_religion.html.slim @@ -20,8 +20,8 @@ = f.govuk_error_summary = f.govuk_radio_buttons_fieldset :following_religion do - = f.govuk_radio_button :following_religion, true, link_errors: true, label: { text: t("helpers.label.jobseekers_job_application_following_religion_form.following_religion_options.yes") } - = f.govuk_radio_button :following_religion, false, label: { text: t("helpers.label.jobseekers_job_application_following_religion_form.following_religion_options.no") } + = f.govuk_radio_button :following_religion, true, link_errors: true + = f.govuk_radio_button :following_religion, "false" = f.govuk_submit job_application_build_submit_button_text do = govuk_link_to t("buttons.cancel_and_return_to_account"), jobseekers_job_applications_path, class: "govuk-link--no-visited-state" diff --git a/app/views/jobseekers/job_applications/build/non_catholic_following_religion.html.slim b/app/views/jobseekers/job_applications/build/non_catholic_following_religion.html.slim index 7f398e1155..98f8f3d906 100644 --- a/app/views/jobseekers/job_applications/build/non_catholic_following_religion.html.slim +++ b/app/views/jobseekers/job_applications/build/non_catholic_following_religion.html.slim @@ -12,8 +12,8 @@ = f.govuk_error_summary = f.govuk_radio_buttons_fieldset :following_religion do - = f.govuk_radio_button :following_religion, true, link_errors: true, label: { text: t("helpers.label.jobseekers_job_application_following_religion_form.following_religion_options.yes") } - = f.govuk_radio_button :following_religion, false, label: { text: t("helpers.label.jobseekers_job_application_following_religion_form.following_religion_options.no") } + = f.govuk_radio_button :following_religion, "true", link_errors: true + = f.govuk_radio_button :following_religion, "false" = f.govuk_submit job_application_build_submit_button_text do = govuk_link_to t("buttons.cancel_and_return_to_account"), jobseekers_job_applications_path, class: "govuk-link--no-visited-state" diff --git a/app/views/jobseekers/job_applications/review/_catholic_religious_information.html.slim b/app/views/jobseekers/job_applications/review/_catholic_religious_information.html.slim index dd97696099..9d2dcdaf92 100644 --- a/app/views/jobseekers/job_applications/review/_catholic_religious_information.html.slim +++ b/app/views/jobseekers/job_applications/review/_catholic_religious_information.html.slim @@ -4,8 +4,8 @@ = govuk_summary_list do |summary_list| - if job_application.following_religion.in? [true, false] - summary_list.with_row do |row| - - row.with_key text: t("helpers.legend.jobseekers_job_application_following_religion_form.following_religion") - - row.with_value text: job_application.following_religion ? t("helpers.label.jobseekers_job_application_following_religion_form.following_religion_options.yes") : t("helpers.label.jobseekers_job_application_following_religion_form.following_religion_options.no") + - row.with_key text: t("helpers.legend.jobseekers_job_application_catholic_following_religion_form.following_religion") + - row.with_value text: t("helpers.label.jobseekers_job_application_catholic_following_religion_form.following_religion_options.#{job_application.following_religion}") - if job_application.following_religion - summary_list.with_row do |row| @@ -18,7 +18,10 @@ - summary_list.with_row do |row| - row.with_key text: t("helpers.legend.jobseekers_job_application_catholic_religion_details_form.religious_reference_type") - - row.with_value text: t("helpers.label.jobseekers_job_application_catholic_religion_details_form.religious_reference_type_options.#{job_application.religious_reference_type}") + - if job_application.religious_reference_type.present? + - row.with_value text: t("helpers.label.jobseekers_job_application_catholic_religion_details_form.religious_reference_type_options.#{job_application.religious_reference_type}") + - else + - row.with_value text: "" - case job_application.religious_reference_type - when "referee" diff --git a/app/views/jobseekers/job_applications/review/_non_catholic_religious_information.html.slim b/app/views/jobseekers/job_applications/review/_non_catholic_religious_information.html.slim index c0e1a9226a..4b5e80eece 100644 --- a/app/views/jobseekers/job_applications/review/_non_catholic_religious_information.html.slim +++ b/app/views/jobseekers/job_applications/review/_non_catholic_religious_information.html.slim @@ -8,8 +8,8 @@ - if job_application.following_religion.in? [true, false] - summary_list.with_row do |row| - - row.with_key text: t("helpers.legend.jobseekers_job_application_following_religion_form.following_religion") - - row.with_value text: job_application.following_religion ? t("helpers.label.jobseekers_job_application_following_religion_form.following_religion_options.yes") : t("helpers.label.jobseekers_job_application_following_religion_form.following_religion_options.no") + - row.with_key text: t("helpers.legend.jobseekers_job_application_non_catholic_following_religion_form.following_religion") + - row.with_value text: t("helpers.label.jobseekers_job_application_non_catholic_following_religion_form.following_religion_options.#{job_application.following_religion}") - if job_application.following_religion - summary_list.with_row do |row| @@ -22,7 +22,7 @@ - summary_list.with_row do |row| - row.with_key text: t("helpers.legend.jobseekers_job_application_catholic_religion_details_form.religious_reference_type") - - row.with_value text: job_application.religious_reference_type == "referee" ? t("helpers.label.jobseekers_job_application_following_religion_form.following_religion_options.yes") : t("helpers.label.jobseekers_job_application_following_religion_form.following_religion_options.no") + - row.with_value text: t("helpers.label.jobseekers_job_application_non_catholic_following_religion_form.following_religion_options.#{job_application.religious_reference_type == 'referee'}") - if job_application.religious_reference_type == "referee" - summary_list.with_row do |row| diff --git a/config/locales/activerecord.yml b/config/locales/activerecord.yml index cd31fe9f01..50176e55a1 100644 --- a/config/locales/activerecord.yml +++ b/config/locales/activerecord.yml @@ -554,7 +554,11 @@ en: attributes: personal_statement: blank: Enter your personal statement - jobseekers/job_application/following_religion_form: + jobseekers/job_application/catholic_following_religion_form: + attributes: + following_religion: + inclusion: Select yes if you follow a specific religion or faith + jobseekers/job_application/non_catholic_following_religion_form: attributes: following_religion: inclusion: Select yes if you follow a specific religion or faith @@ -644,7 +648,11 @@ en: incomplete: Complete your qualifications references: incomplete: Complete your references - following_religion: + school_ethos: + incomplete: Complete the question about how you meet the schools ethos and aims + catholic_following_religion: + incomplete: Complete your religious information + non_catholic_following_religion: incomplete: Complete your religious information catholic_religion_details: incomplete: Complete your religious information diff --git a/config/locales/forms.yml b/config/locales/forms.yml index f909141d68..dfe9115d66 100644 --- a/config/locales/forms.yml +++ b/config/locales/forms.yml @@ -182,18 +182,6 @@ en: benefit letter, payslip or P60. It's made up of 2 letters, 6 numbers and a final letter. phone_number: Enter a phone number you are happy to be contacted on. For example, 01632 960 001, 07700 900 982 or +44 0808 157 0192. previous_names: For example maiden name or name at birth, if different from the name you have now. - jobseekers_job_application_catholic_religion_details_form: - baptism_date: For example 27 3 2007 - faith: For example, Christian. - religious_reference_type_html: >- -

If you are a practising Catholic, you should nominate your Parish Priest where you regularly worship as your referee.

-

If you are not a practising Catholic, you can provide a copy of your baptism certificate, or the date and address of your baptism.

-

Make sure your referee has consented to providing a reference.

- jobseekers_job_application_non_catholic_religion_details_form: - faith: For example, Christian. - place_of_worship: For example, Westminster Abbey, Dean's Yard, London. - jobseekers_job_application_school_ethos_form: - ethos_and_aims: For example, through running after school clubs or supporting the school's local community. jobseekers_qualifications_degree_form: institution: For example, a university or college qualifications_section_completed: Ensure you've added all the education and qualifications you've done. @@ -544,38 +532,6 @@ en: training_and_cpds_section_completed_options: false: No, I'll come back to it later true: Yes, I've completed this section - jobseekers_job_application_following_religion_form: - following_religion_options: - "yes": "Yes" - "no": "No" - jobseekers_job_application_catholic_religion_details_form: - religious_reference_type_options: - referee: "Yes" - baptism_certificate: No, but I can provide a baptism certificate - baptism_date: No, but I can provide the date and address of my baptism - no_referee: "No" - religious_referee_name: Religious referee name - religious_referee_address: Religious referee address - religious_referee_role: Religious referee role - religious_referee_email: Religious referee email - religious_referee_phone: Religious referee phone number (optional) - baptism_certificate: Upload a file - baptism_address: Address of baptism location - faith: What is your religious denomination or faith? - place_of_worship: Address of place of worship (optional) - jobseekers_job_application_non_catholic_religion_details_form: - religious_reference_type_options: - "referee": "Yes" - "no_referee": "No" - religious_referee_name: Religious referee name - religious_referee_address: Religious referee address - religious_referee_role: Religious referee role - religious_referee_email: Religious referee email - religious_referee_phone: Religious referee phone number (optional) - faith: What is your religious denomination or faith? - place_of_worship: Address of place of worship (optional) - jobseekers_job_application_school_ethos_form: - ethos_and_aims: How will you support the school's ethos and aims? jobseekers_job_application_review_form: update_profile_options: qualifications: Update qualifications on profile @@ -966,13 +922,6 @@ en: gender: How would you describe your gender? orientation: How would you describe your sexual orientation? religion: What is your religion or belief? - jobseekers_job_application_following_religion_form: - following_religion: Are you currently following a religion or faith? - jobseekers_job_application_catholic_religion_details_form: - religious_reference_type: Can you provide a religious referee? - baptism_date: What was the date of your baptism? - jobseekers_job_application_non_catholic_religion_details_form: - religious_reference_type: Can you provide a religious referee? jobseekers_break_form: ended_on: End of gap started_on: Start of gap diff --git a/config/locales/jobseekers/job_applications/religion.yml b/config/locales/jobseekers/job_applications/religion.yml new file mode 100644 index 0000000000..af8affc794 --- /dev/null +++ b/config/locales/jobseekers/job_applications/religion.yml @@ -0,0 +1,61 @@ +en: + helpers: + legend: + jobseekers_job_application_catholic_following_religion_form: + following_religion: Are you currently following a religion or faith? + jobseekers_job_application_non_catholic_following_religion_form: + following_religion: Are you currently following a religion or faith? + jobseekers_job_application_catholic_religion_details_form: + religious_reference_type: Can you provide a religious referee? + baptism_date: What was the date of your baptism? + jobseekers_job_application_non_catholic_religion_details_form: + religious_reference_type: Can you provide a religious referee? + label: + jobseekers_job_application_catholic_following_religion_form: + following_religion_options: + "true": "Yes" + "false": "No" + jobseekers_job_application_non_catholic_following_religion_form: + following_religion_options: + "true": "Yes" + "false": "No" + jobseekers_job_application_catholic_religion_details_form: + religious_reference_type_options: + referee: "Yes" + baptism_certificate: No, but I can provide a baptism certificate + baptism_date: No, but I can provide the date and address of my baptism + no_referee: "No" + religious_referee_name: Religious referee name + religious_referee_address: Religious referee address + religious_referee_role: Religious referee role + religious_referee_email: Religious referee email + religious_referee_phone: Religious referee phone number (optional) + baptism_certificate: Upload a file + baptism_address: Address of baptism location + faith: What is your religious denomination or faith? + place_of_worship: Address of place of worship (optional) + jobseekers_job_application_non_catholic_religion_details_form: + religious_reference_type_options: + "referee": "Yes" + "no_referee": "No" + religious_referee_name: Religious referee name + religious_referee_address: Religious referee address + religious_referee_role: Religious referee role + religious_referee_email: Religious referee email + religious_referee_phone: Religious referee phone number (optional) + faith: What is your religious denomination or faith? + place_of_worship: Address of place of worship (optional) + jobseekers_job_application_school_ethos_form: + ethos_and_aims: How will you support the school's ethos and aims? + hint: + jobseekers_job_application_catholic_religion_details_form: + baptism_date: For example 27 3 2007 + faith: For example, Christian. + religious_reference_type_html: >- +

If you are a practising Catholic, you should nominate your Parish Priest where you regularly worship as your referee.

+

If you are not a practising Catholic, you can provide a copy of your baptism certificate, or the date and address of your baptism.

+

Make sure your referee has consented to providing a reference.

+ jobseekers_job_application_non_catholic_religion_details_form: + faith: For example, Christian. + jobseekers_job_application_school_ethos_form: + ethos_and_aims: For example, through running after school clubs or supporting the school's local community. diff --git a/spec/system/jobseekers/jobseekers_can_complete_a_religious_job_application_spec.rb b/spec/system/jobseekers/jobseekers_can_complete_a_religious_job_application_spec.rb index 298091d872..8d95147227 100644 --- a/spec/system/jobseekers/jobseekers_can_complete_a_religious_job_application_spec.rb +++ b/spec/system/jobseekers/jobseekers_can_complete_a_religious_job_application_spec.rb @@ -26,7 +26,7 @@ it "validates first religion step" do expect(page).to have_content(I18n.t("jobseekers.job_applications.build.catholic_following_religion.preference_to_catholics")) validates_step_complete - expect(page).to have_content(I18n.t("activemodel.errors.models.jobseekers/job_application/following_religion_form.attributes.following_religion.inclusion")) + expect(page).to have_content(I18n.t("activemodel.errors.models.jobseekers/job_application/catholic_following_religion_form.attributes.following_religion.inclusion")) end context "without a religion" do @@ -204,7 +204,7 @@ it "show the correct error" do validates_step_complete - expect(page).to have_content(I18n.t("activemodel.errors.models.jobseekers/job_application/following_religion_form.attributes.following_religion.inclusion")) + expect(page).to have_content(I18n.t("activemodel.errors.models.jobseekers/job_application/non_catholic_following_religion_form.attributes.following_religion.inclusion")) end context "when completing following religion question" do From 1cfad517c71a97af059515a0612bf9a7e1df7f7d Mon Sep 17 00:00:00 2001 From: starswan Date: Wed, 11 Dec 2024 15:42:59 +0000 Subject: [PATCH 2/5] corrected key for invalid email message --- config/locales/activerecord.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/activerecord.yml b/config/locales/activerecord.yml index 50176e55a1..1254864442 100644 --- a/config/locales/activerecord.yml +++ b/config/locales/activerecord.yml @@ -574,7 +574,7 @@ en: blank: Enter your referee role religious_referee_email: blank: Enter your referee email address - email: Enter a valid email address + invalid: Enter a valid email address religious_reference_type: inclusion: Select if you can provide a religious referee baptism_address: @@ -595,7 +595,7 @@ en: blank: Enter your referee role religious_referee_email: blank: Enter your referee email address - email: Enter a valid email address + invalid: Enter a valid email address religious_reference_type: inclusion: Select yes if you can provide a religious referee jobseekers/job_application/school_ethos_form: From 46266560b2acba1f6a05c0d9a747bdb690d20700 Mon Sep 17 00:00:00 2001 From: starswan Date: Wed, 11 Dec 2024 17:26:14 +0000 Subject: [PATCH 3/5] remove approved word form content --- config/locales/publishers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/publishers.yml b/config/locales/publishers.yml index 0894399ae2..75ba53ad4c 100644 --- a/config/locales/publishers.yml +++ b/config/locales/publishers.yml @@ -377,7 +377,7 @@ en: show: page_title: Activity log application_form_type: - catholic: CES Approved Teaching Vacancies Form + catholic: Catholic schools Teaching Vacancies Form other_religion: Teaching Vacancies form with religion questions no_religion: Teaching Vacancies other: Other From 98bbcc7e932b7c9e5c6458cd9cdcb7e307cdc6bf Mon Sep 17 00:00:00 2001 From: Stephen Dicks Date: Thu, 12 Dec 2024 11:54:32 +0000 Subject: [PATCH 4/5] catholic form content Co-authored-by: EllieNodder <94541493+EllieNodder@users.noreply.github.com> --- config/locales/publishers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/publishers.yml b/config/locales/publishers.yml index 75ba53ad4c..5195dabad1 100644 --- a/config/locales/publishers.yml +++ b/config/locales/publishers.yml @@ -377,7 +377,7 @@ en: show: page_title: Activity log application_form_type: - catholic: Catholic schools Teaching Vacancies Form + catholic: Catholic schools Teaching Vacancies' form other_religion: Teaching Vacancies form with religion questions no_religion: Teaching Vacancies other: Other From ec3208a5ed3d90142ea73fd1b5c2f24a4bf5fbf4 Mon Sep 17 00:00:00 2001 From: starswan Date: Thu, 12 Dec 2024 12:14:56 +0000 Subject: [PATCH 5/5] remove ipsum lorem from declaration and religious ethos --- app/helpers/job_applications_helper.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/helpers/job_applications_helper.rb b/app/helpers/job_applications_helper.rb index d0dc0f7785..5587b4814c 100644 --- a/app/helpers/job_applications_helper.rb +++ b/app/helpers/job_applications_helper.rb @@ -159,7 +159,7 @@ def religious_job_application_sample(vacancy) religious_reference_type: "referee", religious_referee_name: Faker::Name.name, religious_referee_address: Faker::Address.full_address, - ethos_and_aims: Faker::Lorem.paragraph(sentence_count: 2), + ethos_and_aims: "", religious_referee_role: "Priest", religious_referee_email: Faker::Internet.email, religious_referee_phone: Faker::PhoneNumber.phone_number, @@ -197,8 +197,8 @@ def job_application_attributes # rubocop: disable Metrics/MethodLength, Metrics/ qualified_teacher_status: "yes", statutory_induction_complete: "yes", right_to_work_in_uk: "yes", - safeguarding_issue: "yes", - safeguarding_issue_details: Faker::Lorem.paragraph(sentence_count: 1), + safeguarding_issue: "no", + safeguarding_issue_details: "", qualified_teacher_status_year: "2021", email_address: "jane.smith@gmail.com", support_needed: "yes",