diff --git a/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs b/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs index 83a77547d4..75a6b21edb 100644 --- a/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs +++ b/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs @@ -24,10 +24,12 @@ public IActionResult Index() var signOffRequests = supervisorService.GetSupervisorDashboardToDoItemsForRequestedSignOffs(adminId); var reviewRequests = supervisorService.GetSupervisorDashboardToDoItemsForRequestedReviews(adminId); var supervisorDashboardToDoItems = Enumerable.Concat(signOffRequests, reviewRequests); + var bannerText = GetBannerText(); var model = new SupervisorDashboardViewModel() { DashboardData = dashboardData, - SupervisorDashboardToDoItems = supervisorDashboardToDoItems + SupervisorDashboardToDoItems = supervisorDashboardToDoItems, + BannerText = bannerText }; return View(model); } @@ -168,7 +170,7 @@ public IActionResult ConfirmSupervise(int supervisorDelegateId) public IActionResult RemoveSupervisorDelegateConfirm(int supervisorDelegateId, ReturnPageQuery returnPageQuery) { var superviseDelegate = supervisorService.GetSupervisorDelegateDetailsById(supervisorDelegateId, GetAdminID(), 0); - if(superviseDelegate == null) + if (superviseDelegate == null) { return RedirectToAction("MyStaffList"); } diff --git a/DigitalLearningSolutions.Web/Controllers/SupervisorController/SupervisorController.cs b/DigitalLearningSolutions.Web/Controllers/SupervisorController/SupervisorController.cs index 309253841b..d1dbcd346e 100644 --- a/DigitalLearningSolutions.Web/Controllers/SupervisorController/SupervisorController.cs +++ b/DigitalLearningSolutions.Web/Controllers/SupervisorController/SupervisorController.cs @@ -25,7 +25,7 @@ public partial class SupervisorController : Controller private readonly ISearchSortFilterPaginateService searchSortFilterPaginateService; private readonly IMultiPageFormService multiPageFormService; private readonly IRegistrationService registrationService; - + private readonly ICentresDataService centresDataService; public SupervisorController( ISupervisorService supervisorService, ICommonService commonService, @@ -39,7 +39,8 @@ public SupervisorController( IConfiguration config, ISearchSortFilterPaginateService searchSortFilterPaginateService, IMultiPageFormService multiPageFormService, - IRegistrationService registrationService + IRegistrationService registrationService, + ICentresDataService centresDataService ) { this.supervisorService = supervisorService; @@ -55,6 +56,7 @@ IRegistrationService registrationService this.searchSortFilterPaginateService = searchSortFilterPaginateService; this.multiPageFormService = multiPageFormService; this.registrationService = registrationService; + this.centresDataService = centresDataService; } private int GetCentreId() @@ -79,5 +81,12 @@ private string GetUserEmail() return userEmail; } } + + private string? GetBannerText() + { + var centreId = User.GetCentreId(); + var bannerText = centresDataService.GetBannerText(centreId); + return bannerText; + } } } diff --git a/DigitalLearningSolutions.Web/ViewModels/Supervisor/SupervisorDashboardViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/Supervisor/SupervisorDashboardViewModel.cs index 75e5634983..301e96fe77 100644 --- a/DigitalLearningSolutions.Web/ViewModels/Supervisor/SupervisorDashboardViewModel.cs +++ b/DigitalLearningSolutions.Web/ViewModels/Supervisor/SupervisorDashboardViewModel.cs @@ -5,6 +5,7 @@ public class SupervisorDashboardViewModel { + public string? BannerText; public DashboardData DashboardData { get; set; } public IEnumerable SupervisorDashboardToDoItems { get; set; } } diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/Index.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/Index.cshtml index e1561e1a8c..67957de72f 100644 --- a/DigitalLearningSolutions.Web/Views/Supervisor/Index.cshtml +++ b/DigitalLearningSolutions.Web/Views/Supervisor/Index.cshtml @@ -20,75 +20,79 @@ }

Supervisor Dashboard

+@if (Model.BannerText != null) +{ +

@Model.BannerText

+}

Your to do list

@if (Model.SupervisorDashboardToDoItems.Count() > 0) { - } else {