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.

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

Add course length to training and CPD section of profile and job applciation #7381

Merged
merged 15 commits into from
Jan 13, 2025
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Change "Year awarded" to "Date completed"
  • Loading branch information
KyleMacPherson committed Jan 13, 2025
commit 30fd40d8717d5797d98970988185529d9fde4638
2 changes: 1 addition & 1 deletion app/helpers/pdf_helper.rb
Original file line number Diff line number Diff line change
@@ -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)
Original file line number Diff line number Diff line change
@@ -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")
2 changes: 1 addition & 1 deletion config/locales/forms.yml
Original file line number Diff line number Diff line change
@@ -616,7 +616,7 @@ 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

2 changes: 1 addition & 1 deletion spec/support/jobseeker_helpers.rb
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@ def fill_in_training_and_cpds(name: "Fire safety", provider: "TrainingProvider l
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

Original file line number Diff line number Diff line change
@@ -71,7 +71,7 @@ def fill_in_and_submit_training_form(name, provider, grade, year, course_length)
fill_in "Name", with: name
fill_in "Training provider", with: provider
fill_in "Grade", with: grade
fill_in "Year awarded", with: year
fill_in "Date completed", with: year
fill_in "Course length", with: course_length
click_on "Save and continue"
end
@@ -86,7 +86,7 @@ def expect_page_to_have_values(name, provider, grade, year, course_length)
expect(page).to have_css(".govuk-summary-list__key", text: "Grade (optional)")
expect(page).to have_css(".govuk-summary-list__value", text: grade)

expect(page).to have_css(".govuk-summary-list__key", text: "Year awarded")
expect(page).to have_css(".govuk-summary-list__key", text: "Date completed")
expect(page).to have_css(".govuk-summary-list__value", text: year)

expect(page).to have_css(".govuk-summary-list__key", text: "Course length")
Original file line number Diff line number Diff line change
@@ -98,7 +98,7 @@ def fill_in_and_submit_training_form(name, provider, grade, year, course_length)
fill_in "Name", with: name
fill_in "Training provider", with: provider
fill_in "Grade", with: grade
fill_in "Year awarded", with: year
fill_in "Date completed", with: year
fill_in "Course length", with: course_length
click_on "Save and continue"
end
@@ -113,7 +113,7 @@ def expect_page_to_have_values(name, provider, grade, year, course_length)
expect(page).to have_css(".govuk-summary-list__key", text: "Grade (optional)")
expect(page).to have_css(".govuk-summary-list__value", text: grade)

expect(page).to have_css(".govuk-summary-list__key", text: "Year awarded")
expect(page).to have_css(".govuk-summary-list__key", text: "Date completed")
expect(page).to have_css(".govuk-summary-list__value", text: year)

expect(page).to have_css(".govuk-summary-list__key", text: "Course length")