TD-2027 Fixes conditions for the display of the withdraw and resend links

Author: kevwhitt-hee

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

@@ -1,5 +1,6 @@
-@using DigitalLearningSolutions.Web.ViewModels.LearningPortal.SelfAssessments
-
+@using DigitalLearningSolutions.Data.Utilities;
+@using DigitalLearningSolutions.Web.ViewModels.LearningPortal.SelfAssessments
+@inject IClockUtility ClockUtility
 @model SignOffHistoryViewModel
 
 @if (Model.SupervisorSignOffs.Any())
@@ -50,27 +51,33 @@
                     </td>
 
                     <td role="cell" class="nhsuk-table__cell">
-                        <div class="nhsuk-grid-column-one-half nhsuk-u-padding-0">
-                            <a asp-action="ResendSupervisorSignOffRequest"
-                               asp-route-selfAssessmentId=@Model.SelfAssessment.Id
-                               asp-route-candidateAssessmentSupervisorId=@supervisorSignOff.CandidateAssessmentSupervisorID
-                               asp-route-candidateAssessmentSupervisorVerificationId=@supervisorSignOff.ID
-                               asp-route-supervisorName=@supervisorSignOff.SupervisorName
-                               asp-route-supervisorEmail=@supervisorSignOff.SupervisorEmail
-                               asp-route-vocabulary="Proficiencies">
-                                Resend
-                            </a>
-                        </div>
+                        @if (supervisorSignOff.Verified == null && supervisorSignOff.Removed == null)
+                        {
+                            @if (supervisorSignOff.EmailSent == null || supervisorSignOff.EmailSent.Value.ToShortDateString() != ClockUtility.UtcNow.ToShortDateString())
+                            {
+                                <div class="nhsuk-grid-column-one-half nhsuk-u-padding-0">
+                                    <a asp-action="ResendSupervisorSignOffRequest"
+                                       asp-route-selfAssessmentId=@Model.SelfAssessment.Id
+                                       asp-route-candidateAssessmentSupervisorId=@supervisorSignOff.CandidateAssessmentSupervisorID
+                                       asp-route-candidateAssessmentSupervisorVerificationId=@supervisorSignOff.ID
+                                       asp-route-supervisorName=@supervisorSignOff.SupervisorName
+                                       asp-route-supervisorEmail=@supervisorSignOff.SupervisorEmail
+                                       asp-route-vocabulary="Proficiencies">
+                                        Resend
+                                    </a>
+                                </div>
+                            }
 
-                        <div class="nhsuk-grid-column-one-half nhsuk-u-padding-0">
-                            <a asp-action="WithdrawSupervisorSignOffRequest"
-                               asp-route-selfAssessmentId=@Model.SelfAssessment.Id
-                               asp-route-candidateAssessmentSupervisorVerificationId=@supervisorSignOff.ID
-                               asp-route-vocabulary="Proficiencies"
-                               asp-route-source="SignOffHistory">
-                                Withdraw
-                            </a>
-                        </div>
+                            <div class="nhsuk-grid-column-one-half nhsuk-u-padding-0">
+                                <a asp-action="WithdrawSupervisorSignOffRequest"
+                                   asp-route-selfAssessmentId=@Model.SelfAssessment.Id
+                                   asp-route-candidateAssessmentSupervisorVerificationId=@supervisorSignOff.ID
+                                   asp-route-vocabulary="Proficiencies"
+                                   asp-route-source="SignOffHistory">
+                                    Withdraw
+                                </a>
+                            </div>
+                        }
                     </td>
                 </tr>
             }

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

@@ -44,17 +44,19 @@
                 }
             </dd>
             <dd class="nhsuk-summary-list__actions">
-                @if (((
-               Model.FirstOrDefault().EmailSent == null && Model.FirstOrDefault().Verified == null || (Model.FirstOrDefault().Verified == null) && Model.FirstOrDefault().EmailSent.Value.ToShortDateString() != ClockUtility.UtcNow.ToShortDateString()) && Model.FirstOrDefault().Removed == null))
+                @if (Model.FirstOrDefault().Verified == null && Model.FirstOrDefault().Removed == null)
                 {
-                    @if (ViewContext.RouteData.Values.ContainsKey("vocabulary"))
+                    @if (Model.FirstOrDefault().EmailSent == null || Model.FirstOrDefault().EmailSent.Value.ToShortDateString() != ClockUtility.UtcNow.ToShortDateString())
                     {
-                        <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"]">Send reminder</a>
+                        @if (ViewContext.RouteData.Values.ContainsKey("vocabulary"))
+                        {
+                            <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"]">Send reminder</a>
+                        }
                     }
-                }
 
-                <a asp-action="WithdrawSupervisorSignOffRequest" asp-route-selfAssessmentId=@ViewContext.RouteData.Values["selfAssessmentId"]
-                   asp-route-candidateAssessmentSupervisorVerificationId="@Model.FirstOrDefault().ID" asp-route-vocabulary="Proficiencies" asp-route-source="SupervisorSignOffSummary">Withdraw</a>
+                    <a asp-action="WithdrawSupervisorSignOffRequest" asp-route-selfAssessmentId=@ViewContext.RouteData.Values["selfAssessmentId"]
+                       asp-route-candidateAssessmentSupervisorVerificationId="@Model.FirstOrDefault().ID" asp-route-vocabulary="Proficiencies" asp-route-source="SupervisorSignOffSummary">Withdraw</a>
+                }
             </dd>
         </div>
         <div class="nhsuk-summary-list__row">