Skip to content

TD-6871 Changing Retirement Text And Adding Warning Callout #3493

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.

Sign up for GitHub

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

Merged
rshrirohit merged 1 commit into from
Feb 19, 2026
Merged

TD-6871 Changing Retirement Text And Adding Warning Callout #3493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion ...gSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ CandidateAssessments AS CA LEFT OUTER JOIN
SA.SupervisorSelfAssessmentReview,
SA.ReviewerCommentsLabel,
SA.EnforceRoleRequirementsForSignOff,
SA.RetirementDate,
COALESCE(SA.Vocabulary, 'Capability') AS Vocabulary,
COUNT(C.ID) AS NumberOfCompetencies,
CA.StartedDate,
Expand Down Expand Up @@ -256,7 +257,8 @@ GROUP BY
CA.LaunchCount, CA.SubmittedDate, SA.LinearNavigation, SA.UseDescriptionExpanders,
SA.ManageOptionalCompetenciesPrompt, SA.SupervisorSelfAssessmentReview, SA.SupervisorResultsReview,
SA.ReviewerCommentsLabel,SA.EnforceRoleRequirementsForSignOff, SA.ManageSupervisorsDescription,CA.NonReportable,
U.FirstName , U.LastName,SA.MinimumOptionalCompetencies, CA.SelfAssessmentProcessAgreed, SA.IncludeLearnerDeclarationPrompt",
U.FirstName , U.LastName,SA.MinimumOptionalCompetencies, CA.SelfAssessmentProcessAgreed, SA.IncludeLearnerDeclarationPrompt,
SA.RetirementDate",
new { delegateUserId, selfAssessmentId }
);
}
Expand Down
20 changes: 19 additions & 1 deletion ...lLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentOverview.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,32 @@
{
<p class="nhsuk-breadcrumb__back">
<a class="nhsuk-breadcrumb__backlink" asp-action="SelfAssessment"
asp-route-selfAssessmentId="@Model.SelfAssessment.Id">
asp-route-selfAssessmentId="@Model.SelfAssessment.Id">
Back to @Model.SelfAssessment.Name
</a>
</p>
}
<h1>@Model.SelfAssessment.Name - @Model.VocabPlural()</h1>
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
@if (@Model.SelfAssessment.RetirementDate!=null)
{
<div class="nhsuk-warning-callout">
<h2 class="nhsuk-warning-callout__label">
<span role="text">
<span class="nhsuk-u-visually-hidden">Important: </span>
New version available
</span>
</h2>
<div>
<p>A new version of this assessment is now available. As you’re already begun, you can choose what works best for you.</p>
<ul>
<li>Continue with this version: Keep going with your current journey. Your progress will stay saved as usual.</li>
<li>Start the new version: Move to the updated version if you prefer. If you switch to the newer version, you will start from the beginning (0% progress), but your progress in the current version will still be kept on your record.</li>
</ul>
</div>
</div>
}
@if (Model.SelfAssessment.NonReportable)
{
<partial name="_NonReportableSelfAssessment" />
Expand Down
5 changes: 2 additions & 3 deletions DigitalLearningSolutions.Web/Views/Supervisor/ConfirmRetiringSelfAssessment.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,10 @@
<h1 class="nhsuk-u-padding-bottom-3" id="page-heading">Confirm Enrolment</h1>
<p class="nhsuk-body-m">You are about to enrol learners on a retiring self-assessment.</p>
<p class="nhsuk-body-m nhsuk-u-font-weight-bold">Retirement date: @Model.RetirementDate?.ToString("dd/MM/yyyy")</p>
<p class="nhsuk-body-m">After this date, this self-assessment will no longer be available for use.</p>
<p class="nhsuk-body-m">Please note:</p>
<ul>
<li>Learners may not have enough time to complete the self-assessment before it is retired</li>
<li>You may wish to consider enrolling them on an updated version, if available</li>
<li>once enrolled, learners can continue to complete the self-assessment even after the retirement date</li>
<li>you may wish to consider enrolling them on an updated version, if available</li>
</ul>
<p class="nhsuk-body-m">To continue, you must acknowledge that you understand the self-assessment is being retired and you still wish to proceed.</p>
<form method="post" asp-controller="Supervisor">
Expand Down
5 changes: 2 additions & 3 deletions DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/Enrol/ConfirmRetiring.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,10 @@
<h1 class="nhsuk-u-padding-bottom-3" id="page-heading">Confirm Enrolment</h1>
<p class="nhsuk-body-m">You are about to enrol learners on a retiring self-assessment.</p>
<p class="nhsuk-body-m nhsuk-u-font-weight-bold">Retirement date: @Model.RetirementDate?.ToString("dd/MM/yyyy")</p>
<p class="nhsuk-body-m">After this date, this self-assessment will no longer be available for use.</p>
<p class="nhsuk-body-m">Please note:</p>
<ul>
<li>Learners may not have enough time to complete the self-assessment before it is retired</li>
<li>You may wish to consider enrolling them on an updated version, if available</li>
<li>once enrolled, learners can continue to complete the self-assessment even after the retirement date</li>
<li>you may wish to consider enrolling them on an updated version, if available</li>
</ul>
<p class="nhsuk-body-m">To continue, you must acknowledge that you understand the self-assessment is being retired and you still wish to proceed.</p>
<form method="post" asp-controller="Enrol">
Expand Down
Loading