Skip to content

TD-4764-Nominated supervisor role check added to display links accordingly #2854

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: Release 2024.38
merged 1 commit into from
Oct 2, 2024
Merged

TD-4764-Nominated supervisor role check added to display links accordingly #2854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Web/Views/Supervisor/DelegateProfileAssessments.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</details>
@if (Model.DelegateSelfAssessments.Any())
{
<partial name="Shared/_DelegateProfileAssessmentGrid" model="Model.DelegateSelfAssessments" />
<partial name="Shared/_DelegateProfileAssessmentGrid" model="Model" />
}
else
{
Expand Down
146 changes: 83 additions & 63 deletions DigitalLearningSolutions.Web/Views/Supervisor/Shared/_DelegateProfileAssessmentGrid.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,75 +1,95 @@
@using DigitalLearningSolutions.Data.Models.Supervisor;
@using DigitalLearningSolutions.Data.Utilities
@model IEnumerable<DelegateSelfAssessment>;
@using DigitalLearningSolutions.Web.ViewModels.Supervisor
@model DelegateSelfAssessmentsViewModel;
@inject IClockUtility ClockUtility

<table role="table" class="nhsuk-table-responsive">
<caption class="nhsuk-table__caption"><h2>Self assessments</h2></caption>
<thead role="rowgroup" class="nhsuk-table__head">
<tr role="row">
<th role="columnheader" class="" scope="col">
Self Assessment
</th>
<th role="columnheader" class="" scope="col">
Role links
</th>
<th role="columnheader" class="" scope="col">
Last activity
</th>
<th role="columnheader" class="" scope="col">
Status
</th>
<th role="columnheader" class="" scope="col">
Actions
</th>
</tr>
</thead>
<tbody class="nhsuk-table__body">
@foreach (var delegateSelfAssessment in Model)
{
<tr role="row" class="nhsuk-table__row">
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Self Assessment </span>@delegateSelfAssessment.RoleName
</td>
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Role links </span>@(delegateSelfAssessment.ProfessionalGroup != null ? delegateSelfAssessment.ProfessionalGroup : "None/Generic")
@(delegateSelfAssessment.SubGroup != null ? " / " + delegateSelfAssessment.SubGroup : "")
@(delegateSelfAssessment.RoleProfile != null ? " / " + delegateSelfAssessment.RoleProfile : "")
</td>
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Last activity </span>@delegateSelfAssessment.LastAccessed.ToShortDateString()<br /> (@delegateSelfAssessment.LaunchCount launches)
</td>
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Status </span> <partial name="Shared/_ProfileAssessmentStatusTag" model="delegateSelfAssessment" />
</td>
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Actions </span>
@if (delegateSelfAssessment.IsAssignedToSupervisor)
{
@if (delegateSelfAssessment.SignOffRequested == 0 && delegateSelfAssessment.LastAccessed < ClockUtility.UtcNow.AddDays(-7))
<caption class="nhsuk-table__caption"><h2>Self assessments</h2></caption>
<thead role="rowgroup" class="nhsuk-table__head">
<tr role="row">
<th role="columnheader" class="" scope="col">
Self Assessment
</th>
<th role="columnheader" class="" scope="col">
Role links
</th>
<th role="columnheader" class="" scope="col">
Last activity
</th>
<th role="columnheader" class="" scope="col">
Status
</th>
@if (!Model.IsNominatedSupervisor || (Model.IsNominatedSupervisor && Model.DelegateSelfAssessments.Where(x => x.IsAssignedToSupervisor).Any()))
{
<th role="columnheader" class="" scope="col">
Actions
</th>
}
</tr>
</thead>
<tbody class="nhsuk-table__body">
@foreach (var delegateSelfAssessment in Model.DelegateSelfAssessments)
{
<tr role="row" class="nhsuk-table__row">
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Self Assessment </span>@delegateSelfAssessment.RoleName
</td>
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Role links </span>@(delegateSelfAssessment.ProfessionalGroup != null ? delegateSelfAssessment.ProfessionalGroup : "None/Generic")
@(delegateSelfAssessment.SubGroup != null ? " / " + delegateSelfAssessment.SubGroup : "")
@(delegateSelfAssessment.RoleProfile != null ? " / " + delegateSelfAssessment.RoleProfile : "")
</td>
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Last activity </span>@delegateSelfAssessment.LastAccessed.ToShortDateString()<br /> (@delegateSelfAssessment.LaunchCount launches)
</td>
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Status </span> <partial name="Shared/_ProfileAssessmentStatusTag" model="delegateSelfAssessment" />
</td>
@if (Model.IsNominatedSupervisor && Model.DelegateSelfAssessments.Where(x => x.IsAssignedToSupervisor).Any())
{
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Actions </span>
@if (delegateSelfAssessment.IsAssignedToSupervisor)
{
<a class="status-tag" asp-action="SendReminderDelegateSelfAssessment" asp-route-supervisorDelegateId="@ViewContext.RouteData.Values["supervisorDelegateId"]" asp-route-candidateAssessmentId="@delegateSelfAssessment.ID">Send reminder</a>
@if (delegateSelfAssessment.LaunchCount > 0)
{
<a asp-action="ReviewDelegateSelfAssessment" asp-route-supervisorDelegateId="@ViewContext.RouteData.Values["supervisorDelegateId"]" asp-route-candidateAssessmentId="@delegateSelfAssessment.ID">@(delegateSelfAssessment.ResultsVerificationRequests > 0 ? "Review" : "View")</a>
}
}
@if (delegateSelfAssessment.LaunchCount > 0)
</td>
}
else
{
<td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
<span class="nhsuk-table-responsive__heading">Actions </span>
@if (delegateSelfAssessment.IsAssignedToSupervisor)
{
<a asp-action="ReviewDelegateSelfAssessment" asp-route-supervisorDelegateId="@ViewContext.RouteData.Values["supervisorDelegateId"]" asp-route-candidateAssessmentId="@delegateSelfAssessment.ID">@(delegateSelfAssessment.SignOffRequested > 0 | delegateSelfAssessment.ResultsVerificationRequests > 0 ? "Review" : "View")</a>
}
@if (delegateSelfAssessment.CompletedDate != null | delegateSelfAssessment.LaunchCount == 0)
{
<a asp-action="RemoveDelegateSelfAssessment" asp-route-supervisorDelegateId="@ViewContext.RouteData.Values["supervisorDelegateId"]" asp-route-candidateAssessmentId="@delegateSelfAssessment.ID">Remove</a>
@if (delegateSelfAssessment.SignOffRequested == 0 && delegateSelfAssessment.LastAccessed < ClockUtility.UtcNow.AddDays(-7))
{
<a class="status-tag" asp-action="SendReminderDelegateSelfAssessment" asp-route-supervisorDelegateId="@ViewContext.RouteData.Values["supervisorDelegateId"]" asp-route-candidateAssessmentId="@delegateSelfAssessment.ID">Send reminder</a>
}
@if (delegateSelfAssessment.LaunchCount > 0)
{
<a asp-action="ReviewDelegateSelfAssessment" asp-route-supervisorDelegateId="@ViewContext.RouteData.Values["supervisorDelegateId"]" asp-route-candidateAssessmentId="@delegateSelfAssessment.ID">@(delegateSelfAssessment.SignOffRequested > 0 | delegateSelfAssessment.ResultsVerificationRequests > 0 ? "Review" : "View")</a>
}
@if (delegateSelfAssessment.CompletedDate != null | delegateSelfAssessment.LaunchCount == 0)
{
<a asp-action="RemoveDelegateSelfAssessment" asp-route-supervisorDelegateId="@ViewContext.RouteData.Values["supervisorDelegateId"]" asp-route-candidateAssessmentId="@delegateSelfAssessment.ID">Remove</a>
}
@if (delegateSelfAssessment.CompletedDate == null && delegateSelfAssessment.LaunchCount != 0 && delegateSelfAssessment.SupervisorRoleTitle == "Educator/Manager")
{
<a asp-action="RemoveDelegateSelfAssessmentsupervisor" asp-route-supervisorDelegateId="@ViewContext.RouteData.Values["supervisorDelegateId"]" asp-route-candidateAssessmentId="@delegateSelfAssessment.ID">Stop supervising</a>

}
}
@if (delegateSelfAssessment.CompletedDate == null && delegateSelfAssessment.LaunchCount != 0 && delegateSelfAssessment.SupervisorRoleTitle == "Educator/Manager")
else
{
<a asp-action="RemoveDelegateSelfAssessmentsupervisor" asp-route-supervisorDelegateId="@ViewContext.RouteData.Values["supervisorDelegateId"]" asp-route-candidateAssessmentId="@delegateSelfAssessment.ID">Stop supervising</a>

<a asp-action="QuickAddSupervisor" asp-route-supervisorDelegateId="@ViewContext.RouteData.Values["supervisorDelegateId"]" asp-route-delegateUserId="@delegateSelfAssessment.DelegateUserID" asp-route-selfAssessmentId="@delegateSelfAssessment.SelfAssessmentID">Supervise</a>
}
}
else
{
<a asp-action="QuickAddSupervisor" asp-route-supervisorDelegateId="@ViewContext.RouteData.Values["supervisorDelegateId"]" asp-route-delegateUserId="@delegateSelfAssessment.DelegateUserID" asp-route-selfAssessmentId="@delegateSelfAssessment.SelfAssessmentID">Supervise</a>
}
</td>
</tr>
}
</tbody>
</td>
}
</tr>
}
</tbody>
</table>
Loading