Skip to content

Commit

Permalink
CDPS-223: Fix prisoner name on work and skills page (#193)
Browse files Browse the repository at this point in the history
  • Loading branch information
davidatmoj authored Jun 16, 2023
1 parent 33fefe3 commit 252fda2
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions server/services/workAndSkillsPageService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export default class WorkAndSkillsPageService {

public async get(prisonerData: Prisoner) {
const { prisonerNumber, firstName, lastName } = prisonerData
const prisonerName = `${properCaseName(firstName)} ${properCaseName(lastName)}`
const workAndSkillsPrisonerName = `${properCaseName(firstName)} ${properCaseName(lastName)}`

const [
learnerEmployabilitySkills,
Expand Down Expand Up @@ -56,7 +56,7 @@ export default class WorkAndSkillsPageService {
learnerLatestAssessments,
learnerGoals,
learnerNeurodivergence,
prisonerName,
workAndSkillsPrisonerName,
offenderActivitiesHistory,
unacceptableAbsences,
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
{% endif %}

{% if(learnerEducation.length == 0) %}
<p>{{ prisonerName }} is not currently doing any courses.</p>
<p>{{ workAndSkillsPrisonerName }} is not currently doing any courses.</p>
{% endif %}
<p class="govuk-body">
<a class="govuk-link--no-visited-state" href="{{ fullCourseHistoryLinkUrl }}">View full course history</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<div class="govuk-grid-row">
<div class="govuk-grid-column-full">
<p class="govuk-body">
{{ prisonerName }} has no employability skills.
{{ workAndSkillsPrisonerName }} has no employability skills.
</p>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions server/views/partials/workAndSkillsPage/workAndActivities.njk
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
})
}}
{% else %}
<p>{{ prisonerName }} has no work or activities.</p>
<p>{{ workAndSkillsPrisonerName }} has no work or activities.</p>
{% endif %}

{% if not prisonerData.restrictedPatient %}
Expand All @@ -39,6 +39,6 @@
</div>
<hr class="govuk-section-break govuk-section-break--visible govuk-!-margin-bottom-3" />
{% if(unacceptableAbsences.unacceptableAbsenceLastSixMonths === 0) %}
<p>{{ prisonerName }} has no unacceptable absences in the last 6 months.</p>
<p>{{ workAndSkillsPrisonerName }} has no unacceptable absences in the last 6 months.</p>
{% endif %}
{%- endcall -%}

0 comments on commit 252fda2

Please sign in to comment.