Merge pull request #3340 from TechnologyEnhancedLearning/Develop/feature/TD-5616-Enrolling-on-retiring-self-assessment

rshrirohit · web-flow · commit 4008ae6eb2ea · 2025-08-12T11:36:56.000+01:00
TD-5616-Supervisor enrolling learners onto a retiring self assessment
diff --git a/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentDataService.cs b/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentDataService.cs
@@ -16,6 +16,7 @@ public interface ISelfAssessmentDataService
     {
         //Self Assessments
         string? GetSelfAssessmentNameById(int selfAssessmentId);
+        SelfAssessment? GetSelfAssessmentById(int selfAssessmentId);
         SelfAssessment GetSelfAssessmentRetirementDateById(int selfAssessmentId);
 
         // CompetencyDataService
@@ -205,6 +206,55 @@ FROM SelfAssessments
             return name;
         }
 
+        public SelfAssessment? GetSelfAssessmentById(int selfAssessmentId)
+        {
+            return connection.Query<SelfAssessment?>(
+                @"SELECT [ID]
+                      ,[Name]
+                      ,[Description]
+                      ,[IncludesSignposting]
+                      ,[BrandID]
+                      ,[CreatedDate]
+                      ,[CreatedByCentreID]
+                      ,[CreatedByAdminID]
+                      ,[ArchivedDate]
+                      ,[ArchivedByAdminID]
+                      ,[IncludeDevelopment]
+                      ,[ParentSelfAssessmentID]
+                      ,[NRPProfessionalGroupID]
+                      ,[NRPSubGroupID]
+                      ,[NRPRoleID]
+                      ,[PublishStatusID]
+                      ,[UpdatedByAdminID]
+                      ,[National]
+                      ,[Public]
+                      ,[Archived]
+                      ,[LastEdit]
+                      ,[SupervisorSelfAssessmentReview]
+                      ,[SupervisorResultsReview]
+                      ,[RAGResults]
+                      ,[LinearNavigation]
+                      ,[CategoryID]
+                      ,[UseDescriptionExpanders]
+                      ,[ManageOptionalCompetenciesPrompt]
+                      ,[Vocabulary]
+                      ,[SignOffRequestorStatement]
+                      ,[SignOffSupervisorStatement]
+                      ,[QuestionLabel]
+                      ,[DescriptionLabel]
+                      ,[EnforceRoleRequirementsForSignOff]
+                      ,[ReviewerCommentsLabel]
+                      ,[ManageSupervisorsDescription]
+                      ,[IncludeRequirementsFilters]
+                      ,[MinimumOptionalCompetencies]
+                      ,[RetirementDate]
+                      ,[EnrolmentCutoffDate]
+                      ,[RetirementReason]
+                FROM SelfAssessments
+                WHERE ID = @selfAssessmentId",
+                new { selfAssessmentId }
+            ).SingleOrDefault();
+        }
         public SelfAssessment GetSelfAssessmentRetirementDateById(int selfAssessmentId)
         {
             var date = connection.QueryFirstOrDefault<SelfAssessment>(
diff --git a/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs b/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs
@@ -784,6 +784,18 @@ public IActionResult EnrolSetRoleProfile(int supervisorDelegateId, int selfAsses
                 };
                 return View("EnrolDelegateOnProfileAssessment", model);
             }
+            var retirementDate = selfAssessmentService.GetSelfAssessmentById(selfAssessmentID).RetirementDate;
+            if (retirementDate?.Date is DateTime date && date >= DateTime.Today &&
+                date <= DateTime.Today.AddDays(14))
+            {
+                var model = new RetiringSelfAssessmentViewModel()
+                {
+                    SelfAssessmentID = selfAssessmentID,
+                    SupervisorDelegateID = supervisorDelegateId,
+                    RetirementDate = retirementDate
+                };
+                return View("ConfirmRetiringSelfAssessment", model);
+            }
 
             sessionEnrolOnRoleProfile.SelfAssessmentID = selfAssessmentID;
             multiPageFormService.SetMultiPageFormData(
@@ -798,6 +810,34 @@ public IActionResult EnrolSetRoleProfile(int supervisorDelegateId, int selfAsses
             );
         }
 
+        [HttpPost]
+        public IActionResult RetiringSelfAssessmentConfirmed(RetiringSelfAssessmentViewModel retiringSelfAssessment)
+        {
+            if (ModelState.IsValid && retiringSelfAssessment.ActionConfirmed)
+            {
+                var sessionEnrolOnRoleProfile = multiPageFormService.GetMultiPageFormData<SessionEnrolOnRoleProfile>(
+                    MultiPageFormDataFeature.EnrolDelegateOnProfileAssessment,
+                    TempData
+                    ).GetAwaiter().GetResult();
+
+                sessionEnrolOnRoleProfile.SelfAssessmentID = retiringSelfAssessment.SelfAssessmentID;
+                multiPageFormService.SetMultiPageFormData(
+                    sessionEnrolOnRoleProfile,
+                    MultiPageFormDataFeature.EnrolDelegateOnProfileAssessment,
+                    TempData
+                );
+                return RedirectToAction(
+                    "EnrolDelegateCompleteBy",
+                    "Supervisor",
+                    new { supervisorDelegateId = retiringSelfAssessment.SupervisorDelegateID }
+                );
+            }
+            else
+            {
+                return View("ConfirmRetiringSelfAssessment", retiringSelfAssessment);
+            }
+        }
+
         [Route("/Supervisor/Staff/{supervisorDelegateId}/ProfileAssessment/Enrol/CompleteBy")]
         [ResponseCache(CacheProfileName = "Never")]
         [TypeFilter(
diff --git a/DigitalLearningSolutions.Web/Services/SelfAssessmentService.cs b/DigitalLearningSolutions.Web/Services/SelfAssessmentService.cs
@@ -14,6 +14,7 @@ public interface ISelfAssessmentService
     {
         //Self Assessments
         string? GetSelfAssessmentNameById(int selfAssessmentId);
+        SelfAssessment? GetSelfAssessmentById(int selfAssessmentId);
         // Candidate Assessments
         IEnumerable<CurrentSelfAssessment> GetSelfAssessmentsForCandidate(int delegateUserId, int centreId, int? adminIdCategoryID);
         IEnumerable<CurrentSelfAssessment> GetSelfAssessmentsForCandidate(int delegateUserId, int centreId);
@@ -467,6 +468,11 @@ public void RemoveEnrolment(int selfAssessmentId, int delegateUserId)
             return selfAssessmentDataService.GetSelfAssessmentNameById(selfAssessmentId);
         }
 
+        public SelfAssessment? GetSelfAssessmentById(int selfAssessmentId)
+        {
+            return selfAssessmentDataService.GetSelfAssessmentById(selfAssessmentId);
+        }
+
         public (SelfAssessmentDelegatesData, int?) GetSelfAssessmentDelegatesPerPage(string searchString, int offSet, int itemsPerPage, string sortBy, string sortDirection,
             int? selfAssessmentId, int centreId, bool? isDelegateActive, bool? removed, bool? submitted, bool? signedOff, int? adminCategoryId)
         {
diff --git a/DigitalLearningSolutions.Web/ViewModels/Supervisor/RetiringSelfAssessmentViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/Supervisor/RetiringSelfAssessmentViewModel.cs
@@ -0,0 +1,14 @@
+﻿namespace DigitalLearningSolutions.Web.ViewModels.Supervisor
+{
+    using DigitalLearningSolutions.Web.Attributes;
+    using System;
+
+    public class RetiringSelfAssessmentViewModel
+    {
+        public int SelfAssessmentID { get; set; }
+        public int SupervisorDelegateID { get; set; }
+        public DateTime? RetirementDate { get; set; }
+        [BooleanMustBeTrue(ErrorMessage = "Please tick the checkbox to confirm you wish to perform this action")]
+        public bool ActionConfirmed { get; set; }
+    }
+}
diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/ConfirmRetiringSelfAssessment.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/ConfirmRetiringSelfAssessment.cshtml
@@ -0,0 +1,56 @@
+﻿@using DigitalLearningSolutions.Web.Extensions
+@using DigitalLearningSolutions.Web.ViewModels.Supervisor
+@using Microsoft.Extensions.Configuration
+@model RetiringSelfAssessmentViewModel;
+@inject IConfiguration Configuration;
+@{
+    var errorHasOccurred = !ViewData.ModelState.IsValid;
+    ViewData["Title"] = (errorHasOccurred ? "Error: " : "") + "Enrol on Profile Assessment";
+    ViewData["Application"] = "Supervisor";
+    ViewData["HeaderPathName"] = "Supervisor";
+}
+
+@section NavMenuItems {
+    <partial name="Shared/_NavMenuItems" />
+}
+
+<div class="nhsuk-grid-row">
+    <div class="nhsuk-grid-column-full word-break">
+        @if (errorHasOccurred)
+        {
+            <vc:error-summary order-of-property-names="@(new[] { nameof(Model.ActionConfirmed) })" />
+        }
+        <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>
+        </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">
+            <div class="nhsuk-checkboxes__item">
+                <vc:single-checkbox asp-for="@nameof(Model.ActionConfirmed)"
+                                    label=" I understand this self-assessment is being retired and I still want to enrol learners."
+                                    hint-text="" />
+            </div>
+            <button type="submit" class="nhsuk-button nhsuk-button nhsuk-u-margin-top-4" asp-action="RetiringSelfAssessmentConfirmed">
+                Continue
+            </button>
+            @Html.HiddenFor(m => m.SelfAssessmentID)
+            @Html.HiddenFor(m => m.SupervisorDelegateID)
+            @Html.HiddenFor(m => m.RetirementDate)
+        </form>
+        <div class="nhsuk-back-link">
+            <a class="nhsuk-back-link__link" asp-controller="Supervisor"
+               asp-action="DelegateProfileAssessments" asp-route-supervisorDelegateId="@Model.SupervisorDelegateID">
+                <svg class="nhsuk-icon nhsuk-icon__chevron-left" focusable='false' xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
+                    <path d="M13.41 12l5.3-5.29a1 1 0 1 0-1.42-1.42L12 10.59l-5.29-5.3a1 1 0 0 0-1.42 1.42l5.3 5.29-5.3 5.29a1 1 0 0 0 0 1.42 1 1 0 0 0 1.42 0l5.29-5.3 5.29 5.3a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42z"></path>
+                </svg>
+                Cancel
+            </a>
+        </div>
+    </div>
+</div>

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ public interface ISelfAssessmentService`
`14`	`14`	`{`
`15`	`15`	`//Self Assessments`
`16`	`16`	`string? GetSelfAssessmentNameById(int selfAssessmentId);`
	`17`	`+ SelfAssessment? GetSelfAssessmentById(int selfAssessmentId);`
`17`	`18`	`// Candidate Assessments`
`18`	`19`	`IEnumerable<CurrentSelfAssessment> GetSelfAssessmentsForCandidate(int delegateUserId, int centreId, int? adminIdCategoryID);`
`19`	`20`	`IEnumerable<CurrentSelfAssessment> GetSelfAssessmentsForCandidate(int delegateUserId, int centreId);`
`@@ -467,6 +468,11 @@ public void RemoveEnrolment(int selfAssessmentId, int delegateUserId)`
`467`	`468`	`return selfAssessmentDataService.GetSelfAssessmentNameById(selfAssessmentId);`
`468`	`469`	`}`
`469`	`470`
	`471`	`+ public SelfAssessment? GetSelfAssessmentById(int selfAssessmentId)`
	`472`	`+ {`
	`473`	`+ return selfAssessmentDataService.GetSelfAssessmentById(selfAssessmentId);`
	`474`	`+ }`
	`475`	`+`
`470`	`476`	`public (SelfAssessmentDelegatesData, int?) GetSelfAssessmentDelegatesPerPage(string searchString, int offSet, int itemsPerPage, string sortBy, string sortDirection,`
`471`	`477`	`int? selfAssessmentId, int centreId, bool? isDelegateActive, bool? removed, bool? submitted, bool? signedOff, int? adminCategoryId)`
`472`	`478`	`{`