Merge branch 'DLS-Release-v1.1.1' into UAT

Author: rshrirohit

DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs

@@ -1215,7 +1215,7 @@ public IActionResult SignOffProfileAssessment(
             SignOffProfileAssessmentViewModel model
         )
         {
-            if ((!ModelState.IsValid) && (model.NumberOfSelfAssessedOptionalCompetencies > 0) && (!model.OptionalCompetenciesChecked))
+            if ((!ModelState.IsValid) && (model.NumberOfSelfAssessedOptionalCompetencies > 0) && (!model.OptionalCompetenciesChecked) && model.SignedOff)
             {
                 SelfAssessmentResultSummary? selfAssessmentSummary =
                     supervisorService.GetSelfAssessmentResultSummary(candidateAssessmentId, supervisorDelegateId);
@@ -1231,7 +1231,10 @@ SignOffProfileAssessmentViewModel model
                     CandidateAssessmentSupervisorVerificationId =
                         selfAssessmentSummary.CandidateAssessmentSupervisorVerificationId,
                     CandidateAssessmentSupervisorVerificationSummaries = verificationsSummary,
-                    NumberOfSelfAssessedOptionalCompetencies = optionalCompetencies.Count(x => x.IncludedInSelfAssessment)
+                    NumberOfSelfAssessedOptionalCompetencies = optionalCompetencies.Count(x => x.IncludedInSelfAssessment),
+                    SupervisorComments = model.SupervisorComments,
+                    SignedOff = model.SignedOff,
+                    IsSignOffverified = model.SignedOff
                 };
                 return View("SignOffProfileAssessment", newModel);
             }

DigitalLearningSolutions.Web/ViewModels/Supervisor/SignOffProfileAssessmentViewModel.cs

@@ -21,5 +21,6 @@ public class SignOffProfileAssessmentViewModel
         [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; }
+        public bool? IsSignOffverified { get; set; }
     }
 }

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

@@ -14,6 +14,9 @@
       .Select(q => q.ResultDateTime)
       .DefaultIfEmpty(DateTime.MinValue)
       .Max();
+    bool signedOff = (from record in Model.SupervisorSignOffs
+                      orderby record.ID descending
+                      select record.SignedOff).FirstOrDefault();
     var competencySummaries = from g in Model.CompetencyGroups
                               let questions = g.SelectMany(c => c.AssessmentQuestions).Where(q => q.Required)
                               let selfAssessedCount = questions.Count(q => q.Result.HasValue)
@@ -41,7 +44,7 @@
 }
 
 @section mobilebacklink
-    {
+{
     <p class="nhsuk-breadcrumb__back">
         <a class="nhsuk-breadcrumb__backlink" asp-action="SelfAssessment"
            asp-route-selfAssessmentId="@Model.SelfAssessment.Id">
@@ -197,7 +200,7 @@
                         </div>
                     }
                     @if (!Model.SupervisorSignOffs.Where(x => x.Verified == null).Any()
-                   && latestResult > latestSignoff
+                   && (latestResult > latestSignoff || !signedOff)
                    && (Model.NumberOfSelfAssessedOptionalCompetencies >= Model.SelfAssessment.MinimumOptionalCompetencies)
                    )
                     {