Skip to content

TD-4889 When a supervisor promotes a learner to the Nominated supervisor role, assign them to the same category as the supervisor #2917

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
merged 1 commit into from
Nov 6, 2024
Merged

TD-4889 When a supervisor promotes a learner to the Nominated supervisor role, assign them to the same category as the supervisor #2917

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
5 changes: 4 additions & 1 deletion ...LearningSolutions.Web.Tests/Controllers/SupervisorController/SupervisorControllerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public class SupervisorControllerTests
private IClockUtility clockUtility = null!;
private ICandidateAssessmentDownloadFileService candidateAssessmentDownloadFileService = null!;
private IPdfService pdfService = null!;
private ICourseCategoriesService courseCategoriesService = null!;

[SetUp]
public void Setup()
Expand All @@ -55,6 +56,7 @@ public void Setup()
clockUtility = A.Fake<IClockUtility>();
candidateAssessmentDownloadFileService = A.Fake<ICandidateAssessmentDownloadFileService>();
pdfService = A.Fake<IPdfService>();
courseCategoriesService = A.Fake<ICourseCategoriesService>();
A.CallTo(() => candidateAssessmentDownloadFileService.GetCandidateAssessmentDownloadFileForCentre(A<int>._, A<int>._, A<bool>._))
.Returns(new byte[] { });
}
Expand Down Expand Up @@ -83,7 +85,8 @@ public void ExportCandidateAssessment_should_return_file_object_with_file_name_i
emailService,
candidateAssessmentDownloadFileService,
clockUtility,
pdfService
pdfService,
courseCategoriesService
);
string expectedFileName = $"{((selfAssessmentName.Length > 30) ? selfAssessmentName.Substring(0, 30) : selfAssessmentName)} - {delegateName} - {clockUtility.UtcNow:yyyy-MM-dd}.xlsx";

Expand Down
10 changes: 7 additions & 3 deletions DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1273,9 +1273,13 @@ public IActionResult SignOffHistory(int supervisorDelegateId, int candidateAsses
[Route("/Supervisor/Staff/{supervisorDelegateId}/NominateSupervisor")]
public IActionResult NominateSupervisor(int supervisorDelegateId, ReturnPageQuery returnPageQuery)
{
var centreId = User.GetCentreIdKnownNotNull();
var loggedInAdmin = userService.GetAdminById(GetAdminId());
var superviseDelegate =
supervisorService.GetSupervisorDelegateDetailsById(supervisorDelegateId, GetAdminId(), 0);
var model = new SupervisorDelegateViewModel(superviseDelegate, returnPageQuery);
var categories = courseCategoriesService.GetCategoriesForCentreAndCentrallyManagedCourses(centreId);
categories = categories.Prepend(new Category { CategoryName = "All", CourseCategoryID = 0 });
var model = new SupervisorDelegateViewModel(superviseDelegate, returnPageQuery, categories, loggedInAdmin.CategoryId);
if (TempData["NominateSupervisorError"] != null)
{
if (Convert.ToBoolean(TempData["NominateSupervisorError"].ToString()))
Expand All @@ -1300,13 +1304,13 @@ public IActionResult ConfirmNominateSupervisor(SupervisorDelegateViewModel super
supervisorDelegateDetail.DelegateUserID,
(int)User.GetCentreId()
);

supervisorDelegate.SelfAssessmentCategory = supervisorDelegate.SelfAssessmentCategory == 0 ? adminUser.CategoryId.Value : supervisorDelegate.SelfAssessmentCategory;
var centreName = adminUser.CentreName;

var adminRoles = new AdminRoles(false, false, true, false, false, false, false, false);
if (supervisorDelegateDetail.DelegateUserID != null)
{
registrationService.PromoteDelegateToAdmin(adminRoles, categoryId, (int)supervisorDelegateDetail.DelegateUserID, (int)User.GetCentreId(), true);
registrationService.PromoteDelegateToAdmin(adminRoles, supervisorDelegate.SelfAssessmentCategory, (int)supervisorDelegateDetail.DelegateUserID, (int)User.GetCentreId(), true);

if (delegateUser != null && adminUser != null)
{
Expand Down
5 changes: 4 additions & 1 deletion DigitalLearningSolutions.Web/Controllers/SupervisorController/SupervisorController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public partial class SupervisorController : Controller
private readonly ICandidateAssessmentDownloadFileService candidateAssessmentDownloadFileService;
private readonly IClockUtility clockUtility;
private readonly IPdfService pdfService;
private readonly ICourseCategoriesService courseCategoriesService;

public SupervisorController(
ISupervisorService supervisorService,
Expand All @@ -47,7 +48,8 @@ public SupervisorController(
IEmailService emailService,
ICandidateAssessmentDownloadFileService candidateAssessmentDownloadFileService,
IClockUtility clockUtility,
IPdfService pdfService
IPdfService pdfService,
ICourseCategoriesService courseCategoriesService
)
{
this.supervisorService = supervisorService;
Expand All @@ -65,6 +67,7 @@ IPdfService pdfService
this.candidateAssessmentDownloadFileService = candidateAssessmentDownloadFileService;
this.clockUtility = clockUtility;
this.pdfService = pdfService;
this.courseCategoriesService = courseCategoriesService;
}

private int GetCentreId()
Expand Down
22 changes: 21 additions & 1 deletion DigitalLearningSolutions.Web/ViewModels/Supervisor/SupervisorDelegateViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,29 @@
using DigitalLearningSolutions.Data.Models.SearchSortFilterPaginate;
using DigitalLearningSolutions.Data.Models.Supervisor;
using DigitalLearningSolutions.Web.Attributes;
using Microsoft.AspNetCore.Mvc.Rendering;
using System.Collections.Generic;
using System.ComponentModel;
using DigitalLearningSolutions.Data.Models.Common;
using DigitalLearningSolutions.Web.Helpers;
using System.Linq;

public class SupervisorDelegateViewModel
{
public SupervisorDelegateViewModel(SupervisorDelegateDetail detail, ReturnPageQuery returnPageQuery, IEnumerable<Category> categories, int? adminCategoryId)
{
Id = detail.ID;
FirstName = detail.FirstName;
LastName = detail.LastName;
DelegateEmail = detail.DelegateEmail;
CandidateAssessmentCount = detail.CandidateAssessmentCount;
ReturnPageQuery = returnPageQuery;
SelfAssessmentCategory = AdminCategoryHelper.CategoryIdToAdminCategory(adminCategoryId);
SelfAssessmentCategories = SelectListHelper.MapOptionsToSelectListItems(
categories.Select(c => (c.CourseCategoryID, c.CategoryName)),
adminCategoryId
);
}
public SupervisorDelegateViewModel(SupervisorDelegateDetail detail, ReturnPageQuery returnPageQuery)
{
Id = detail.ID;
Expand All @@ -23,10 +42,11 @@ public SupervisorDelegateViewModel() { }
public int CandidateAssessmentCount { get; set; }
public string DelegateEmail { get; set; }
public ReturnPageQuery ReturnPageQuery { get; set; }

[BooleanMustBeTrue(ErrorMessage = "Please tick the checkbox to confirm you wish to perform this action")]
public bool ActionConfirmed { get; set; }
[DefaultValue(false)]
public bool ConfirmedRemove { get; set; }
public int SelfAssessmentCategory { get; set; }
public IEnumerable<SelectListItem> SelfAssessmentCategories { get; set; }
}
}
94 changes: 53 additions & 41 deletions DigitalLearningSolutions.Web/Views/Supervisor/NominateSupervisor.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,53 +3,65 @@
@model SupervisorDelegateViewModel;
@inject IConfiguration Configuration;
@{
var errorHasOccurred = !ViewData.ModelState.IsValid;
ViewData["Application"] = "Supervisor";
ViewData["Title"] = "Confirm Nominated supervisor";
ViewData["HeaderPath"] = $"{Configuration["AppRootPath"]}/Supervisor/MyStaff";
ViewData["HeaderPathName"] = "My Staff";
var errorHasOccurred = !ViewData.ModelState.IsValid;
ViewData["Application"] = "Supervisor";
ViewData["Title"] = "Confirm Nominated supervisor";
ViewData["HeaderPath"] = $"{Configuration["AppRootPath"]}/Supervisor/MyStaff";
ViewData["HeaderPathName"] = "My Staff";
}

@section NavMenuItems {
<partial name="Shared/_NavMenuItems" />
<partial name="Shared/_NavMenuItems" />
}

<div class="nhsuk-grid-row">
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
@if (errorHasOccurred)
{
<vc:error-summary order-of-property-names="@(new[] { nameof(Model.ActionConfirmed) })" />
}
<h1 id="page-heading">@ViewData["Title"]</h1>
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-one-quarter nhsuk-heading-l">
<div class="nhsuk-u-font-weight-bold">
Staff member:
@if (errorHasOccurred)
{
<vc:error-summary order-of-property-names="@(new[] { nameof(Model.ActionConfirmed) })" />
}
<h1 id="page-heading">@ViewData["Title"]</h1>
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-one-quarter nhsuk-heading-l">
<div class="nhsuk-u-font-weight-bold">
Staff member:
</div>
</div>
<div class="nhsuk-grid-column-three-quarters nhsuk-heading-l nhsuk-u-font-weight-normal">
@Model.FirstName @Model.LastName (@Model.DelegateEmail)
</div>
</div>
</div>
<div class="nhsuk-grid-column-three-quarters nhsuk-heading-l nhsuk-u-font-weight-normal">
@Model.FirstName @Model.LastName (@Model.DelegateEmail)
</div>
</div>
<p class="nhsuk-body-m">By promoting this member of staff to the Nominated supervisor role, you are confirming their competence to assess the capability of others.</p>
<p>Once the Nominated supervisor role has been assigned, it can only be removed by a Centre Manager or Clinical Centre Manager.</p>
<form method="post" asp-controller="Supervisor">
<div class="nhsuk-checkboxes__item">
<vc:single-checkbox asp-for="@nameof(Model.ActionConfirmed)"
label="I am sure that I wish to promote @Model.FirstName @Model.LastName to the Nominated supervisor role"
hint-text="I understand that the Nominated supervisor role can only be removed by a Centre Manager or Clinical Centre Manager." />
</div>
<button type="submit" class="nhsuk-button nhsuk-u-margin-top-4" asp-action="ConfirmNominateSupervisor">
Confirm
</button>
@Html.HiddenFor(m => m.Id)
@Html.HiddenFor(m => m.FirstName)
@Html.HiddenFor(m => m.LastName)
@Html.HiddenFor(m => m.DelegateEmail)
@Html.HiddenFor(m => m.CandidateAssessmentCount)
@Html.HiddenFor(m => m.ReturnPageQuery)
</form>
<p class="nhsuk-body-m">By promoting this member of staff to the Nominated supervisor role, you are confirming their competence to assess the capability of others.</p>
<p>Once the Nominated supervisor role has been assigned, it can only be removed by a Centre Manager or Clinical Centre Manager.</p>
<form method="post" asp-controller="Supervisor">
<div class="nhsuk-checkboxes__item">
<vc:single-checkbox asp-for="@nameof(Model.ActionConfirmed)"
label="I am sure that I wish to promote @Model.FirstName @Model.LastName to the Nominated supervisor role"
hint-text="I understand that the Nominated supervisor role can only be removed by a Centre Manager or Clinical Centre Manager." />
</div>
@if(Model.SelfAssessmentCategory == 0)
{
<vc:select-list asp-for="SelfAssessmentCategory"
label="Self assessment category (optional)"
value="@Model.SelfAssessmentCategory.ToString()"
hint-text="Limits the nominated supervisor to self assessments in a particular category."
required="false"
css-class="nhsuk-u-width-one-half"
default-option=""
select-list-options="@Model.SelfAssessmentCategories" />
}
<button type="submit" class="nhsuk-button nhsuk-u-margin-top-4" asp-action="ConfirmNominateSupervisor">
Confirm
</button>
@Html.HiddenFor(m => m.Id)
@Html.HiddenFor(m => m.FirstName)
@Html.HiddenFor(m => m.LastName)
@Html.HiddenFor(m => m.DelegateEmail)
@Html.HiddenFor(m => m.CandidateAssessmentCount)
@Html.HiddenFor(m => m.ReturnPageQuery)
@Html.HiddenFor(m => m.SelfAssessmentCategories)
</form>

<vc:cancel-link-with-return-page-query asp-controller="Supervisor" asp-action="MyStaffList" return-page-query="@Model.ReturnPageQuery" />
</div>
<vc:cancel-link-with-return-page-query asp-controller="Supervisor" asp-action="MyStaffList" return-page-query="@Model.ReturnPageQuery" />
</div>
</div>
Loading