Merge pull request #7381 from DFE-Digital/cpd-changes

Add course length to training and CPD section of profile and job applciation
DFE-Digital · Jan 13, 2025 · d817f6b · d817f6b
2 parents 859c004 + b220e49
commit d817f6b
Show file tree

Hide file tree

Showing 24 changed files with 136 additions and 51 deletions.
diff --git a/app/controllers/jobseekers/job_applications/training_and_cpds_controller.rb b/app/controllers/jobseekers/job_applications/training_and_cpds_controller.rb
@@ -41,13 +41,13 @@ def form_attributes
     when "create", "update"
       training_and_cpd_form_params
     when "edit"
-      training_and_cpd.slice(:name, :provider, :grade, :year_awarded)
+      training_and_cpd.slice(:name, :provider, :grade, :year_awarded, :course_length)
     end
   end
 
   def training_and_cpd_form_params
     params.require(:jobseekers_training_and_cpd_form)
-          .permit(:name, :provider, :grade, :year_awarded)
+          .permit(:name, :provider, :grade, :year_awarded, :course_length)
   end
 
   def training_and_cpd

diff --git a/app/controllers/jobseekers/profiles/training_and_cpds_controller.rb b/app/controllers/jobseekers/profiles/training_and_cpds_controller.rb
@@ -41,13 +41,13 @@ def form_attributes
     when "create", "update"
       training_and_cpd_form_params
     when "edit"
-      training_and_cpd.slice(:name, :provider, :grade, :year_awarded)
+      training_and_cpd.slice(:name, :provider, :grade, :year_awarded, :course_length)
     end
   end
 
   def training_and_cpd_form_params
     params.require(:jobseekers_training_and_cpd_form)
-          .permit(:name, :provider, :grade, :year_awarded)
+          .permit(:name, :provider, :grade, :year_awarded, :course_length)
   end
 
   def training_and_cpd

diff --git a/app/form_models/jobseekers/training_and_cpd_form.rb b/app/form_models/jobseekers/training_and_cpd_form.rb
@@ -1,7 +1,7 @@
 class Jobseekers::TrainingAndCpdForm
   include ActiveModel::Model
 
-  attr_accessor :name, :provider, :grade, :year_awarded
+  attr_accessor :name, :provider, :grade, :year_awarded, :course_length
 
-  validates :name, :provider, :year_awarded, presence: true
+  validates :name, :provider, :year_awarded, :course_length, presence: true
 end
diff --git a/app/helpers/pdf_helper.rb b/app/helpers/pdf_helper.rb
@@ -106,7 +106,7 @@ def add_secondary_qualification_details(pdf, qualification)
     secondary_qualification_data = [
       ["Name:", qualification.name],
       ["Grade:", qualification.grade],
-      ["Year Awarded:", qualification.year],
+      ["Date completed:", qualification.year],
     ].reject { |row| row[1].blank? }
 
     render_table(pdf, secondary_qualification_data)
@@ -119,7 +119,7 @@ def add_general_qualification_details(pdf, qualification)
       ["Qualification Name:", qualification.name],
       ["Institution:", qualification.institution],
       ["Grade:", qualification.grade],
-      ["Year Awarded:", qualification.year],
+      ["Date completed:", qualification.year],
     ].reject { |row| row[1].blank? }
 
     render_table(pdf, general_qualification_data)

diff --git a/app/views/jobseekers/job_applications/build/training_and_cpds.html.slim b/app/views/jobseekers/job_applications/build/training_and_cpds.html.slim
@@ -12,7 +12,7 @@
         = render DetailComponent.new title: training.name do |detail|
           - detail.with_body do
             = govuk_summary_list classes: "govuk-!-margin-bottom-0" do |summary_list|
-              - attributes = %w[name provider grade year_awarded]
+              - attributes = %w[name provider grade year_awarded course_length]
               - attributes.each do |attribute|
                 - if training[attribute].present?
                   - summary_list.with_row do |row|

diff --git a/app/views/jobseekers/job_applications/review/_training_and_cpds.html.slim b/app/views/jobseekers/job_applications/review/_training_and_cpds.html.slim
@@ -11,5 +11,6 @@
           - if training.grade.present?
             span class="govuk-!-display-inline-block govuk-!-margin-left-1"
               = "(#{training.grade})"
+        p class="govuk-!-margin-bottom-1" = training.course_length
         p.govuk-caption-m
           = "#{training.provider}, #{training.year_awarded}"
diff --git a/app/views/jobseekers/job_applications/training_and_cpds/edit.html.slim b/app/views/jobseekers/job_applications/training_and_cpds/edit.html.slim
@@ -6,12 +6,20 @@
     h1.govuk-heading-xl = t(".heading")
 
     = form_for form, url: jobseekers_job_application_training_and_cpd_path, method: :put do |f|
+      p.govuk-body = t(".description")
+      p.govuk-body = t(".example_intro")
+      ul.govuk-list.govuk-list--bullet
+        li = t(".example1")
+        li = t(".example2")
+        li = t(".example3")
+        li = t(".example4")
       = f.govuk_error_summary
 
       = f.govuk_text_field :name, label: { size: "s" }, aria: { required: true }
       = f.govuk_text_field :provider, label: { size: "s" }, aria: { required: true }
-      = f.govuk_text_field :grade, label: { size: "s" }
       = f.govuk_text_field :year_awarded, label: { size: "s" }, type: "number", width: 4, hint: { text: t(".hint") }
+      = f.govuk_text_field :course_length, label: { size: "s" }, aria: { required: true }
+      = f.govuk_text_field :grade, label: { size: "s" }
       = f.govuk_submit t("buttons.save_and_continue")
 
     .govuk-button-group

diff --git a/app/views/jobseekers/job_applications/training_and_cpds/new.html.slim b/app/views/jobseekers/job_applications/training_and_cpds/new.html.slim
@@ -6,12 +6,21 @@
     h1.govuk-heading-xl = t(".heading")
 
     = form_for form, url: jobseekers_job_application_training_and_cpds_path(job_application), method: :post do |f|
+      p.govuk-body = t(".description")
+      p.govuk-body = t(".example_intro")
+      ul.govuk-list.govuk-list--bullet
+        li = t(".example1")
+        li = t(".example2")
+        li = t(".example3")
+        li = t(".example4")
+
       = f.govuk_error_summary
 
       = f.govuk_text_field :name, label: { size: "s" }, aria: { required: true }
       = f.govuk_text_field :provider, label: { size: "s" }, aria: { required: true }
-      = f.govuk_text_field :grade, label: { size: "s" }
+      = f.govuk_text_field :course_length, label: { size: "s" }, aria: { required: true }
       = f.govuk_text_field :year_awarded, label: { size: "s" }, type: "number", width: 4, hint: { text: t(".hint") }
+      = f.govuk_text_field :grade, label: { size: "s" }
       = f.govuk_submit t("buttons.save_and_continue")
 
     .govuk-button-group

diff --git a/app/views/jobseekers/profiles/qualifications/confirm_destroy.html.slim b/app/views/jobseekers/profiles/qualifications/confirm_destroy.html.slim
@@ -24,7 +24,7 @@
             - row.with_key text: "Institution"
             - row.with_value text: qualification.institution
           - summary_list.with_row do |row|
-            - row.with_key text: "Year awarded"
+            - row.with_key text: "Date completed"
             - row.with_value text: qualification.year
           - summary_list.with_row do |row|
             - row.with_key text: t("jobseekers.qualifications.subjects_and_grades")

diff --git a/app/views/jobseekers/profiles/training_and_cpds/confirm_destroy.html.slim b/app/views/jobseekers/profiles/training_and_cpds/confirm_destroy.html.slim
@@ -18,13 +18,17 @@
           - row.with_value text: training_and_cpd.provider
 
         - summary_list.with_row do |row|
-          - row.with_key text: t("helpers.label.jobseekers_training_and_cpd_form.grade")
-          - row.with_value text: training_and_cpd.grade
+          - row.with_key text: t("helpers.label.jobseekers_training_and_cpd_form.course_length")
+          - row.with_value text: training_and_cpd.course_length
 
         - summary_list.with_row do |row|
           - row.with_key text: t("helpers.label.jobseekers_training_and_cpd_form.year_awarded")
           - row.with_value text: training_and_cpd.year_awarded
 
+        - summary_list.with_row do |row|
+          - row.with_key text: t("helpers.label.jobseekers_training_and_cpd_form.grade")
+          - row.with_value text: training_and_cpd.grade
+
       = f.govuk_submit "Delete training"
 
     .govuk-button-group

diff --git a/app/views/jobseekers/profiles/training_and_cpds/edit.html.slim b/app/views/jobseekers/profiles/training_and_cpds/edit.html.slim
@@ -6,12 +6,21 @@
     h1.govuk-heading-xl = "Edit training and continuing professional development (CPD)"
 
     = form_for form, url: jobseekers_profile_training_and_cpd_path, method: :put do |f|
+      p.govuk-body = t(".description")
+      p.govuk-body = t(".example_intro")
+      ul.govuk-list.govuk-list--bullet
+        li = t(".example1")
+        li = t(".example2")
+        li = t(".example3")
+        li = t(".example4")
+
       = f.govuk_error_summary
 
       = f.govuk_text_field :name, label: { size: "s" }, aria: { required: true }
       = f.govuk_text_field :provider, label: { size: "s" }, aria: { required: true }
-      = f.govuk_text_field :grade, label: { size: "s" }
+      = f.govuk_text_field :course_length, label: { size: "s" }, aria: { required: true }
       = f.govuk_text_field :year_awarded, label: { size: "s" }, type: "number", width: 4, hint: { text: t(".hint") }
+      = f.govuk_text_field :grade, label: { size: "s" }
       = f.govuk_submit t("buttons.save_and_continue")
 
     .govuk-button-group

diff --git a/app/views/jobseekers/profiles/training_and_cpds/new.html.slim b/app/views/jobseekers/profiles/training_and_cpds/new.html.slim
@@ -6,12 +6,21 @@
     h1.govuk-heading-xl = "Add training and continuing professional development (CPD)"
 
     = form_for form, url: jobseekers_profile_training_and_cpds_path(profile), method: :post do |f|
+      p.govuk-body = t(".description")
+      p.govuk-body = t(".example_intro")
+      ul.govuk-list.govuk-list--bullet
+        li = t(".example1")
+        li = t(".example2")
+        li = t(".example3")
+        li = t(".example4")
+
       = f.govuk_error_summary
 
       = f.govuk_text_field :name, label: { size: "s" }, aria: { required: true }
       = f.govuk_text_field :provider, label: { size: "s" }, aria: { required: true }
-      = f.govuk_text_field :grade, label: { size: "s" }
+      = f.govuk_text_field :course_length, label: { size: "s" }, aria: { required: true }
       = f.govuk_text_field :year_awarded, label: { size: "s" }, type: "number", width: 4, hint: { text: t(".hint") }
+      = f.govuk_text_field :grade, label: { size: "s" }
       = f.govuk_submit t("buttons.save_and_continue")
 
     .govuk-button-group

diff --git a/app/views/jobseekers/training_and_cpds/_training_and_cpds.html.slim b/app/views/jobseekers/training_and_cpds/_training_and_cpds.html.slim
@@ -10,13 +10,18 @@
           - row.with_key text: t("helpers.label.jobseekers_training_and_cpd_form.provider")
           - row.with_value text: training.provider
 
-        - summary_list.with_row do |row|
-          - row.with_key text: t("helpers.label.jobseekers_training_and_cpd_form.grade")
-          - row.with_value text: training.grade
+        - if training.course_length.present?
+          - summary_list.with_row do |row|
+            - row.with_key text: t("helpers.label.jobseekers_training_and_cpd_form.course_length")
+            - row.with_value text: training.course_length
 
         - summary_list.with_row do |row|
           - row.with_key text: t("helpers.label.jobseekers_training_and_cpd_form.year_awarded")
           - row.with_value text: training.year_awarded
 
+        - summary_list.with_row do |row|
+          - row.with_key text: t("helpers.label.jobseekers_training_and_cpd_form.grade")
+          - row.with_value text: training.grade
+
     - detail.with_action govuk_link_to(safe_join([t("buttons.change"), tag.span(training.name, class: "govuk-visually-hidden")]), edit_jobseekers_profile_training_and_cpd_path(training), class: "govuk-link--no-visited-state")
     - detail.with_action govuk_link_to(safe_join([t("buttons.delete"), tag.span(training.name, class: "govuk-visually-hidden")]), jobseekers_profile_training_and_cpd_confirm_destroy_path(training))
diff --git a/config/analytics.yml b/config/analytics.yml
@@ -439,6 +439,7 @@ shared:
     - updated_at
     - jobseeker_profile_id
     - job_application_id
+    - course_length
   :noticed_notifications:
     - id
     - type

diff --git a/config/locales/activerecord.yml b/config/locales/activerecord.yml
@@ -734,6 +734,8 @@ en:
               blank: Enter the name of the provider of the training
             year_awarded:
               blank: Enter the year the course or training was awarded
+            course_length:
+              blank: Enter the length of the course
         jobseekers/account_transfer_form:
           attributes:
             email:

diff --git a/config/locales/forms.yml b/config/locales/forms.yml
@@ -616,8 +616,9 @@ en:
         name: Name of course or training
         provider: Training provider
         grade: Grade (optional)
-        year_awarded: Year awarded
+        year_awarded: Date completed
         year_completed_hint: For example, 1998
+        course_length: Course length
 
 
       personal_details_form:

diff --git a/config/locales/jobseekers.yml b/config/locales/jobseekers.yml
@@ -88,6 +88,13 @@ en:
         success: Thank you for your feedback on your job alert
       update:
         success: Thank you for providing additional feedback on your job alert
+    shared:
+      training_shared: &training_shared
+        example_intro: "For example you could include:"
+        example1: safeguarding training
+        example2: Prevent duty training
+        example3: first aid courses
+        example4: Team Teach
     job_applications:
       apply: Apply for this job
       applying_for_the_job_heading: Applying for the job
@@ -251,13 +258,17 @@ en:
         step_title: Training and continuing professional development (CPD)
         title: Add training and continuing professional development (CPD)
         new:
-          hint: For example, 1998
+          <<: *training_shared
+          hint: For example, 2024.
           caption: Training and continuing professional development (CPD)
           heading: Add training and continuing professional development (CPD)
+          description: Include any training you've completed within the last 3 years relevant to the role you're applying for.
         edit:
-          hint: For example, 1998
+          <<: *training_shared
+          hint: For example, 2024.
           caption: Training and continuing professional development (CPD)
           heading: Edit training and continuing professional development (CPD)
+          description: Include any training you've completed within the last 3 years relevant to the role you're applying for.
         destroy:
           success: Training deleted
         review:
@@ -767,9 +778,13 @@ en:
           about_you_title: About You
       training_and_cpds:
         new:
-          hint: For example, 1998
+          <<: *training_shared
+          hint: For example, 2024.
+          description: Include any training you've completed within the last 3 years.
         edit:
-          hint: For example, 1998
+          <<: *training_shared
+          hint: For example, 2024.
+          description: Include any training you've completed within the last 3 years.
         destroy:
           success: Training deleted
       qualifications:

diff --git a/db/migrate/20250108105814_add_course_length_to_training_and_cpds.rb b/db/migrate/20250108105814_add_course_length_to_training_and_cpds.rb
@@ -0,0 +1,5 @@
+class AddCourseLengthToTrainingAndCpds < ActiveRecord::Migration[7.2]
+  def change
+    add_column :training_and_cpds, :course_length, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -607,6 +607,7 @@
     t.datetime "updated_at", null: false
     t.uuid "jobseeker_profile_id"
     t.uuid "job_application_id"
+    t.string "course_length"
     t.index ["job_application_id"], name: "index_training_and_cpds_on_job_application_id"
     t.index ["jobseeker_profile_id"], name: "index_training_and_cpds_on_jobseeker_profile_id"
   end

diff --git a/spec/factories/training_and_cpds.rb b/spec/factories/training_and_cpds.rb
@@ -4,6 +4,7 @@
     provider { "TeachTrainLtd" }
     grade { "Pass" }
     year_awarded { "2020" }
+    course_length { "1 year" }
 
     jobseeker_profile { nil }
     job_application { nil }

diff --git a/spec/form_models/jobseekers/training_and_cpd_form_spec.rb b/spec/form_models/jobseekers/training_and_cpd_form_spec.rb
@@ -4,4 +4,5 @@
   it { is_expected.to validate_presence_of(:name) }
   it { is_expected.to validate_presence_of(:provider) }
   it { is_expected.to validate_presence_of(:year_awarded) }
+  it { is_expected.to validate_presence_of(:course_length) }
 end
diff --git a/spec/support/jobseeker_helpers.rb b/spec/support/jobseeker_helpers.rb
@@ -44,11 +44,12 @@ def fill_in_employment_history(job_title: "The Best Teacher", start_month: "09",
     fill_in "jobseekers_job_application_details_employment_form[ended_on(2i)]", with: end_month
   end
 
-  def fill_in_training_and_cpds(name: "Fire safety", provider: "TrainingProvider ltd", grade: "Pass", year_awarded: "2020")
+  def fill_in_training_and_cpds(name: "Fire safety", provider: "TrainingProvider ltd", grade: "Pass", year_awarded: "2020", course_length: "1 year")
     fill_in "Name of course or training", with: name
     fill_in "Training provider", with: provider
     fill_in "Grade", with: grade
-    fill_in "Year awarded", with: year_awarded
+    fill_in "Date completed", with: year_awarded
+    fill_in "Course length", with: course_length
   end
 
   def fill_in_break_in_employment(start_year: "2020", start_month: "08", end_year: "2020", end_month: "12")