Merge pull request #2770 from TechnologyEnhancedLearning/Develop/Features/TD-4428-Additionaloptionalcompetenciescheckboxonthelearnersignoffrequestscreen

TD-4428 Additional optional competencies checkbox on the learner signoff request screen

Author: rshrirohit

DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs

@@ -1475,10 +1475,12 @@ public IActionResult RequestSignOff(int selfAssessmentId)
             var assessment = selfAssessmentService.GetSelfAssessmentForCandidateById(delegateUserId, selfAssessmentId);
             var supervisors =
                 selfAssessmentService.GetSignOffSupervisorsForSelfAssessmentId(selfAssessmentId, delegateUserId);
+            var optionalCompetencies = selfAssessmentService.GetCandidateAssessmentOptionalCompetencies(selfAssessmentId, delegateUserId);
             var model = new RequestSignOffViewModel
             {
                 SelfAssessment = assessment,
                 Supervisors = supervisors,
+                NumberOfSelfAssessedOptionalCompetencies = optionalCompetencies.Count(x => x.IncludedInSelfAssessment)
             };
             return View("SelfAssessments/RequestSignOff", model);
         }
@@ -1493,10 +1495,12 @@ public IActionResult RequestSignOff(int selfAssessmentId, string vocabulary, Req
                 var assessment = selfAssessmentService.GetSelfAssessmentForCandidateById(delegateUserId, selfAssessmentId);
                 var supervisors =
                     selfAssessmentService.GetSignOffSupervisorsForSelfAssessmentId(selfAssessmentId, delegateUserId);
+                var optionalCompetencies = selfAssessmentService.GetCandidateAssessmentOptionalCompetencies(selfAssessmentId, delegateUserId);
                 var newModel = new RequestSignOffViewModel
                 {
                     SelfAssessment = assessment,
                     Supervisors = supervisors,
+                    NumberOfSelfAssessedOptionalCompetencies = optionalCompetencies.Count(x => x.IncludedInSelfAssessment)
                 };
                 return View("SelfAssessments/RequestSignOff", newModel);
             }

DigitalLearningSolutions.Web/ViewModels/LearningPortal/SelfAssessments/RequestSignOffViewModel.cs

@@ -14,6 +14,11 @@ public class RequestSignOffViewModel
         [Required]
         [Range(1, 1, ErrorMessage = "Please tick to confirm that you understand the request sign-off statement")]
         public bool StatementChecked { get; set; }
+        [Required]
+        [Range(1, 1, ErrorMessage = "Please tick to confirm that you have include optional competencies that are appropriate to your role before requesting sign-off")]
+        public bool OptionalCompetenciesChecked { get; set; }
+        public int NumberOfSelfAssessedOptionalCompetencies { get; set; }
+
         public string VocabPlural()
         {
             if (SelfAssessment != null)

DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/RequestSignOff.cshtml

@@ -60,6 +60,17 @@
                     </label>
                 </div>
             </nhs-form-group>
+            @if (Model.NumberOfSelfAssessedOptionalCompetencies >= Model.SelfAssessment.MinimumOptionalCompetencies)
+            {
+                <nhs-form-group nhs-validation-for="OptionalCompetenciesChecked">
+                    <div class="nhsuk-checkboxes__item">
+                        <input class="nhsuk-checkboxes__input" id="optional-ompetencies" name="OptionalCompetenciesChecked" asp-for="OptionalCompetenciesChecked" type="checkbox">
+                        <label class="nhsuk-label nhsuk-checkboxes__label" for="optional-competencies">
+                        I have reviewed the optional competencies available for this self assessment and included those that are appropriate to my role.
+                    </label>
+                </div>
+            </nhs-form-group>
+            }
         </fieldset>
 
         <button class="nhsuk-button" type="submit">