From b77192608e1ccb20fa36e742deece0046e578ae2 Mon Sep 17 00:00:00 2001 From: sherif-olaboye <123654949+sherif-olaboye@users.noreply.github.com> Date: Mon, 1 Dec 2025 10:34:36 +0000 Subject: [PATCH 1/3] TD-5401 Manage supervision settings --- .../CompetencyAssessmentDataService.cs | 133 +++++++++--- .../Extensions/ConfigurationExtensions.cs | 11 + .../CompetencyAssessmentBase.cs | 5 +- .../CompetencyAssessments.cs | 199 ++++++++++++++++++ .../Services/CompetencyAssessmentService.cs | 28 +++ .../BaseSignoffDeclarationViewModel.cs | 29 +++ .../LearnerSignoffDeclarationViewModel.cs | 12 ++ .../ManagesupervisionViewModel.cs | 60 ++++++ ...upervisedSelfAssessmentSignoffViewModel.cs | 31 +++ .../SupervisorSignoffDeclarationViewModel.cs | 13 ++ .../LearnerSignoffDeclaration.cshtml | 99 +++++++++ .../ManageCompetencyAssessment.cshtml | 3 +- .../ManageSupervisionSettings.cshtml | 165 +++++++++++++++ .../SupervisedSelfAssessmentSignoff.cshtml | 121 +++++++++++ .../SupervisorSignoffDeclaration.cshtml | 97 +++++++++ .../appSettings.UAT.json | 2 + .../appsettings.Development.json | 5 +- .../appsettings.Production.json | 2 + .../appsettings.SIT.json | 2 + .../appsettings.Test.json | 2 + .../appsettings.UarTest.json | 2 + DigitalLearningSolutions.Web/appsettings.json | 4 +- 22 files changed, 997 insertions(+), 28 deletions(-) create mode 100644 DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/BaseSignoffDeclarationViewModel.cs create mode 100644 DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/LearnerSignoffDeclarationViewModel.cs create mode 100644 DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/ManagesupervisionViewModel.cs create mode 100644 DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/SupervisedSelfAssessmentSignoffViewModel.cs create mode 100644 DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/SupervisorSignoffDeclarationViewModel.cs create mode 100644 DigitalLearningSolutions.Web/Views/CompetencyAssessments/LearnerSignoffDeclaration.cshtml create mode 100644 DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageSupervisionSettings.cshtml create mode 100644 DigitalLearningSolutions.Web/Views/CompetencyAssessments/SupervisedSelfAssessmentSignoff.cshtml create mode 100644 DigitalLearningSolutions.Web/Views/CompetencyAssessments/SupervisorSignoffDeclaration.cshtml diff --git a/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs b/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs index 853e2bf42e..f92346dd63 100644 --- a/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs @@ -71,7 +71,16 @@ public bool UpdateCompetencyAssessmentFeaturesTaskStatus(int id, bool descriptio bool workingGroupStatus, bool AllframeworkCompetenciesStatus); void UpdateSelfAssessmentFromFramework(int selfAssessmentId, int? frameworkId); bool UpdatePrimaryFrameworkCompetencies(int assessmentId, int frameworkId); - + bool UpdateSupervisorRolesTaskStatus(int competencyAssessmentId, bool taskCompleteChecked); + bool UpdateSelfAssessments(int competencyAssessmentId, + int? supervised, + int? signoff, + int? confirm, + int? supervisorDeclarationValue, + string? supervisorCustomText, + int? leanerDeclarationValue, + string? leanerCustomText + ); //INSERT DATA int InsertCompetencyAssessment(int adminId, int centreId, string competencyAssessmentName); bool InsertSelfAssessmentFramework(int adminId, int selfAssessmentId, int frameworkId); @@ -94,7 +103,12 @@ public class CompetencyAssessmentDataService : ICompetencyAssessmentDataService sa.NRPProfessionalGroupID, sa.NRPSubGroupID, sa.NRPRoleID, - sa.PublishStatusID, sa.Vocabulary, CASE WHEN sa.CreatedByAdminID = @adminId THEN 3 WHEN sac.CanModify = 1 THEN 2 WHEN sac.CanModify = 0 THEN 1 ELSE 0 END AS UserRole"; + sa.PublishStatusID, sa.Vocabulary, + CASE WHEN sa.CreatedByAdminID = @adminId THEN 3 WHEN sac.CanModify = 1 THEN 2 WHEN sac.CanModify = 0 THEN 1 ELSE 0 END AS UserRole, + sa.SupervisorResultsReview, + sa.SupervisorSelfAssessmentReview, + sa.SignOffSupervisorStatement, + sa.SignOffRequestorStatement"; private const string SelfAssessmentFields = @", sa.CategoryID, sa.CreatedDate, @@ -879,43 +893,43 @@ FROM FrameworkCompetencies AS FC return true; } - + public bool UpdatePrimaryFrameworkCompetencies(int assessmentId, int frameworkId) { connection.EnsureOpen(); using (var transaction = connection.BeginTransaction()) { - var numberOfAffectedRows = connection.Execute( - @"UPDATE SelfAssessmentFrameworks + var numberOfAffectedRows = connection.Execute( + @"UPDATE SelfAssessmentFrameworks SET IsPrimary = 0 WHERE (SelfAssessmentId = @assessmentId) AND (RemovedDate IS NULL)", - new { assessmentId }, - transaction: transaction - ); + new { assessmentId }, + transaction: transaction + ); - var numberOfAffectedRow = connection.Execute( - @"UPDATE SelfAssessmentFrameworks + var numberOfAffectedRow = connection.Execute( + @"UPDATE SelfAssessmentFrameworks SET IsPrimary = 1 WHERE (SelfAssessmentId = @assessmentId) AND (FrameworkId = @frameworkId) AND (RemovedDate IS NULL)", - new { assessmentId, frameworkId }, - transaction: transaction - ); + new { assessmentId, frameworkId }, + transaction: transaction + ); - if ((numberOfAffectedRow < 1) || (numberOfAffectedRows < 1)) - { - logger.LogWarning( - "Not updating SelfAssessmentFrameworks as db update failed. " + - $"assessmentId: {assessmentId}, frameworkId: {frameworkId}" - ); - transaction.Rollback(); - return false; - } + if ((numberOfAffectedRow < 1) || (numberOfAffectedRows < 1)) + { + logger.LogWarning( + "Not updating SelfAssessmentFrameworks as db update failed. " + + $"assessmentId: {assessmentId}, frameworkId: {frameworkId}" + ); + transaction.Rollback(); + return false; + } - transaction.Commit(); - return true; + transaction.Commit(); + return true; } } public int? GetSelfAssessmentStructure(int competencyAssessmentId) @@ -1057,5 +1071,76 @@ FROM SelfAssessmentCollaborators AS sc new { invitedByAdminId, id } ).FirstOrDefault(); } + public bool UpdateSupervisorRolesTaskStatus(int competencyAssessmentId, bool taskCompleteChecked) + { + var numberOfAffectedRows = connection.Execute( + @" UPDATE SelfAssessmentTaskStatus + SET SupervisorRolesTaskStatus = CASE WHEN @taskCompleteChecked = 1 THEN 1 ELSE NULL END + WHERE SelfAssessmentId = @competencyAssessmentId", + new { competencyAssessmentId, taskCompleteChecked = taskCompleteChecked ? 1 : 0 } + ); + if (numberOfAffectedRows < 1) + { + logger.LogWarning( + "Not updating SupervisorRolesTaskStatus as db update failed. " + + $"competencyAssessmentId: {competencyAssessmentId}, taskCompleteChecked: {taskCompleteChecked}" + ); + return false; + } + return true; + } + public bool UpdateSelfAssessments(int competencyAssessmentId, + int? supervised, + int? signoff, + int? confirm, + int? supervisorDeclarationValue, + string? supervisorCustomText, + int? leanerDeclarationValue, + string? leanerCustomText + ) + { + var sqlQuery = @" + IF @supervised = 0 + BEGIN + UPDATE SelfAssessments SET SupervisorResultsReview = 0 + WHERE ID = @competencyAssessmentId; + END + ELSE + BEGIN + UPDATE SelfAssessments + SET SupervisorResultsReview = 1, + SupervisorSelfAssessmentReview = @confirm, + SignOffSupervisorStatement = CASE WHEN @supervisorDeclarationValue = 0 THEN NULL ELSE @supervisorCustomText END, + SignOffRequestorStatement = CASE WHEN @leanerDeclarationValue = 0 THEN NULL ELSE @leanerCustomText END + WHERE ID = @competencyAssessmentId; + END + "; + var affectedRows = connection.Execute( + sqlQuery, + new + { + competencyAssessmentId, + supervised, + confirm, + supervisorDeclarationValue, + supervisorCustomText, + leanerDeclarationValue, + leanerCustomText + } + ); + + if ((affectedRows < 1)) + { + logger.LogWarning( + "Not updating SelfAssessments as db update failed. " + + $"competencyAssessmentId: {competencyAssessmentId}, supervised: {supervised}" + + $"signoff: {signoff}, confirm: {confirm}, supervisorDeclarationValue: {supervisorDeclarationValue} " + + $"supervisorCustomText: {supervisorCustomText}, leanerDeclarationValue: {leanerDeclarationValue}, leanerCustomText: {leanerCustomText} " + ); + return false; + } + return true; + } + } } diff --git a/DigitalLearningSolutions.Data/Extensions/ConfigurationExtensions.cs b/DigitalLearningSolutions.Data/Extensions/ConfigurationExtensions.cs index f869df5f74..f42dbddeed 100644 --- a/DigitalLearningSolutions.Data/Extensions/ConfigurationExtensions.cs +++ b/DigitalLearningSolutions.Data/Extensions/ConfigurationExtensions.cs @@ -60,6 +60,9 @@ public static class ConfigurationExtensions private const string TableauViewName = "ViewName"; private const string TableauSiteName = "SiteName"; private const string TableauAuthApi = "AuthApiPath"; + private const string SupervisorDefaultText = "SupervisorDefaultText"; + private const string LearnerDefaultText = "LearnerDefaultText"; + public static string GetAppRootPath(this IConfiguration config) { return config[AppRootPathName]!; @@ -268,5 +271,13 @@ public static string GetTableauViewName(this IConfiguration config) { return config[$"{TableauSectionKey}:{TableauViewName}"]!; } + public static string GetSupervisorDefaultText(this IConfiguration config) + { + return config[SupervisorDefaultText]!; + } + public static string GetLearnerDefaultText(this IConfiguration config) + { + return config[LearnerDefaultText]!; + } } } diff --git a/DigitalLearningSolutions.Data/Models/CompetencyAssessments/CompetencyAssessmentBase.cs b/DigitalLearningSolutions.Data/Models/CompetencyAssessments/CompetencyAssessmentBase.cs index 5fa9080ae3..19a98d0e65 100644 --- a/DigitalLearningSolutions.Data/Models/CompetencyAssessments/CompetencyAssessmentBase.cs +++ b/DigitalLearningSolutions.Data/Models/CompetencyAssessments/CompetencyAssessmentBase.cs @@ -19,8 +19,11 @@ public class CompetencyAssessmentBase public int? NRPRoleID { get; set; } public int PublishStatusID { get; set; } public int UserRole { get; set; } + public int SupervisorResultsReview { get; set; } + public int SupervisorSelfAssessmentReview { get; set; } + public string? SignOffRequestorStatement { get; set; } + public string? SignOffSupervisorStatement { get; set; } public string? Vocabulary { get; set; } - } } diff --git a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs index 75ee43be31..da3b610888 100644 --- a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs +++ b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs @@ -1,6 +1,7 @@ namespace DigitalLearningSolutions.Web.Controllers.CompetencyAssessmentsController { using DigitalLearningSolutions.Data.Enums; + using DigitalLearningSolutions.Data.Extensions; using DigitalLearningSolutions.Data.Models.CompetencyAssessments; using DigitalLearningSolutions.Data.Models.Frameworks; using DigitalLearningSolutions.Data.Models.SelfAssessments; @@ -815,7 +816,189 @@ public IActionResult RemoveCollaborator(int competencyAssessmentId, int id, stri return RedirectToAction("AssessmentWorkingGroup", "CompetencyAssessments", new { competencyAssessmentId, actionName = actionName }); } + [Route("/CompetencyAssessments/{competencyAssessmentId}/SupervisorRoles")] + public IActionResult SupervisorRoles(int competencyAssessmentId) + { + if (competencyAssessmentId == 0) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 }); + var competencyAssessmentTaskStatus = competencyAssessmentService.GetCompetencyAssessmentTaskStatus(competencyAssessmentId, null); + if(competencyAssessmentTaskStatus.SupervisorRolesTaskStatus != null) return RedirectToAction("ManageSupervisionSettings", "CompetencyAssessments", + new + { + CompetencyAssessmentId = competencyAssessmentId, + ActionName = "SupervisorRoles" + }); return RedirectToAction("SupervisedSelfAssessmentSignoff", "CompetencyAssessments", new { competencyAssessmentId }); + } + + [Route("/CompetencyAssessments/{competencyAssessmentId}/Supervised")] + [Route("/CompetencyAssessments/{competencyAssessmentId}/{actionName}/Supervised")] + public IActionResult SupervisedSelfAssessmentSignoff(int competencyAssessmentId, string? actionName) + { + if (competencyAssessmentId == 0) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 }); + if (actionName== "Signoff") + { + var data = GetManagesupervisionData(); + data.Signoff.ActionName = actionName; + var models = new SupervisedSelfAssessmentSignoffViewModel(data.Signoff); + return View(models); + } + var adminId = GetAdminID(); + var baseData = competencyAssessmentService.GetCompetencyAssessmentBaseById(competencyAssessmentId, adminId); + if (string.IsNullOrEmpty(baseData.CompetencyAssessmentName)) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 }); + var model = new SupervisedSelfAssessmentSignoffViewModel(competencyAssessmentId, baseData.CompetencyAssessmentName, actionName); + return View("SupervisedSelfAssessmentSignoff", model); + } + [HttpPost] + [Route("/CompetencyAssessments/{competencyAssessmentId}/Supervised")] + public IActionResult SupervisedSelfAssessmentSignoff(SupervisedSelfAssessmentSignoffViewModel supervisedSelf) + { + if (supervisedSelf == null) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 }); + if (supervisedSelf.ActionName != null) + { + var data = GetManagesupervisionData(); + var model = new ManagesupervisionViewModel(data.LearnerDeclaration, data.SupervisorDeclaration, supervisedSelf); + SetManagesupervisionData(model); + } + else + { + var model = new ManagesupervisionViewModel(supervisedSelf); + SetManagesupervisionData(model); + } + if (supervisedSelf.Supervised == 0) return RedirectToAction("ManageSupervisionSettings", "CompetencyAssessments", new { supervisedSelf.CompetencyAssessmentId }); + if (supervisedSelf.ActionName != null) return RedirectToAction("SupervisorSignoffDeclaration", "CompetencyAssessments", + new + { + CompetencyAssessmentId = supervisedSelf.CompetencyAssessmentId, + ActionName = "Supervisor" + }); + return RedirectToAction("SupervisorSignoffDeclaration", "CompetencyAssessments", new { supervisedSelf.CompetencyAssessmentId }); + } + + [Route("/CompetencyAssessments/{competencyAssessmentId}/SupervisorDeclaration")] + [Route("/CompetencyAssessments/{competencyAssessmentId}/{actionName}/SupervisorDeclaration")] + public IActionResult SupervisorSignoffDeclaration(int competencyAssessmentId, string? actionName) + { + if (competencyAssessmentId == 0) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 }); + var data = GetManagesupervisionData(); + if (actionName == "Supervisor") + { + data.SupervisorDeclaration.ActionName = actionName; + var models = new SupervisorSignoffDeclarationViewModel(data.SupervisorDeclaration); + return View(models); + } + var model = new SupervisorSignoffDeclarationViewModel(competencyAssessmentId); + model.CompetencyAssessmentName = data.CompetencyAssessmentName; + model.DefaultText = this.config.GetSupervisorDefaultText(); + return View(model); + } + + [HttpPost] + [Route("/CompetencyAssessments/{competencyAssessmentId}/SupervisorDeclaration")] + public IActionResult SupervisorSignoffDeclaration(SupervisorSignoffDeclarationViewModel viewModel) + { + if (viewModel == null) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 }); + if (!ModelState.IsValid || (viewModel.DeclarationValue == 1 && string.IsNullOrEmpty(viewModel.CustomText))) + { + ModelState.AddModelError(nameof(viewModel.CustomText), ""); + return View(viewModel); + } + var data = GetManagesupervisionData(); + var model = new ManagesupervisionViewModel(data.LearnerDeclaration,viewModel, data.Signoff ); + SetManagesupervisionData(model); + if (viewModel.ActionName != null) return RedirectToAction("LearnerSignoffDeclaration", "CompetencyAssessments", + new + { + CompetencyAssessmentId = viewModel.CompetencyAssessmentId, + ActionName = "Learner" + }); + return RedirectToAction("LearnerSignoffDeclaration", "CompetencyAssessments", new { viewModel.CompetencyAssessmentId }); + } + + [Route("/CompetencyAssessments/{competencyAssessmentId}/LearnerDeclaration")] + [Route("/CompetencyAssessments/{competencyAssessmentId}/{actionName}/LearnerDeclaration")] + public IActionResult LearnerSignoffDeclaration(int competencyAssessmentId, string? actionName) + { + if (competencyAssessmentId == 0) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 }); + var data = GetManagesupervisionData(); + if (actionName == "Learner") + { + data.LearnerDeclaration.ActionName = actionName; + var models = new LearnerSignoffDeclarationViewModel(data.LearnerDeclaration); + return View(models); + } + var model = new LearnerSignoffDeclarationViewModel(competencyAssessmentId); + model.CompetencyAssessmentName = data.CompetencyAssessmentName; + model.DefaultText = this.config.GetLearnerDefaultText(); + return View(model); + } + + [HttpPost] + [Route("/CompetencyAssessments/{competencyAssessmentId}/LearnerDeclaration")] + public IActionResult LearnerSignoffDeclaration(LearnerSignoffDeclarationViewModel viewModel) + { + if (viewModel == null) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 }); + if (!ModelState.IsValid || (viewModel.DeclarationValue == 1 && string.IsNullOrEmpty(viewModel.CustomText) )) + { + ModelState.AddModelError(nameof(viewModel.CustomText), ""); + return View(viewModel); + } + var data = GetManagesupervisionData(); + var model = new ManagesupervisionViewModel(viewModel, data.SupervisorDeclaration, data.Signoff); + SetManagesupervisionData(model); + return RedirectToAction("ManageSupervisionSettings", "CompetencyAssessments", new { viewModel.CompetencyAssessmentId }); + } + + [Route("/CompetencyAssessments/{competencyAssessmentId}/SupervisionSettings")] + [Route("/CompetencyAssessments/{competencyAssessmentId}/{actionName}/SupervisionSettings")] + public IActionResult ManageSupervisionSettings(int competencyAssessmentId, string? actionName) + { + if (competencyAssessmentId == 0) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 }); + if (actionName == "SupervisorRoles") + { + var adminId = GetAdminID(); + var baseData = competencyAssessmentService.GetCompetencyAssessmentBaseById(competencyAssessmentId, adminId); + var model = new ManagesupervisionViewModel(competencyAssessmentId, baseData.CompetencyAssessmentName, + baseData.SupervisorResultsReview, + baseData.SupervisorSelfAssessmentReview, + baseData.SignOffSupervisorStatement, + baseData.SignOffRequestorStatement, + this.config.GetLearnerDefaultText(), + this.config.GetSupervisorDefaultText()); + SetManagesupervisionData(model); + return View(model); + } + var data = GetManagesupervisionData(); + return View(data); + + } + + [HttpPost] + [Route("/CompetencyAssessments/{competencyAssessmentId}/SupervisionSettings")] + [Route("/CompetencyAssessments/{competencyAssessmentId}/{actionName}/SupervisionSettings")] + public IActionResult ManageSupervisionSettings(ManagesupervisionViewModel viewModel) + { + if (viewModel == null) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 }); + var data = GetManagesupervisionData(); + if (!ModelState.IsValid) + { + var model = new ManagesupervisionViewModel(data.LearnerDeclaration, data.SupervisorDeclaration, data.Signoff); + return View("ManageSupervisionSettings", model); + } + competencyAssessmentService.UpdateSupervisorRolesTaskStatus(data.Signoff.CompetencyAssessmentId, viewModel.TaskCompleteChecked); + competencyAssessmentService.UpdateSelfAssessments(data.Signoff.CompetencyAssessmentId, + data.Signoff.Supervised, + data.Signoff.Signoff, + data.Signoff.Confirm, + data.SupervisorDeclaration.DeclarationValue, + data.SupervisorDeclaration.CustomText, + data.LearnerDeclaration.DeclarationValue, + data.LearnerDeclaration.CustomText + ); + multiPageFormService.ClearMultiPageFormData(MultiPageFormDataFeature.AddCustomWebForm("ManagesupervisionDataCWF"), TempData); + TempData.Clear(); + return RedirectToAction("ManageCompetencyAssessment", new { competencyAssessmentId = viewModel.CompetencyAssessmentId }); + + } private void SetcompetencyAssessmentFeaturesData(CompetencyAssessmentFeaturesViewModel data) { multiPageFormService.SetMultiPageFormData( @@ -832,5 +1015,21 @@ private CompetencyAssessmentFeaturesViewModel GetcompetencyAssessmentFeaturesDat ).GetAwaiter().GetResult(); return data; } + private void SetManagesupervisionData(ManagesupervisionViewModel data) + { + multiPageFormService.SetMultiPageFormData( + data, + MultiPageFormDataFeature.AddCustomWebForm("ManagesupervisionDataCWF"), + TempData + ); + } + private ManagesupervisionViewModel GetManagesupervisionData() + { + var data = multiPageFormService.GetMultiPageFormData( + MultiPageFormDataFeature.AddCustomWebForm("ManagesupervisionDataCWF"), + TempData + ).GetAwaiter().GetResult(); + return data; + } } } diff --git a/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs b/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs index 05859537e6..79d217a58f 100644 --- a/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs +++ b/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs @@ -60,6 +60,16 @@ bool UpdateCompetencyAssessmentFeaturesTaskStatus(int id, bool descriptionStatus bool workingGroupStatus, bool AllframeworkCompetenciesStatus); void UpdateSelfAssessmentFromFramework(int selfAssessmentId, int? frameworkId); bool UpdatePrimaryFrameworkCompetencies(int assessmentId, int frameworkId); + bool UpdateSupervisorRolesTaskStatus(int competencyAssessmentId, bool taskCompleteChecked); + bool UpdateSelfAssessments(int competencyAssessmentId, + int? supervised, + int? signoff, + int? confirm, + int? supervisorDeclarationValue, + string? supervisorCustomText, + int? leanerDeclarationValue, + string? leanerCustomText + ); //INSERT DATA int InsertCompetencyAssessment(int adminId, int centreId, string competencyAssessmentName, int? frameworkId); @@ -323,5 +333,23 @@ public void RemoveCollaboratorFromCompetencyAssessment(int competencyAssessmentI return competencyAssessmentDataService.GetCollaboratorNotification(id, invitedByAdminId); } + public bool UpdateSupervisorRolesTaskStatus(int competencyAssessmentId, bool taskCompleteChecked) + { + return competencyAssessmentDataService.UpdateSupervisorRolesTaskStatus(competencyAssessmentId, taskCompleteChecked); + } + public bool UpdateSelfAssessments(int competencyAssessmentId, + int? supervised, + int? signoff, + int? confirm, + int? supervisorDeclarationValue, + string? supervisorCustomText, + int? leanerDeclarationValue, + string? leanerCustomText + ) + { + return competencyAssessmentDataService.UpdateSelfAssessments(competencyAssessmentId, supervised, signoff, confirm, + supervisorDeclarationValue, supervisorCustomText, leanerDeclarationValue, leanerCustomText); + } + } } diff --git a/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/BaseSignoffDeclarationViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/BaseSignoffDeclarationViewModel.cs new file mode 100644 index 0000000000..b5667f2a04 --- /dev/null +++ b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/BaseSignoffDeclarationViewModel.cs @@ -0,0 +1,29 @@ +namespace DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments +{ + public abstract class BaseSignoffDeclarationViewModel + { + protected BaseSignoffDeclarationViewModel() { } + protected BaseSignoffDeclarationViewModel(int id) + { + CompetencyAssessmentId = id; + } + + public int CompetencyAssessmentId { get; set; } + public string CompetencyAssessmentName { get; set; } = string.Empty; + public int? DeclarationValue { get; set; } + public string? ActionName { get; set; } + public string? CustomText { get; set; } + public string? DefaultText { get; set; } + public string? Declaration => DeclarationValue == 1 ? "Custom" : "Default"; + public string? DeclarationText => DeclarationValue == 1 ? CustomText : DefaultText; + protected void CopyProperties(BaseSignoffDeclarationViewModel model) + { + CompetencyAssessmentId = model.CompetencyAssessmentId; + CompetencyAssessmentName = model.CompetencyAssessmentName; + CustomText = model.CustomText; + DefaultText = model.DefaultText.Replace("{{CompetencyAssessmentName}}", model.CompetencyAssessmentName); + DeclarationValue = model.DeclarationValue; + ActionName = model.ActionName; + } + } +} diff --git a/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/LearnerSignoffDeclarationViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/LearnerSignoffDeclarationViewModel.cs new file mode 100644 index 0000000000..acc530ec0f --- /dev/null +++ b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/LearnerSignoffDeclarationViewModel.cs @@ -0,0 +1,12 @@ +namespace DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments +{ + public class LearnerSignoffDeclarationViewModel: BaseSignoffDeclarationViewModel + { + public LearnerSignoffDeclarationViewModel() : base() { } + public LearnerSignoffDeclarationViewModel(int id) : base(id) { } + public LearnerSignoffDeclarationViewModel(LearnerSignoffDeclarationViewModel model) + { + CopyProperties(model); + } + } +} diff --git a/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/ManagesupervisionViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/ManagesupervisionViewModel.cs new file mode 100644 index 0000000000..f718d6dc55 --- /dev/null +++ b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/ManagesupervisionViewModel.cs @@ -0,0 +1,60 @@ +using System.ComponentModel.DataAnnotations; + +namespace DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments +{ + public class ManagesupervisionViewModel + { + public ManagesupervisionViewModel() { } + public ManagesupervisionViewModel(SupervisedSelfAssessmentSignoffViewModel signoff) { + Signoff = signoff; + CompetencyAssessmentName = signoff.CompetencyAssessmentName; + } + public ManagesupervisionViewModel(SupervisorSignoffDeclarationViewModel supervisorDeclaration, + SupervisedSelfAssessmentSignoffViewModel signoff) + { + SupervisorDeclaration = supervisorDeclaration; + Signoff = signoff; + } + public ManagesupervisionViewModel(LearnerSignoffDeclarationViewModel learnerDeclaration, + SupervisorSignoffDeclarationViewModel supervisorDeclaration, + SupervisedSelfAssessmentSignoffViewModel signoff) + { + LearnerDeclaration = learnerDeclaration; + SupervisorDeclaration = supervisorDeclaration; + Signoff = signoff; + } + public ManagesupervisionViewModel(int competencyAssessmentId, string competencyAssessmentName, + int supervisorResultsReview, + int SupervisorSelfAssessmentReview, + string? signOffSupervisorStatement, + string? signOffRequestorStatement, + string learnerDefaultText, + string supervisorDefaultText ) + { + CompetencyAssessmentId = competencyAssessmentId; + CompetencyAssessmentName = competencyAssessmentName; + Signoff.CompetencyAssessmentId = competencyAssessmentId; + Signoff.Supervised = supervisorResultsReview; + Signoff.Signoff = supervisorResultsReview; + Signoff.Confirm = SupervisorSelfAssessmentReview; + SupervisorDeclaration.CompetencyAssessmentName = competencyAssessmentName; + SupervisorDeclaration.CompetencyAssessmentId = competencyAssessmentId; + SupervisorDeclaration.DeclarationValue = signOffSupervisorStatement == null ? 0 : 1; + SupervisorDeclaration.CustomText = signOffSupervisorStatement; + SupervisorDeclaration.DefaultText = supervisorDefaultText.Replace("{{CompetencyAssessmentName}}", CompetencyAssessmentName); + LearnerDeclaration.DeclarationValue = signOffRequestorStatement == null ? 0 : 1; + LearnerDeclaration.CustomText = signOffRequestorStatement; + LearnerDeclaration.DefaultText = learnerDefaultText.Replace("{{CompetencyAssessmentName}}", CompetencyAssessmentName); + LearnerDeclaration.CompetencyAssessmentName = competencyAssessmentName; + LearnerDeclaration.CompetencyAssessmentId = competencyAssessmentId; + } + public SupervisedSelfAssessmentSignoffViewModel Signoff { get; set; } = new SupervisedSelfAssessmentSignoffViewModel(); + public SupervisorSignoffDeclarationViewModel SupervisorDeclaration { get; set; } = new SupervisorSignoffDeclarationViewModel(); + public LearnerSignoffDeclarationViewModel LearnerDeclaration { get; set; } = new LearnerSignoffDeclarationViewModel(); + [Required] + [Range(1, 1, ErrorMessage = "Please indicate your confirmation by ticking the checkbox to show that the task has been completed.")] + public bool TaskCompleteChecked { get; set; } + public int CompetencyAssessmentId { get; set; } + public string CompetencyAssessmentName { get; set; } = string.Empty; + } +} diff --git a/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/SupervisedSelfAssessmentSignoffViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/SupervisedSelfAssessmentSignoffViewModel.cs new file mode 100644 index 0000000000..28aed5e0fb --- /dev/null +++ b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/SupervisedSelfAssessmentSignoffViewModel.cs @@ -0,0 +1,31 @@ +namespace DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments +{ + public class SupervisedSelfAssessmentSignoffViewModel + { + public SupervisedSelfAssessmentSignoffViewModel() + { } + public SupervisedSelfAssessmentSignoffViewModel(int id, string competencyAssessmentName, string? actionName) + { + CompetencyAssessmentId = id; + CompetencyAssessmentName = competencyAssessmentName; + this.ActionName = actionName; + } + public SupervisedSelfAssessmentSignoffViewModel(SupervisedSelfAssessmentSignoffViewModel model ) + { + CompetencyAssessmentId = model.CompetencyAssessmentId; + Confirm = model.Confirm; + Supervised = model.Supervised; + Signoff = model.Signoff; + ActionName = model.ActionName; + } + public int CompetencyAssessmentId { get; set; } + public string CompetencyAssessmentName { get; set; } = string.Empty; + public int? Supervised { get; set; } + public int? Signoff { get; set; } + public int? Confirm { get; set; } + public string? ActionName { get; set; } + public string SupervisedText => Supervised == 1 ? "Yes" : "No"; + public string SignoffText => Signoff == 1 ? "Yes" : "No"; + public string ConfirmText => Confirm == 1 ? "Yes" : "No"; + } +} diff --git a/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/SupervisorSignoffDeclarationViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/SupervisorSignoffDeclarationViewModel.cs new file mode 100644 index 0000000000..7c8961a20c --- /dev/null +++ b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/SupervisorSignoffDeclarationViewModel.cs @@ -0,0 +1,13 @@ +namespace DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments +{ + public class SupervisorSignoffDeclarationViewModel: BaseSignoffDeclarationViewModel + { + public SupervisorSignoffDeclarationViewModel() : base() { } + + public SupervisorSignoffDeclarationViewModel(int id) : base(id) { } + public SupervisorSignoffDeclarationViewModel(SupervisorSignoffDeclarationViewModel model) + { + CopyProperties(model); + } + } +} diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/LearnerSignoffDeclaration.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/LearnerSignoffDeclaration.cshtml new file mode 100644 index 0000000000..7fa4984644 --- /dev/null +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/LearnerSignoffDeclaration.cshtml @@ -0,0 +1,99 @@ +@using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments +@model LearnerSignoffDeclarationViewModel +@{ + var errorHasOccurred = !ViewData.ModelState.IsValid && ViewData.ModelState.ContainsKey(nameof(Model.CustomText)); + ViewData["Title"] = "Learner sign off declaration"; +} + +
+
+ @if (errorHasOccurred) + { + + } +
+
+ +

+ Learner sign off declaration +

+ + +

+ This will be displayed to the learner is requesting supervisor signing off of their completed self assessment +

+ +
+ +
+ + + +
+
+
+ +
+ @Html.Raw(Model.DefaultText) +
+ +
+
+
+ + +
+ +
+
+ + + + + + + + Enter the declaration text + +
+
+ +
+
+ + + +
+ + + + Back + +
+ + + Cancel + +
+
+
+
+
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml index 073dfd8d9e..22e38eaaee 100644 --- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml @@ -5,6 +5,7 @@ ViewData["Application"] = "Framework Service"; } + @section NavMenuItems { } @@ -188,7 +189,7 @@
  • - Define supervisor roles + Manage supervision settings
    diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageSupervisionSettings.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageSupervisionSettings.cshtml new file mode 100644 index 0000000000..ad2811bf59 --- /dev/null +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageSupervisionSettings.cshtml @@ -0,0 +1,165 @@ +@using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments +@model ManagesupervisionViewModel +@{ + var errorHasOccurred = !ViewData.ModelState.IsValid && ViewData.ModelState.ContainsKey(nameof(Model.TaskCompleteChecked)); + ViewData["Title"] = "Manage supervision sessions"; +} +
    +
    + @if (errorHasOccurred) + { + + } +

    Manage supervision settings

    +
    +
    +
    +
    +
    +
    + + +
    +
    + Self assessment is supervised +
    +
    + @Model.Signoff.SupervisedText +
    +
    + +
    +
    + + @if (@Model.Signoff.SupervisedText == "Yes") + { + +
    +
    + Supervisor signs off self assessment +
    +
    + @Model.Signoff.SignoffText +
    + +
    + + @if (@Model.Signoff.SupervisedText == "Yes") + { +
    +
    + Supervisor sign off statement +
    +
    + @Model.SupervisorDeclaration.Declaration + + +
    +
    + + + View declaration text + + +
    + @Html.Raw(@Model.SupervisorDeclaration.DeclarationText) +
    +
    +
    +
    +
    + +
    +
    + + + +
    +
    + Learner sign off statement +
    +
    + @Model.LearnerDeclaration.Declaration + + +
    +
    + + + View declaration text + + +
    + @Html.Raw(@Model.LearnerDeclaration.DeclarationText) +
    + +
    +
    +
    +
    + +
    +
    + } + +
    +
    + Supervisor or nominated supervisor confirms individual assessment results +
    +
    + @Model.Signoff.ConfirmText +
    + +
    + } + +
    +
    + + +
    + + + +
    +     + + + + + +
    + + + + + Cancel + +
    +
    +
    +
    diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SupervisedSelfAssessmentSignoff.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SupervisedSelfAssessmentSignoff.cshtml new file mode 100644 index 0000000000..1c98c444b4 --- /dev/null +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SupervisedSelfAssessmentSignoff.cshtml @@ -0,0 +1,121 @@ +@using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments +@model SupervisedSelfAssessmentSignoffViewModel +@{ + ViewData["Title"] = "Supervised self assessment and sign off"; +} + +@section NavMenuItems { + +} +@section NavBreadcrumbs { + +} +
    +
    +
    + +

    Supervised self assessment and sign-off

    +
    +
    + +

    + Will the self assessment be supervised? +

    +     + +
    + +
    + + +
    + +
    + + +
    + +
    + +
    + + +
    + +
    + + +
    +
    + + +
    + +
    + +
    + +
    + + +
    +
    + + +
    +
    + +
    +
    + +
    +
    + + + + +
    + + + Cancel + +
    +
    + +
    + +
    +
    diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SupervisorSignoffDeclaration.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SupervisorSignoffDeclaration.cshtml new file mode 100644 index 0000000000..062517ccee --- /dev/null +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SupervisorSignoffDeclaration.cshtml @@ -0,0 +1,97 @@ +@using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments +@model SupervisorSignoffDeclarationViewModel +@{ + var errorHasOccurred = !ViewData.ModelState.IsValid && ViewData.ModelState.ContainsKey(nameof(Model.CustomText)); + ViewData["Title"] = "Supervisor sign off declaration"; +} +
    +
    + @if (errorHasOccurred) + { + + } +
    +
    + +

    + Supervisor sign off declaration +

    +     + +

    + This will be displayed to the supervisor when they are signing off a completed self assessment. +

    + +
    + +
    + + + +
    +
    +
    + +
    + @Html.Raw(Model.DefaultText) +
    +
    +
    + +
    + + +
    + +
    +
    + + + + + + + + Enter the declaration text + +
    +
    + +
    +
    + + +
    + + + + Back + +
    + + + Cancel + +
    +
    +
    +
    +
    diff --git a/DigitalLearningSolutions.Web/appSettings.UAT.json b/DigitalLearningSolutions.Web/appSettings.UAT.json index a566c32732..5e62081af9 100644 --- a/DigitalLearningSolutions.Web/appSettings.UAT.json +++ b/DigitalLearningSolutions.Web/appSettings.UAT.json @@ -3,6 +3,8 @@ "ConnectionStrings": { "DefaultConnection": "" }, + "LearnerDefaultText": "

    I confirm that I have completed the required pathway and achieved the necessary {{CompetencyAssessmentName}}. I understand that:

    • I am responsible and accountable for my practice
    • my skills and achievements are recorded for future reference
    • if I move to a new role or area, I may need to review or expand my skills
    • I must follow organisational policies and guidance
    • I should speak to a senior colleague if I am unsure about any aspect of my practice,

    my {{CompetencyAssessmentName}} will be reviewed as part of personal development and revalidation

    ", + "SupervisorDefaultText": "

    I confirm that the individual:

    • has completed all required learning and assessments
    • is safe and proficient in the skills recorded
    • has been assessed by a competent and authorised assessor

    {{CompetencyAssessmentName}} will be reviewed as part of personal development and revalidation.

    ", "CurrentSystemBaseUrl": "https://www.dls.nhs.uk/dev-prev", "AppRootPath": "https://www.dls.nhs.uk/dev-my-learning-portal", "LegacyLearningMenu": false, diff --git a/DigitalLearningSolutions.Web/appsettings.Development.json b/DigitalLearningSolutions.Web/appsettings.Development.json index 9b2d9762c8..f4d51ac193 100644 --- a/DigitalLearningSolutions.Web/appsettings.Development.json +++ b/DigitalLearningSolutions.Web/appsettings.Development.json @@ -2,7 +2,9 @@ "ConnectionStrings": { "DefaultConnection": "Data Source=localhost;Initial Catalog=mbdbx101_uar;Integrated Security=True;TrustServerCertificate=true;", "UnitTestConnection": "Data Source=localhost;Initial Catalog=mbdbx101_uar_test;Integrated Security=True;TrustServerCertificate=true;" - }, + }, + "LearnerDefaultText": "

    I confirm that I have completed the required pathway and achieved the necessary {{CompetencyAssessmentName}}. I understand that:

    • I am responsible and accountable for my practice
    • my skills and achievements are recorded for future reference
    • if I move to a new role or area, I may need to review or expand my skills
    • I must follow organisational policies and guidance
    • I should speak to a senior colleague if I am unsure about any aspect of my practice,

    my {{CompetencyAssessmentName}} will be reviewed as part of personal development and revalidation

    ", + "SupervisorDefaultText": "

    I confirm that the individual:

    • has completed all required learning and assessments
    • is safe and proficient in the skills recorded
    • has been assessed by a competent and authorised assessor

    {{CompetencyAssessmentName}} will be reviewed as part of personal development and revalidation.

    ", "CurrentSystemBaseUrl": "https://localhost:5001", "AppRootPath": "https://localhost:44363", "LegacyLearningMenu": false, @@ -71,4 +73,5 @@ "LearningHubUserApi": { "UserApiUrl": "https://lh-userapi.dev.local/api/" } + } diff --git a/DigitalLearningSolutions.Web/appsettings.Production.json b/DigitalLearningSolutions.Web/appsettings.Production.json index 02a9d9fd44..ad3d68b91e 100644 --- a/DigitalLearningSolutions.Web/appsettings.Production.json +++ b/DigitalLearningSolutions.Web/appsettings.Production.json @@ -3,6 +3,8 @@ "ConnectionStrings": { "DefaultConnection": "" }, + "LearnerDefaultText": "

    I confirm that I have completed the required pathway and achieved the necessary {{CompetencyAssessmentName}}. I understand that:

    • I am responsible and accountable for my practice
    • my skills and achievements are recorded for future reference
    • if I move to a new role or area, I may need to review or expand my skills
    • I must follow organisational policies and guidance
    • I should speak to a senior colleague if I am unsure about any aspect of my practice,

    my {{CompetencyAssessmentName}} will be reviewed as part of personal development and revalidation

    ", + "SupervisorDefaultText": "

    I confirm that the individual:

    • has completed all required learning and assessments
    • is safe and proficient in the skills recorded
    • has been assessed by a competent and authorised assessor

    {{CompetencyAssessmentName}} will be reviewed as part of personal development and revalidation.

    ", "CurrentSystemBaseUrl": "https://www.dls.nhs.uk", "AppRootPath": "https://www.dls.nhs.uk/v2", "LegacyLearningMenu": false, diff --git a/DigitalLearningSolutions.Web/appsettings.SIT.json b/DigitalLearningSolutions.Web/appsettings.SIT.json index a606afc359..fcfc49b955 100644 --- a/DigitalLearningSolutions.Web/appsettings.SIT.json +++ b/DigitalLearningSolutions.Web/appsettings.SIT.json @@ -3,6 +3,8 @@ "ConnectionStrings": { "DefaultConnection": "Data Source=localhost;Initial Catalog=mbdbx101_uar_test;Integrated Security=True;TrustServerCertificate=true;" }, + "LearnerDefaultText": "

    I confirm that I have completed the required pathway and achieved the necessary {{CompetencyAssessmentName}}. I understand that:

    • I am responsible and accountable for my practice
    • my skills and achievements are recorded for future reference
    • if I move to a new role or area, I may need to review or expand my skills
    • I must follow organisational policies and guidance
    • I should speak to a senior colleague if I am unsure about any aspect of my practice,

    my {{CompetencyAssessmentName}} will be reviewed as part of personal development and revalidation

    ", + "SupervisorDefaultText": "

    I confirm that the individual:

    • has completed all required learning and assessments
    • is safe and proficient in the skills recorded
    • has been assessed by a competent and authorised assessor

    {{CompetencyAssessmentName}} will be reviewed as part of personal development and revalidation.

    ", "CurrentSystemBaseUrl": "https://localhost:44367", "AppRootPath": "https://localhost:44363", "LegacyLearningMenu": false, diff --git a/DigitalLearningSolutions.Web/appsettings.Test.json b/DigitalLearningSolutions.Web/appsettings.Test.json index a5055c50db..5b7a25affe 100644 --- a/DigitalLearningSolutions.Web/appsettings.Test.json +++ b/DigitalLearningSolutions.Web/appsettings.Test.json @@ -3,6 +3,8 @@ "ConnectionStrings": { "DefaultConnection": "Data Source=localhost;Initial Catalog=mbdbx101_test;Integrated Security=True;encrypt=false;TrustServerCertificate=true;" }, + "LearnerDefaultText": "

    I confirm that I have completed the required pathway and achieved the necessary {{CompetencyAssessmentName}}. I understand that:

    • I am responsible and accountable for my practice
    • my skills and achievements are recorded for future reference
    • if I move to a new role or area, I may need to review or expand my skills
    • I must follow organisational policies and guidance
    • I should speak to a senior colleague if I am unsure about any aspect of my practice,

    my {{CompetencyAssessmentName}} will be reviewed as part of personal development and revalidation

    ", + "SupervisorDefaultText": "

    I confirm that the individual:

    • has completed all required learning and assessments
    • is safe and proficient in the skills recorded
    • has been assessed by a competent and authorised assessor

    {{CompetencyAssessmentName}} will be reviewed as part of personal development and revalidation.

    ", "CurrentSystemBaseUrl": "https://www.dls.nhs.uk/dev-prev", "AppRootPath": "https://hee-dls-test.softwire.com", "LegacyLearningMenu": false, diff --git a/DigitalLearningSolutions.Web/appsettings.UarTest.json b/DigitalLearningSolutions.Web/appsettings.UarTest.json index 82b0d9423f..c5383db681 100644 --- a/DigitalLearningSolutions.Web/appsettings.UarTest.json +++ b/DigitalLearningSolutions.Web/appsettings.UarTest.json @@ -3,6 +3,8 @@ "ConnectionStrings": { "DefaultConnection": "Data Source=localhost;Initial Catalog=mbdbx101_uar_test;Integrated Security=True;TrustServerCertificate=true;" }, + "LearnerDefaultText": "

    I confirm that I have completed the required pathway and achieved the necessary {{CompetencyAssessmentName}}. I understand that:

    • I am responsible and accountable for my practice
    • my skills and achievements are recorded for future reference
    • if I move to a new role or area, I may need to review or expand my skills
    • I must follow organisational policies and guidance
    • I should speak to a senior colleague if I am unsure about any aspect of my practice,

    my {{CompetencyAssessmentName}} will be reviewed as part of personal development and revalidation

    ", + "SupervisorDefaultText": "

    I confirm that the individual:

    • has completed all required learning and assessments
    • is safe and proficient in the skills recorded
    • has been assessed by a competent and authorised assessor

    {{CompetencyAssessmentName}} will be reviewed as part of personal development and revalidation.

    ", "CurrentSystemBaseUrl": "https://www.dls.nhs.uk/dev-prev", "AppRootPath": "https://hee-dls-test.softwire.com/uar-test", "LegacyLearningMenu": false, diff --git a/DigitalLearningSolutions.Web/appsettings.json b/DigitalLearningSolutions.Web/appsettings.json index 701341469d..dc87d7cd1e 100644 --- a/DigitalLearningSolutions.Web/appsettings.json +++ b/DigitalLearningSolutions.Web/appsettings.json @@ -5,6 +5,8 @@ "ReadOnlyConnection": "Data Source=localhost;Initial Catalog=mbdbx101_uar;Integrated Security=True;encrypt=false;TrustServerCertificate=true;", "UnitTestConnection": "Data Source=localhost;Initial Catalog=mbdbx101_uar_test;Integrated Security=True;encrypt=false;TrustServerCertificate=true;" }, + "LearnerDefaultText": "

    I confirm that I have completed the required pathway and achieved the necessary {{CompetencyAssessmentName}}. I understand that:

    • I am responsible and accountable for my practice
    • my skills and achievements are recorded for future reference
    • if I move to a new role or area, I may need to review or expand my skills
    • I must follow organisational policies and guidance
    • I should speak to a senior colleague if I am unsure about any aspect of my practice,

    my {{CompetencyAssessmentName}} will be reviewed as part of personal development and revalidation

    ", + "SupervisorDefaultText": "

    I confirm that the individual:

    • has completed all required learning and assessments
    • is safe and proficient in the skills recorded
    • has been assessed by a competent and authorised assessor

    {{CompetencyAssessmentName}} will be reviewed as part of personal development and revalidation.

    ", "CurrentSystemBaseUrl": "https://www.dls.nhs.uk", "AppRootPath": "https://localhost:44363", "LegacyLearningMenu": false, @@ -19,7 +21,7 @@ "PricingPage": true, "ShowSelfAssessmentProgressButtons": false, "LoginWithLearningHub": true, - "TableauSelfAssessmentDashboards": true + "TableauSelfAssessmentDashboards": true }, "LearningHubOpenAPIBaseUrl": "https://uks-learninghubnhsuk-openapi-test.azurewebsites.net", "LearningHubOpenAPIKey": "", From 2e0203e507533f0d852539cf35f3e6311daae136 Mon Sep 17 00:00:00 2001 From: sherif-olaboye <123654949+sherif-olaboye@users.noreply.github.com> Date: Mon, 1 Dec 2025 10:35:45 +0000 Subject: [PATCH 2/3] TD-5401 Manage supervision settings --- .../CompetencyAssessments.cs | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs index da3b610888..b433bdd031 100644 --- a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs +++ b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs @@ -828,16 +828,16 @@ public IActionResult SupervisorRoles(int competencyAssessmentId) ActionName = "SupervisorRoles" }); return RedirectToAction("SupervisedSelfAssessmentSignoff", "CompetencyAssessments", new { competencyAssessmentId }); } - + [Route("/CompetencyAssessments/{competencyAssessmentId}/Supervised")] [Route("/CompetencyAssessments/{competencyAssessmentId}/{actionName}/Supervised")] public IActionResult SupervisedSelfAssessmentSignoff(int competencyAssessmentId, string? actionName) { if (competencyAssessmentId == 0) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 }); - if (actionName== "Signoff") + if (actionName == "Signoff") { - var data = GetManagesupervisionData(); - data.Signoff.ActionName = actionName; + var data = GetManagesupervisionData(); + data.Signoff.ActionName = actionName; var models = new SupervisedSelfAssessmentSignoffViewModel(data.Signoff); return View(models); } @@ -864,13 +864,13 @@ public IActionResult SupervisedSelfAssessmentSignoff(SupervisedSelfAssessmentSig var model = new ManagesupervisionViewModel(supervisedSelf); SetManagesupervisionData(model); } - if (supervisedSelf.Supervised == 0) return RedirectToAction("ManageSupervisionSettings", "CompetencyAssessments", new { supervisedSelf.CompetencyAssessmentId }); - if (supervisedSelf.ActionName != null) return RedirectToAction("SupervisorSignoffDeclaration", "CompetencyAssessments", - new - { - CompetencyAssessmentId = supervisedSelf.CompetencyAssessmentId, - ActionName = "Supervisor" - }); + if (supervisedSelf.Supervised == 0) return RedirectToAction("ManageSupervisionSettings", "CompetencyAssessments", new { supervisedSelf.CompetencyAssessmentId }); + if (supervisedSelf.ActionName != null) return RedirectToAction("SupervisorSignoffDeclaration", "CompetencyAssessments", + new + { + CompetencyAssessmentId = supervisedSelf.CompetencyAssessmentId, + ActionName = "Supervisor" + }); return RedirectToAction("SupervisorSignoffDeclaration", "CompetencyAssessments", new { supervisedSelf.CompetencyAssessmentId }); } @@ -903,7 +903,7 @@ public IActionResult SupervisorSignoffDeclaration(SupervisorSignoffDeclarationVi return View(viewModel); } var data = GetManagesupervisionData(); - var model = new ManagesupervisionViewModel(data.LearnerDeclaration,viewModel, data.Signoff ); + var model = new ManagesupervisionViewModel(data.LearnerDeclaration, viewModel, data.Signoff); SetManagesupervisionData(model); if (viewModel.ActionName != null) return RedirectToAction("LearnerSignoffDeclaration", "CompetencyAssessments", new @@ -937,12 +937,12 @@ public IActionResult LearnerSignoffDeclaration(int competencyAssessmentId, strin public IActionResult LearnerSignoffDeclaration(LearnerSignoffDeclarationViewModel viewModel) { if (viewModel == null) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 }); - if (!ModelState.IsValid || (viewModel.DeclarationValue == 1 && string.IsNullOrEmpty(viewModel.CustomText) )) + if (!ModelState.IsValid || (viewModel.DeclarationValue == 1 && string.IsNullOrEmpty(viewModel.CustomText))) { - ModelState.AddModelError(nameof(viewModel.CustomText), ""); + ModelState.AddModelError(nameof(viewModel.CustomText), ""); return View(viewModel); } - var data = GetManagesupervisionData(); + var data = GetManagesupervisionData(); var model = new ManagesupervisionViewModel(viewModel, data.SupervisorDeclaration, data.Signoff); SetManagesupervisionData(model); return RedirectToAction("ManageSupervisionSettings", "CompetencyAssessments", new { viewModel.CompetencyAssessmentId }); @@ -956,7 +956,7 @@ public IActionResult ManageSupervisionSettings(int competencyAssessmentId, strin if (actionName == "SupervisorRoles") { var adminId = GetAdminID(); - var baseData = competencyAssessmentService.GetCompetencyAssessmentBaseById(competencyAssessmentId, adminId); + var baseData = competencyAssessmentService.GetCompetencyAssessmentBaseById(competencyAssessmentId, adminId); var model = new ManagesupervisionViewModel(competencyAssessmentId, baseData.CompetencyAssessmentName, baseData.SupervisorResultsReview, baseData.SupervisorSelfAssessmentReview, @@ -969,7 +969,7 @@ public IActionResult ManageSupervisionSettings(int competencyAssessmentId, strin } var data = GetManagesupervisionData(); return View(data); - + } [HttpPost] @@ -997,7 +997,7 @@ public IActionResult ManageSupervisionSettings(ManagesupervisionViewModel viewMo multiPageFormService.ClearMultiPageFormData(MultiPageFormDataFeature.AddCustomWebForm("ManagesupervisionDataCWF"), TempData); TempData.Clear(); return RedirectToAction("ManageCompetencyAssessment", new { competencyAssessmentId = viewModel.CompetencyAssessmentId }); - + } private void SetcompetencyAssessmentFeaturesData(CompetencyAssessmentFeaturesViewModel data) { From 5a7d9506dcd893ec09d62c212c6974b0979bb652 Mon Sep 17 00:00:00 2001 From: sherif-olaboye <123654949+sherif-olaboye@users.noreply.github.com> Date: Tue, 2 Dec 2025 11:45:39 +0000 Subject: [PATCH 3/3] TD-5401 Resolving merge conflict issue --- .../CompetencyAssessmentDataService.cs | 12 ++++++---- .../CompetencyAssessmentBase.cs | 2 -- .../CompetencyAssessments.cs | 14 +++++++---- .../ManagesupervisionViewModel.cs | 23 +++++++++++++++---- 4 files changed, 36 insertions(+), 15 deletions(-) diff --git a/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs b/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs index 9cf2364d8d..62cbe7d0cb 100644 --- a/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs @@ -118,9 +118,8 @@ public class CompetencyAssessmentDataService : ICompetencyAssessmentDataService sa.SupervisorResultsReview, sa.SupervisorSelfAssessmentReview, sa.SignOffSupervisorStatement, - sa.SignOffRequestorStatement"; - sa.IncludeLearnerDeclarationPrompt, sa.IncludesSignposting, sa.LinearNavigation, sa.UseDescriptionExpanders, sa.QuestionLabel, sa.ReviewerCommentsLabel, - sa.SupervisorSelfAssessmentReview, sa.SupervisorResultsReview "; + sa.SignOffRequestorStatement, + sa.IncludeLearnerDeclarationPrompt, sa.IncludesSignposting, sa.LinearNavigation, sa.UseDescriptionExpanders, sa.QuestionLabel, sa.ReviewerCommentsLabel "; private const string SelfAssessmentFields = @", sa.CategoryID, sa.CreatedDate, @@ -1139,7 +1138,7 @@ UPDATE SelfAssessments leanerDeclarationValue, leanerCustomText } - ); + ); if ((affectedRows < 1)) { @@ -1148,6 +1147,11 @@ UPDATE SelfAssessments $"competencyAssessmentId: {competencyAssessmentId}, supervised: {supervised}" + $"signoff: {signoff}, confirm: {confirm}, supervisorDeclarationValue: {supervisorDeclarationValue} " + $"supervisorCustomText: {supervisorCustomText}, leanerDeclarationValue: {leanerDeclarationValue}, leanerCustomText: {leanerCustomText} " + ); + return false; + } + return true; + } public bool HasCompetencyWithSignpostedLearning(int competencyAssessmentId) { diff --git a/DigitalLearningSolutions.Data/Models/CompetencyAssessments/CompetencyAssessmentBase.cs b/DigitalLearningSolutions.Data/Models/CompetencyAssessments/CompetencyAssessmentBase.cs index 96c233af04..7efdb03634 100644 --- a/DigitalLearningSolutions.Data/Models/CompetencyAssessments/CompetencyAssessmentBase.cs +++ b/DigitalLearningSolutions.Data/Models/CompetencyAssessments/CompetencyAssessmentBase.cs @@ -19,8 +19,6 @@ public class CompetencyAssessmentBase public int? NRPRoleID { get; set; } public int PublishStatusID { get; set; } public int UserRole { get; set; } - public int SupervisorResultsReview { get; set; } - public int SupervisorSelfAssessmentReview { get; set; } public string? SignOffRequestorStatement { get; set; } public string? SignOffSupervisorStatement { get; set; } public string? Vocabulary { get; set; } diff --git a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs index 194258c27f..e52d33bdf1 100644 --- a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs +++ b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs @@ -1047,7 +1047,7 @@ public IActionResult SupervisorSignoffDeclaration(int competencyAssessmentId, st } var model = new SupervisorSignoffDeclarationViewModel(competencyAssessmentId); model.CompetencyAssessmentName = data.CompetencyAssessmentName; - model.DefaultText = this.config.GetSupervisorDefaultText(); + model.DefaultText = this.config.GetSupervisorDefaultText().Replace("{{CompetencyAssessmentName}}", model.CompetencyAssessmentName); ; return View(model); } @@ -1063,6 +1063,7 @@ public IActionResult SupervisorSignoffDeclaration(SupervisorSignoffDeclarationVi } var data = GetManagesupervisionData(); var model = new ManagesupervisionViewModel(data.LearnerDeclaration, viewModel, data.Signoff); + model.CompetencyAssessmentName = viewModel.CompetencyAssessmentName; SetManagesupervisionData(model); if (viewModel.ActionName != null) return RedirectToAction("LearnerSignoffDeclaration", "CompetencyAssessments", new @@ -1087,7 +1088,7 @@ public IActionResult LearnerSignoffDeclaration(int competencyAssessmentId, strin } var model = new LearnerSignoffDeclarationViewModel(competencyAssessmentId); model.CompetencyAssessmentName = data.CompetencyAssessmentName; - model.DefaultText = this.config.GetLearnerDefaultText(); + model.DefaultText = this.config.GetLearnerDefaultText().Replace("{{CompetencyAssessmentName}}", model.CompetencyAssessmentName); return View(model); } @@ -1103,6 +1104,7 @@ public IActionResult LearnerSignoffDeclaration(LearnerSignoffDeclarationViewMode } var data = GetManagesupervisionData(); var model = new ManagesupervisionViewModel(viewModel, data.SupervisorDeclaration, data.Signoff); + model.CompetencyAssessmentName = viewModel.CompetencyAssessmentName; SetManagesupervisionData(model); return RedirectToAction("ManageSupervisionSettings", "CompetencyAssessments", new { viewModel.CompetencyAssessmentId }); } @@ -1127,7 +1129,8 @@ public IActionResult ManageSupervisionSettings(int competencyAssessmentId, strin return View(model); } var data = GetManagesupervisionData(); - return View(data); + var dataModel = new ManagesupervisionViewModel(competencyAssessmentId, data, this.config.GetLearnerDefaultText(), this.config.GetSupervisorDefaultText()); + return View(dataModel); } @@ -1186,7 +1189,10 @@ private ManagesupervisionViewModel GetManagesupervisionData() { var data = multiPageFormService.GetMultiPageFormData( MultiPageFormDataFeature.AddCustomWebForm("ManagesupervisionDataCWF"), - + TempData + ).GetAwaiter().GetResult(); + return data; + } private void SetOptionsLabelsData(OptionsLabelsViewModel data) { multiPageFormService.SetMultiPageFormData( diff --git a/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/ManagesupervisionViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/ManagesupervisionViewModel.cs index f718d6dc55..9f97983947 100644 --- a/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/ManagesupervisionViewModel.cs +++ b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/ManagesupervisionViewModel.cs @@ -23,9 +23,22 @@ public ManagesupervisionViewModel(LearnerSignoffDeclarationViewModel learnerDecl SupervisorDeclaration = supervisorDeclaration; Signoff = signoff; } + public ManagesupervisionViewModel(int competencyAssessmentId, + ManagesupervisionViewModel model, + string learnerDefaultText, + string supervisorDefaultText) + { + CompetencyAssessmentId = competencyAssessmentId; + CompetencyAssessmentName = model.CompetencyAssessmentName; + Signoff = model.Signoff; + SupervisorDeclaration = model.SupervisorDeclaration; + SupervisorDeclaration.DefaultText = supervisorDefaultText.Replace("{{CompetencyAssessmentName}}", CompetencyAssessmentName); + LearnerDeclaration = model.LearnerDeclaration; + LearnerDeclaration.DefaultText = learnerDefaultText.Replace("{{CompetencyAssessmentName}}", CompetencyAssessmentName); + } public ManagesupervisionViewModel(int competencyAssessmentId, string competencyAssessmentName, - int supervisorResultsReview, - int SupervisorSelfAssessmentReview, + bool supervisorResultsReview, + bool SupervisorSelfAssessmentReview, string? signOffSupervisorStatement, string? signOffRequestorStatement, string learnerDefaultText, @@ -34,9 +47,9 @@ public ManagesupervisionViewModel(int competencyAssessmentId, string competencyA CompetencyAssessmentId = competencyAssessmentId; CompetencyAssessmentName = competencyAssessmentName; Signoff.CompetencyAssessmentId = competencyAssessmentId; - Signoff.Supervised = supervisorResultsReview; - Signoff.Signoff = supervisorResultsReview; - Signoff.Confirm = SupervisorSelfAssessmentReview; + Signoff.Supervised = supervisorResultsReview == true ? 1 : 0; + Signoff.Signoff = supervisorResultsReview == true ? 1 : 0; + Signoff.Confirm = SupervisorSelfAssessmentReview == true ? 1 : 0; SupervisorDeclaration.CompetencyAssessmentName = competencyAssessmentName; SupervisorDeclaration.CompetencyAssessmentId = competencyAssessmentId; SupervisorDeclaration.DeclarationValue = signOffSupervisorStatement == null ? 0 : 1;