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

Author: sherif-olaboye

DigitalLearningSolutions.Data/DataServices/SupervisorDataService.cs

@@ -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.MinimumOptionalCompetencies,ca.DelegateUserID
+              sa.SignOffSupervisorStatement,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,6 +28,5 @@ 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

@@ -1188,7 +1188,7 @@ public IActionResult SignOffProfileAssessment(
             SignOffProfileAssessmentViewModel model
         )
         {
-            if (!ModelState.IsValid)
+            if ((!ModelState.IsValid) && (model.NumberOfSelfAssessedOptionalCompetencies > 0) && (!model.OptionalCompetenciesChecked))
             {
                 SelfAssessmentResultSummary? selfAssessmentSummary =
                     supervisorService.GetSelfAssessmentResultSummary(candidateAssessmentId, supervisorDelegateId);

DigitalLearningSolutions.Web/Views/Supervisor/SignOffProfileAssessment.cshtml

@@ -173,6 +173,7 @@
           </h2>
         </legend>
         <input type="hidden" asp-for="CandidateAssessmentSupervisorVerificationId" />
+                <input type="hidden" asp-for="NumberOfSelfAssessedOptionalCompetencies" />
         <nhs-form-group nhs-validation-for="SupervisorComments">
           <vc:text-area asp-for="SupervisorComments" character-count="null" label="@(Model.SelfAssessmentResultSummary.ReviewerCommentsLabel == null ? "Reviewer comments": Model.SelfAssessmentResultSummary.ReviewerCommentsLabel.ToString())" rows="5" css-class="" hint-text="" populate-with-current-value="true" spell-check="false"></vc:text-area>
         </nhs-form-group>
@@ -204,7 +205,7 @@
             <span asp-validation-for="SignedOff" class="text-danger"></span>
           </div>
         </nhs-form-group>
-                @if (Model.NumberOfSelfAssessedOptionalCompetencies >= Model.SelfAssessmentResultSummary.MinimumOptionalCompetencies)
+                @if (Model.NumberOfSelfAssessedOptionalCompetencies > 0)
                 {
                     <nhs-form-group nhs-validation-for="OptionalCompetenciesChecked">
                         <div class="nhsuk-checkboxes__item">