Merge pull request #2145 from TechnologyEnhancedLearning/Develop/Fixes/TD-2524_Issue_when_Learner_changed_answers_of_self_assessment_before_resending_the_sign_off

TD-2524 show resend link only when all assessments are in confirmed state and sign off button when all results are confirmed

Author: kevwhitt-hee

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

@@ -155,7 +155,8 @@
              model="@competencySummaries"
              view-data="@(new ViewDataDictionary(ViewData) { { "IsSupervisorResultsReviewed", Model.SelfAssessment.IsSupervisorResultsReviewed } })" />
         <h2>@Model.SelfAssessment.SignOffRoleName Sign-off</h2>
-        <partial name="../../Supervisor/Shared/_SupervisorSignOffSummary.cshtml" model="Model.SupervisorSignOffs" />
+        <partial name="../../Supervisor/Shared/_SupervisorSignOffSummary.cshtml" model="Model.SupervisorSignOffs"
+             view-data="@(new ViewDataDictionary(ViewData) { { "IsAllCompetencyConfirmed", competencySummaries.Sum(c => (int)c["questionsCount"]) == competencySummaries.Sum(c => (int)c["verifiedCount"]) }})" />
         @if (Model.AllQuestionsVerifiedOrNotRequired)
         {
             @if (!Model.SupervisorSignOffs.Any())

DigitalLearningSolutions.Web/Views/Supervisor/ReviewSelfAssessment.cshtml

@@ -85,16 +85,20 @@
         @if (!Model.ExportToExcelHide)
         {
             <a class="nhsuk-button nhsuk-button--secondary float-right"
-             asp-route-candidateAssessmentId="@Model.CandidateAssessmentId"
-             asp-route-selfAssessmentName="@Model.DelegateSelfAssessment.RoleName"
-             asp-route-delegateUserID="@Model.DelegateSelfAssessment.DelegateUserID"
-             asp-route-delegateName="@Model.SupervisorDelegateDetail.FirstName @Model.SupervisorDelegateDetail.LastName"
-             asp-action="ExportCandidateAssessment"
-             role="button">
+           asp-route-candidateAssessmentId="@Model.CandidateAssessmentId"
+           asp-route-selfAssessmentName="@Model.DelegateSelfAssessment.RoleName"
+           asp-route-delegateUserID="@Model.DelegateSelfAssessment.DelegateUserID"
+           asp-route-delegateName="@Model.SupervisorDelegateDetail.FirstName @Model.SupervisorDelegateDetail.LastName"
+           asp-action="ExportCandidateAssessment"
+           role="button">
                 Export to Excel
             </a>
         }
-        @if (Model.DelegateSelfAssessment.SignOffRequested > 0)
+        @if (
+          Model.DelegateSelfAssessment.SignOffRequested > 0 &&
+          Model.DelegateSelfAssessment.ResultsVerificationRequests == 0 &&
+          competencySummaries.Sum(c => (int)c["questionsCount"]) == competencySummaries.Sum(c => (int)c["verifiedCount"])
+        )
         {
             <a role="button" asp-action="SignOffProfileAssessment" asp-route-candidateAssessmentId="@Model.DelegateSelfAssessment.ID" asp-route-supervisorDelegateId="@Model.SupervisorDelegateDetail.ID" class="nhsuk-button">Sign-off self assessment</a>
         }
@@ -200,7 +204,7 @@
 {
     <div class="nhsuk-u-margin-top-4">
         <h3>Self Assessment Sign-off Status</h3>
-        <partial name="Shared/_SupervisorSignOffSummary" model="@Model.SupervisorSignOffs" />
+        <partial name="Shared/_SupervisorSignOffSummary" model="@Model.SupervisorSignOffs" view-data="@(new ViewDataDictionary(ViewData) { { "IsAllCompetencyConfirmed", true }})" />
     </div>
 }
 @if (Model.CompetencyGroups.Any())

DigitalLearningSolutions.Web/Views/Supervisor/Shared/_SupervisorSignOffSummary.cshtml

@@ -48,7 +48,7 @@
                 {
                     @if (Model.FirstOrDefault().EmailSent == null || Model.FirstOrDefault().EmailSent.Value.ToShortDateString() != ClockUtility.UtcNow.ToShortDateString())
                     {
-                        @if (ViewContext.RouteData.Values.ContainsKey("vocabulary"))
+                        @if (ViewContext.RouteData.Values.ContainsKey("vocabulary") && (bool)ViewData["IsAllCompetencyConfirmed"])
                         {
                             <a asp-action="SendRequestSignOffReminder" asp-route-candidateAssessmentSupervisorVerificationId="@Model.FirstOrDefault().ID" asp-route-vocabulary="@ViewContext.RouteData.Values["vocabulary"]" asp-route-candidateAssessmentSupervisorId="@Model.FirstOrDefault().CandidateAssessmentSupervisorID" asp-route-selfAssessmentId="@ViewContext.RouteData.Values["selfAssessmentId"]">Resend</a>
                         }