Skip to content

Commit c8fbdba

Browse files
rshrirohitrshrirohit
authored
Merge pull request #2084 from TechnologyEnhancedLearning/Develop/Fixes/TD-2027-ConditionalWithdrawResendActions
TD-2027 Fixes conditions for the display of withdraw and resend
2 parents 95f4989 + 6cf3911 commit c8fbdba

File tree

2 files changed

+38
-29
lines changed

2 files changed

+38
-29
lines changed

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

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
@using DigitalLearningSolutions.Web.ViewModels.LearningPortal.SelfAssessments
2-
1+
@using DigitalLearningSolutions.Data.Utilities;
2+
@using DigitalLearningSolutions.Web.ViewModels.LearningPortal.SelfAssessments
3+
@inject IClockUtility ClockUtility
34
@model SignOffHistoryViewModel
45

56
@if (Model.SupervisorSignOffs.Any())
@@ -50,27 +51,33 @@
5051
</td>
5152

5253
<td role="cell" class="nhsuk-table__cell">
53-
<div class="nhsuk-grid-column-one-half nhsuk-u-padding-0">
54-
<a asp-action="ResendSupervisorSignOffRequest"
55-
asp-route-selfAssessmentId=@Model.SelfAssessment.Id
56-
asp-route-candidateAssessmentSupervisorId=@supervisorSignOff.CandidateAssessmentSupervisorID
57-
asp-route-candidateAssessmentSupervisorVerificationId=@supervisorSignOff.ID
58-
asp-route-supervisorName=@supervisorSignOff.SupervisorName
59-
asp-route-supervisorEmail=@supervisorSignOff.SupervisorEmail
60-
asp-route-vocabulary="Proficiencies">
61-
Resend
62-
</a>
63-
</div>
54+
@if (supervisorSignOff.Verified == null && supervisorSignOff.Removed == null)
55+
{
56+
@if (supervisorSignOff.EmailSent == null || supervisorSignOff.EmailSent.Value.ToShortDateString() != ClockUtility.UtcNow.ToShortDateString())
57+
{
58+
<div class="nhsuk-grid-column-one-half nhsuk-u-padding-0">
59+
<a asp-action="ResendSupervisorSignOffRequest"
60+
asp-route-selfAssessmentId=@Model.SelfAssessment.Id
61+
asp-route-candidateAssessmentSupervisorId=@supervisorSignOff.CandidateAssessmentSupervisorID
62+
asp-route-candidateAssessmentSupervisorVerificationId=@supervisorSignOff.ID
63+
asp-route-supervisorName=@supervisorSignOff.SupervisorName
64+
asp-route-supervisorEmail=@supervisorSignOff.SupervisorEmail
65+
asp-route-vocabulary="Proficiencies">
66+
Resend
67+
</a>
68+
</div>
69+
}
6470

65-
<div class="nhsuk-grid-column-one-half nhsuk-u-padding-0">
66-
<a asp-action="WithdrawSupervisorSignOffRequest"
67-
asp-route-selfAssessmentId=@Model.SelfAssessment.Id
68-
asp-route-candidateAssessmentSupervisorVerificationId=@supervisorSignOff.ID
69-
asp-route-vocabulary="Proficiencies"
70-
asp-route-source="SignOffHistory">
71-
Withdraw
72-
</a>
73-
</div>
71+
<div class="nhsuk-grid-column-one-half nhsuk-u-padding-0">
72+
<a asp-action="WithdrawSupervisorSignOffRequest"
73+
asp-route-selfAssessmentId=@Model.SelfAssessment.Id
74+
asp-route-candidateAssessmentSupervisorVerificationId=@supervisorSignOff.ID
75+
asp-route-vocabulary="Proficiencies"
76+
asp-route-source="SignOffHistory">
77+
Withdraw
78+
</a>
79+
</div>
80+
}
7481
</td>
7582
</tr>
7683
}

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,19 @@
4444
}
4545
</dd>
4646
<dd class="nhsuk-summary-list__actions">
47-
@if (((
48-
Model.FirstOrDefault().EmailSent == null && Model.FirstOrDefault().Verified == null || (Model.FirstOrDefault().Verified == null) && Model.FirstOrDefault().EmailSent.Value.ToShortDateString() != ClockUtility.UtcNow.ToShortDateString()) && Model.FirstOrDefault().Removed == null))
47+
@if (Model.FirstOrDefault().Verified == null && Model.FirstOrDefault().Removed == null)
4948
{
50-
@if (ViewContext.RouteData.Values.ContainsKey("vocabulary"))
49+
@if (Model.FirstOrDefault().EmailSent == null || Model.FirstOrDefault().EmailSent.Value.ToShortDateString() != ClockUtility.UtcNow.ToShortDateString())
5150
{
52-
<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>
51+
@if (ViewContext.RouteData.Values.ContainsKey("vocabulary"))
52+
{
53+
<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>
54+
}
5355
}
54-
}
5556

56-
<a asp-action="WithdrawSupervisorSignOffRequest" asp-route-selfAssessmentId=@ViewContext.RouteData.Values["selfAssessmentId"]
57-
asp-route-candidateAssessmentSupervisorVerificationId="@Model.FirstOrDefault().ID" asp-route-vocabulary="Proficiencies" asp-route-source="SupervisorSignOffSummary">Withdraw</a>
57+
<a asp-action="WithdrawSupervisorSignOffRequest" asp-route-selfAssessmentId=@ViewContext.RouteData.Values["selfAssessmentId"]
58+
asp-route-candidateAssessmentSupervisorVerificationId="@Model.FirstOrDefault().ID" asp-route-vocabulary="Proficiencies" asp-route-source="SupervisorSignOffSummary">Withdraw</a>
59+
}
5860
</dd>
5961
</div>
6062
<div class="nhsuk-summary-list__row">

0 commit comments

Comments
 (0)