TD-4429 Additional optional competencies checkbox on the supervisor sign off screen

Author: sherif-olaboye

DigitalLearningSolutions.Data/DataServices/SupervisorDataService.cs

@@ -238,7 +238,7 @@ LEFT JOIN UserCentreDetails ucd
                             AND da.CentreID = @centreId", new { delegateEmail, centreId });
             }
 
-            int existingId = (int)connection.ExecuteScalar(
+            int existingId = Convert.ToInt32(connection.ExecuteScalar(
                 @"
                     SELECT COALESCE
                     ((SELECT Top 1 ID
@@ -253,7 +253,7 @@ FROM  SupervisorDelegates sd
                     supervisorAdminId = supervisorAdminId ?? 0,
                     delegateUserId = delegateUserId ?? 0
                 }
-            );
+            ));
 
             if (existingId > 0)
             {
@@ -285,7 +285,7 @@ FROM  SupervisorDelegates sd
                     return -1;
                 }
 
-                existingId = (int)connection.ExecuteScalar(
+                existingId = Convert.ToInt32(connection.ExecuteScalar(
                     @"
                     SELECT COALESCE
                     ((SELECT ID
@@ -302,7 +302,7 @@ FROM    SupervisorDelegates sd
                         supervisorAdminId = supervisorAdminId ?? 0,
                         delegateUserId = delegateUserId ?? 0
                     }
-                ); return existingId;
+                )); return existingId;
             }
         }
 
@@ -794,23 +794,23 @@ FROM    CandidateAssessments
         }
         public int InsertCandidateAssessmentSupervisor(int delegateUserId, int supervisorDelegateId, int selfAssessmentId, int? selfAssessmentSupervisorRoleId)
         {
-            int candidateAssessmentId = (int)connection.ExecuteScalar(
+            int candidateAssessmentId = Convert.ToInt32(connection.ExecuteScalar(
                 @"SELECT COALESCE
                  ((SELECT ID
                   FROM    CandidateAssessments
                    WHERE (SelfAssessmentID = @selfAssessmentId) AND (DelegateUserID = @delegateUserId) AND (RemovedDate IS NULL) AND (CompletedDate IS NULL)), 0) AS CandidateAssessmentID",
-              new { selfAssessmentId, delegateUserId });
+              new { selfAssessmentId, delegateUserId }));
             if (candidateAssessmentId > 0)
             {
-                var candidateAssessmentSupervisorsId = (int)connection.ExecuteScalar(
+                var candidateAssessmentSupervisorsId = Convert.ToInt32(connection.ExecuteScalar(
                     @"
                     SELECT COALESCE
                     ((SELECT ID
                         FROM CandidateAssessmentSupervisors
                         WHERE (CandidateAssessmentID = @candidateAssessmentId)
                             AND (SupervisorDelegateId = @supervisorDelegateId)                        
 							AND ((SelfAssessmentSupervisorRoleID IS NULL) OR (SelfAssessmentSupervisorRoleID = @selfAssessmentSupervisorRoleId))), 0) AS CandidateAssessmentSupervisorID", new
-                    { candidateAssessmentId, supervisorDelegateId, selfAssessmentSupervisorRoleId });
+                    { candidateAssessmentId, supervisorDelegateId, selfAssessmentSupervisorRoleId }));
 
                 if (candidateAssessmentSupervisorsId == 0)
                 {
@@ -1067,7 +1067,7 @@ SelfAssessmentStructure AS sas1 INNER JOIN
              (ca1.ID = ca.ID) AND (caoc1.IncludedInSelfAssessment = 1) AND (NOT (sar1.Result IS NULL)) AND (sasrv.SignedOff = 1) AND (caqrr1.LevelRAG = 3) OR
              (ca1.ID = ca.ID) AND (sas1.Optional = 0) AND (NOT (sar1.SupportingComments IS NULL)) AND (sasrv.SignedOff = 1) AND (caqrr1.LevelRAG = 3) OR
              (ca1.ID = ca.ID) AND (caoc1.IncludedInSelfAssessment = 1) AND (NOT (sar1.SupportingComments IS NULL)) AND (sasrv.SignedOff = 1) AND (caqrr1.LevelRAG = 3)) AS MeetingCount,
-              sa.SignOffSupervisorStatement
+              sa.SignOffSupervisorStatement,sa.MinimumOptionalCompetencies,ca.DelegateUserID
 FROM   NRPProfessionalGroups AS npg RIGHT OUTER JOIN
              NRPSubGroups AS nsg RIGHT OUTER JOIN
              SelfAssessmentSupervisorRoles AS sasr RIGHT OUTER JOIN

DigitalLearningSolutions.Data/Models/Supervisor/DelegateSelfAssessment.cs

@@ -28,5 +28,6 @@ public class DelegateSelfAssessment
         public bool IsSupervisorResultsReviewed { get; set; }
         public bool IsAssignedToSupervisor { get; set; }
         public bool NonReportable { get; set; }
+        public int MinimumOptionalCompetencies { get; set; }
     }
 }

DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs

@@ -1167,13 +1167,15 @@ public IActionResult SignOffProfileAssessment(int supervisorDelegateId, int cand
                 supervisorService.GetSupervisorDelegateDetailsById(supervisorDelegateId, GetAdminId(), 0);
             IEnumerable<CandidateAssessmentSupervisorVerificationSummary>? verificationsSummary =
                 supervisorService.GetCandidateAssessmentSupervisorVerificationSummaries(candidateAssessmentId);
+            var optionalCompetencies = selfAssessmentService.GetCandidateAssessmentOptionalCompetencies(selfAssessmentSummary.SelfAssessmentID, selfAssessmentSummary.DelegateUserID);
             SignOffProfileAssessmentViewModel? model = new SignOffProfileAssessmentViewModel()
             {
                 SelfAssessmentResultSummary = selfAssessmentSummary,
                 SupervisorDelegate = supervisorDelegate,
                 CandidateAssessmentSupervisorVerificationId =
                     selfAssessmentSummary?.CandidateAssessmentSupervisorVerificationId,
-                CandidateAssessmentSupervisorVerificationSummaries = verificationsSummary
+                CandidateAssessmentSupervisorVerificationSummaries = verificationsSummary,
+                NumberOfSelfAssessedOptionalCompetencies = optionalCompetencies.Count(x => x.IncludedInSelfAssessment)
             };
             return View("SignOffProfileAssessment", model);
         }
@@ -1194,13 +1196,15 @@ SignOffProfileAssessmentViewModel model
                     supervisorService.GetSupervisorDelegateDetailsById(supervisorDelegateId, GetAdminId(), 0);
                 IEnumerable<CandidateAssessmentSupervisorVerificationSummary>? verificationsSummary =
                     supervisorService.GetCandidateAssessmentSupervisorVerificationSummaries(candidateAssessmentId);
+                var optionalCompetencies = selfAssessmentService.GetCandidateAssessmentOptionalCompetencies(selfAssessmentSummary.SelfAssessmentID, selfAssessmentSummary.DelegateUserID);
                 SignOffProfileAssessmentViewModel? newModel = new SignOffProfileAssessmentViewModel()
                 {
                     SelfAssessmentResultSummary = selfAssessmentSummary,
                     SupervisorDelegate = supervisorDelegate,
                     CandidateAssessmentSupervisorVerificationId =
                         selfAssessmentSummary.CandidateAssessmentSupervisorVerificationId,
-                    CandidateAssessmentSupervisorVerificationSummaries = verificationsSummary
+                    CandidateAssessmentSupervisorVerificationSummaries = verificationsSummary,
+                    NumberOfSelfAssessedOptionalCompetencies = optionalCompetencies.Count(x => x.IncludedInSelfAssessment)
                 };
                 return View("SignOffProfileAssessment", newModel);
             }

DigitalLearningSolutions.Web/ViewModels/Supervisor/SignOffProfileAssessmentViewModel.cs

@@ -17,5 +17,9 @@ public class SignOffProfileAssessmentViewModel
         [RequiredWhen("SignedOff", false, AllowEmptyStrings = false, ErrorMessage = "Comments are required when rejecting a self assessment (when Sign-off is unchecked).")]
         public string? SupervisorComments { get; set; }
         public bool SignedOff { get; set; }
+        [Required]
+        [Range(1, 1, ErrorMessage = "Please tick to confirm that you have  reviewed the optional competencies included in this self assessment and they are appropriate to the learner’s role.")]
+        public bool OptionalCompetenciesChecked { get; set; }
+        public int NumberOfSelfAssessedOptionalCompetencies { get; set; }
     }
 }

DigitalLearningSolutions.Web/Views/Supervisor/SignOffProfileAssessment.cshtml

@@ -55,7 +55,10 @@
     </p>
   </nav>
 }
-
+@if (errorHasOccurred)
+{
+    <vc:error-summary order-of-property-names="@(new[] {nameof(Model.OptionalCompetenciesChecked) })" />
+}
   <details class="nhsuk-details nhsuk-expander">
     <summary class="nhsuk-details__summary">
       <h1 class="nhsuk-details__summary-text nhsuk-u-margin-bottom-0">
@@ -201,7 +204,18 @@
             <span asp-validation-for="SignedOff" class="text-danger"></span>
           </div>
         </nhs-form-group>
-      </fieldset>
+                @if (Model.NumberOfSelfAssessedOptionalCompetencies >= Model.SelfAssessmentResultSummary.MinimumOptionalCompetencies)
+                {
+                    <nhs-form-group nhs-validation-for="OptionalCompetenciesChecked">
+                        <div class="nhsuk-checkboxes__item">
+                            <input class="nhsuk-checkboxes__input" id="optional-competencies" name="OptionalCompetenciesChecked" asp-for="OptionalCompetenciesChecked" type="checkbox">
+                            <label class="nhsuk-label nhsuk-checkboxes__label" for="optional-competencies">
+                                I have reviewed the optional competencies included in this self assessment and confirm them to be appropriate to the learner’s role.
+                            </label>
+                        </div>
+                    </nhs-form-group>
+                }
+            </fieldset>
       <button class="nhsuk-button nhsuk-u-margin-bottom-0" type="submit">
         Submit
       </button>