From 6cf28ac7cc2f13f8e5d1cd7989feac6cf8d94fcb Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Tue, 7 Jan 2025 16:35:53 +0000 Subject: [PATCH 01/36] TD-5163 Process imported competencies --- .../ImportCompetencies.cs | 14 ---- .../Services/FrameworkService.cs | 2 + .../ImportCompetenciesFromFileService.cs | 69 ++++++------------- 3 files changed, 23 insertions(+), 62 deletions(-) diff --git a/DigitalLearningSolutions.Web/Controllers/FrameworksController/ImportCompetencies.cs b/DigitalLearningSolutions.Web/Controllers/FrameworksController/ImportCompetencies.cs index 886c0800f5..84f02d1ebf 100644 --- a/DigitalLearningSolutions.Web/Controllers/FrameworksController/ImportCompetencies.cs +++ b/DigitalLearningSolutions.Web/Controllers/FrameworksController/ImportCompetencies.cs @@ -245,23 +245,9 @@ public IActionResult ImportSummarySubmit() var workbook = new XLWorkbook(filePath); var results = importCompetenciesFromFileService.ProcessCompetenciesFromFile(workbook, adminId, data.FrameworkId, data.FrameworkVocubulary, data.ReorderCompetenciesOption, data.AddAssessmentQuestionsOption, data.AddCustomAssessmentQuestion ? (int)data.CustomAssessmentQuestionID : 0, data.AddDefaultAssessmentQuestions ? data.DefaultQuestionIDs : []); data.ImportCompetenciesResult = results; - //TO DO apply ordering changes if required: - if (data.ReorderCompetenciesOption == 2 && data.CompetenciesToReorderCount > 0) - { - - } setBulkUploadData(data); return RedirectToAction("UploadResults", "Frameworks", new { frameworkId = data.FrameworkId, tabname = data.TabName }); } - [Route("/Framework/{frameworkId}/{tabname}/Import/Results")] - public IActionResult UploadResults() - { - var data = GetBulkUploadData(); - FileHelper.DeleteFile(webHostEnvironment, data.CompetenciesFileName); - TempData.Clear(); - var model = new ImportCompetenciesResultsViewModel(data.ImportCompetenciesResult, data.FrameworkId, data.FrameworkName, data.FrameworkVocubulary); - return View("Developer/Import/UploadResults", model); - } [Route("CancelImport")] public IActionResult CancelImport() { diff --git a/DigitalLearningSolutions.Web/Services/FrameworkService.cs b/DigitalLearningSolutions.Web/Services/FrameworkService.cs index 78510692db..3b2bc6fbd0 100644 --- a/DigitalLearningSolutions.Web/Services/FrameworkService.cs +++ b/DigitalLearningSolutions.Web/Services/FrameworkService.cs @@ -119,12 +119,14 @@ bool zeroBased int InsertCompetencyGroup(string groupName, string? groupDescription, int adminId, int? frameworkId = null); + int InsertFrameworkCompetency(int competencyId, int? frameworkCompetencyGroupID, int adminId, int frameworkId, bool alwaysShowDescription = false); int InsertFrameworkCompetency(int competencyId, int? frameworkCompetencyGroupID, int adminId, int frameworkId, bool alwaysShowDescription = false); IEnumerable GetAllCompetenciesForAdminId(string name, int adminId); int InsertCompetency(string name, string? description, int adminId); + int InsertFrameworkCompetencyGroup(int groupId, int frameworkID, int adminId); int InsertFrameworkCompetencyGroup(int groupId, int frameworkID, int adminId); int AddCollaboratorToFramework(int frameworkId, string userEmail, bool canModify, int? centreID); diff --git a/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs b/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs index 02b8affac1..581d062209 100644 --- a/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs +++ b/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs @@ -20,6 +20,7 @@ public interface IImportCompetenciesFromFileService byte[] GetCompetencyFileForFramework(int frameworkId, bool isBlank, string vocabulary); public ImportCompetenciesResult PreProcessCompetenciesTable(IXLWorkbook workbook, string vocabulary, int frameworkId); public ImportCompetenciesResult ProcessCompetenciesFromFile(IXLWorkbook workbook, int adminUserId, int frameworkId, string vocabulary, int reorderCompetenciesOption, int addAssessmentQuestionsOption, int customAssessmentQuestionID, List defaultQuestionIds); + public ImportCompetenciesResult ProcessCompetenciesFromFile(IXLWorkbook workbook, int adminUserId, int frameworkId, string vocabulary, int reorderCompetenciesOption, int addAssessmentQuestionsOption, int customAssessmentQuestionID, List defaultQuestionIds); } public class ImportCompetenciesFromFileService : IImportCompetenciesFromFileService { @@ -71,11 +72,12 @@ private void PreProcessCompetencyRow(CompetencyTableRow competencyRow, List competencyRow.Validate(); } public ImportCompetenciesResult ProcessCompetenciesFromFile(IXLWorkbook workbook, int adminUserId, int frameworkId, string vocabulary, int reorderCompetenciesOption, int addAssessmentQuestionsOption, int customAssessmentQuestionID, List defaultQuestionIds) + public ImportCompetenciesResult ProcessCompetenciesFromFile(IXLWorkbook workbook, int adminUserId, int frameworkId, string vocabulary, int reorderCompetenciesOption, int addAssessmentQuestionsOption, int customAssessmentQuestionID, List defaultQuestionIds) { int maxFrameworkCompetencyId = frameworkService.GetMaxFrameworkCompetencyID(); int maxFrameworkCompetencyGroupId = frameworkService.GetMaxFrameworkCompetencyGroupID(); var table = OpenCompetenciesTable(workbook, vocabulary); - return ProcessCompetenciesTable(table, adminUserId, frameworkId, maxFrameworkCompetencyId, maxFrameworkCompetencyGroupId, addAssessmentQuestionsOption, reorderCompetenciesOption, customAssessmentQuestionID, defaultQuestionIds); + return ProcessCompetenciesTable(table, adminUserId, frameworkId, maxFrameworkCompetencyId, maxFrameworkCompetencyGroupId, addAssessmentQuestionsOption, customAssessmentQuestionID, defaultQuestionIds); } internal IXLTable OpenCompetenciesTable(IXLWorkbook workbook, string vocabulary) { @@ -92,7 +94,7 @@ internal IXLTable OpenCompetenciesTable(IXLWorkbook workbook, string vocabulary) } return table; } - internal ImportCompetenciesResult ProcessCompetenciesTable(IXLTable table, int adminUserId, int frameworkId, int maxFrameworkCompetencyId, int maxFrameworkCompetencyGroupId, int addAssessmentQuestionsOption, int reorderCompetenciesOption, int customAssessmentQuestionID, List defaultQuestionIds) + internal ImportCompetenciesResult ProcessCompetenciesTable(IXLTable table, int adminUserId, int frameworkId, int maxFrameworkCompetencyId, int maxFrameworkCompetencyGroupId, int addAssessmentQuestionsOption, int customAssessmentQuestionID, List defaultQuestionIds) { var competenciesRows = table.Rows().Skip(1).Select(row => new CompetencyTableRow(table, row)).ToList(); int rowCount = 0; @@ -120,7 +122,7 @@ internal ImportCompetenciesResult ProcessCompetenciesTable(IXLTable table, int a .Count(); foreach (var competencyRow in competenciesRows) { - maxFrameworkCompetencyGroupId = ProcessCompetencyRow(adminUserId, frameworkId, maxFrameworkCompetencyId, maxFrameworkCompetencyGroupId, addAssessmentQuestionsOption, reorderCompetenciesOption, customAssessmentQuestionID, defaultQuestionIds, competencyRow); + maxFrameworkCompetencyGroupId = ProcessCompetencyRow(adminUserId, frameworkId, maxFrameworkCompetencyId, maxFrameworkCompetencyGroupId, addAssessmentQuestionsOption, customAssessmentQuestionID, defaultQuestionIds, competencyRow); } // Check for changes to competency group order and apply them if appropriate: if (reorderCompetenciesOption == 2) @@ -159,7 +161,6 @@ private int ProcessCompetencyRow( int maxFrameworkCompetencyId, int maxFrameworkCompetencyGroupId, int addAssessmentQuestionsOption, - int reorderCompetenciesOption, int customAssessmentQuestionID, List defaultQuestionIds, CompetencyTableRow competencyRow @@ -169,13 +170,13 @@ CompetencyTableRow competencyRow { return maxFrameworkCompetencyGroupId; } + int newCompetencyGroupId = 0; int newCompetencyId = 0; - int newFrameworkCompetencyId = 0; //If competency group is set, check if competency group exists within framework and add if not and get the Framework Competency Group ID - int? frameworkCompetencyGroupId = null; + int ? frameworkCompetencyGroupId = null; if (competencyRow.CompetencyGroup != null) { - int newCompetencyGroupId = frameworkService.InsertCompetencyGroup(competencyRow.CompetencyGroup, competencyRow.GroupDescription, adminUserId, frameworkId); + newCompetencyGroupId = frameworkService.InsertCompetencyGroup(competencyRow.CompetencyGroup, competencyRow.GroupDescription, adminUserId); if (newCompetencyGroupId > 0) { frameworkCompetencyGroupId = frameworkService.InsertFrameworkCompetencyGroup(newCompetencyGroupId, frameworkId, adminUserId); @@ -193,10 +194,10 @@ CompetencyTableRow competencyRow if (frameworkCompetency != null) { newCompetencyId = frameworkCompetency.CompetencyID; - if (frameworkCompetency.Name != competencyRow.Competency || frameworkCompetency.Description != competencyRow.CompetencyDescription || frameworkCompetency.AlwaysShowDescription != competencyRow.AlwaysShowDescription) + if (frameworkCompetency.Name != competencyRow.Competency || frameworkCompetency.Description != competencyRow.CompetencyDescription || frameworkCompetency.AlwaysShowDescription != competencyRow.AlwaysShowDescription ) { frameworkService.UpdateFrameworkCompetency((int)competencyRow.ID, competencyRow.Competency, competencyRow.CompetencyDescription, adminUserId, competencyRow.AlwaysShowDescription ?? false); - competencyRow.RowStatus = (competencyRow.RowStatus == RowStatus.CompetencyGroupInserted ? RowStatus.CompetencyGroupAndCompetencyUpdated : RowStatus.CompetencyUpdated); + competencyRow.RowStatus = (competencyRow.RowStatus == RowStatus.CompetencyGroupInserted ? RowStatus.CompetencyGroupAndCompetencyUpdated: RowStatus.CompetencyUpdated); } else { @@ -210,7 +211,7 @@ CompetencyTableRow competencyRow newCompetencyId = frameworkService.InsertCompetency(competencyRow.Competency, competencyRow.CompetencyDescription, adminUserId); if (newCompetencyId > 0) { - newFrameworkCompetencyId = frameworkService.InsertFrameworkCompetency(newCompetencyId, frameworkCompetencyGroupId, adminUserId, frameworkId, competencyRow.AlwaysShowDescription ?? false); //including always show desc flag + var newFrameworkCompetencyId = frameworkService.InsertFrameworkCompetency(newCompetencyId, frameworkCompetencyGroupId, adminUserId, frameworkId, competencyRow.AlwaysShowDescription ?? false); //including always show desc flag if (newFrameworkCompetencyId > maxFrameworkCompetencyId) { competencyRow.RowStatus = (competencyRow.RowStatus == RowStatus.CompetencyGroupInserted ? RowStatus.CompetencyGroupAndCompetencyInserted : RowStatus.CompetencyInserted); @@ -224,12 +225,11 @@ CompetencyTableRow competencyRow // If flags are supplied, add them: - if (!string.IsNullOrWhiteSpace(competencyRow.FlagsCsv.Trim())) + if (competencyRow.FlagsCsv != null) { var flags = competencyRow.FlagsCsv.Split(','); - var flagIds = new List(); - foreach (var flag in flags) - { + int[] flagIds = []; + foreach (var flag in flags) { int flagId = 0; var frameworkFlags = frameworkService.GetCompetencyFlagsByFrameworkId(frameworkId, null, null); if (frameworkFlags.Any()) @@ -239,7 +239,6 @@ CompetencyTableRow competencyRow if (frameworkFlag.FlagName == flag) { flagId = frameworkFlag.FlagId; - break; } } } @@ -247,56 +246,30 @@ CompetencyTableRow competencyRow { flagId = frameworkService.AddCustomFlagToFramework(frameworkId, flag, "Flag", "nhsuk-tag--white"); } - flagIds.Add(flagId); + flagIds.Append(flagId); } - if (flagIds.Count > 0) - { - var updated = frameworkService.UpdateCompetencyFlags(frameworkId, newCompetencyId, [.. flagIds]); - if (updated > 0 && competencyRow.RowStatus == RowStatus.Skipped) - { - competencyRow.RowStatus = RowStatus.CompetencyUpdated; - } + if (flagIds.Any()) { + frameworkService.UpdateCompetencyFlags(frameworkId, newCompetencyId, flagIds); } } - // Reorder competencies if required: - if (reorderCompetenciesOption == 2) - { - var frameworkCompetencyId = (int)competencyRow.ID; - var frameworkCompetency = frameworkService.GetFrameworkCompetencyById(frameworkCompetencyId); - var placesToMove = Math.Abs(frameworkCompetency.Ordering - competencyRow.CompetencyOrderNumber); - - if (placesToMove > 0) - { - var direction = frameworkCompetency.Ordering > competencyRow.CompetencyOrderNumber ? "UP" : "DOWN"; - - for (int i = 0; i < placesToMove; i++) - { - frameworkService.MoveFrameworkCompetency(frameworkCompetencyId, true, direction); - } - - competencyRow.Reordered = true; - } - } // Add assessment questions if necessary: if (defaultQuestionIds.Count > 0 | customAssessmentQuestionID > 0) { if (competencyRow.RowStatus == RowStatus.CompetencyInserted | competencyRow.RowStatus == RowStatus.CompetencyGroupAndCompetencyInserted || addAssessmentQuestionsOption == 2 && competencyRow.RowStatus == RowStatus.CompetencyUpdated | competencyRow.RowStatus == RowStatus.CompetencyGroupAndCompetencyUpdated || addAssessmentQuestionsOption == 3) { - foreach (var id in defaultQuestionIds) + foreach(var id in defaultQuestionIds) { - frameworkService.AddCompetencyAssessmentQuestion(competencyRow.ID ?? newFrameworkCompetencyId, id, adminUserId); + frameworkService.AddCompetencyAssessmentQuestion((int)competencyRow.ID, id, adminUserId); } - if (customAssessmentQuestionID > 0) + if(customAssessmentQuestionID > 0) { - frameworkService.AddCompetencyAssessmentQuestion(competencyRow.ID ?? newFrameworkCompetencyId, customAssessmentQuestionID, adminUserId); + frameworkService.AddCompetencyAssessmentQuestion((int)competencyRow.ID, customAssessmentQuestionID, adminUserId); } } } - - return maxFrameworkCompetencyGroupId; } From a43b8625f6ed0fd62241220177124a5d12e2ea6f Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Wed, 8 Jan 2025 16:56:32 +0000 Subject: [PATCH 02/36] TD-5163 modifies the insert competency group method to take an optional framework id --- .../DataServices/FrameworkDataService.cs | 51 ++++++++++++++++++- .../ImportCompetenciesFromFileService.cs | 2 +- 2 files changed, 50 insertions(+), 3 deletions(-) diff --git a/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs b/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs index b73bce21b8..fc259c4f4f 100644 --- a/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs @@ -123,6 +123,7 @@ bool zeroBased //INSERT DATA BrandedFramework CreateFramework(DetailFramework detailFramework, int adminId); + int InsertCompetencyGroup(string groupName, string? groupDescription, int adminId, int? frameworkId); int InsertCompetencyGroup(string groupName, string? groupDescription, int adminId, int? frameworkId); int InsertFrameworkCompetencyGroup(int groupId, int frameworkID, int adminId); @@ -476,6 +477,7 @@ public BrandedFramework CreateFramework(DetailFramework detailFramework, int adm return new BrandedFramework(); } + var existingFrameworks = connection.QuerySingle( var existingFrameworks = connection.QuerySingle( @"SELECT COUNT(*) FROM Frameworks WHERE FrameworkName = @frameworkName", new { frameworkName } @@ -549,6 +551,7 @@ int adminId return GetBrandedFrameworkByFrameworkId(frameworkId, adminId); } + public int InsertCompetencyGroup(string groupName, string? groupDescription, int adminId, int? frameworkId) public int InsertCompetencyGroup(string groupName, string? groupDescription, int adminId, int? frameworkId) { if ((groupName.Length == 0) | (adminId < 1)) @@ -581,7 +584,26 @@ OUTPUT INSERTED.Id VALUES (@groupName, @groupDescription, @adminId)", new { groupName, groupDescription, adminId } ); - + if (numberOfAffectedRows < 1) + { + logger.LogWarning( + "Not inserting competency group as db insert failed. " + + $"Group name: {groupName}, admin id: {adminId}" + ); + return -1; + } + + existingId = connection.QuerySingle( + @"SELECT COALESCE + ((SELECT TOP (1) ID + FROM CompetencyGroups + WHERE (Name = @groupName) AND EXISTS + (SELECT 1 AS Expr1 + FROM FrameworkCompetencyGroups + WHERE (CompetencyGroupID = CompetencyGroups.ID) AND (FrameworkID = @frameworkId) OR + (CompetencyGroupID = CompetencyGroups.ID) AND (@frameworkId IS NULL))), 0) AS CompetencyGroupID", + new { groupName, groupDescription } + ); return existingId; } @@ -595,6 +617,7 @@ public int InsertFrameworkCompetencyGroup(int groupId, int frameworkId, int admi return -2; } + var existingId = connection.QuerySingle( var existingId = connection.QuerySingle( @"SELECT COALESCE ((SELECT ID FROM FrameworkCompetencyGroups WHERE CompetencyGroupID = @groupID AND FrameworkID = @frameworkID), 0) AS FrameworkCompetencyGroupID", new { groupId, frameworkId } @@ -613,7 +636,19 @@ FROM [FrameworkCompetencyGroups] WHERE ([FrameworkID] = @frameworkId)), 0)+1, @frameworkId)", new { groupId, adminId, frameworkId } ); - + if (numberOfAffectedRows < 1) + { + logger.LogWarning( + "Not inserting framework competency group as db insert failed. " + + $"Group id: {groupId}, admin id: {adminId}, frameworkId: {frameworkId}" + ); + return -1; + } + + existingId = connection.QuerySingle( + @"SELECT COALESCE ((SELECT ID FROM FrameworkCompetencyGroups WHERE CompetencyGroupID = @groupID AND FrameworkID = @frameworkID), 0) AS FrameworkCompetencyGroupID", + new { groupId, frameworkId } + ); return existingId; } @@ -657,6 +692,7 @@ public int InsertFrameworkCompetency( var existingId = 0; if (frameworkCompetencyGroupID == null) { + existingId = connection.QuerySingle( existingId = connection.QuerySingle( @"SELECT COALESCE ((SELECT ID FROM FrameworkCompetencies WHERE [CompetencyID] = @competencyId AND FrameworkCompetencyGroupID IS NULL), 0) AS FrameworkCompetencyID", new { competencyId, frameworkCompetencyGroupID } @@ -664,6 +700,7 @@ public int InsertFrameworkCompetency( } else { + existingId = connection.QuerySingle( existingId = connection.QuerySingle( @"SELECT COALESCE ((SELECT ID FROM FrameworkCompetencies WHERE [CompetencyID] = @competencyId AND FrameworkCompetencyGroupID = @frameworkCompetencyGroupID), 0) AS FrameworkCompetencyID", new { competencyId, frameworkCompetencyGroupID } @@ -693,6 +730,7 @@ FROM [FrameworkCompetencies] if (frameworkCompetencyGroupID == null) { + existingId = connection.QuerySingle( existingId = connection.QuerySingle( @"SELECT COALESCE ((SELECT ID FROM FrameworkCompetencies WHERE [CompetencyID] = @competencyId AND FrameworkCompetencyGroupID IS NULL), 0) AS FrameworkCompetencyID", new { competencyId, frameworkCompetencyGroupID } @@ -700,6 +738,7 @@ FROM [FrameworkCompetencies] } else { + existingId = connection.QuerySingle( existingId = connection.QuerySingle( @"SELECT COALESCE ((SELECT ID FROM FrameworkCompetencies WHERE [CompetencyID] = @competencyId AND FrameworkCompetencyGroupID = @frameworkCompetencyGroupID), 0) AS FrameworkCompetencyID", new { competencyId, frameworkCompetencyGroupID } @@ -751,6 +790,7 @@ public int AddCollaboratorToFramework(int frameworkId, string? userEmail, bool c return -3; } + var existingId = connection.QuerySingle( var existingId = connection.QuerySingle( @"SELECT COALESCE ((SELECT ID @@ -801,6 +841,7 @@ FROM FrameworkCollaborators ); } + existingId = connection.QuerySingle( existingId = connection.QuerySingle( @"SELECT COALESCE ((SELECT ID @@ -989,6 +1030,7 @@ int adminId return; } + var usedElsewhere = connection.QuerySingle( var usedElsewhere = connection.QuerySingle( @"SELECT COUNT(*) FROM FrameworkCompetencyGroups WHERE CompetencyGroupId = @competencyGroupId @@ -1159,6 +1201,7 @@ public void DeleteFrameworkCompetencyGroup(int frameworkCompetencyGroupId, int c } //Check if used elsewhere and delete competency group if not: + var usedElsewhere = connection.QuerySingle( var usedElsewhere = connection.QuerySingle( @"SELECT COUNT(*) FROM FrameworkCompetencyGroups WHERE CompetencyGroupId = @competencyGroupId", @@ -1166,6 +1209,7 @@ public void DeleteFrameworkCompetencyGroup(int frameworkCompetencyGroupId, int c ); if (usedElsewhere == 0) { + usedElsewhere = connection.QuerySingle( usedElsewhere = connection.QuerySingle( @"SELECT COUNT(*) FROM SelfAssessmentStructure WHERE CompetencyGroupId = @competencyGroupId", @@ -1197,6 +1241,7 @@ public void DeleteFrameworkCompetencyGroup(int frameworkCompetencyGroupId, int c public void DeleteFrameworkCompetency(int frameworkCompetencyId, int adminId) { + var competencyId = connection.QuerySingle( var competencyId = connection.QuerySingle( @"SELECT CompetencyID FROM FrameworkCompetencies WHERE ID = @frameworkCompetencyId", new { frameworkCompetencyId } @@ -1228,6 +1273,7 @@ public void DeleteFrameworkCompetency(int frameworkCompetencyId, int adminId) } //Check if used elsewhere and delete competency group if not: + var usedElsewhere = connection.QuerySingle( var usedElsewhere = connection.QuerySingle( @"SELECT COUNT(*) FROM FrameworkCompetencies WHERE CompetencyID = @competencyId", @@ -1235,6 +1281,7 @@ public void DeleteFrameworkCompetency(int frameworkCompetencyId, int adminId) ); if (usedElsewhere == 0) { + usedElsewhere = connection.QuerySingle( usedElsewhere = connection.QuerySingle( @"SELECT COUNT(*) FROM SelfAssessmentStructure WHERE CompetencyID = @competencyId", diff --git a/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs b/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs index 581d062209..06bf4b30cc 100644 --- a/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs +++ b/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs @@ -176,7 +176,7 @@ CompetencyTableRow competencyRow int ? frameworkCompetencyGroupId = null; if (competencyRow.CompetencyGroup != null) { - newCompetencyGroupId = frameworkService.InsertCompetencyGroup(competencyRow.CompetencyGroup, competencyRow.GroupDescription, adminUserId); + int newCompetencyGroupId = frameworkService.InsertCompetencyGroup(competencyRow.CompetencyGroup, competencyRow.GroupDescription, adminUserId, frameworkId); if (newCompetencyGroupId > 0) { frameworkCompetencyGroupId = frameworkService.InsertFrameworkCompetencyGroup(newCompetencyGroupId, frameworkId, adminUserId); From a65f2f83e2f59b72bbd8793b38a678864c2acf72 Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Tue, 28 Jan 2025 09:07:22 +0000 Subject: [PATCH 03/36] TD-5286 Renames role profiles to competency assessments throughout the application --- .../CompetencyAssessmentDataService.cs | 197 +++++++++++ .../DataServices/FrameworkDataService.cs | 6 +- .../DataServices/RoleProfileDataService.cs | 197 ----------- .../DataServices/SupervisorDataService.cs | 28 +- .../Enums/NavMenuTab.cs | 4 +- .../CompetencyAssessment.cs} | 8 +- .../CompetencyAssessmentBase.cs} | 9 +- .../NRPProfessionalGroups.cs | 3 +- .../NRPRoles.cs | 4 +- .../NRPSubGroups.cs | 2 +- .../Models/Frameworks/DashboardData.cs | 4 +- .../Models/Frameworks/DashboardToDoItem.cs | 2 +- .../SessionNewCompetencyAssessment.cs | 15 + .../RoleProfiles/SessionNewRoleProfile.cs | 15 - ... => SessionEnrolOnCompetencyAssessment.cs} | 2 +- .../Supervisor/DelegateSelfAssessment.cs | 2 +- .../TestHelpers/SupervisorTagTestHelper.cs | 4 +- .../CompetencyAssessments.cs | 306 ++++++++++++++++++ .../CompetencyAssessmentsController.cs} | 108 +++---- .../RoleProfilesController/RoleProfiles.cs | 306 ------------------ .../SupervisorController/Supervisor.cs | 128 ++++---- .../Helpers/SearchHelper.cs | 20 +- .../Helpers/SortingHelper.cs | 52 +-- .../Models/Enums/CompetencyAssessmentsTab.cs | 39 +++ .../Models/Enums/RoleProfilesTab.cs | 39 --- .../Services/CompetencyAssessmentService.cs | 68 ++++ .../Services/FrameworkNotificationService.cs | 16 +- .../Services/RoleProfileService.cs | 68 ---- .../Services/SupervisorService.cs | 14 +- DigitalLearningSolutions.Web/Startup.cs | 4 +- .../AllCompetencyAssessmentsViewModel.cs | 42 +++ ...BaseCompetencyAssessmentsPageViewModel.cs} | 142 ++++---- .../CompetencyAssessmentsViewModel.cs | 29 ++ .../MyCompetencyAssessmentsViewModel.cs | 43 +++ .../ProfessionalGroupViewModel.cs | 11 + .../RoleProfiles/AllRoleProfilesViewModel.cs | 42 --- .../RoleProfiles/MyRoleProfilesViewModel.cs | 41 --- .../ProfessionalGroupViewModel.cs | 11 - .../RoleProfiles/RoleProfilesViewModel.cs | 29 -- ...rolDelegateOnProfileAssessmentViewModel.cs | 6 +- .../EnrolDelegateSetCompletByDateViewModel.cs | 4 +- .../EnrolDelegateSummaryViewModel.cs | 4 +- .../EnrolDelegateSupervisorRoleViewModel.cs | 4 +- .../Views/ApplicationSelector/Index.cshtml | 4 +- .../CompetencyAssessment.cshtml} | 0 .../Index.cshtml | 12 +- .../Name.cshtml | 36 +-- .../ProfessionalGroup.cshtml | 60 ++-- .../Shared/_AssessmentsGrid.cshtml} | 32 +- ...CompetencyAssessmentsSearchAndSort.cshtml} | 22 +- .../Shared/_PageSearch.cshtml | 26 +- .../Shared/_PageSort.cshtml | 52 +-- .../Shared/_Pagination.cshtml | 4 +- .../Shared/_SearchResultsCount.cshtml | 4 +- .../_AllCompetencyAssessments.cshtml | 23 ++ .../_MyCompetencyAssessments.cshtml | 29 ++ .../Views/Frameworks/Index.cshtml | 10 +- .../Frameworks/Shared/_NavMenuItems.cshtml | 6 +- .../Shared/_PublishedWarning.cshtml | 2 +- .../RoleProfiles/_AllRoleProfiles.cshtml | 23 -- .../Views/RoleProfiles/_MyRoleProfiles.cshtml | 29 -- .../EnrolDelegateOnProfileAssessment.cshtml | 22 +- .../EnrolDelegateSetCompleteBy.cshtml | 2 +- .../Supervisor/EnrolDelegateSummary.cshtml | 4 +- .../Views/Supervisor/Index.cshtml | 6 +- ...SelectDelegateSupervisorRoleSummary.cshtml | 6 +- .../_DelegateProfileAssessmentGrid.cshtml | 2 +- 67 files changed, 1249 insertions(+), 1245 deletions(-) create mode 100644 DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs delete mode 100644 DigitalLearningSolutions.Data/DataServices/RoleProfileDataService.cs rename DigitalLearningSolutions.Data/Models/{RoleProfiles/RoleProfile.cs => CompetencyAssessments/CompetencyAssessment.cs} (74%) rename DigitalLearningSolutions.Data/Models/{RoleProfiles/RoleProfileBase.cs => CompetencyAssessments/CompetencyAssessmentBase.cs} (71%) rename DigitalLearningSolutions.Data/Models/{RoleProfiles => CompetencyAssessments}/NRPProfessionalGroups.cs (81%) rename DigitalLearningSolutions.Data/Models/{RoleProfiles => CompetencyAssessments}/NRPRoles.cs (67%) rename DigitalLearningSolutions.Data/Models/{RoleProfiles => CompetencyAssessments}/NRPSubGroups.cs (83%) create mode 100644 DigitalLearningSolutions.Data/Models/SessionData/CompetencyAssessments/SessionNewCompetencyAssessment.cs delete mode 100644 DigitalLearningSolutions.Data/Models/SessionData/RoleProfiles/SessionNewRoleProfile.cs rename DigitalLearningSolutions.Data/Models/SessionData/Supervisor/{SessionEnrolOnRoleProfile.cs => SessionEnrolOnCompetencyAssessment.cs} (84%) create mode 100644 DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs rename DigitalLearningSolutions.Web/Controllers/{RoleProfilesController/RoleProfilesController.cs => CompetencyAssessmentsController/CompetencyAssessmentsController.cs} (75%) delete mode 100644 DigitalLearningSolutions.Web/Controllers/RoleProfilesController/RoleProfiles.cs create mode 100644 DigitalLearningSolutions.Web/Models/Enums/CompetencyAssessmentsTab.cs delete mode 100644 DigitalLearningSolutions.Web/Models/Enums/RoleProfilesTab.cs create mode 100644 DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs delete mode 100644 DigitalLearningSolutions.Web/Services/RoleProfileService.cs create mode 100644 DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/AllCompetencyAssessmentsViewModel.cs rename DigitalLearningSolutions.Web/ViewModels/{RoleProfiles/BaseRoleProfileViewModel.cs => CompetencyAssessments/BaseCompetencyAssessmentsPageViewModel.cs} (61%) create mode 100644 DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/CompetencyAssessmentsViewModel.cs create mode 100644 DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/MyCompetencyAssessmentsViewModel.cs create mode 100644 DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/ProfessionalGroupViewModel.cs delete mode 100644 DigitalLearningSolutions.Web/ViewModels/RoleProfiles/AllRoleProfilesViewModel.cs delete mode 100644 DigitalLearningSolutions.Web/ViewModels/RoleProfiles/MyRoleProfilesViewModel.cs delete mode 100644 DigitalLearningSolutions.Web/ViewModels/RoleProfiles/ProfessionalGroupViewModel.cs delete mode 100644 DigitalLearningSolutions.Web/ViewModels/RoleProfiles/RoleProfilesViewModel.cs rename DigitalLearningSolutions.Web/Views/{RoleProfiles/RoleProfile.cshtml => CompetencyAssessments/CompetencyAssessment.cshtml} (100%) rename DigitalLearningSolutions.Web/Views/{RoleProfiles => CompetencyAssessments}/Index.cshtml (65%) rename DigitalLearningSolutions.Web/Views/{RoleProfiles => CompetencyAssessments}/Name.cshtml (67%) rename DigitalLearningSolutions.Web/Views/{RoleProfiles => CompetencyAssessments}/ProfessionalGroup.cshtml (52%) rename DigitalLearningSolutions.Web/Views/{RoleProfiles/Shared/_ProfilesGrid.cshtml => CompetencyAssessments/Shared/_AssessmentsGrid.cshtml} (66%) rename DigitalLearningSolutions.Web/Views/{RoleProfiles/Shared/_RoleProfilesSearchAndSort.cshtml => CompetencyAssessments/Shared/_CompetencyAssessmentsSearchAndSort.cshtml} (66%) rename DigitalLearningSolutions.Web/Views/{RoleProfiles => CompetencyAssessments}/Shared/_PageSearch.cshtml (87%) rename DigitalLearningSolutions.Web/Views/{RoleProfiles => CompetencyAssessments}/Shared/_PageSort.cshtml (80%) rename DigitalLearningSolutions.Web/Views/{RoleProfiles => CompetencyAssessments}/Shared/_Pagination.cshtml (94%) rename DigitalLearningSolutions.Web/Views/{RoleProfiles => CompetencyAssessments}/Shared/_SearchResultsCount.cshtml (76%) create mode 100644 DigitalLearningSolutions.Web/Views/CompetencyAssessments/_AllCompetencyAssessments.cshtml create mode 100644 DigitalLearningSolutions.Web/Views/CompetencyAssessments/_MyCompetencyAssessments.cshtml delete mode 100644 DigitalLearningSolutions.Web/Views/RoleProfiles/_AllRoleProfiles.cshtml delete mode 100644 DigitalLearningSolutions.Web/Views/RoleProfiles/_MyRoleProfiles.cshtml diff --git a/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs b/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs new file mode 100644 index 0000000000..e2af8e2aa8 --- /dev/null +++ b/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs @@ -0,0 +1,197 @@ +namespace DigitalLearningSolutions.Data.DataServices +{ + using System.Collections.Generic; + using System.Data; + using System.Linq; + using Dapper; + using DigitalLearningSolutions.Data.Models.CompetencyAssessments; + using Microsoft.Extensions.Logging; + + public interface ICompetencyAssessmentDataService + { + //GET DATA + IEnumerable GetAllCompetencyAssessments(int adminId); + + IEnumerable GetCompetencyAssessmentsForAdminId(int adminId); + + CompetencyAssessmentBase? GetCompetencyAssessmentBaseById(int competencyAssessmentId, int adminId); + + CompetencyAssessmentBase? GetCompetencyAssessmentByName(string competencyAssessmentName, int adminId); + + IEnumerable GetNRPProfessionalGroups(); + + //UPDATE DATA + bool UpdateCompetencyAssessmentName(int competencyAssessmentId, int adminId, string competencyAssessmentName); + + bool UpdateCompetencyAssessmentProfessionalGroup(int competencyAssessmentId, int adminId, int? nrpProfessionalGroupID); + //INSERT DATA + + //DELETE DATA + } + + public class CompetencyAssessmentDataService : ICompetencyAssessmentDataService + { + private const string SelfAssessmentBaseFields = @"sa.ID, sa.Name AS CompetencyAssessmentName, sa.Description, sa.BrandID, + sa.ParentSelfAssessmentID, + sa.[National], sa.[Public], sa.CreatedByAdminID AS OwnerAdminID, + sa.NRPProfessionalGroupID, + sa.NRPSubGroupID, + sa.NRPRoleID, + sa.PublishStatusID, CASE WHEN sa.CreatedByAdminID = @adminId THEN 3 WHEN sac.CanModify = 1 THEN 2 WHEN sac.CanModify = 0 THEN 1 ELSE 0 END AS UserRole"; + + private const string SelfAssessmentFields = + @", sa.CreatedDate, + (SELECT BrandName + FROM Brands + WHERE (BrandID = sa.BrandID)) AS Brand, + (SELECT [Name] + FROM SelfAssessments AS sa2 + WHERE (ID = sa.ParentSelfAssessmentID)) AS ParentSelfAssessment, + (SELECT Forename + ' ' + Surname + (CASE WHEN Active = 1 THEN '' ELSE ' (Inactive)' END) AS Expr1 + FROM AdminUsers + WHERE (AdminID = sa.CreatedByAdminID)) AS Owner, + sa.Archived, + sa.LastEdit, + (SELECT ProfessionalGroup + FROM NRPProfessionalGroups + WHERE (ID = sa.NRPProfessionalGroupID)) AS NRPProfessionalGroup, + (SELECT SubGroup + FROM NRPSubGroups + WHERE (ID = sa.NRPSubGroupID)) AS NRPSubGroup, + (SELECT RoleProfile + FROM NRPRoles + WHERE (ID = sa.NRPRoleID)) AS NRPRole, sar.ID AS SelfAssessmentReviewID"; + + private const string SelfAssessmentBaseTables = + @"SelfAssessments AS sa LEFT OUTER JOIN + SelfAssessmentCollaborators AS sac ON sac.SelfAssessmentID = sa.ID AND sac.AdminID = @adminId"; + + private const string SelfAssessmentTables = + @" LEFT OUTER JOIN + SelfAssessmentReviews AS sar ON sac.ID = sar.SelfAssessmentCollaboratorID AND sar.Archived IS NULL AND sar.ReviewComplete IS NULL"; + + private readonly IDbConnection connection; + private readonly ILogger logger; + + public CompetencyAssessmentDataService(IDbConnection connection, ILogger logger) + { + this.connection = connection; + this.logger = logger; + } + + public IEnumerable GetAllCompetencyAssessments(int adminId) + { + return connection.Query( + $@"SELECT {SelfAssessmentBaseFields} {SelfAssessmentFields} + FROM {SelfAssessmentBaseTables} {SelfAssessmentTables}", + new { adminId } + ); + } + + public IEnumerable GetCompetencyAssessmentsForAdminId(int adminId) + { + return connection.Query( + $@"SELECT {SelfAssessmentBaseFields} {SelfAssessmentFields} + FROM {SelfAssessmentBaseTables} {SelfAssessmentTables} + WHERE (sa.CreatedByAdminID = @adminId) OR + (@adminId IN + (SELECT AdminID + FROM SelfAssessmentCollaborators + WHERE (SelfAssessmentID = sa.ID)))", + new { adminId } + ); + } + + public CompetencyAssessmentBase? GetCompetencyAssessmentBaseById(int competencyAssessmentId, int adminId) + { + return connection.Query( + $@"SELECT {SelfAssessmentBaseFields} + FROM {SelfAssessmentBaseTables} + WHERE (sa.ID = @competencyAssessmentId)", + new { competencyAssessmentId, adminId } + ).FirstOrDefault(); + } + + public bool UpdateCompetencyAssessmentName(int competencyAssessmentId, int adminId, string competencyAssessmentName) + { + if ((competencyAssessmentName.Length == 0) | (adminId < 1) | (competencyAssessmentId < 1)) + { + logger.LogWarning( + $"Not updating role profile name as it failed server side validation. AdminId: {adminId}, competencyAssessmentName: {competencyAssessmentName}, competencyAssessmentId: {competencyAssessmentId}" + ); + return false; + } + + var existingSelfAssessments = (int)connection.ExecuteScalar( + @"SELECT COUNT(*) FROM SelfAssessments WHERE [Name] = @competencyAssessmentName AND ID <> @competencyAssessmentId", + new { competencyAssessmentName, competencyAssessmentId } + ); + if (existingSelfAssessments > 0) + { + return false; + } + + var numberOfAffectedRows = connection.Execute( + @"UPDATE SelfAssessments SET [Name] = @competencyAssessmentName, UpdatedByAdminID = @adminId + WHERE ID = @competencyAssessmentId", + new { competencyAssessmentName, adminId, competencyAssessmentId } + ); + if (numberOfAffectedRows < 1) + { + logger.LogWarning( + "Not updating role profile name as db update failed. " + + $"SelfAssessmentName: {competencyAssessmentName}, admin id: {adminId}, competencyAssessmentId: {competencyAssessmentId}" + ); + return false; + } + + return true; + } + + public IEnumerable GetNRPProfessionalGroups() + { + return connection.Query( + @"SELECT ID, ProfessionalGroup, Active + FROM NRPProfessionalGroups + WHERE (Active = 1) + ORDER BY ProfessionalGroup" + ); + } + + public CompetencyAssessmentBase? GetCompetencyAssessmentByName(string competencyAssessmentName, int adminId) + { + return connection.Query( + $@"SELECT {SelfAssessmentBaseFields} + FROM {SelfAssessmentBaseTables} + WHERE (sa.Name = @competencyAssessmentName)", + new { competencyAssessmentName, adminId } + ).FirstOrDefault(); + } + + public bool UpdateCompetencyAssessmentProfessionalGroup(int competencyAssessmentId, int adminId, int? nrpProfessionalGroupID) + { + var sameCount = (int)connection.ExecuteScalar( + @"SELECT COUNT(*) FROM CompetencyAssessments WHERE ID = @competencyAssessmentId AND NRPProfessionalGroupID = @nrpProfessionalGroupID", + new { competencyAssessmentId, nrpProfessionalGroupID } + ); + if (sameCount > 0) + { + //same so don't update: + return false; + } + + //needs updating: + var numberOfAffectedRows = connection.Execute( + @"UPDATE SelfAssessments SET NRPProfessionalGroupID = @nrpProfessionalGroupID, NRPSubGroupID = NULL, NRPRoleID = NULL, UpdatedByAdminID = @adminId + WHERE ID = @competencyAssessmentId", + new { nrpProfessionalGroupID, adminId, competencyAssessmentId } + ); + if (numberOfAffectedRows > 0) + { + return true; + } + + return false; + } + } +} diff --git a/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs b/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs index fc259c4f4f..560cf5772a 100644 --- a/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs @@ -2222,7 +2222,7 @@ public void ArchiveReviewRequest(int reviewId) FROM FrameworkCollaborators WHERE (FrameworkID = FW.ID) AND (IsDeleted=0)))) AS MyFrameworksCount, - (SELECT COUNT(*) FROM SelfAssessments) AS RoleProfileCount, + (SELECT COUNT(*) FROM SelfAssessments) AS CompetencyAssessmentCount, (SELECT COUNT(*) FROM SelfAssessments AS RP LEFT OUTER JOIN SelfAssessmentCollaborators AS RPC ON RPC.SelfAssessmentID = RP.ID AND RPC.AdminID = @adminId @@ -2230,7 +2230,7 @@ FROM FrameworkCollaborators (@adminId IN (SELECT AdminID FROM SelfAssessmentCollaborators - WHERE (SelfAssessmentID = RP.ID)))) AS MyRoleProfileCount", + WHERE (SelfAssessmentID = RP.ID)))) AS MyCompetencyAssessmentCount", new { adminId } ).FirstOrDefault(); } @@ -2240,7 +2240,7 @@ public IEnumerable GetDashboardToDoItems(int adminId) return connection.Query( @"SELECT FW.ID AS FrameworkID, - 0 AS RoleProfileID, + 0 AS CompetencyAssessmentID, FW.FrameworkName AS ItemName, AU.Forename + ' ' + AU.Surname + (CASE WHEN AU.Active = 1 THEN '' ELSE ' (Inactive)' END) AS RequestorName, FWR.SignOffRequired, diff --git a/DigitalLearningSolutions.Data/DataServices/RoleProfileDataService.cs b/DigitalLearningSolutions.Data/DataServices/RoleProfileDataService.cs deleted file mode 100644 index 7e37d4ff03..0000000000 --- a/DigitalLearningSolutions.Data/DataServices/RoleProfileDataService.cs +++ /dev/null @@ -1,197 +0,0 @@ -namespace DigitalLearningSolutions.Data.DataServices -{ - using System.Collections.Generic; - using System.Data; - using System.Linq; - using Dapper; - using DigitalLearningSolutions.Data.Models.RoleProfiles; - using Microsoft.Extensions.Logging; - - public interface IRoleProfileDataService - { - //GET DATA - IEnumerable GetAllRoleProfiles(int adminId); - - IEnumerable GetRoleProfilesForAdminId(int adminId); - - RoleProfileBase? GetRoleProfileBaseById(int roleProfileId, int adminId); - - RoleProfileBase? GetRoleProfileByName(string roleProfileName, int adminId); - - IEnumerable GetNRPProfessionalGroups(); - - //UPDATE DATA - bool UpdateRoleProfileName(int roleProfileId, int adminId, string roleProfileName); - - bool UpdateRoleProfileProfessionalGroup(int roleProfileId, int adminId, int? nrpProfessionalGroupID); - //INSERT DATA - - //DELETE DATA - } - - public class RoleProfileDataService : IRoleProfileDataService - { - private const string SelfAssessmentBaseFields = @"rp.ID, rp.Name AS RoleProfileName, rp.Description, rp.BrandID, - rp.ParentSelfAssessmentID, - rp.[National], rp.[Public], rp.CreatedByAdminID AS OwnerAdminID, - rp.NRPProfessionalGroupID, - rp.NRPSubGroupID, - rp.NRPRoleID, - rp.PublishStatusID, CASE WHEN rp.CreatedByAdminID = @adminId THEN 3 WHEN rpc.CanModify = 1 THEN 2 WHEN rpc.CanModify = 0 THEN 1 ELSE 0 END AS UserRole"; - - private const string SelfAssessmentFields = - @", rp.CreatedDate, - (SELECT BrandName - FROM Brands - WHERE (BrandID = rp.BrandID)) AS Brand, - (SELECT [Name] - FROM SelfAssessments AS rp2 - WHERE (ID = rp.ParentSelfAssessmentID)) AS ParentSelfAssessment, - (SELECT Forename + ' ' + Surname + (CASE WHEN Active = 1 THEN '' ELSE ' (Inactive)' END) AS Expr1 - FROM AdminUsers - WHERE (AdminID = rp.CreatedByAdminID)) AS Owner, - rp.Archived, - rp.LastEdit, - (SELECT ProfessionalGroup - FROM NRPProfessionalGroups - WHERE (ID = rp.NRPProfessionalGroupID)) AS NRPProfessionalGroup, - (SELECT SubGroup - FROM NRPSubGroups - WHERE (ID = rp.NRPSubGroupID)) AS NRPSubGroup, - (SELECT RoleProfile - FROM NRPRoles - WHERE (ID = rp.NRPRoleID)) AS NRPRole, rpr.ID AS SelfAssessmentReviewID"; - - private const string SelfAssessmentBaseTables = - @"SelfAssessments AS rp LEFT OUTER JOIN - SelfAssessmentCollaborators AS rpc ON rpc.SelfAssessmentID = rp.ID AND rpc.AdminID = @adminId"; - - private const string SelfAssessmentTables = - @" LEFT OUTER JOIN - SelfAssessmentReviews AS rpr ON rpc.ID = rpr.SelfAssessmentCollaboratorID AND rpr.Archived IS NULL AND rpr.ReviewComplete IS NULL"; - - private readonly IDbConnection connection; - private readonly ILogger logger; - - public RoleProfileDataService(IDbConnection connection, ILogger logger) - { - this.connection = connection; - this.logger = logger; - } - - public IEnumerable GetAllRoleProfiles(int adminId) - { - return connection.Query( - $@"SELECT {SelfAssessmentBaseFields} {SelfAssessmentFields} - FROM {SelfAssessmentBaseTables} {SelfAssessmentTables}", - new { adminId } - ); - } - - public IEnumerable GetRoleProfilesForAdminId(int adminId) - { - return connection.Query( - $@"SELECT {SelfAssessmentBaseFields} {SelfAssessmentFields} - FROM {SelfAssessmentBaseTables} {SelfAssessmentTables} - WHERE (rp.CreatedByAdminID = @adminId) OR - (@adminId IN - (SELECT AdminID - FROM SelfAssessmentCollaborators - WHERE (SelfAssessmentID = rp.ID)))", - new { adminId } - ); - } - - public RoleProfileBase? GetRoleProfileBaseById(int roleProfileId, int adminId) - { - return connection.Query( - $@"SELECT {SelfAssessmentBaseFields} - FROM {SelfAssessmentBaseTables} - WHERE (rp.ID = @roleProfileId)", - new { roleProfileId, adminId } - ).FirstOrDefault(); - } - - public bool UpdateRoleProfileName(int roleProfileId, int adminId, string roleProfileName) - { - if ((roleProfileName.Length == 0) | (adminId < 1) | (roleProfileId < 1)) - { - logger.LogWarning( - $"Not updating role profile name as it failed server side validation. AdminId: {adminId}, roleProfileName: {roleProfileName}, roleProfileId: {roleProfileId}" - ); - return false; - } - - var existingSelfAssessments = (int)connection.ExecuteScalar( - @"SELECT COUNT(*) FROM SelfAssessments WHERE [Name] = @roleProfileName AND ID <> @roleProfileId", - new { roleProfileName, roleProfileId } - ); - if (existingSelfAssessments > 0) - { - return false; - } - - var numberOfAffectedRows = connection.Execute( - @"UPDATE SelfAssessments SET [Name] = @roleProfileName, UpdatedByAdminID = @adminId - WHERE ID = @roleProfileId", - new { roleProfileName, adminId, roleProfileId } - ); - if (numberOfAffectedRows < 1) - { - logger.LogWarning( - "Not updating role profile name as db update failed. " + - $"SelfAssessmentName: {roleProfileName}, admin id: {adminId}, roleProfileId: {roleProfileId}" - ); - return false; - } - - return true; - } - - public IEnumerable GetNRPProfessionalGroups() - { - return connection.Query( - @"SELECT ID, ProfessionalGroup, Active - FROM NRPProfessionalGroups - WHERE (Active = 1) - ORDER BY ProfessionalGroup" - ); - } - - public RoleProfileBase? GetRoleProfileByName(string roleProfileName, int adminId) - { - return connection.Query( - $@"SELECT {SelfAssessmentBaseFields} - FROM {SelfAssessmentBaseTables} - WHERE (rp.Name = @roleProfileName)", - new { roleProfileName, adminId } - ).FirstOrDefault(); - } - - public bool UpdateRoleProfileProfessionalGroup(int roleProfileId, int adminId, int? nrpProfessionalGroupID) - { - var sameCount = (int)connection.ExecuteScalar( - @"SELECT COUNT(*) FROM RoleProfiles WHERE ID = @roleProfileId AND NRPProfessionalGroupID = @nrpProfessionalGroupID", - new { roleProfileId, nrpProfessionalGroupID } - ); - if (sameCount > 0) - { - //same so don't update: - return false; - } - - //needs updating: - var numberOfAffectedRows = connection.Execute( - @"UPDATE SelfAssessments SET NRPProfessionalGroupID = @nrpProfessionalGroupID, NRPSubGroupID = NULL, NRPRoleID = NULL, UpdatedByAdminID = @adminId - WHERE ID = @roleProfileId", - new { nrpProfessionalGroupID, adminId, roleProfileId } - ); - if (numberOfAffectedRows > 0) - { - return true; - } - - return false; - } - } -} diff --git a/DigitalLearningSolutions.Data/DataServices/SupervisorDataService.cs b/DigitalLearningSolutions.Data/DataServices/SupervisorDataService.cs index 0d8fab0715..c97ecf67a8 100644 --- a/DigitalLearningSolutions.Data/DataServices/SupervisorDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/SupervisorDataService.cs @@ -1,7 +1,7 @@ namespace DigitalLearningSolutions.Data.DataServices { using Dapper; - using DigitalLearningSolutions.Data.Models.RoleProfiles; + using DigitalLearningSolutions.Data.Models.CompetencyAssessments; using DigitalLearningSolutions.Data.Models.SelfAssessments; using DigitalLearningSolutions.Data.Models.Supervisor; using Microsoft.Extensions.Logging; @@ -23,8 +23,8 @@ public interface ISupervisorDataService IEnumerable GetSupervisorDashboardToDoItemsForRequestedSignOffs(int adminId); IEnumerable GetSupervisorDashboardToDoItemsForRequestedReviews(int adminId); DelegateSelfAssessment? GetSelfAssessmentBaseByCandidateAssessmentId(int candidateAssessmentId, int? adminIdCategoryId); - IEnumerable GetAvailableRoleProfilesForDelegate(int candidateId, int centreId, int? categoryId); - RoleProfile? GetRoleProfileById(int selfAssessmentId); + IEnumerable GetAvailableCompetencyAssessmentsForDelegate(int candidateId, int centreId, int? categoryId); + CompetencyAssessment? GetCompetencyAssessmentById(int selfAssessmentId); IEnumerable GetSupervisorRolesForSelfAssessment(int selfAssessmentId); IEnumerable GetSupervisorRolesBySelfAssessmentIdForSupervisor(int selfAssessmentId); IEnumerable GetDelegateNominatableSupervisorRolesForSelfAssessment(int selfAssessmentId); @@ -576,7 +576,7 @@ public bool RemoveSupervisorDelegateById(int supervisorDelegateId, int delegateU public IEnumerable GetSelfAssessmentsForSupervisorDelegateId(int supervisorDelegateId, int? adminIdCategoryId) { return connection.Query( - @$"SELECT {delegateSelfAssessmentFields}, COALESCE(ca.LastAccessed, ca.StartedDate) AS LastAccessed, ca.CompleteByDate, ca.LaunchCount, ca.CompletedDate, r.RoleProfile, sg.SubGroup, pg.ProfessionalGroup,CONVERT(BIT, IIF(cas.CandidateAssessmentID IS NULL, 0, 1)) AS IsAssignedToSupervisor,ca.DelegateUserID, + @$"SELECT {delegateSelfAssessmentFields}, COALESCE(ca.LastAccessed, ca.StartedDate) AS LastAccessed, ca.CompleteByDate, ca.LaunchCount, ca.CompletedDate, r.CompetencyAssessment, sg.SubGroup, pg.ProfessionalGroup,CONVERT(BIT, IIF(cas.CandidateAssessmentID IS NULL, 0, 1)) AS IsAssignedToSupervisor,ca.DelegateUserID, (SELECT COUNT(*) AS Expr1 FROM CandidateAssessmentSupervisorVerifications AS casv WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Requested IS NOT NULL) AND (Verified IS NULL)) AS SignOffRequested, @@ -695,7 +695,7 @@ FROM SelfAssessmentResults AS sar2 public DelegateSelfAssessment? GetSelfAssessmentByCandidateAssessmentId(int candidateAssessmentId, int adminId, int? adminIdCategoryId) { return connection.Query( - @$"SELECT ca.ID, sa.ID AS SelfAssessmentID, sa.Name AS RoleName, sa.SupervisorSelfAssessmentReview, sa.SupervisorResultsReview, sa.ReviewerCommentsLabel, COALESCE (sasr.RoleName, 'Supervisor') AS SupervisorRoleTitle, ca.StartedDate, ca.LastAccessed, ca.CompleteByDate, ca.LaunchCount, ca.CompletedDate, r.RoleProfile, sg.SubGroup, pg.ProfessionalGroup, sa.SupervisorResultsReview AS IsSupervisorResultsReviewed, + @$"SELECT ca.ID, sa.ID AS SelfAssessmentID, sa.Name AS RoleName, sa.SupervisorSelfAssessmentReview, sa.SupervisorResultsReview, sa.ReviewerCommentsLabel, COALESCE (sasr.RoleName, 'Supervisor') AS SupervisorRoleTitle, ca.StartedDate, ca.LastAccessed, ca.CompleteByDate, ca.LaunchCount, ca.CompletedDate, r.CompetencyAssessment, sg.SubGroup, pg.ProfessionalGroup, sa.SupervisorResultsReview AS IsSupervisorResultsReviewed, (SELECT COUNT(*) AS Expr1 FROM CandidateAssessmentSupervisorVerifications AS casv WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Requested IS NOT NULL) AND (Verified IS NULL)) AS SignOffRequested, @@ -763,10 +763,10 @@ public int RemoveSelfAssessmentResultSupervisorVerificationById(int id) } return numberOfAffectedRows; } - public IEnumerable GetAvailableRoleProfilesForDelegate(int delegateUserId, int centreId, int? categoryId) + public IEnumerable GetAvailableCompetencyAssessmentsForDelegate(int delegateUserId, int centreId, int? categoryId) { - return connection.Query( - $@"SELECT rp.ID, rp.Name AS RoleProfileName, rp.Description, rp.BrandID, rp.ParentSelfAssessmentID, rp.[National], rp.[Public], rp.CreatedByAdminID AS OwnerAdminID, rp.NRPProfessionalGroupID, rp.NRPSubGroupID, rp.NRPRoleID, rp.PublishStatusID, 0 AS UserRole, rp.CreatedDate, + return connection.Query( + $@"SELECT rp.ID, rp.Name AS CompetencyAssessmentName, rp.Description, rp.BrandID, rp.ParentSelfAssessmentID, rp.[National], rp.[Public], rp.CreatedByAdminID AS OwnerAdminID, rp.NRPProfessionalGroupID, rp.NRPSubGroupID, rp.NRPRoleID, rp.PublishStatusID, 0 AS UserRole, rp.CreatedDate, (SELECT BrandName FROM Brands WHERE (BrandID = rp.BrandID)) AS Brand, '' AS ParentSelfAssessment, '' AS Owner, rp.Archived, rp.LastEdit, @@ -776,7 +776,7 @@ FROM NRPProfessionalGroups (SELECT SubGroup FROM NRPSubGroups WHERE (ID = rp.NRPSubGroupID)) AS NRPSubGroup, - (SELECT RoleProfile + (SELECT CompetencyAssessment FROM NRPRoles WHERE (ID = rp.NRPRoleID)) AS NRPRole, 0 AS SelfAssessmentReviewID FROM SelfAssessments AS rp INNER JOIN @@ -791,10 +791,10 @@ FROM CandidateAssessments AS CA ); } - public RoleProfile? GetRoleProfileById(int selfAssessmentId) + public CompetencyAssessment? GetCompetencyAssessmentById(int selfAssessmentId) { - return connection.Query( - $@"SELECT ID, Name AS RoleProfileName, Description, BrandID, ParentSelfAssessmentID, [National], [Public], CreatedByAdminID AS OwnerAdminID, NRPProfessionalGroupID, NRPSubGroupID, NRPRoleID, PublishStatusID, 0 AS UserRole, CreatedDate, + return connection.Query( + $@"SELECT ID, Name AS CompetencyAssessmentName, Description, BrandID, ParentSelfAssessmentID, [National], [Public], CreatedByAdminID AS OwnerAdminID, NRPProfessionalGroupID, NRPSubGroupID, NRPRoleID, PublishStatusID, 0 AS UserRole, CreatedDate, (SELECT BrandName FROM Brands WHERE (BrandID = rp.BrandID)) AS Brand, @@ -806,7 +806,7 @@ FROM NRPProfessionalGroups (SELECT SubGroup FROM NRPSubGroups WHERE (ID = rp.NRPSubGroupID)) AS NRPSubGroup, - (SELECT RoleProfile + (SELECT CompetencyAssessment FROM NRPRoles WHERE (ID = rp.NRPRoleID)) AS NRPRole, 0 AS SelfAssessmentReviewID FROM SelfAssessments AS rp @@ -1113,7 +1113,7 @@ FROM CandidateAssessmentSupervisors { return connection.Query( @"SELECT ca.ID, ca.SelfAssessmentID, sa.Name AS RoleName, sa.ReviewerCommentsLabel, COALESCE (sasr.SelfAssessmentReview, 1) AS SelfAssessmentReview, COALESCE (sasr.ResultsReview, 1) AS SupervisorResultsReview, COALESCE (sasr.RoleName, 'Supervisor') AS SupervisorRoleTitle, ca.StartedDate, - ca.LastAccessed, ca.CompleteByDate, ca.LaunchCount, ca.CompletedDate, npg.ProfessionalGroup, nsg.SubGroup, nr.RoleProfile, casv.ID AS CandidateAssessmentSupervisorVerificationId, + ca.LastAccessed, ca.CompleteByDate, ca.LaunchCount, ca.CompletedDate, npg.ProfessionalGroup, nsg.SubGroup, nr.CompetencyAssessment, casv.ID AS CandidateAssessmentSupervisorVerificationId, (SELECT COUNT(sas1.CompetencyID) AS CompetencyAssessmentQuestionCount FROM SelfAssessmentStructure AS sas1 INNER JOIN CandidateAssessments AS ca1 ON sas1.SelfAssessmentID = ca1.SelfAssessmentID INNER JOIN diff --git a/DigitalLearningSolutions.Data/Enums/NavMenuTab.cs b/DigitalLearningSolutions.Data/Enums/NavMenuTab.cs index a0d60c8399..7691f565e9 100644 --- a/DigitalLearningSolutions.Data/Enums/NavMenuTab.cs +++ b/DigitalLearningSolutions.Data/Enums/NavMenuTab.cs @@ -91,9 +91,9 @@ public class NavMenuTab : Enumeration nameof(Frameworks) ); - public static readonly NavMenuTab RolesProfiles = new NavMenuTab( + public static readonly NavMenuTab CompetencyAssessments = new NavMenuTab( 17, - nameof(RolesProfiles) + nameof(CompetencyAssessments) ); public static readonly NavMenuTab LogOut = new NavMenuTab( diff --git a/DigitalLearningSolutions.Data/Models/RoleProfiles/RoleProfile.cs b/DigitalLearningSolutions.Data/Models/CompetencyAssessments/CompetencyAssessment.cs similarity index 74% rename from DigitalLearningSolutions.Data/Models/RoleProfiles/RoleProfile.cs rename to DigitalLearningSolutions.Data/Models/CompetencyAssessments/CompetencyAssessment.cs index ec1970fc92..f67d03ecbd 100644 --- a/DigitalLearningSolutions.Data/Models/RoleProfiles/RoleProfile.cs +++ b/DigitalLearningSolutions.Data/Models/CompetencyAssessments/CompetencyAssessment.cs @@ -1,8 +1,8 @@ -namespace DigitalLearningSolutions.Data.Models.RoleProfiles +namespace DigitalLearningSolutions.Data.Models.CompetencyAssessments { using System; using System.ComponentModel.DataAnnotations; - public class RoleProfile : RoleProfileBase + public class CompetencyAssessment : CompetencyAssessmentBase { public DateTime CreatedDate { get; set; } public string? Brand @@ -10,14 +10,14 @@ public string? Brand get => brand; set => brand = GetValidOrNull(value); } - public string? ParentRoleProfile { get; set; } + public string? ParentCompetencyAssessment { get; set; } public string? Owner { get; set; } public DateTime? Archived { get; set; } public DateTime LastEdit { get; set; } public string? NRPProfessionalGroup { get; set; } public string? NRPSubGroup { get; set; } public string? NRPRole { get; set; } - public int? RoleProfileReviewID { get; set; } + public int? CompetencyAssessmentReviewID { get; set; } private string? brand; private static string? GetValidOrNull(string? toValidate) { diff --git a/DigitalLearningSolutions.Data/Models/RoleProfiles/RoleProfileBase.cs b/DigitalLearningSolutions.Data/Models/CompetencyAssessments/CompetencyAssessmentBase.cs similarity index 71% rename from DigitalLearningSolutions.Data/Models/RoleProfiles/RoleProfileBase.cs rename to DigitalLearningSolutions.Data/Models/CompetencyAssessments/CompetencyAssessmentBase.cs index 1c843fae46..23ec8fede7 100644 --- a/DigitalLearningSolutions.Data/Models/RoleProfiles/RoleProfileBase.cs +++ b/DigitalLearningSolutions.Data/Models/CompetencyAssessments/CompetencyAssessmentBase.cs @@ -1,16 +1,16 @@ -namespace DigitalLearningSolutions.Data.Models.RoleProfiles +namespace DigitalLearningSolutions.Data.Models.CompetencyAssessments { using System; using System.ComponentModel.DataAnnotations; - public class RoleProfileBase + public class CompetencyAssessmentBase { public int ID { get; set; } [StringLength(255, MinimumLength = 3)] [Required] - public string RoleProfileName { get; set; } = string.Empty; + public string CompetencyAssessmentName { get; set; } = string.Empty; public string? Description { get; set; } public int BrandID { get; set; } - public int? ParentRoleProfileID { get; set; } + public int? ParentCompetencyAssessmentID { get; set; } public bool National { get; set; } public bool Public { get; set; } public int OwnerAdminID { get; set; } @@ -22,3 +22,4 @@ public class RoleProfileBase } } + diff --git a/DigitalLearningSolutions.Data/Models/RoleProfiles/NRPProfessionalGroups.cs b/DigitalLearningSolutions.Data/Models/CompetencyAssessments/NRPProfessionalGroups.cs similarity index 81% rename from DigitalLearningSolutions.Data/Models/RoleProfiles/NRPProfessionalGroups.cs rename to DigitalLearningSolutions.Data/Models/CompetencyAssessments/NRPProfessionalGroups.cs index de1f9e4588..bdc4f6942a 100644 --- a/DigitalLearningSolutions.Data/Models/RoleProfiles/NRPProfessionalGroups.cs +++ b/DigitalLearningSolutions.Data/Models/CompetencyAssessments/NRPProfessionalGroups.cs @@ -1,4 +1,4 @@ -namespace DigitalLearningSolutions.Data.Models.RoleProfiles +namespace DigitalLearningSolutions.Data.Models.CompetencyAssessments { using System.ComponentModel.DataAnnotations; public class NRPProfessionalGroups @@ -10,3 +10,4 @@ public class NRPProfessionalGroups public bool Active { get; set; } } } + diff --git a/DigitalLearningSolutions.Data/Models/RoleProfiles/NRPRoles.cs b/DigitalLearningSolutions.Data/Models/CompetencyAssessments/NRPRoles.cs similarity index 67% rename from DigitalLearningSolutions.Data/Models/RoleProfiles/NRPRoles.cs rename to DigitalLearningSolutions.Data/Models/CompetencyAssessments/NRPRoles.cs index f404bfb243..22cba2ada8 100644 --- a/DigitalLearningSolutions.Data/Models/RoleProfiles/NRPRoles.cs +++ b/DigitalLearningSolutions.Data/Models/CompetencyAssessments/NRPRoles.cs @@ -1,4 +1,4 @@ -namespace DigitalLearningSolutions.Data.Models.RoleProfiles +namespace DigitalLearningSolutions.Data.Models.CompetencyAssessments { using System.ComponentModel.DataAnnotations; public class NRPRoles @@ -7,7 +7,7 @@ public class NRPRoles public int NRPSubGroupID { get; set; } [StringLength(255, MinimumLength = 3)] [Required] - public string RoleProfile { get; set; } = string.Empty; + public string ProfileName { get; set; } = string.Empty; public bool Active { get; set; } } } diff --git a/DigitalLearningSolutions.Data/Models/RoleProfiles/NRPSubGroups.cs b/DigitalLearningSolutions.Data/Models/CompetencyAssessments/NRPSubGroups.cs similarity index 83% rename from DigitalLearningSolutions.Data/Models/RoleProfiles/NRPSubGroups.cs rename to DigitalLearningSolutions.Data/Models/CompetencyAssessments/NRPSubGroups.cs index 6d43b936a2..fda19bcb09 100644 --- a/DigitalLearningSolutions.Data/Models/RoleProfiles/NRPSubGroups.cs +++ b/DigitalLearningSolutions.Data/Models/CompetencyAssessments/NRPSubGroups.cs @@ -1,4 +1,4 @@ -namespace DigitalLearningSolutions.Data.Models.RoleProfiles +namespace DigitalLearningSolutions.Data.Models.CompetencyAssessments { using System.ComponentModel.DataAnnotations; public class NRPSubGroups diff --git a/DigitalLearningSolutions.Data/Models/Frameworks/DashboardData.cs b/DigitalLearningSolutions.Data/Models/Frameworks/DashboardData.cs index f5d28bd284..207e61079c 100644 --- a/DigitalLearningSolutions.Data/Models/Frameworks/DashboardData.cs +++ b/DigitalLearningSolutions.Data/Models/Frameworks/DashboardData.cs @@ -4,7 +4,7 @@ public class DashboardData { public int FrameworksCount { get; set; } public int MyFrameworksCount { get; set; } - public int RoleProfileCount { get; set; } - public int MyRoleProfileCount { get; set; } + public int CompetencyAssessmentCount { get; set; } + public int MyCompetencyAssessmentCount { get; set; } } } diff --git a/DigitalLearningSolutions.Data/Models/Frameworks/DashboardToDoItem.cs b/DigitalLearningSolutions.Data/Models/Frameworks/DashboardToDoItem.cs index 96ee4e8326..dc7e6b0386 100644 --- a/DigitalLearningSolutions.Data/Models/Frameworks/DashboardToDoItem.cs +++ b/DigitalLearningSolutions.Data/Models/Frameworks/DashboardToDoItem.cs @@ -4,7 +4,7 @@ public class DashboardToDoItem { public int? FrameworkID { get; set; } - public int? RoleProfileID { get; set; } + public int? CompetencyAssessmentID { get; set; } public string ItemName { get; set; } = string.Empty; public string RequestorName { get; set; } = string.Empty; public bool SignOffRequired { get; set; } diff --git a/DigitalLearningSolutions.Data/Models/SessionData/CompetencyAssessments/SessionNewCompetencyAssessment.cs b/DigitalLearningSolutions.Data/Models/SessionData/CompetencyAssessments/SessionNewCompetencyAssessment.cs new file mode 100644 index 0000000000..b8d572404f --- /dev/null +++ b/DigitalLearningSolutions.Data/Models/SessionData/CompetencyAssessments/SessionNewCompetencyAssessment.cs @@ -0,0 +1,15 @@ +namespace DigitalLearningSolutions.Data.Models.SessionData.CompetencyAssessments +{ + using System; + using DigitalLearningSolutions.Data.Models.CompetencyAssessments; + public class SessionNewCompetencyAssessment + { + public SessionNewCompetencyAssessment() + { + Id = new Guid(); + CompetencyAssessmentBase = new CompetencyAssessmentBase(); + } + public Guid Id { get; set; } + public CompetencyAssessmentBase CompetencyAssessmentBase { get; set; } + } +} diff --git a/DigitalLearningSolutions.Data/Models/SessionData/RoleProfiles/SessionNewRoleProfile.cs b/DigitalLearningSolutions.Data/Models/SessionData/RoleProfiles/SessionNewRoleProfile.cs deleted file mode 100644 index 617c8ebb64..0000000000 --- a/DigitalLearningSolutions.Data/Models/SessionData/RoleProfiles/SessionNewRoleProfile.cs +++ /dev/null @@ -1,15 +0,0 @@ -namespace DigitalLearningSolutions.Data.Models.SessionData.RoleProfiles -{ - using System; - using DigitalLearningSolutions.Data.Models.RoleProfiles; - public class SessionNewRoleProfile - { - public SessionNewRoleProfile() - { - Id = new Guid(); - RoleProfileBase = new RoleProfileBase(); - } - public Guid Id { get; set; } - public RoleProfileBase RoleProfileBase { get; set; } - } -} diff --git a/DigitalLearningSolutions.Data/Models/SessionData/Supervisor/SessionEnrolOnRoleProfile.cs b/DigitalLearningSolutions.Data/Models/SessionData/Supervisor/SessionEnrolOnCompetencyAssessment.cs similarity index 84% rename from DigitalLearningSolutions.Data/Models/SessionData/Supervisor/SessionEnrolOnRoleProfile.cs rename to DigitalLearningSolutions.Data/Models/SessionData/Supervisor/SessionEnrolOnCompetencyAssessment.cs index 29b7b1b261..1fd5fee129 100644 --- a/DigitalLearningSolutions.Data/Models/SessionData/Supervisor/SessionEnrolOnRoleProfile.cs +++ b/DigitalLearningSolutions.Data/Models/SessionData/Supervisor/SessionEnrolOnCompetencyAssessment.cs @@ -1,7 +1,7 @@ namespace DigitalLearningSolutions.Data.Models.SessionData.Supervisor { using System; - public class SessionEnrolOnRoleProfile + public class SessionEnrolOnCompetencyAssessment { public int? SelfAssessmentID { get; set; } public DateTime? CompleteByDate { get; set; } diff --git a/DigitalLearningSolutions.Data/Models/Supervisor/DelegateSelfAssessment.cs b/DigitalLearningSolutions.Data/Models/Supervisor/DelegateSelfAssessment.cs index 51ddb99a85..014de6be9f 100644 --- a/DigitalLearningSolutions.Data/Models/Supervisor/DelegateSelfAssessment.cs +++ b/DigitalLearningSolutions.Data/Models/Supervisor/DelegateSelfAssessment.cs @@ -22,7 +22,7 @@ public class DelegateSelfAssessment public string? DescriptionLabel { get; set; } public string? ReviewerCommentsLabel { get; set; } public string? SubGroup { get; set; } - public string? RoleProfile { get; set; } + public string? CompetencyAssessment { get; set; } public int SignOffRequested { get; set; } public int ResultsVerificationRequests { get; set; } public bool IsSupervisorResultsReviewed { get; set; } diff --git a/DigitalLearningSolutions.Web.Tests/TestHelpers/SupervisorTagTestHelper.cs b/DigitalLearningSolutions.Web.Tests/TestHelpers/SupervisorTagTestHelper.cs index e55cc5fe1a..ba437edd2d 100644 --- a/DigitalLearningSolutions.Web.Tests/TestHelpers/SupervisorTagTestHelper.cs +++ b/DigitalLearningSolutions.Web.Tests/TestHelpers/SupervisorTagTestHelper.cs @@ -101,7 +101,7 @@ public static DelegateSelfAssessment CreateDefaultDelegateSelfAssessment( string? descriptionLabel = null, string? reviewerCommentsLabel = null, string? subGroup = null, - string? roleProfile = null, + string? competencyAssessment = null, int signOffRequested =1, int resultsVerificationRequests =1, bool isSupervisorResultsReviewed =false, @@ -116,7 +116,7 @@ public static DelegateSelfAssessment CreateDefaultDelegateSelfAssessment( ResultsVerificationRequests = resultsVerificationRequests, ReviewerCommentsLabel = reviewerCommentsLabel, SubGroup = subGroup, - RoleProfile = roleProfile, + CompetencyAssessment = competencyAssessment, SignOffRequested = signOffRequested, SupervisorResultsReview = supervisorResultsReview, SupervisorSelfAssessmentReview= supervisorSelfAssessmentReview, diff --git a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs new file mode 100644 index 0000000000..1441624e6f --- /dev/null +++ b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs @@ -0,0 +1,306 @@ +namespace DigitalLearningSolutions.Web.Controllers.CompetencyAssessmentsController +{ + using DigitalLearningSolutions.Data.Models.CompetencyAssessments; + using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments; + using Microsoft.AspNetCore.Mvc; + using Microsoft.Extensions.Logging; + using DigitalLearningSolutions.Web.Extensions; + using DigitalLearningSolutions.Data.Models.SessionData.CompetencyAssessments; + using Microsoft.AspNetCore.Http; + using System; + using System.Collections.Generic; + using DigitalLearningSolutions.Data.Enums; + using DigitalLearningSolutions.Web.Attributes; + using DigitalLearningSolutions.Web.Models.Enums; + + public partial class CompetencyAssessmentsController + { + private const string CookieName = "DLSFrameworkService"; + [Route("/CompetencyAssessments/View/{tabname}/{page=1:int}")] + [SetSelectedTab(nameof(NavMenuTab.CompetencyAssessments))] + public IActionResult ViewCompetencyAssessments(string tabname, string? searchString = null, + string sortBy = CompetencyAssessmentSortByOptionTexts.CompetencyAssessmentName, + string sortDirection = BaseCompetencyAssessmentsPageViewModel.AscendingText, + int page = 1 + ) + { + var adminId = GetAdminID(); + var isWorkforceManager = GetIsWorkforceManager(); + var isWorkforceContributor = GetIsWorkforceContributor(); + IEnumerable competencyAssessments; + if (tabname == "All") + { + competencyAssessments = competencyAssessmentService.GetAllCompetencyAssessments(adminId); + } + else + { + if (!isWorkforceContributor && !isWorkforceManager) + { + return RedirectToAction("ViewCompetencyAssessments", "CompetencyAssessments", new { tabname = "All" }); + } + competencyAssessments = competencyAssessmentService.GetCompetencyAssessmentsForAdminId(adminId); + } + if (competencyAssessments == null) + { + logger.LogWarning($"Attempt to display competency assessments for admin {adminId} returned null."); + return StatusCode(403); + } + MyCompetencyAssessmentsViewModel myCompetencyAssessments; + AllCompetencyAssessmentsViewModel allCompetencyAssessments; + if (tabname == "Mine") + { + myCompetencyAssessments = new MyCompetencyAssessmentsViewModel( + competencyAssessments, + searchString, + sortBy, + sortDirection, + page, + isWorkforceManager); + allCompetencyAssessments = new AllCompetencyAssessmentsViewModel( + new List(), + searchString, + sortBy, + sortDirection, + page + ); + } + else + { + allCompetencyAssessments = new AllCompetencyAssessmentsViewModel( + competencyAssessments, + searchString, + sortBy, + sortDirection, + page); + myCompetencyAssessments = new MyCompetencyAssessmentsViewModel( + new List(), + searchString, + sortBy, + sortDirection, + page, + isWorkforceManager + ); + } + + var currentTab = tabname == "All" ? CompetencyAssessmentsTab.AllCompetencyAssessments : CompetencyAssessmentsTab.MyCompetencyAssessments; + CompetencyAssessmentsViewModel? model = new CompetencyAssessmentsViewModel( + isWorkforceManager, + isWorkforceContributor, + allCompetencyAssessments, + myCompetencyAssessments, + currentTab + ); + return View("Index", model); + } + public IActionResult StartNewCompetencyAssessmentSession() + { + var adminId = GetAdminID(); + TempData.Clear(); + var sessionNewCompetencyAssessment = new SessionNewCompetencyAssessment(); + if (!Request.Cookies.ContainsKey(CookieName)) + { + var id = Guid.NewGuid(); + + Response.Cookies.Append( + CookieName, + id.ToString(), + new CookieOptions + { + Expires = DateTimeOffset.UtcNow.AddDays(30) + }); + + sessionNewCompetencyAssessment.Id = id; + } + else + { + if (Request.Cookies.TryGetValue(CookieName, out string idString)) + { + sessionNewCompetencyAssessment.Id = Guid.Parse(idString); + } + else + { + var id = Guid.NewGuid(); + + Response.Cookies.Append( + CookieName, + id.ToString(), + new CookieOptions + { + Expires = DateTimeOffset.UtcNow.AddDays(30) + }); + sessionNewCompetencyAssessment.Id = id; + } + } + CompetencyAssessmentBase competencyAssessmentBase = new CompetencyAssessmentBase() + { + BrandID = 6, + OwnerAdminID = adminId, + National = true, + Public = true, + PublishStatusID = 1, + UserRole = 3 + }; + sessionNewCompetencyAssessment.CompetencyAssessmentBase = competencyAssessmentBase; + TempData.Set(sessionNewCompetencyAssessment); + return RedirectToAction("CompetencyAssessmentName", "CompetencyAssessments", new { actionname = "New" }); + } + + [Route("/CompetencyAssessments/Name/{actionname}/{competencyAssessmentId}")] + [Route("/CompetencyAssessments/Name/{actionname}")] + [SetSelectedTab(nameof(NavMenuTab.CompetencyAssessments))] + public IActionResult CompetencyAssessmentName(string actionname, int competencyAssessmentId = 0) + { + var adminId = GetAdminID(); + CompetencyAssessmentBase? competencyAssessmentBase; + if (competencyAssessmentId > 0) + { + competencyAssessmentBase = competencyAssessmentService.GetCompetencyAssessmentBaseById(competencyAssessmentId, adminId); + if (competencyAssessmentBase == null) + { + logger.LogWarning($"Failed to load name page for competencyAssessmentId: {competencyAssessmentId} adminId: {adminId}"); + return StatusCode(500); + } + if (competencyAssessmentBase.UserRole < 2) + { + return StatusCode(403); + } + } + else + { + SessionNewCompetencyAssessment sessionNewCompetencyAssessment = TempData.Peek(); + TempData.Set(sessionNewCompetencyAssessment); + competencyAssessmentBase = sessionNewCompetencyAssessment.CompetencyAssessmentBase; + TempData.Set(sessionNewCompetencyAssessment); + } + return View("Name", competencyAssessmentBase); + } + + [HttpPost] + [Route("/CompetencyAssessments/Name/{actionname}/{competencyAssessmentId}")] + [Route("/CompetencyAssessments/Name/{actionname}")] + [SetSelectedTab(nameof(NavMenuTab.CompetencyAssessments))] + public IActionResult SaveProfileName(CompetencyAssessmentBase competencyAssessmentBase, string actionname, int competencyAssessmentId = 0) + { + if (!ModelState.IsValid) + { + ModelState.Remove(nameof(CompetencyAssessmentBase.CompetencyAssessmentName)); + ModelState.AddModelError(nameof(CompetencyAssessmentBase.CompetencyAssessmentName), "Please enter a valid competency assessment name (between 3 and 255 characters)"); + // do something + return View("Name", competencyAssessmentBase); + } + else + { + if (actionname == "New") + { + var sameItems = competencyAssessmentService.GetCompetencyAssessmentByName(competencyAssessmentBase.CompetencyAssessmentName, GetAdminID()); + if (sameItems != null) + { + ModelState.Remove(nameof(CompetencyAssessmentBase.CompetencyAssessmentName)); + ModelState.AddModelError(nameof(CompetencyAssessmentBase.CompetencyAssessmentName), "Another competency assessment exists with that name. Please choose a different name."); + // do something + return View("Name", competencyAssessmentBase); + } + SessionNewCompetencyAssessment sessionNewCompetencyAssessment = TempData.Peek(); + sessionNewCompetencyAssessment.CompetencyAssessmentBase = competencyAssessmentBase; + TempData.Set(sessionNewCompetencyAssessment); + return RedirectToAction("CompetencyAssessmentProfessionalGroup", "CompetencyAssessments", new { actionname }); + } + else + { + var adminId = GetAdminID(); + var isUpdated = competencyAssessmentService.UpdateCompetencyAssessmentName(competencyAssessmentBase.ID, adminId, competencyAssessmentBase.CompetencyAssessmentName); + if (isUpdated) + { + return RedirectToAction("ViewCompetencyAssessment", new { tabname = "Details", competencyAssessmentId }); + } + else + { + ModelState.AddModelError(nameof(CompetencyAssessmentBase.CompetencyAssessmentName), "Another competency assessment exists with that name. Please choose a different name."); + // do something + return View("Name", competencyAssessmentBase); + } + } + + } + } + + [Route("/CompetencyAssessments/ProfessionalGroup/{actionname}/{competencyAssessmentId}")] + [Route("/CompetencyAssessments/ProfessionalGroup/{actionname}")] + [SetSelectedTab(nameof(NavMenuTab.CompetencyAssessments))] + public IActionResult CompetencyAssessmentProfessionalGroup(string actionname, int competencyAssessmentId = 0) + { + var adminId = GetAdminID(); + CompetencyAssessmentBase? competencyAssessmentBase; + if (competencyAssessmentId > 0) + { + competencyAssessmentBase = competencyAssessmentService.GetCompetencyAssessmentBaseById(competencyAssessmentId, adminId); + if (competencyAssessmentBase == null) + { + logger.LogWarning($"Failed to load Professional Group page for competencyAssessmentId: {competencyAssessmentId} adminId: {adminId}"); + return StatusCode(500); + } + if (competencyAssessmentBase.UserRole < 2) + { + return StatusCode(403); + } + } + else + { + SessionNewCompetencyAssessment sessionNewCompetencyAssessment = TempData.Peek(); + TempData.Set(sessionNewCompetencyAssessment); + competencyAssessmentBase = sessionNewCompetencyAssessment.CompetencyAssessmentBase; + TempData.Set(sessionNewCompetencyAssessment); + } + var professionalGroups = competencyAssessmentService.GetNRPProfessionalGroups(); + var model = new ProfessionalGroupViewModel() + { + NRPProfessionalGroups = professionalGroups, + CompetencyAssessmentBase = competencyAssessmentBase + }; + return View("ProfessionalGroup", model); + } + + [HttpPost] + [Route("/CompetencyAssessments/ProfessionalGroup/{actionname}/{competencyAssessmentId}")] + [Route("/CompetencyAssessments/ProfessionalGroup/{actionname}")] + [SetSelectedTab(nameof(NavMenuTab.CompetencyAssessments))] + public IActionResult SaveProfessionalGroup(CompetencyAssessmentBase competencyAssessmentBase, string actionname, int competencyAssessmentId = 0) + { + if (competencyAssessmentBase.NRPProfessionalGroupID == null) + { + ModelState.Remove(nameof(CompetencyAssessmentBase.NRPProfessionalGroupID)); + ModelState.AddModelError(nameof(CompetencyAssessmentBase.NRPProfessionalGroupID), "Please choose a professional group" + (competencyAssessmentId == 0 ? "or Skip this step" : "") + "."); + // do something + return View("Name", competencyAssessmentBase); + } + if (actionname == "New") + { + SessionNewCompetencyAssessment sessionNewCompetencyAssessment = TempData.Peek(); + sessionNewCompetencyAssessment.CompetencyAssessmentBase = competencyAssessmentBase; + TempData.Set(sessionNewCompetencyAssessment); + return RedirectToAction("CompetencyAssessmentSubGroup", "CompetencyAssessments", new { actionname }); + } + else + { + var adminId = GetAdminID(); + var isUpdated = competencyAssessmentService.UpdateCompetencyAssessmentProfessionalGroup(competencyAssessmentBase.ID, adminId, competencyAssessmentBase.NRPProfessionalGroupID); + if (isUpdated) + { + return RedirectToAction("CompetencyAssessmentSubGroup", "CompetencyAssessments", new { actionname, competencyAssessmentId }); + } + else + { + return RedirectToAction("ViewCompetencyAssessment", new { tabname = "Details", competencyAssessmentId }); + } + } + } + + [Route("/CompetencyAssessments/SubGroup/{actionname}/{competencyAssessmentId}")] + [Route("/CompetencyAssessments/SubGroup/{actionname}")] + [SetSelectedTab(nameof(NavMenuTab.CompetencyAssessments))] + public IActionResult CompetencyAssessmentSubGroup(string actionname, int competencyAssessmentId = 0) + { + return View("SubGroup"); + } + } +} diff --git a/DigitalLearningSolutions.Web/Controllers/RoleProfilesController/RoleProfilesController.cs b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessmentsController.cs similarity index 75% rename from DigitalLearningSolutions.Web/Controllers/RoleProfilesController/RoleProfilesController.cs rename to DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessmentsController.cs index 9a3173289f..86da61c39e 100644 --- a/DigitalLearningSolutions.Web/Controllers/RoleProfilesController/RoleProfilesController.cs +++ b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessmentsController.cs @@ -1,54 +1,54 @@ -namespace DigitalLearningSolutions.Web.Controllers.RoleProfilesController -{ - using DigitalLearningSolutions.Web.Helpers; - using DigitalLearningSolutions.Web.Services; - using Microsoft.AspNetCore.Authorization; - using Microsoft.AspNetCore.Mvc; - using Microsoft.Extensions.Configuration; - using Microsoft.Extensions.Logging; - - [Authorize(Policy = CustomPolicies.UserFrameworksAdminOnly)] - public partial class RoleProfilesController : Controller - { - private readonly IRoleProfileService roleProfileService; - private readonly ICommonService commonService; - private readonly IFrameworkNotificationService frameworkNotificationService; - private readonly ILogger logger; - private readonly IConfiguration config; - public RoleProfilesController( - IRoleProfileService roleProfileService, - ICommonService commonService, - IFrameworkNotificationService frameworkNotificationService, - ILogger logger, - IConfiguration config) - { - this.roleProfileService = roleProfileService; - this.commonService = commonService; - this.frameworkNotificationService = frameworkNotificationService; - this.logger = logger; - this.config = config; - } - public IActionResult Index() - { - return View(); - } - private int? GetCentreId() - { - return User.GetCustomClaimAsInt(CustomClaimTypes.UserCentreId); - } - private int GetAdminID() - { - return User.GetCustomClaimAsRequiredInt(CustomClaimTypes.UserAdminId); - } - private bool GetIsWorkforceManager() - { - var isWorkforceManager = User.GetCustomClaimAsBool(CustomClaimTypes.IsWorkforceManager); - return isWorkforceManager != null && (bool)isWorkforceManager; - } - private bool GetIsWorkforceContributor() - { - var isWorkforceContributor = User.GetCustomClaimAsBool(CustomClaimTypes.IsWorkforceContributor); - return isWorkforceContributor != null && (bool)isWorkforceContributor; - } - } -} +namespace DigitalLearningSolutions.Web.Controllers.CompetencyAssessmentsController +{ + using DigitalLearningSolutions.Web.Helpers; + using DigitalLearningSolutions.Web.Services; + using Microsoft.AspNetCore.Authorization; + using Microsoft.AspNetCore.Mvc; + using Microsoft.Extensions.Configuration; + using Microsoft.Extensions.Logging; + + [Authorize(Policy = CustomPolicies.UserFrameworksAdminOnly)] + public partial class CompetencyAssessmentsController : Controller + { + private readonly ICompetencyAssessmentService competencyAssessmentService; + private readonly ICommonService commonService; + private readonly IFrameworkNotificationService frameworkNotificationService; + private readonly ILogger logger; + private readonly IConfiguration config; + public CompetencyAssessmentsController( + ICompetencyAssessmentService competencyAssessmentService, + ICommonService commonService, + IFrameworkNotificationService frameworkNotificationService, + ILogger logger, + IConfiguration config) + { + this.competencyAssessmentService = competencyAssessmentService; + this.commonService = commonService; + this.frameworkNotificationService = frameworkNotificationService; + this.logger = logger; + this.config = config; + } + public IActionResult Index() + { + return View(); + } + private int? GetCentreId() + { + return User.GetCustomClaimAsInt(CustomClaimTypes.UserCentreId); + } + private int GetAdminID() + { + return User.GetCustomClaimAsRequiredInt(CustomClaimTypes.UserAdminId); + } + private bool GetIsWorkforceManager() + { + var isWorkforceManager = User.GetCustomClaimAsBool(CustomClaimTypes.IsWorkforceManager); + return isWorkforceManager != null && (bool)isWorkforceManager; + } + private bool GetIsWorkforceContributor() + { + var isWorkforceContributor = User.GetCustomClaimAsBool(CustomClaimTypes.IsWorkforceContributor); + return isWorkforceContributor != null && (bool)isWorkforceContributor; + } + } +} diff --git a/DigitalLearningSolutions.Web/Controllers/RoleProfilesController/RoleProfiles.cs b/DigitalLearningSolutions.Web/Controllers/RoleProfilesController/RoleProfiles.cs deleted file mode 100644 index dfcae3b8ef..0000000000 --- a/DigitalLearningSolutions.Web/Controllers/RoleProfilesController/RoleProfiles.cs +++ /dev/null @@ -1,306 +0,0 @@ -namespace DigitalLearningSolutions.Web.Controllers.RoleProfilesController -{ - using DigitalLearningSolutions.Data.Models.RoleProfiles; - using DigitalLearningSolutions.Web.ViewModels.RoleProfiles; - using Microsoft.AspNetCore.Mvc; - using Microsoft.Extensions.Logging; - using DigitalLearningSolutions.Web.Extensions; - using DigitalLearningSolutions.Data.Models.SessionData.RoleProfiles; - using Microsoft.AspNetCore.Http; - using System; - using System.Collections.Generic; - using DigitalLearningSolutions.Data.Enums; - using DigitalLearningSolutions.Web.Attributes; - using DigitalLearningSolutions.Web.Models.Enums; - - public partial class RoleProfilesController - { - private const string CookieName = "DLSFrameworkService"; - [Route("/RoleProfiles/View/{tabname}/{page=1:int}")] - [SetSelectedTab(nameof(NavMenuTab.RolesProfiles))] - public IActionResult ViewRoleProfiles(string tabname, string? searchString = null, - string sortBy = RoleProfileSortByOptionTexts.RoleProfileName, - string sortDirection = BaseRoleProfilesPageViewModel.AscendingText, - int page = 1 - ) - { - var adminId = GetAdminID(); - var isWorkforceManager = GetIsWorkforceManager(); - var isWorkforceContributor = GetIsWorkforceContributor(); - IEnumerable roleProfiles; - if (tabname == "All") - { - roleProfiles = roleProfileService.GetAllRoleProfiles(adminId); - } - else - { - if (!isWorkforceContributor && !isWorkforceManager) - { - return RedirectToAction("ViewRoleProfiles", "RoleProfiles", new { tabname = "All" }); - } - roleProfiles = roleProfileService.GetRoleProfilesForAdminId(adminId); - } - if (roleProfiles == null) - { - logger.LogWarning($"Attempt to display role profiles for admin {adminId} returned null."); - return StatusCode(403); - } - MyRoleProfilesViewModel myRoleProfiles; - AllRoleProfilesViewModel allRoleProfiles; - if (tabname == "Mine") - { - myRoleProfiles = new MyRoleProfilesViewModel( - roleProfiles, - searchString, - sortBy, - sortDirection, - page, - isWorkforceManager); - allRoleProfiles = new AllRoleProfilesViewModel( - new List(), - searchString, - sortBy, - sortDirection, - page - ); - } - else - { - allRoleProfiles = new AllRoleProfilesViewModel( - roleProfiles, - searchString, - sortBy, - sortDirection, - page); - myRoleProfiles = new MyRoleProfilesViewModel( - new List(), - searchString, - sortBy, - sortDirection, - page, - isWorkforceManager - ); - } - - var currentTab = tabname == "All" ? RoleProfilesTab.AllRoleProfiles : RoleProfilesTab.MyRoleProfiles; - RoleProfilesViewModel? model = new RoleProfilesViewModel( - isWorkforceManager, - isWorkforceContributor, - allRoleProfiles, - myRoleProfiles, - currentTab - ); - return View("Index", model); - } - public IActionResult StartNewRoleProfileSession() - { - var adminId = GetAdminID(); - TempData.Clear(); - var sessionNewRoleProfile = new SessionNewRoleProfile(); - if (!Request.Cookies.ContainsKey(CookieName)) - { - var id = Guid.NewGuid(); - - Response.Cookies.Append( - CookieName, - id.ToString(), - new CookieOptions - { - Expires = DateTimeOffset.UtcNow.AddDays(30) - }); - - sessionNewRoleProfile.Id = id; - } - else - { - if (Request.Cookies.TryGetValue(CookieName, out string idString)) - { - sessionNewRoleProfile.Id = Guid.Parse(idString); - } - else - { - var id = Guid.NewGuid(); - - Response.Cookies.Append( - CookieName, - id.ToString(), - new CookieOptions - { - Expires = DateTimeOffset.UtcNow.AddDays(30) - }); - sessionNewRoleProfile.Id = id; - } - } - RoleProfileBase roleProfileBase = new RoleProfileBase() - { - BrandID = 6, - OwnerAdminID = adminId, - National = true, - Public = true, - PublishStatusID = 1, - UserRole = 3 - }; - sessionNewRoleProfile.RoleProfileBase = roleProfileBase; - TempData.Set(sessionNewRoleProfile); - return RedirectToAction("RoleProfileName", "RoleProfiles", new { actionname = "New" }); - } - - [Route("/RoleProfiles/Name/{actionname}/{roleProfileId}")] - [Route("/RoleProfiles/Name/{actionname}")] - [SetSelectedTab(nameof(NavMenuTab.RolesProfiles))] - public IActionResult RoleProfileName(string actionname, int roleProfileId = 0) - { - var adminId = GetAdminID(); - RoleProfileBase? roleProfileBase; - if (roleProfileId > 0) - { - roleProfileBase = roleProfileService.GetRoleProfileBaseById(roleProfileId, adminId); - if (roleProfileBase == null) - { - logger.LogWarning($"Failed to load name page for roleProfileId: {roleProfileId} adminId: {adminId}"); - return StatusCode(500); - } - if (roleProfileBase.UserRole < 2) - { - return StatusCode(403); - } - } - else - { - SessionNewRoleProfile sessionNewRoleProfile = TempData.Peek(); - TempData.Set(sessionNewRoleProfile); - roleProfileBase = sessionNewRoleProfile.RoleProfileBase; - TempData.Set(sessionNewRoleProfile); - } - return View("Name", roleProfileBase); - } - - [HttpPost] - [Route("/RoleProfiles/Name/{actionname}/{roleProfileId}")] - [Route("/RoleProfiles/Name/{actionname}")] - [SetSelectedTab(nameof(NavMenuTab.RolesProfiles))] - public IActionResult SaveProfileName(RoleProfileBase roleProfileBase, string actionname, int roleProfileId = 0) - { - if (!ModelState.IsValid) - { - ModelState.Remove(nameof(RoleProfileBase.RoleProfileName)); - ModelState.AddModelError(nameof(RoleProfileBase.RoleProfileName), "Please enter a valid role profile name (between 3 and 255 characters)"); - // do something - return View("Name", roleProfileBase); - } - else - { - if (actionname == "New") - { - var sameItems = roleProfileService.GetRoleProfileByName(roleProfileBase.RoleProfileName, GetAdminID()); - if (sameItems != null) - { - ModelState.Remove(nameof(RoleProfileBase.RoleProfileName)); - ModelState.AddModelError(nameof(RoleProfileBase.RoleProfileName), "Another role profile exists with that name. Please choose a different name."); - // do something - return View("Name", roleProfileBase); - } - SessionNewRoleProfile sessionNewRoleProfile = TempData.Peek(); - sessionNewRoleProfile.RoleProfileBase = roleProfileBase; - TempData.Set(sessionNewRoleProfile); - return RedirectToAction("RoleProfileProfessionalGroup", "RoleProfiles", new { actionname }); - } - else - { - var adminId = GetAdminID(); - var isUpdated = roleProfileService.UpdateRoleProfileName(roleProfileBase.ID, adminId, roleProfileBase.RoleProfileName); - if (isUpdated) - { - return RedirectToAction("ViewRoleProfile", new { tabname = "Details", roleProfileId }); - } - else - { - ModelState.AddModelError(nameof(RoleProfileBase.RoleProfileName), "Another role profile exists with that name. Please choose a different name."); - // do something - return View("Name", roleProfileBase); - } - } - - } - } - - [Route("/RoleProfiles/ProfessionalGroup/{actionname}/{roleProfileId}")] - [Route("/RoleProfiles/ProfessionalGroup/{actionname}")] - [SetSelectedTab(nameof(NavMenuTab.RolesProfiles))] - public IActionResult RoleProfileProfessionalGroup(string actionname, int roleProfileId = 0) - { - var adminId = GetAdminID(); - RoleProfileBase? roleProfileBase; - if (roleProfileId > 0) - { - roleProfileBase = roleProfileService.GetRoleProfileBaseById(roleProfileId, adminId); - if (roleProfileBase == null) - { - logger.LogWarning($"Failed to load Professional Group page for roleProfileId: {roleProfileId} adminId: {adminId}"); - return StatusCode(500); - } - if (roleProfileBase.UserRole < 2) - { - return StatusCode(403); - } - } - else - { - SessionNewRoleProfile sessionNewRoleProfile = TempData.Peek(); - TempData.Set(sessionNewRoleProfile); - roleProfileBase = sessionNewRoleProfile.RoleProfileBase; - TempData.Set(sessionNewRoleProfile); - } - var professionalGroups = roleProfileService.GetNRPProfessionalGroups(); - var model = new ProfessionalGroupViewModel() - { - NRPProfessionalGroups = professionalGroups, - RoleProfileBase = roleProfileBase - }; - return View("ProfessionalGroup", model); - } - - [HttpPost] - [Route("/RoleProfiles/ProfessionalGroup/{actionname}/{roleProfileId}")] - [Route("/RoleProfiles/ProfessionalGroup/{actionname}")] - [SetSelectedTab(nameof(NavMenuTab.RolesProfiles))] - public IActionResult SaveProfessionalGroup(RoleProfileBase roleProfileBase, string actionname, int roleProfileId = 0) - { - if (roleProfileBase.NRPProfessionalGroupID == null) - { - ModelState.Remove(nameof(RoleProfileBase.NRPProfessionalGroupID)); - ModelState.AddModelError(nameof(RoleProfileBase.NRPProfessionalGroupID), "Please choose a professional group" + (roleProfileId == 0 ? "or Skip this step" : "") + "."); - // do something - return View("Name", roleProfileBase); - } - if (actionname == "New") - { - SessionNewRoleProfile sessionNewRoleProfile = TempData.Peek(); - sessionNewRoleProfile.RoleProfileBase = roleProfileBase; - TempData.Set(sessionNewRoleProfile); - return RedirectToAction("RoleProfileSubGroup", "RoleProfiles", new { actionname }); - } - else - { - var adminId = GetAdminID(); - var isUpdated = roleProfileService.UpdateRoleProfileProfessionalGroup(roleProfileBase.ID, adminId, roleProfileBase.NRPProfessionalGroupID); - if (isUpdated) - { - return RedirectToAction("RoleProfileSubGroup", "RoleProfiles", new { actionname, roleProfileId }); - } - else - { - return RedirectToAction("ViewRoleProfile", new { tabname = "Details", roleProfileId }); - } - } - } - - [Route("/RoleProfiles/SubGroup/{actionname}/{roleProfileId}")] - [Route("/RoleProfiles/SubGroup/{actionname}")] - [SetSelectedTab(nameof(NavMenuTab.RolesProfiles))] - public IActionResult RoleProfileSubGroup(string actionname, int roleProfileId = 0) - { - return View("SubGroup"); - } - } -} diff --git a/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs b/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs index 22eb2ddf41..93c8e1f610 100644 --- a/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs +++ b/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs @@ -699,9 +699,9 @@ public IActionResult StartEnrolDelegateOnProfileAssessment(int supervisorDelegat { TempData.Clear(); - var sessionEnrolOnRoleProfile = new SessionEnrolOnRoleProfile(); + var sessionEnrolOnCompetencyAssessment = new SessionEnrolOnCompetencyAssessment(); multiPageFormService.SetMultiPageFormData( - sessionEnrolOnRoleProfile, + sessionEnrolOnCompetencyAssessment, MultiPageFormDataFeature.EnrolDelegateOnProfileAssessment, TempData ); @@ -719,12 +719,12 @@ public IActionResult StartEnrolDelegateOnProfileAssessment(int supervisorDelegat )] public IActionResult EnrolDelegateOnProfileAssessment(int supervisorDelegateId) { - var sessionEnrolOnRoleProfile = multiPageFormService.GetMultiPageFormData( + var sessionEnrolOnCompetencyAssessment = multiPageFormService.GetMultiPageFormData( MultiPageFormDataFeature.EnrolDelegateOnProfileAssessment, TempData ).GetAwaiter().GetResult(); multiPageFormService.SetMultiPageFormData( - sessionEnrolOnRoleProfile, + sessionEnrolOnCompetencyAssessment, MultiPageFormDataFeature.EnrolDelegateOnProfileAssessment, TempData ); @@ -732,25 +732,25 @@ public IActionResult EnrolDelegateOnProfileAssessment(int supervisorDelegateId) var supervisorDelegate = supervisorService.GetSupervisorDelegateDetailsById(supervisorDelegateId, GetAdminId(), 0); - var roleProfiles = supervisorService.GetAvailableRoleProfilesForDelegate( + var competencyAssessments = supervisorService.GetAvailableCompetencyAssessmentsForDelegate( (int)supervisorDelegate.DelegateUserID, GetCentreId(), loggedInAdmin.CategoryId ); var model = new EnrolDelegateOnProfileAssessmentViewModel() { - SessionEnrolOnRoleProfile = sessionEnrolOnRoleProfile, + SessionEnrolOnCompetencyAssessment = sessionEnrolOnCompetencyAssessment, SupervisorDelegateDetail = supervisorDelegate, - RoleProfiles = roleProfiles + CompetencyAssessments = competencyAssessments }; return View("EnrolDelegateOnProfileAssessment", model); } [HttpPost] [Route("/Supervisor/Staff/{supervisorDelegateId}/ProfileAssessment/Enrol/Profile")] - public IActionResult EnrolSetRoleProfile(int supervisorDelegateId, int selfAssessmentID) + public IActionResult EnrolSetCompetencyAssessment(int supervisorDelegateId, int selfAssessmentID) { - var sessionEnrolOnRoleProfile = multiPageFormService.GetMultiPageFormData( + var sessionEnrolOnCompetencyAssessment = multiPageFormService.GetMultiPageFormData( MultiPageFormDataFeature.EnrolDelegateOnProfileAssessment, TempData ).GetAwaiter().GetResult(); @@ -761,29 +761,29 @@ public IActionResult EnrolSetRoleProfile(int supervisorDelegateId, int selfAsses { ModelState.AddModelError("selfAssessmentId", "You must select a self assessment"); multiPageFormService.SetMultiPageFormData( - sessionEnrolOnRoleProfile, + sessionEnrolOnCompetencyAssessment, MultiPageFormDataFeature.EnrolDelegateOnProfileAssessment, TempData ); var supervisorDelegate = supervisorService.GetSupervisorDelegateDetailsById(supervisorDelegateId, GetAdminId(), 0); - var roleProfiles = supervisorService.GetAvailableRoleProfilesForDelegate( + var competencyAssessments = supervisorService.GetAvailableCompetencyAssessmentsForDelegate( (int)supervisorDelegate.DelegateUserID, GetCentreId(), loggedInAdmin.CategoryId ); var model = new EnrolDelegateOnProfileAssessmentViewModel() { - SessionEnrolOnRoleProfile = sessionEnrolOnRoleProfile, + SessionEnrolOnCompetencyAssessment = sessionEnrolOnCompetencyAssessment, SupervisorDelegateDetail = supervisorDelegate, - RoleProfiles = roleProfiles + CompetencyAssessments = competencyAssessments }; return View("EnrolDelegateOnProfileAssessment", model); } - sessionEnrolOnRoleProfile.SelfAssessmentID = selfAssessmentID; + sessionEnrolOnCompetencyAssessment.SelfAssessmentID = selfAssessmentID; multiPageFormService.SetMultiPageFormData( - sessionEnrolOnRoleProfile, + sessionEnrolOnCompetencyAssessment, MultiPageFormDataFeature.EnrolDelegateOnProfileAssessment, TempData ); @@ -802,23 +802,23 @@ public IActionResult EnrolSetRoleProfile(int supervisorDelegateId, int selfAsses )] public IActionResult EnrolDelegateCompleteBy(int supervisorDelegateId, int? day, int? month, int? year) { - var sessionEnrolOnRoleProfile = multiPageFormService.GetMultiPageFormData( + var sessionEnrolOnCompetencyAssessment = multiPageFormService.GetMultiPageFormData( MultiPageFormDataFeature.EnrolDelegateOnProfileAssessment, TempData ).GetAwaiter().GetResult(); multiPageFormService.SetMultiPageFormData( - sessionEnrolOnRoleProfile, + sessionEnrolOnCompetencyAssessment, MultiPageFormDataFeature.EnrolDelegateOnProfileAssessment, TempData ); var supervisorDelegate = supervisorService.GetSupervisorDelegateDetailsById(supervisorDelegateId, GetAdminId(), 0); - var roleProfile = supervisorService.GetRoleProfileById((int)sessionEnrolOnRoleProfile.SelfAssessmentID); + var competencyAssessment = supervisorService.GetCompetencyAssessmentById((int)sessionEnrolOnCompetencyAssessment.SelfAssessmentID); var model = new EnrolDelegateSetCompletByDateViewModel() { SupervisorDelegateDetail = supervisorDelegate, - RoleProfile = roleProfile, - CompleteByDate = sessionEnrolOnRoleProfile.CompleteByDate + CompetencyAssessment = competencyAssessment, + CompleteByDate = sessionEnrolOnCompetencyAssessment.CompleteByDate }; if (day != null && month != null && year != null) { @@ -835,7 +835,7 @@ public IActionResult EnrolDelegateSetCompleteBy(int supervisorDelegateId, int da TempData["completeByDate"] = day; TempData["completeByMonth"] = month; TempData["completeByYear"] = year; - var sessionEnrolOnRoleProfile = multiPageFormService.GetMultiPageFormData(MultiPageFormDataFeature.EnrolDelegateOnProfileAssessment, TempData).GetAwaiter().GetResult(); + var sessionEnrolOnCompetencyAssessment = multiPageFormService.GetMultiPageFormData(MultiPageFormDataFeature.EnrolDelegateOnProfileAssessment, TempData).GetAwaiter().GetResult(); if (day != 0 | month != 0 | year != 0) { var validationResult = OldDateValidator.ValidateDate(day, month, year); @@ -846,9 +846,9 @@ public IActionResult EnrolDelegateSetCompleteBy(int supervisorDelegateId, int da else { var completeByDate = new DateTime(year, month, day); - sessionEnrolOnRoleProfile.CompleteByDate = completeByDate; + sessionEnrolOnCompetencyAssessment.CompleteByDate = completeByDate; multiPageFormService.SetMultiPageFormData( - sessionEnrolOnRoleProfile, + sessionEnrolOnCompetencyAssessment, MultiPageFormDataFeature.EnrolDelegateOnProfileAssessment, TempData ); @@ -856,7 +856,7 @@ public IActionResult EnrolDelegateSetCompleteBy(int supervisorDelegateId, int da } var supervisorRoles = - supervisorService.GetSupervisorRolesBySelfAssessmentIdForSupervisor(sessionEnrolOnRoleProfile.SelfAssessmentID.Value); + supervisorService.GetSupervisorRolesBySelfAssessmentIdForSupervisor(sessionEnrolOnCompetencyAssessment.SelfAssessmentID.Value); if (supervisorRoles.Count() > 1) { TempData["navigatedFrom"] = "EnrolDelegateSupervisorRole"; @@ -868,9 +868,9 @@ public IActionResult EnrolDelegateSetCompleteBy(int supervisorDelegateId, int da } else if (supervisorRoles.Count() == 1) { - sessionEnrolOnRoleProfile.SelfAssessmentSupervisorRoleId = supervisorRoles.First().ID; + sessionEnrolOnCompetencyAssessment.SelfAssessmentSupervisorRoleId = supervisorRoles.First().ID; multiPageFormService.SetMultiPageFormData( - sessionEnrolOnRoleProfile, + sessionEnrolOnCompetencyAssessment, MultiPageFormDataFeature.EnrolDelegateOnProfileAssessment, TempData ); @@ -891,21 +891,21 @@ public IActionResult EnrolDelegateSetCompleteBy(int supervisorDelegateId, int da )] public IActionResult EnrolDelegateSupervisorRole(int supervisorDelegateId) { - var sessionEnrolOnRoleProfile = multiPageFormService.GetMultiPageFormData(MultiPageFormDataFeature.EnrolDelegateOnProfileAssessment, TempData).GetAwaiter().GetResult(); + var sessionEnrolOnCompetencyAssessment = multiPageFormService.GetMultiPageFormData(MultiPageFormDataFeature.EnrolDelegateOnProfileAssessment, TempData).GetAwaiter().GetResult(); multiPageFormService.SetMultiPageFormData( - sessionEnrolOnRoleProfile, + sessionEnrolOnCompetencyAssessment, MultiPageFormDataFeature.EnrolDelegateOnProfileAssessment, TempData ); var supervisorDelegate = supervisorService.GetSupervisorDelegateDetailsById(supervisorDelegateId, GetAdminId(), 0); - var roleProfile = supervisorService.GetRoleProfileById((int)sessionEnrolOnRoleProfile.SelfAssessmentID); - var supervisorRoles = supervisorService.GetSupervisorRolesForSelfAssessment(sessionEnrolOnRoleProfile.SelfAssessmentID.Value); + var competencyAssessment = supervisorService.GetCompetencyAssessmentById((int)sessionEnrolOnCompetencyAssessment.SelfAssessmentID); + var supervisorRoles = supervisorService.GetSupervisorRolesForSelfAssessment(sessionEnrolOnCompetencyAssessment.SelfAssessmentID.Value); var model = new EnrolDelegateSupervisorRoleViewModel() { SupervisorDelegateDetail = supervisorDelegate, - RoleProfile = roleProfile, - SelfAssessmentSupervisorRoleId = sessionEnrolOnRoleProfile.SelfAssessmentSupervisorRoleId, + CompetencyAssessment = competencyAssessment, + SelfAssessmentSupervisorRoleId = sessionEnrolOnCompetencyAssessment.SelfAssessmentSupervisorRoleId, SelfAssessmentSupervisorRoles = supervisorRoles }; ViewBag.completeByDate = TempData["completeByDate"]; @@ -922,24 +922,24 @@ public IActionResult EnrolDelegateSetSupervisorRole( int selfAssessmentSupervisorRoleId ) { - var sessionEnrolOnRoleProfile = multiPageFormService.GetMultiPageFormData(MultiPageFormDataFeature.EnrolDelegateOnProfileAssessment, TempData).GetAwaiter().GetResult(); + var sessionEnrolOnCompetencyAssessment = multiPageFormService.GetMultiPageFormData(MultiPageFormDataFeature.EnrolDelegateOnProfileAssessment, TempData).GetAwaiter().GetResult(); if (!ModelState.IsValid) { ModelState.ClearErrorsForAllFieldsExcept("SelfAssessmentSupervisorRoleId"); var supervisorDelegate = supervisorService.GetSupervisorDelegateDetailsById(supervisorDelegateId, GetAdminId(), 0); - var roleProfile = supervisorService.GetRoleProfileById((int)sessionEnrolOnRoleProfile.SelfAssessmentID); + var competencyAssessment = supervisorService.GetCompetencyAssessmentById((int)sessionEnrolOnCompetencyAssessment.SelfAssessmentID); var supervisorRoles = - supervisorService.GetSupervisorRolesForSelfAssessment(sessionEnrolOnRoleProfile.SelfAssessmentID.Value); + supervisorService.GetSupervisorRolesForSelfAssessment(sessionEnrolOnCompetencyAssessment.SelfAssessmentID.Value); model.SupervisorDelegateDetail = supervisorDelegate; - model.RoleProfile = roleProfile; + model.CompetencyAssessment = competencyAssessment; model.SelfAssessmentSupervisorRoles = supervisorRoles; return View("EnrolDelegateSupervisorRole", model); } - sessionEnrolOnRoleProfile.SelfAssessmentSupervisorRoleId = selfAssessmentSupervisorRoleId; + sessionEnrolOnCompetencyAssessment.SelfAssessmentSupervisorRoleId = selfAssessmentSupervisorRoleId; multiPageFormService.SetMultiPageFormData( - sessionEnrolOnRoleProfile, + sessionEnrolOnCompetencyAssessment, MultiPageFormDataFeature.EnrolDelegateOnProfileAssessment, TempData ); @@ -958,32 +958,32 @@ int selfAssessmentSupervisorRoleId )] public IActionResult EnrolDelegateSummary(int supervisorDelegateId) { - var sessionEnrolOnRoleProfile = multiPageFormService.GetMultiPageFormData(MultiPageFormDataFeature.EnrolDelegateOnProfileAssessment, TempData).GetAwaiter().GetResult(); + var sessionEnrolOnCompetencyAssessment = multiPageFormService.GetMultiPageFormData(MultiPageFormDataFeature.EnrolDelegateOnProfileAssessment, TempData).GetAwaiter().GetResult(); multiPageFormService.SetMultiPageFormData( - sessionEnrolOnRoleProfile, + sessionEnrolOnCompetencyAssessment, MultiPageFormDataFeature.EnrolDelegateOnProfileAssessment, TempData ); var supervisorDelegate = supervisorService.GetSupervisorDelegateDetailsById(supervisorDelegateId, GetAdminId(), 0); - var roleProfile = supervisorService.GetRoleProfileById((int)sessionEnrolOnRoleProfile.SelfAssessmentID); - var supervisorRoleName = (sessionEnrolOnRoleProfile.SelfAssessmentSupervisorRoleId == null + var competencyAssessment = supervisorService.GetCompetencyAssessmentById((int)sessionEnrolOnCompetencyAssessment.SelfAssessmentID); + var supervisorRoleName = (sessionEnrolOnCompetencyAssessment.SelfAssessmentSupervisorRoleId == null ? "Supervisor" : supervisorService - .GetSupervisorRoleById(sessionEnrolOnRoleProfile.SelfAssessmentSupervisorRoleId.Value).RoleName); - var supervisorRoleCount = (sessionEnrolOnRoleProfile.SelfAssessmentSupervisorRoleId == null + .GetSupervisorRoleById(sessionEnrolOnCompetencyAssessment.SelfAssessmentSupervisorRoleId.Value).RoleName); + var supervisorRoleCount = (sessionEnrolOnCompetencyAssessment.SelfAssessmentSupervisorRoleId == null ? 0 : supervisorService - .GetSupervisorRolesForSelfAssessment(sessionEnrolOnRoleProfile.SelfAssessmentID.Value).Count()); - var allowSupervisorRoleSelection = (sessionEnrolOnRoleProfile.SelfAssessmentSupervisorRoleId == null + .GetSupervisorRolesForSelfAssessment(sessionEnrolOnCompetencyAssessment.SelfAssessmentID.Value).Count()); + var allowSupervisorRoleSelection = (sessionEnrolOnCompetencyAssessment.SelfAssessmentSupervisorRoleId == null ? false : supervisorService - .GetSupervisorRolesForSelfAssessment(sessionEnrolOnRoleProfile.SelfAssessmentID.Value).FirstOrDefault().AllowSupervisorRoleSelection); + .GetSupervisorRolesForSelfAssessment(sessionEnrolOnCompetencyAssessment.SelfAssessmentID.Value).FirstOrDefault().AllowSupervisorRoleSelection); var model = new EnrolDelegateSummaryViewModel() { SupervisorDelegateDetail = supervisorDelegate, - RoleProfile = roleProfile, + CompetencyAssessment = competencyAssessment, SupervisorRoleName = supervisorRoleName, - CompleteByDate = sessionEnrolOnRoleProfile.CompleteByDate, + CompleteByDate = sessionEnrolOnCompetencyAssessment.CompleteByDate, SupervisorRoleCount = supervisorRoleCount, AllowSupervisorRoleSelection = allowSupervisorRoleSelection }; @@ -996,10 +996,10 @@ public IActionResult EnrolDelegateSummary(int supervisorDelegateId) public IActionResult EnrolDelegateConfirm(int delegateUserId, int supervisorDelegateId) { - var sessionEnrolOnRoleProfile = multiPageFormService.GetMultiPageFormData(MultiPageFormDataFeature.EnrolDelegateOnProfileAssessment, TempData).GetAwaiter().GetResult(); - var selfAssessmentId = sessionEnrolOnRoleProfile.SelfAssessmentID; - var completeByDate = sessionEnrolOnRoleProfile.CompleteByDate; - var selfAssessmentSupervisorRoleId = sessionEnrolOnRoleProfile.SelfAssessmentSupervisorRoleId; + var sessionEnrolOnCompetencyAssessment = multiPageFormService.GetMultiPageFormData(MultiPageFormDataFeature.EnrolDelegateOnProfileAssessment, TempData).GetAwaiter().GetResult(); + var selfAssessmentId = sessionEnrolOnCompetencyAssessment.SelfAssessmentID; + var completeByDate = sessionEnrolOnCompetencyAssessment.CompleteByDate; + var selfAssessmentSupervisorRoleId = sessionEnrolOnCompetencyAssessment.SelfAssessmentSupervisorRoleId; var loggedInUserId = User.GetUserId(); var candidateAssessmentId = supervisorService.EnrolDelegateOnAssessment( delegateUserId, @@ -1031,7 +1031,7 @@ public IActionResult QuickAddSupervisor(int selfAssessmentId, int supervisorDele { var supervisorDelegate = supervisorService.GetSupervisorDelegateDetailsById(supervisorDelegateId, GetAdminId(), 0); - var roleProfile = supervisorService.GetRoleProfileById(selfAssessmentId); + var competencyAssessment = supervisorService.GetCompetencyAssessmentById(selfAssessmentId); var supervisorRoles = supervisorService.GetSupervisorRolesBySelfAssessmentIdForSupervisor(selfAssessmentId); if (supervisorRoles.Any() && supervisorRoles.Count() > 1) @@ -1039,7 +1039,7 @@ public IActionResult QuickAddSupervisor(int selfAssessmentId, int supervisorDele var model = new EnrolDelegateSupervisorRoleViewModel() { SupervisorDelegateDetail = supervisorDelegate, - RoleProfile = roleProfile, + CompetencyAssessment = competencyAssessment, SelfAssessmentSupervisorRoleId = null, SelfAssessmentSupervisorRoles = supervisorRoles }; @@ -1059,25 +1059,25 @@ public IActionResult QuickAddSupervisor(int selfAssessmentId, int supervisorDele } } - var sessionEnrolOnRoleProfile = new SessionEnrolOnRoleProfile() + var sessionEnrolOnCompetencyAssessment = new SessionEnrolOnCompetencyAssessment() { SelfAssessmentID = supervisorRoles.FirstOrDefault().SelfAssessmentID, SelfAssessmentSupervisorRoleId = supervisorRoles.FirstOrDefault().ID }; multiPageFormService.SetMultiPageFormData( - sessionEnrolOnRoleProfile, + sessionEnrolOnCompetencyAssessment, MultiPageFormDataFeature.EnrolDelegateOnProfileAssessment, TempData ); var supervisorRoleName = supervisorRoles.FirstOrDefault().RoleName; var model = new EnrolDelegateSummaryViewModel { - RoleProfile = roleProfile, + CompetencyAssessment = competencyAssessment, SupervisorDelegateDetail = supervisorDelegate, SupervisorRoleName = supervisorRoleName }; - return View("SelectDelegateSupervisorRoleSummary", new Tuple(model, sessionEnrolOnRoleProfile.SelfAssessmentSupervisorRoleId)); + return View("SelectDelegateSupervisorRoleSummary", new Tuple(model, sessionEnrolOnCompetencyAssessment.SelfAssessmentSupervisorRoleId)); } @@ -1087,7 +1087,7 @@ public IActionResult QuickAddSupervisor(int selfAssessmentId, int supervisorDele [HttpPost] public IActionResult QuickAddSupervisor(EnrolDelegateSupervisorRoleViewModel supervisorRole, int selfAssessmentId, int supervisorDelegateId, int delegateUserId) { - var roleProfile = supervisorService.GetRoleProfileById(selfAssessmentId); + var competencyAssessment = supervisorService.GetCompetencyAssessmentById(selfAssessmentId); var supervisorDelegate = supervisorService.GetSupervisorDelegateDetailsById(supervisorDelegateId, GetAdminId(), 0); if (supervisorRole.SelfAssessmentSupervisorRoleId == null) @@ -1096,7 +1096,7 @@ public IActionResult QuickAddSupervisor(EnrolDelegateSupervisorRoleViewModel sup var model = new EnrolDelegateSupervisorRoleViewModel() { SupervisorDelegateDetail = supervisorDelegate, - RoleProfile = roleProfile, + CompetencyAssessment = competencyAssessment, SelfAssessmentSupervisorRoleId = null, SelfAssessmentSupervisorRoles = supervisorRoles }; @@ -1107,7 +1107,7 @@ public IActionResult QuickAddSupervisor(EnrolDelegateSupervisorRoleViewModel sup var model = new EnrolDelegateSummaryViewModel { - RoleProfile = roleProfile, + CompetencyAssessment = competencyAssessment, SupervisorDelegateDetail = supervisorDelegate, SupervisorRoleName = supervisorRole.SelfAssessmentSupervisorRoleId == null ? "Supervisor" : supervisorService.GetSupervisorRoleById((int)supervisorRole.SelfAssessmentSupervisorRoleId).RoleName, @@ -1126,12 +1126,12 @@ public IActionResult QuickAddSupervisorConfirm(int? selfAssessmentSupervisorRole var supervisorDelegate = supervisorService.GetSupervisorDelegateDetailsById(supervisorDelegateId, GetAdminId(), 0); if (!selfAssessmentSupervisorRoleId.HasValue) { - var roleProfile = supervisorService.GetRoleProfileById(selfAssessmentId); + var competencyAssessment = supervisorService.GetCompetencyAssessmentById(selfAssessmentId); var supervisorRoles = supervisorService.GetSupervisorRolesForSelfAssessment(selfAssessmentId); var model = new EnrolDelegateSupervisorRoleViewModel() { SupervisorDelegateDetail = supervisorDelegate, - RoleProfile = roleProfile, + CompetencyAssessment = competencyAssessment, SelfAssessmentSupervisorRoleId = null, SelfAssessmentSupervisorRoles = supervisorRoles }; diff --git a/DigitalLearningSolutions.Web/Helpers/SearchHelper.cs b/DigitalLearningSolutions.Web/Helpers/SearchHelper.cs index 381be134dd..9b3dc5acf8 100644 --- a/DigitalLearningSolutions.Web/Helpers/SearchHelper.cs +++ b/DigitalLearningSolutions.Web/Helpers/SearchHelper.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using DigitalLearningSolutions.Data.Helpers; - using DigitalLearningSolutions.Data.Models.RoleProfiles; + using DigitalLearningSolutions.Data.Models.CompetencyAssessments; using FuzzySharp; using FuzzySharp.SimilarityRatio; using FuzzySharp.SimilarityRatio.Scorer.StrategySensitive; @@ -29,8 +29,8 @@ public static class SearchHelper "profile", "job", "role", }; - public static IEnumerable FilterRoleProfiles( - IEnumerable roleProfiles, + public static IEnumerable FilterCompetencyAssessments( + IEnumerable competencyAssessments, string? searchString, int minMatchScore, bool stripStopWords @@ -38,7 +38,7 @@ bool stripStopWords { if (searchString == null) { - return roleProfiles; + return competencyAssessments; } if (stripStopWords) @@ -46,16 +46,16 @@ bool stripStopWords searchString = CleanSearchedWords(searchString); } - var query = new RoleProfile + var query = new CompetencyAssessment { - RoleProfileName = searchString.ToLower(), + CompetencyAssessmentName = searchString.ToLower(), }; if (stripStopWords) { var results = Process.ExtractSorted( query, - roleProfiles, - roleProfile => roleProfile.RoleProfileName.ToLower(), + competencyAssessments, + competencyAssessment => competencyAssessment.CompetencyAssessmentName.ToLower(), ScorerCache.Get(), minMatchScore ); @@ -65,8 +65,8 @@ bool stripStopWords { var results = Process.ExtractSorted( query, - roleProfiles, - roleProfile => roleProfile.RoleProfileName.ToLower(), + competencyAssessments, + competencyAssessment => competencyAssessment.CompetencyAssessmentName.ToLower(), ScorerCache.Get(), minMatchScore ); diff --git a/DigitalLearningSolutions.Web/Helpers/SortingHelper.cs b/DigitalLearningSolutions.Web/Helpers/SortingHelper.cs index e630a9ea9b..2a4cd083b8 100644 --- a/DigitalLearningSolutions.Web/Helpers/SortingHelper.cs +++ b/DigitalLearningSolutions.Web/Helpers/SortingHelper.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using System.Linq; using DigitalLearningSolutions.Data.Helpers; - using DigitalLearningSolutions.Data.Models.RoleProfiles; - using DigitalLearningSolutions.Web.ViewModels.RoleProfiles; + using DigitalLearningSolutions.Data.Models.CompetencyAssessments; + using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments; /// /// This is the older version of the SortingHelper. For future search/sort implementations we should @@ -13,36 +13,36 @@ /// public static class SortingHelper { - public static IEnumerable SortRoleProfileItems( - IEnumerable roleProfiles, + public static IEnumerable SortCompetencyAssessmentItems( + IEnumerable competencyAssessments, string sortBy, string sortDirection ) { return sortBy switch { - RoleProfileSortByOptionTexts.RoleProfileName => sortDirection == BaseRoleProfilesPageViewModel.DescendingText - ? roleProfiles.OrderByDescending(roleProfile => roleProfile.RoleProfileName) - : roleProfiles.OrderBy(roleProfile => roleProfile.RoleProfileName), - RoleProfileSortByOptionTexts.RoleProfileOwner => sortDirection == BaseRoleProfilesPageViewModel.DescendingText - ? roleProfiles.OrderByDescending(roleProfile => roleProfile.Owner) - : roleProfiles.OrderBy(roleProfile => roleProfile.Owner), - RoleProfileSortByOptionTexts.RoleProfileCreatedDate => sortDirection == BaseRoleProfilesPageViewModel.DescendingText - ? roleProfiles.OrderByDescending(roleProfile => roleProfile.CreatedDate) - : roleProfiles.OrderBy(roleProfile => roleProfile.CreatedDate), - RoleProfileSortByOptionTexts.RoleProfilePublishStatus => sortDirection == BaseRoleProfilesPageViewModel.DescendingText - ? roleProfiles.OrderByDescending(roleProfile => roleProfile.PublishStatusID) - : roleProfiles.OrderBy(roleProfile => roleProfile.PublishStatusID), - RoleProfileSortByOptionTexts.RoleProfileBrand => sortDirection == BaseRoleProfilesPageViewModel.DescendingText - ? roleProfiles.OrderByDescending(roleProfile => roleProfile.Brand) - : roleProfiles.OrderBy(roleProfile => roleProfile.Brand), - RoleProfileSortByOptionTexts.RoleProfileNationalRoleProfile => sortDirection == BaseRoleProfilesPageViewModel.DescendingText - ? roleProfiles.OrderByDescending(roleProfile => roleProfile.NRPRole) - : roleProfiles.OrderBy(roleProfile => roleProfile.NRPRole), - RoleProfileSortByOptionTexts.RoleProfileNationalRoleGroup => sortDirection == BaseRoleProfilesPageViewModel.DescendingText - ? roleProfiles.OrderByDescending(roleProfile => roleProfile.NRPProfessionalGroup) - : roleProfiles.OrderBy(roleProfile => roleProfile.NRPProfessionalGroup), - _ => roleProfiles + CompetencyAssessmentSortByOptionTexts.CompetencyAssessmentName => sortDirection == BaseCompetencyAssessmentsPageViewModel.DescendingText + ? competencyAssessments.OrderByDescending(competencyAssessment => competencyAssessment.CompetencyAssessmentName) + : competencyAssessments.OrderBy(competencyAssessment => competencyAssessment.CompetencyAssessmentName), + CompetencyAssessmentSortByOptionTexts.CompetencyAssessmentOwner => sortDirection == BaseCompetencyAssessmentsPageViewModel.DescendingText + ? competencyAssessments.OrderByDescending(competencyAssessment => competencyAssessment.Owner) + : competencyAssessments.OrderBy(competencyAssessment => competencyAssessment.Owner), + CompetencyAssessmentSortByOptionTexts.CompetencyAssessmentCreatedDate => sortDirection == BaseCompetencyAssessmentsPageViewModel.DescendingText + ? competencyAssessments.OrderByDescending(competencyAssessment => competencyAssessment.CreatedDate) + : competencyAssessments.OrderBy(competencyAssessment => competencyAssessment.CreatedDate), + CompetencyAssessmentSortByOptionTexts.CompetencyAssessmentPublishStatus => sortDirection == BaseCompetencyAssessmentsPageViewModel.DescendingText + ? competencyAssessments.OrderByDescending(competencyAssessment => competencyAssessment.PublishStatusID) + : competencyAssessments.OrderBy(competencyAssessment => competencyAssessment.PublishStatusID), + CompetencyAssessmentSortByOptionTexts.CompetencyAssessmentBrand => sortDirection == BaseCompetencyAssessmentsPageViewModel.DescendingText + ? competencyAssessments.OrderByDescending(competencyAssessment => competencyAssessment.Brand) + : competencyAssessments.OrderBy(competencyAssessment => competencyAssessment.Brand), + CompetencyAssessmentSortByOptionTexts.CompetencyAssessmentNationalCompetencyAssessment => sortDirection == BaseCompetencyAssessmentsPageViewModel.DescendingText + ? competencyAssessments.OrderByDescending(competencyAssessment => competencyAssessment.NRPRole) + : competencyAssessments.OrderBy(competencyAssessment => competencyAssessment.NRPRole), + CompetencyAssessmentSortByOptionTexts.CompetencyAssessmentNationalRoleGroup => sortDirection == BaseCompetencyAssessmentsPageViewModel.DescendingText + ? competencyAssessments.OrderByDescending(competencyAssessment => competencyAssessment.NRPProfessionalGroup) + : competencyAssessments.OrderBy(competencyAssessment => competencyAssessment.NRPProfessionalGroup), + _ => competencyAssessments }; } } diff --git a/DigitalLearningSolutions.Web/Models/Enums/CompetencyAssessmentsTab.cs b/DigitalLearningSolutions.Web/Models/Enums/CompetencyAssessmentsTab.cs new file mode 100644 index 0000000000..c77a640c7e --- /dev/null +++ b/DigitalLearningSolutions.Web/Models/Enums/CompetencyAssessmentsTab.cs @@ -0,0 +1,39 @@ +namespace DigitalLearningSolutions.Web.Models.Enums +{ + using System.Collections.Generic; + + public class CompetencyAssessmentsTab : BaseTabEnumeration + { + public static CompetencyAssessmentsTab MyCompetencyAssessments = new CompetencyAssessmentsTab( + 1, + nameof(MyCompetencyAssessments), + "CompetencyAssessments", + "ViewCompetencyAssessments", + "My Competency Assessments", + new Dictionary { { "tabName", "Mine" } } + ); + + public static CompetencyAssessmentsTab AllCompetencyAssessments = new CompetencyAssessmentsTab( + 2, + nameof(AllCompetencyAssessments), + "CompetencyAssessments", + "ViewCompetencyAssessments", + "All Competency Assessments", + new Dictionary { { "tabName", "All" } } + ); + + private CompetencyAssessmentsTab( + int id, + string name, + string controller, + string action, + string linkText, + Dictionary staticRouteData + ) : base(id, name, controller, action, linkText, staticRouteData) { } + + public override IEnumerable GetAllTabs() + { + return GetAll(); + } + } +} diff --git a/DigitalLearningSolutions.Web/Models/Enums/RoleProfilesTab.cs b/DigitalLearningSolutions.Web/Models/Enums/RoleProfilesTab.cs deleted file mode 100644 index 3d599ce5d0..0000000000 --- a/DigitalLearningSolutions.Web/Models/Enums/RoleProfilesTab.cs +++ /dev/null @@ -1,39 +0,0 @@ -namespace DigitalLearningSolutions.Web.Models.Enums -{ - using System.Collections.Generic; - - public class RoleProfilesTab : BaseTabEnumeration - { - public static RoleProfilesTab MyRoleProfiles = new RoleProfilesTab( - 1, - nameof(MyRoleProfiles), - "RoleProfiles", - "ViewRoleProfiles", - "My Role Profiles", - new Dictionary { { "tabName", "Mine" } } - ); - - public static RoleProfilesTab AllRoleProfiles = new RoleProfilesTab( - 2, - nameof(AllRoleProfiles), - "RoleProfiles", - "ViewRoleProfiles", - "All Role Profiles", - new Dictionary { { "tabName", "All" } } - ); - - private RoleProfilesTab( - int id, - string name, - string controller, - string action, - string linkText, - Dictionary staticRouteData - ) : base(id, name, controller, action, linkText, staticRouteData) { } - - public override IEnumerable GetAllTabs() - { - return GetAll(); - } - } -} diff --git a/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs b/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs new file mode 100644 index 0000000000..27385103bd --- /dev/null +++ b/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs @@ -0,0 +1,68 @@ +using DigitalLearningSolutions.Data.DataServices; +using DigitalLearningSolutions.Data.Models.CompetencyAssessments; +using System.Collections.Generic; + +namespace DigitalLearningSolutions.Web.Services +{ + public interface ICompetencyAssessmentService + { + //GET DATA + IEnumerable GetAllCompetencyAssessments(int adminId); + + IEnumerable GetCompetencyAssessmentsForAdminId(int adminId); + + CompetencyAssessmentBase? GetCompetencyAssessmentBaseById(int competencyAssessmentId, int adminId); + + CompetencyAssessmentBase? GetCompetencyAssessmentByName(string competencyAssessmentName, int adminId); + + IEnumerable GetNRPProfessionalGroups(); + + //UPDATE DATA + bool UpdateCompetencyAssessmentName(int competencyAssessmentId, int adminId, string competencyAssessmentName); + + bool UpdateCompetencyAssessmentProfessionalGroup(int competencyAssessmentId, int adminId, int? nrpProfessionalGroupID); + + } + public class CompetencyAssessmentService : ICompetencyAssessmentService + { + private readonly ICompetencyAssessmentDataService competencyAssessmentDataService; + public CompetencyAssessmentService(ICompetencyAssessmentDataService competencyAssessmentDataService) + { + this.competencyAssessmentDataService = competencyAssessmentDataService; + } + public IEnumerable GetAllCompetencyAssessments(int adminId) + { + return competencyAssessmentDataService.GetAllCompetencyAssessments(adminId); + } + + public IEnumerable GetNRPProfessionalGroups() + { + return competencyAssessmentDataService.GetNRPProfessionalGroups(); + } + + public CompetencyAssessmentBase? GetCompetencyAssessmentBaseById(int competencyAssessmentId, int adminId) + { + return competencyAssessmentDataService.GetCompetencyAssessmentBaseById(competencyAssessmentId, adminId); + } + + public CompetencyAssessmentBase? GetCompetencyAssessmentByName(string competencyAssessmentName, int adminId) + { + return competencyAssessmentDataService.GetCompetencyAssessmentByName(competencyAssessmentName, adminId); + } + + public IEnumerable GetCompetencyAssessmentsForAdminId(int adminId) + { + return competencyAssessmentDataService.GetCompetencyAssessmentsForAdminId(adminId); + } + + public bool UpdateCompetencyAssessmentName(int competencyAssessmentId, int adminId, string competencyAssessmentName) + { + return competencyAssessmentDataService.UpdateCompetencyAssessmentName(competencyAssessmentId, adminId, competencyAssessmentName); + } + + public bool UpdateCompetencyAssessmentProfessionalGroup(int competencyAssessmentId, int adminId, int? nrpProfessionalGroupID) + { + return competencyAssessmentDataService.UpdateCompetencyAssessmentProfessionalGroup(competencyAssessmentId, adminId, nrpProfessionalGroupID); + } + } +} diff --git a/DigitalLearningSolutions.Web/Services/FrameworkNotificationService.cs b/DigitalLearningSolutions.Web/Services/FrameworkNotificationService.cs index 092f38c15d..d0cfdb0a0f 100644 --- a/DigitalLearningSolutions.Web/Services/FrameworkNotificationService.cs +++ b/DigitalLearningSolutions.Web/Services/FrameworkNotificationService.cs @@ -34,7 +34,7 @@ public class FrameworkNotificationService : IFrameworkNotificationService private readonly IConfigDataService configDataService; private readonly IEmailService emailService; private readonly IFrameworkService frameworkService; - private readonly IRoleProfileService roleProfileService; + private readonly ICompetencyAssessmentService competencyAssessmentService; private readonly ISupervisorService supervisorService; private readonly ISelfAssessmentDataService selfAssessmentDataService; private readonly ICentresDataService centresDataService; @@ -42,7 +42,7 @@ public FrameworkNotificationService( IFrameworkService frameworkService, IConfigDataService configDataService, IEmailService emailService, - IRoleProfileService roleProfileService, + ICompetencyAssessmentService competencyAssessmentService, ISupervisorService supervisorService, ISelfAssessmentDataService selfAssessmentDataService, ICentresDataService centresDataService @@ -51,7 +51,7 @@ ICentresDataService centresDataService this.frameworkService = frameworkService; this.configDataService = configDataService; this.emailService = emailService; - this.roleProfileService = roleProfileService; + this.competencyAssessmentService = competencyAssessmentService; this.supervisorService = supervisorService; this.selfAssessmentDataService = selfAssessmentDataService; this.centresDataService = centresDataService; @@ -221,8 +221,8 @@ public void SendSupervisorDelegateInvite(int supervisorDelegateId, int adminId, builder.TextBody = $@"Dear colleague, You have been invited to register to access the NHS England, Digital Learning Solutions platform as a supervised delegate by {supervisorDelegate.SupervisorName} ({supervisorDelegate.SupervisorEmail}) ({centreName}). To register, visit {dlsUrlBuilder.Uri.ToString()}. - Registering using this link will confirm your acceptance of the invite. Your supervisor will then be able to assign role profile assessments and view and validate your self assessment results."; - builder.HtmlBody = $@"

Dear colleague,

You have been invited to register to access the NHS England, Digital Learning Solutions platform as a supervised delegate by {supervisorDelegate.SupervisorName} ({centreName}).

Click here to register and confirm your acceptance of the invite.

Your supervisor will then be able to assign role profile assessments and view and validate your self assessment results.

"; + Registering using this link will confirm your acceptance of the invite. Your supervisor will then be able to assign competency assessments and view and validate your self assessment results."; + builder.HtmlBody = $@"

Dear colleague,

You have been invited to register to access the NHS England, Digital Learning Solutions platform as a supervised delegate by {supervisorDelegate.SupervisorName} ({centreName}).

Click here to register and confirm your acceptance of the invite.

Your supervisor will then be able to assign competency assessments and view and validate your self assessment results.

"; emailService.SendEmail(new Email(emailSubjectLine, builder, supervisorDelegate.DelegateEmail)); } } @@ -240,7 +240,7 @@ public void SendSupervisorDelegateConfirmed(int supervisorDelegateId, int adminI You are already registered as a delegate at the supervisor's DLS centre so they can now assign competency self assessments and view and validate your self assessment results. If this looks like a mistake, please contact {supervisorDelegate.SupervisorName} ({supervisorDelegate.SupervisorEmail}) ({centreName}) directly to correct."; - builder.HtmlBody = $@"

Dear {supervisorDelegate.FirstName}

{supervisorDelegate.SupervisorName} ({centreName}) has accepted your request to be your supervisor for profile asessment activities in the NHS England, Digital Learning Solutions platform.

Click here to access your role profile assessments.

"; + builder.HtmlBody = $@"

Dear {supervisorDelegate.FirstName}

{supervisorDelegate.SupervisorName} ({centreName}) has accepted your request to be your supervisor for profile asessment activities in the NHS England, Digital Learning Solutions platform.

Click here to access your competency assessments.

"; string toEmail = (@adminId == 0 ? supervisorDelegate.DelegateEmail : supervisorDelegate.SupervisorEmail); emailService.SendEmail(new Email(emailSubjectLine, builder, toEmail)); } @@ -410,8 +410,8 @@ public void SendSupervisorDelegateReminder(int supervisorDelegateId, int adminId builder.TextBody = $@"Dear colleague, This is a reminder to to register to access the NHS England, Digital Learning Solutions platform as a supervised delegate by {supervisorDelegate.SupervisorName} ({supervisorDelegate.SupervisorEmail}) ({centreName}). To register, visit {dlsUrlBuilder.Uri.ToString()}. - Your supervisor will then be able to assign role profile assessments and view and validate your self assessment results."; - builder.HtmlBody = $@"

Dear colleague,

This is a reminder to register to access the NHS England, Digital Learning Solutions platform as a supervised delegate by {supervisorDelegate.SupervisorName} ({centreName}).

Click here to register.

Your supervisor will then be able to assign role profile assessments and view and validate your self assessment results.

"; + Your supervisor will then be able to assign competency assessments and view and validate your self assessment results."; + builder.HtmlBody = $@"

Dear colleague,

This is a reminder to register to access the NHS England, Digital Learning Solutions platform as a supervised delegate by {supervisorDelegate.SupervisorName} ({centreName}).

Click here to register.

Your supervisor will then be able to assign competency assessments and view and validate your self assessment results.

"; emailService.SendEmail(new Email(emailSubjectLine, builder, supervisorDelegate.DelegateEmail)); } } diff --git a/DigitalLearningSolutions.Web/Services/RoleProfileService.cs b/DigitalLearningSolutions.Web/Services/RoleProfileService.cs deleted file mode 100644 index 7983b2afa4..0000000000 --- a/DigitalLearningSolutions.Web/Services/RoleProfileService.cs +++ /dev/null @@ -1,68 +0,0 @@ -using DigitalLearningSolutions.Data.DataServices; -using DigitalLearningSolutions.Data.Models.RoleProfiles; -using System.Collections.Generic; - -namespace DigitalLearningSolutions.Web.Services -{ - public interface IRoleProfileService - { - //GET DATA - IEnumerable GetAllRoleProfiles(int adminId); - - IEnumerable GetRoleProfilesForAdminId(int adminId); - - RoleProfileBase? GetRoleProfileBaseById(int roleProfileId, int adminId); - - RoleProfileBase? GetRoleProfileByName(string roleProfileName, int adminId); - - IEnumerable GetNRPProfessionalGroups(); - - //UPDATE DATA - bool UpdateRoleProfileName(int roleProfileId, int adminId, string roleProfileName); - - bool UpdateRoleProfileProfessionalGroup(int roleProfileId, int adminId, int? nrpProfessionalGroupID); - - } - public class RoleProfileService : IRoleProfileService - { - private readonly IRoleProfileDataService roleProfileDataService; - public RoleProfileService(IRoleProfileDataService roleProfileDataService) - { - this.roleProfileDataService = roleProfileDataService; - } - public IEnumerable GetAllRoleProfiles(int adminId) - { - return roleProfileDataService.GetAllRoleProfiles(adminId); - } - - public IEnumerable GetNRPProfessionalGroups() - { - return roleProfileDataService.GetNRPProfessionalGroups(); - } - - public RoleProfileBase? GetRoleProfileBaseById(int roleProfileId, int adminId) - { - return roleProfileDataService.GetRoleProfileBaseById(roleProfileId, adminId); - } - - public RoleProfileBase? GetRoleProfileByName(string roleProfileName, int adminId) - { - return roleProfileDataService.GetRoleProfileByName(roleProfileName, adminId); - } - - public IEnumerable GetRoleProfilesForAdminId(int adminId) - { - return roleProfileDataService.GetRoleProfilesForAdminId(adminId); - } - - public bool UpdateRoleProfileName(int roleProfileId, int adminId, string roleProfileName) - { - return roleProfileDataService.UpdateRoleProfileName(roleProfileId, adminId, roleProfileName); - } - - public bool UpdateRoleProfileProfessionalGroup(int roleProfileId, int adminId, int? nrpProfessionalGroupID) - { - return roleProfileDataService.UpdateRoleProfileProfessionalGroup(roleProfileId, adminId, nrpProfessionalGroupID); - } - } -} diff --git a/DigitalLearningSolutions.Web/Services/SupervisorService.cs b/DigitalLearningSolutions.Web/Services/SupervisorService.cs index 8cd8d2e16e..5a6dd5685f 100644 --- a/DigitalLearningSolutions.Web/Services/SupervisorService.cs +++ b/DigitalLearningSolutions.Web/Services/SupervisorService.cs @@ -1,5 +1,5 @@ using DigitalLearningSolutions.Data.DataServices; -using DigitalLearningSolutions.Data.Models.RoleProfiles; +using DigitalLearningSolutions.Data.Models.CompetencyAssessments; using DigitalLearningSolutions.Data.Models.SelfAssessments; using DigitalLearningSolutions.Data.Models.Supervisor; using System; @@ -20,8 +20,8 @@ public interface ISupervisorService IEnumerable GetSupervisorDashboardToDoItemsForRequestedSignOffs(int adminId); IEnumerable GetSupervisorDashboardToDoItemsForRequestedReviews(int adminId); DelegateSelfAssessment? GetSelfAssessmentBaseByCandidateAssessmentId(int candidateAssessmentId, int? adminIdCategoryId); - IEnumerable GetAvailableRoleProfilesForDelegate(int candidateId, int centreId, int? categoryId); - RoleProfile? GetRoleProfileById(int selfAssessmentId); + IEnumerable GetAvailableCompetencyAssessmentsForDelegate(int candidateId, int centreId, int? categoryId); + CompetencyAssessment? GetCompetencyAssessmentById(int selfAssessmentId); IEnumerable GetSupervisorRolesForSelfAssessment(int selfAssessmentId); IEnumerable GetSupervisorRolesBySelfAssessmentIdForSupervisor(int selfAssessmentId); IEnumerable GetDelegateNominatableSupervisorRolesForSelfAssessment(int selfAssessmentId); @@ -80,9 +80,9 @@ public int EnrolDelegateOnAssessment(int delegateUserId, int supervisorDelegateI return supervisorDataService.EnrolDelegateOnAssessment(delegateUserId, supervisorDelegateId, selfAssessmentId, completeByDate, selfAssessmentSupervisorRoleId, adminId, centreId, isLoggedInUser); } - public IEnumerable GetAvailableRoleProfilesForDelegate(int candidateId, int centreId, int? categoryId) + public IEnumerable GetAvailableCompetencyAssessmentsForDelegate(int candidateId, int centreId, int? categoryId) { - return supervisorDataService.GetAvailableRoleProfilesForDelegate(candidateId, centreId, categoryId); + return supervisorDataService.GetAvailableCompetencyAssessmentsForDelegate(candidateId, centreId, categoryId); } public CandidateAssessmentSupervisor? GetCandidateAssessmentSupervisor(int candidateAssessmentID, int supervisorDelegateId, int selfAssessmentSupervisorRoleId) @@ -110,9 +110,9 @@ public IEnumerable GetDelegateNominatableSuperviso return supervisorDataService.GetDelegateNominatableSupervisorRolesForSelfAssessment(selfAssessmentId); } - public RoleProfile? GetRoleProfileById(int selfAssessmentId) + public CompetencyAssessment? GetCompetencyAssessmentById(int selfAssessmentId) { - return supervisorDataService.GetRoleProfileById(selfAssessmentId); + return supervisorDataService.GetCompetencyAssessmentById(selfAssessmentId); } public DelegateSelfAssessment? GetSelfAssessmentBaseByCandidateAssessmentId(int candidateAssessmentId, int? adminIdCategoryId) diff --git a/DigitalLearningSolutions.Web/Startup.cs b/DigitalLearningSolutions.Web/Startup.cs index bdc34b4d79..9443817b2d 100644 --- a/DigitalLearningSolutions.Web/Startup.cs +++ b/DigitalLearningSolutions.Web/Startup.cs @@ -434,7 +434,7 @@ private static void RegisterServices(IServiceCollection services) services.AddScoped(); services.AddScoped(); services.AddScoped(); - services.AddScoped(); + services.AddScoped(); services.AddScoped(); services.AddScoped(); services.AddScoped(); @@ -507,7 +507,7 @@ private static void RegisterDataServices(IServiceCollection services) services.AddScoped(); services.AddScoped(); services.AddScoped(); - services.AddScoped(); + services.AddScoped(); services.AddScoped(); services.AddScoped(); services.AddScoped(); diff --git a/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/AllCompetencyAssessmentsViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/AllCompetencyAssessmentsViewModel.cs new file mode 100644 index 0000000000..a858706127 --- /dev/null +++ b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/AllCompetencyAssessmentsViewModel.cs @@ -0,0 +1,42 @@ +namespace DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments +{ + using System.Collections.Generic; + using System.Linq; + using DigitalLearningSolutions.Data.Models.CompetencyAssessments; + using DigitalLearningSolutions.Web.Helpers; + using Microsoft.AspNetCore.Mvc.Rendering; + public class AllCompetencyAssessmentsViewModel : BaseCompetencyAssessmentsPageViewModel + { + public readonly IEnumerable CompetencyAssessments; + public readonly bool IsWorkforceManager; + public override SelectList CompetencyAssessmentSortByOptions { get; } = new SelectList(new[] + { + CompetencyAssessmentSortByOptionTexts.CompetencyAssessmentName, + CompetencyAssessmentSortByOptionTexts.CompetencyAssessmentOwner, + CompetencyAssessmentSortByOptionTexts.CompetencyAssessmentCreatedDate, + CompetencyAssessmentSortByOptionTexts.CompetencyAssessmentPublishStatus, + CompetencyAssessmentSortByOptionTexts.CompetencyAssessmentBrand, + CompetencyAssessmentSortByOptionTexts.CompetencyAssessmentNationalRoleGroup, + CompetencyAssessmentSortByOptionTexts.CompetencyAssessmentNationalCompetencyAssessment + }); + public AllCompetencyAssessmentsViewModel( + IEnumerable competencyAssessments, + string? searchString, + string sortBy, + string sortDirection, + int page + ) : base(searchString, sortBy, sortDirection, page) + { + var sortedItems = SortingHelper.SortCompetencyAssessmentItems( + competencyAssessments, + sortBy, + sortDirection + ); + var filteredItems = SearchHelper.FilterCompetencyAssessments(sortedItems, SearchString, 60, false).ToList(); + MatchingSearchResults = filteredItems.Count; + SetTotalPages(); + CompetencyAssessments = PaginateItems(filteredItems).Cast(); + } + } +} + diff --git a/DigitalLearningSolutions.Web/ViewModels/RoleProfiles/BaseRoleProfileViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/BaseCompetencyAssessmentsPageViewModel.cs similarity index 61% rename from DigitalLearningSolutions.Web/ViewModels/RoleProfiles/BaseRoleProfileViewModel.cs rename to DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/BaseCompetencyAssessmentsPageViewModel.cs index 0b5fa8d753..01a65ba1ca 100644 --- a/DigitalLearningSolutions.Web/ViewModels/RoleProfiles/BaseRoleProfileViewModel.cs +++ b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/BaseCompetencyAssessmentsPageViewModel.cs @@ -1,71 +1,71 @@ -namespace DigitalLearningSolutions.Web.ViewModels.RoleProfiles -{ - using System; - using System.Collections.Generic; - using System.Linq; - using DigitalLearningSolutions.Data.Models.RoleProfiles; - using Microsoft.AspNetCore.Mvc; - using Microsoft.AspNetCore.Mvc.Rendering; - - public abstract class BaseRoleProfilesPageViewModel - { - [BindProperty] public string SortDirection { get; set; } - [BindProperty] public string SortBy { get; set; } - public int Page { get; protected set; } - public int TotalPages { get; protected set; } - public int MatchingSearchResults; - public abstract SelectList RoleProfileSortByOptions { get; } - - public const string DescendingText = "Descending"; - public const string AscendingText = "Ascending"; - - private const int ItemsPerPage = 12; - - public readonly string? SearchString; - - protected BaseRoleProfilesPageViewModel( - string? searchString, - string sortBy, - string sortDirection, - int page - ) - { - SortBy = sortBy; - SortDirection = sortDirection; - SearchString = searchString; - Page = page; - } - protected IEnumerable PaginateItems(IList items) - { - if (items.Count > ItemsPerPage) - { - items = items.Skip(OffsetFromPageNumber(Page)).Take(ItemsPerPage).ToList(); - } - - return items; - } - protected void SetTotalPages() - { - TotalPages = (int)Math.Ceiling(MatchingSearchResults / (double)ItemsPerPage); - if (Page < 1 || Page > TotalPages) - { - Page = 1; - } - } - - private int OffsetFromPageNumber(int pageNumber) => - (pageNumber - 1) * ItemsPerPage; - } - - public static class RoleProfileSortByOptionTexts - { - public const string - RoleProfileName = "Profile Name", - RoleProfileOwner = "Owner", - RoleProfileCreatedDate = "Created Date", - RoleProfilePublishStatus = "Publish Status", - RoleProfileBrand = "Brand", - RoleProfileNationalRoleGroup = "National Job Group", - RoleProfileNationalRoleProfile = "National Job Profile"; - } -} +namespace DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments +{ + using System; + using System.Collections.Generic; + using System.Linq; + using DigitalLearningSolutions.Data.Models.CompetencyAssessments; + using Microsoft.AspNetCore.Mvc; + using Microsoft.AspNetCore.Mvc.Rendering; + + public abstract class BaseCompetencyAssessmentsPageViewModel + { + [BindProperty] public string SortDirection { get; set; } + [BindProperty] public string SortBy { get; set; } + public int Page { get; protected set; } + public int TotalPages { get; protected set; } + public int MatchingSearchResults; + public abstract SelectList CompetencyAssessmentSortByOptions { get; } + + public const string DescendingText = "Descending"; + public const string AscendingText = "Ascending"; + + private const int ItemsPerPage = 12; + + public readonly string? SearchString; + + protected BaseCompetencyAssessmentsPageViewModel( + string? searchString, + string sortBy, + string sortDirection, + int page + ) + { + SortBy = sortBy; + SortDirection = sortDirection; + SearchString = searchString; + Page = page; + } + protected IEnumerable PaginateItems(IList items) + { + if (items.Count > ItemsPerPage) + { + items = items.Skip(OffsetFromPageNumber(Page)).Take(ItemsPerPage).ToList(); + } + + return items; + } + protected void SetTotalPages() + { + TotalPages = (int)Math.Ceiling(MatchingSearchResults / (double)ItemsPerPage); + if (Page < 1 || Page > TotalPages) + { + Page = 1; + } + } + + private int OffsetFromPageNumber(int pageNumber) => + (pageNumber - 1) * ItemsPerPage; + } + + public static class CompetencyAssessmentSortByOptionTexts + { + public const string + CompetencyAssessmentName = "Competency Assessment", + CompetencyAssessmentOwner = "Owner", + CompetencyAssessmentCreatedDate = "Created Date", + CompetencyAssessmentPublishStatus = "Publish Status", + CompetencyAssessmentBrand = "Brand", + CompetencyAssessmentNationalRoleGroup = "National Job Group", + CompetencyAssessmentNationalCompetencyAssessment = "National Job Profile"; + } +} diff --git a/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/CompetencyAssessmentsViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/CompetencyAssessmentsViewModel.cs new file mode 100644 index 0000000000..f091a7dd76 --- /dev/null +++ b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/CompetencyAssessmentsViewModel.cs @@ -0,0 +1,29 @@ +namespace DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments +{ + using DigitalLearningSolutions.Web.Models.Enums; + using DigitalLearningSolutions.Web.ViewModels.Common; + + public class CompetencyAssessmentsViewModel + { + public CompetencyAssessmentsViewModel( + bool isWorkforceManager, + bool isWorkforceContributor, + AllCompetencyAssessmentsViewModel allCompetencyAssessments, + MyCompetencyAssessmentsViewModel myCompetencyAssessments, + CompetencyAssessmentsTab currentTab + ) + { + IsWorkforceManager = isWorkforceManager; + IsWorkforceContributor = isWorkforceContributor; + MyCompetencyAssessmentsViewModel = myCompetencyAssessments; + AllCompetencyAssessmentsViewModel = allCompetencyAssessments; + TabNavLinks = new TabsNavViewModel(currentTab); + } + + public bool IsWorkforceManager { get; set; } + public bool IsWorkforceContributor { get; set; } + public MyCompetencyAssessmentsViewModel MyCompetencyAssessmentsViewModel { get; set; } + public AllCompetencyAssessmentsViewModel AllCompetencyAssessmentsViewModel { get; set; } + public TabsNavViewModel TabNavLinks { get; set; } + } +} diff --git a/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/MyCompetencyAssessmentsViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/MyCompetencyAssessmentsViewModel.cs new file mode 100644 index 0000000000..ec2cf74500 --- /dev/null +++ b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/MyCompetencyAssessmentsViewModel.cs @@ -0,0 +1,43 @@ +namespace DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments +{ + using System.Collections.Generic; + using System.Linq; + using DigitalLearningSolutions.Data.Models.CompetencyAssessments; + using DigitalLearningSolutions.Web.Helpers; + using Microsoft.AspNetCore.Mvc.Rendering; + + public class MyCompetencyAssessmentsViewModel : BaseCompetencyAssessmentsPageViewModel + { + public readonly IEnumerable CompetencyAssessments; + public readonly bool IsWorkforceManager; + + public override SelectList CompetencyAssessmentSortByOptions { get; } = new SelectList(new[] + { + CompetencyAssessmentSortByOptionTexts.CompetencyAssessmentName, + CompetencyAssessmentSortByOptionTexts.CompetencyAssessmentOwner, + CompetencyAssessmentSortByOptionTexts.CompetencyAssessmentCreatedDate, + CompetencyAssessmentSortByOptionTexts.CompetencyAssessmentPublishStatus + }); + + public MyCompetencyAssessmentsViewModel( + IEnumerable competencyAssessments, // Renamed parameter to avoid shadowing + string? searchString, + string sortBy, + string sortDirection, + int page, + bool isWorkforceManager + ) : base(searchString, sortBy, sortDirection, page) + { + var sortedItems = SortingHelper.SortCompetencyAssessmentItems( + competencyAssessments, + sortBy, + sortDirection + ); + var filteredItems = SearchHelper.FilterCompetencyAssessments(sortedItems, SearchString, 60, false).ToList(); + MatchingSearchResults = filteredItems.Count; + SetTotalPages(); + CompetencyAssessments = PaginateItems(filteredItems).Cast(); // Assign to the field + IsWorkforceManager = isWorkforceManager; + } + } +} diff --git a/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/ProfessionalGroupViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/ProfessionalGroupViewModel.cs new file mode 100644 index 0000000000..86ba83228b --- /dev/null +++ b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/ProfessionalGroupViewModel.cs @@ -0,0 +1,11 @@ +namespace DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments +{ + using DigitalLearningSolutions.Data.Models.CompetencyAssessments; + using System.Collections.Generic; + + public class ProfessionalGroupViewModel + { + public IEnumerable NRPProfessionalGroups { get; set; } + public CompetencyAssessmentBase CompetencyAssessmentBase { get; set; } + } +} diff --git a/DigitalLearningSolutions.Web/ViewModels/RoleProfiles/AllRoleProfilesViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/RoleProfiles/AllRoleProfilesViewModel.cs deleted file mode 100644 index bad699149f..0000000000 --- a/DigitalLearningSolutions.Web/ViewModels/RoleProfiles/AllRoleProfilesViewModel.cs +++ /dev/null @@ -1,42 +0,0 @@ -namespace DigitalLearningSolutions.Web.ViewModels.RoleProfiles -{ - using System.Collections.Generic; - using System.Linq; - using DigitalLearningSolutions.Data.Models.RoleProfiles; - using DigitalLearningSolutions.Web.Helpers; - using Microsoft.AspNetCore.Mvc.Rendering; - public class AllRoleProfilesViewModel : BaseRoleProfilesPageViewModel - { - public readonly IEnumerable RoleProfiles; - public readonly bool IsWorkforceManager; - public override SelectList RoleProfileSortByOptions { get; } = new SelectList(new[] - { - RoleProfileSortByOptionTexts.RoleProfileName, - RoleProfileSortByOptionTexts.RoleProfileOwner, - RoleProfileSortByOptionTexts.RoleProfileCreatedDate, - RoleProfileSortByOptionTexts.RoleProfilePublishStatus, - RoleProfileSortByOptionTexts.RoleProfileBrand, - RoleProfileSortByOptionTexts.RoleProfileNationalRoleGroup, - RoleProfileSortByOptionTexts.RoleProfileNationalRoleProfile - }); - public AllRoleProfilesViewModel( - IEnumerable roleProfiles, - string? searchString, - string sortBy, - string sortDirection, - int page - ) : base(searchString, sortBy, sortDirection, page) - { - var sortedItems = SortingHelper.SortRoleProfileItems( - roleProfiles, - sortBy, - sortDirection - ); - var filteredItems = SearchHelper.FilterRoleProfiles(sortedItems, SearchString, 60, false).ToList(); - MatchingSearchResults = filteredItems.Count; - SetTotalPages(); - var paginatedItems = PaginateItems(filteredItems); - RoleProfiles = paginatedItems.Cast(); - } - } -} diff --git a/DigitalLearningSolutions.Web/ViewModels/RoleProfiles/MyRoleProfilesViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/RoleProfiles/MyRoleProfilesViewModel.cs deleted file mode 100644 index 7657922974..0000000000 --- a/DigitalLearningSolutions.Web/ViewModels/RoleProfiles/MyRoleProfilesViewModel.cs +++ /dev/null @@ -1,41 +0,0 @@ -namespace DigitalLearningSolutions.Web.ViewModels.RoleProfiles -{ - using System.Collections.Generic; - using System.Linq; - using DigitalLearningSolutions.Data.Models.RoleProfiles; - using DigitalLearningSolutions.Web.Helpers; - using Microsoft.AspNetCore.Mvc.Rendering; - public class MyRoleProfilesViewModel : BaseRoleProfilesPageViewModel - { - public readonly IEnumerable RoleProfiles; - public readonly bool IsWorkforceManager; - public override SelectList RoleProfileSortByOptions { get; } = new SelectList(new[] - { - RoleProfileSortByOptionTexts.RoleProfileName, - RoleProfileSortByOptionTexts.RoleProfileOwner, - RoleProfileSortByOptionTexts.RoleProfileCreatedDate, - RoleProfileSortByOptionTexts.RoleProfilePublishStatus - }); - public MyRoleProfilesViewModel( - IEnumerable roleProfiles, - string? searchString, - string sortBy, - string sortDirection, - int page, - bool isWorkforceManager - ) : base(searchString, sortBy, sortDirection, page) - { - var sortedItems = SortingHelper.SortRoleProfileItems( - roleProfiles, - sortBy, - sortDirection - ); - var filteredItems = SearchHelper.FilterRoleProfiles(sortedItems, SearchString, 60, false).ToList(); - MatchingSearchResults = filteredItems.Count; - SetTotalPages(); - var paginatedItems = PaginateItems(filteredItems); - RoleProfiles = paginatedItems.Cast(); - IsWorkforceManager = isWorkforceManager; - } - } -} diff --git a/DigitalLearningSolutions.Web/ViewModels/RoleProfiles/ProfessionalGroupViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/RoleProfiles/ProfessionalGroupViewModel.cs deleted file mode 100644 index 67701b8d15..0000000000 --- a/DigitalLearningSolutions.Web/ViewModels/RoleProfiles/ProfessionalGroupViewModel.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace DigitalLearningSolutions.Web.ViewModels.RoleProfiles -{ - using DigitalLearningSolutions.Data.Models.RoleProfiles; - using System.Collections.Generic; - - public class ProfessionalGroupViewModel - { - public IEnumerable NRPProfessionalGroups { get; set; } - public RoleProfileBase RoleProfileBase { get; set; } - } -} diff --git a/DigitalLearningSolutions.Web/ViewModels/RoleProfiles/RoleProfilesViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/RoleProfiles/RoleProfilesViewModel.cs deleted file mode 100644 index 9154eeee6b..0000000000 --- a/DigitalLearningSolutions.Web/ViewModels/RoleProfiles/RoleProfilesViewModel.cs +++ /dev/null @@ -1,29 +0,0 @@ -namespace DigitalLearningSolutions.Web.ViewModels.RoleProfiles -{ - using DigitalLearningSolutions.Web.Models.Enums; - using DigitalLearningSolutions.Web.ViewModels.Common; - - public class RoleProfilesViewModel - { - public RoleProfilesViewModel( - bool isWorkforceManager, - bool isWorkforceContributor, - AllRoleProfilesViewModel allRoleProfiles, - MyRoleProfilesViewModel myRoleProfiles, - RoleProfilesTab currentTab - ) - { - IsWorkforceManager = isWorkforceManager; - IsWorkforceContributor = isWorkforceContributor; - MyRoleProfilesViewModel = myRoleProfiles; - AllRoleProfilesViewModel = allRoleProfiles; - TabNavLinks = new TabsNavViewModel(currentTab); - } - - public bool IsWorkforceManager { get; set; } - public bool IsWorkforceContributor { get; set; } - public MyRoleProfilesViewModel MyRoleProfilesViewModel { get; set; } - public AllRoleProfilesViewModel AllRoleProfilesViewModel { get; set; } - public TabsNavViewModel TabNavLinks { get; set; } - } -} diff --git a/DigitalLearningSolutions.Web/ViewModels/Supervisor/EnrolDelegateOnProfileAssessmentViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/Supervisor/EnrolDelegateOnProfileAssessmentViewModel.cs index ed6e40e583..1b70330bbe 100644 --- a/DigitalLearningSolutions.Web/ViewModels/Supervisor/EnrolDelegateOnProfileAssessmentViewModel.cs +++ b/DigitalLearningSolutions.Web/ViewModels/Supervisor/EnrolDelegateOnProfileAssessmentViewModel.cs @@ -1,13 +1,13 @@ namespace DigitalLearningSolutions.Web.ViewModels.Supervisor { - using DigitalLearningSolutions.Data.Models.RoleProfiles; + using DigitalLearningSolutions.Data.Models.CompetencyAssessments; using DigitalLearningSolutions.Data.Models.SessionData.Supervisor; using DigitalLearningSolutions.Data.Models.Supervisor; using System.Collections.Generic; public class EnrolDelegateOnProfileAssessmentViewModel { - public SessionEnrolOnRoleProfile SessionEnrolOnRoleProfile { get; set; } + public SessionEnrolOnCompetencyAssessment SessionEnrolOnCompetencyAssessment { get; set; } public SupervisorDelegateDetail SupervisorDelegateDetail { get; set; } - public IEnumerable RoleProfiles { get; set; } + public IEnumerable CompetencyAssessments { get; set; } } } diff --git a/DigitalLearningSolutions.Web/ViewModels/Supervisor/EnrolDelegateSetCompletByDateViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/Supervisor/EnrolDelegateSetCompletByDateViewModel.cs index cac66da25f..e8582ca012 100644 --- a/DigitalLearningSolutions.Web/ViewModels/Supervisor/EnrolDelegateSetCompletByDateViewModel.cs +++ b/DigitalLearningSolutions.Web/ViewModels/Supervisor/EnrolDelegateSetCompletByDateViewModel.cs @@ -1,6 +1,6 @@ namespace DigitalLearningSolutions.Web.ViewModels.Supervisor { - using DigitalLearningSolutions.Data.Models.RoleProfiles; + using DigitalLearningSolutions.Data.Models.CompetencyAssessments; using DigitalLearningSolutions.Data.Models.Supervisor; using DigitalLearningSolutions.Web.Helpers; using System; @@ -8,7 +8,7 @@ public class EnrolDelegateSetCompletByDateViewModel { public SupervisorDelegateDetail SupervisorDelegateDetail { get; set; } - public RoleProfile RoleProfile { get; set; } + public CompetencyAssessment CompetencyAssessment { get; set; } public DateTime? CompleteByDate { get; set; } public OldDateValidator.ValidationResult? CompleteByValidationResult { get; set; } } diff --git a/DigitalLearningSolutions.Web/ViewModels/Supervisor/EnrolDelegateSummaryViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/Supervisor/EnrolDelegateSummaryViewModel.cs index 3b36eef8a2..681213e53f 100644 --- a/DigitalLearningSolutions.Web/ViewModels/Supervisor/EnrolDelegateSummaryViewModel.cs +++ b/DigitalLearningSolutions.Web/ViewModels/Supervisor/EnrolDelegateSummaryViewModel.cs @@ -1,13 +1,13 @@ namespace DigitalLearningSolutions.Web.ViewModels.Supervisor { - using DigitalLearningSolutions.Data.Models.RoleProfiles; + using DigitalLearningSolutions.Data.Models.CompetencyAssessments; using DigitalLearningSolutions.Data.Models.Supervisor; using System; public class EnrolDelegateSummaryViewModel { public SupervisorDelegateDetail SupervisorDelegateDetail { get; set; } - public RoleProfile RoleProfile { get; set; } + public CompetencyAssessment CompetencyAssessment { get; set; } public DateTime? CompleteByDate { get; set; } public string SupervisorRoleName { get; set; } public int SupervisorRoleCount { get; set; } diff --git a/DigitalLearningSolutions.Web/ViewModels/Supervisor/EnrolDelegateSupervisorRoleViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/Supervisor/EnrolDelegateSupervisorRoleViewModel.cs index 0c988b9457..4b15b66edf 100644 --- a/DigitalLearningSolutions.Web/ViewModels/Supervisor/EnrolDelegateSupervisorRoleViewModel.cs +++ b/DigitalLearningSolutions.Web/ViewModels/Supervisor/EnrolDelegateSupervisorRoleViewModel.cs @@ -1,6 +1,6 @@ namespace DigitalLearningSolutions.Web.ViewModels.Supervisor { - using DigitalLearningSolutions.Data.Models.RoleProfiles; + using DigitalLearningSolutions.Data.Models.CompetencyAssessments; using DigitalLearningSolutions.Data.Models.Supervisor; using System; using System.Collections.Generic; @@ -9,7 +9,7 @@ public class EnrolDelegateSupervisorRoleViewModel { public SupervisorDelegateDetail? SupervisorDelegateDetail { get; set; } - public RoleProfile? RoleProfile { get; set; } + public CompetencyAssessment? CompetencyAssessment { get; set; } [Required(ErrorMessage = "Please choose a supervisor role")] public int? SelfAssessmentSupervisorRoleId { get; set; } public IEnumerable? SelfAssessmentSupervisorRoles { get; set; } diff --git a/DigitalLearningSolutions.Web/Views/ApplicationSelector/Index.cshtml b/DigitalLearningSolutions.Web/Views/ApplicationSelector/Index.cshtml index 8200e11d84..11c835815f 100644 --- a/DigitalLearningSolutions.Web/Views/ApplicationSelector/Index.cshtml +++ b/DigitalLearningSolutions.Web/Views/ApplicationSelector/Index.cshtml @@ -126,7 +126,7 @@

Supervise

-

Assign and review staff profile assessments and arrange supervision sessions.

+

Assign and review staff competency assessments and arrange supervision sessions.

Frameworks -

Create and distribute competency frameworks and role profiles.

+

Create and distribute competency frameworks and assessments.

@@ -13,7 +13,7 @@
    -
  1. Role Profiles
    2. +
  2. Competency Assessments
@@ -26,11 +26,11 @@
@if ((string)ViewContext.RouteData.Values["tabname"] == "Mine") { - + } else if ((string)ViewContext.RouteData.Values["tabname"] == "All") { - + }
diff --git a/DigitalLearningSolutions.Web/Views/RoleProfiles/Name.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Name.cshtml similarity index 67% rename from DigitalLearningSolutions.Web/Views/RoleProfiles/Name.cshtml rename to DigitalLearningSolutions.Web/Views/CompetencyAssessments/Name.cshtml index 89e8897002..493008c8a0 100644 --- a/DigitalLearningSolutions.Web/Views/RoleProfiles/Name.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Name.cshtml @@ -1,7 +1,7 @@ -@using DigitalLearningSolutions.Data.Models.RoleProfiles; -@model RoleProfileBase; +@using DigitalLearningSolutions.Data.Models.CompetencyAssessments; +@model CompetencyAssessmentBase; @{ - ViewData["Title"] = "New Role Profiles"; + ViewData["Title"] = "New Competency Assessments"; ViewData["Application"] = "Framework Service"; } @@ -14,10 +14,10 @@ } @@ -28,43 +28,43 @@ else } } @if ((string)ViewContext.RouteData.Values["actionname"] == "New") { -

Create a new role profile

+

Create a new competency assessment

} else { -

Edit role profile name

+

Edit competency assessment name

}
@if (!ViewData.ModelState.IsValid) { } - +
Choose a title that identifies the job role or roles that this profile applies to and the scope of capabilities covered.
- - + + - + @@ -79,7 +79,7 @@ else Next
- + @@ -97,7 +97,7 @@ else Save
- + diff --git a/DigitalLearningSolutions.Web/Views/RoleProfiles/ProfessionalGroup.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ProfessionalGroup.cshtml similarity index 52% rename from DigitalLearningSolutions.Web/Views/RoleProfiles/ProfessionalGroup.cshtml rename to DigitalLearningSolutions.Web/Views/CompetencyAssessments/ProfessionalGroup.cshtml index e72a103d7c..3ce78d8b38 100644 --- a/DigitalLearningSolutions.Web/Views/RoleProfiles/ProfessionalGroup.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ProfessionalGroup.cshtml @@ -1,7 +1,7 @@ -@using DigitalLearningSolutions.Web.ViewModels.RoleProfiles; +@using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments; @model ProfessionalGroupViewModel; @{ - ViewData["Title"] = "New Role Profiles"; + ViewData["Title"] = "New Competency Assessments"; ViewData["Application"] = "Framework Service"; } @@ -14,10 +14,10 @@ } @@ -28,11 +28,11 @@ else } @@ -43,16 +43,16 @@ else { } - + - +
@foreach (var professionalGroup in Model.NRPProfessionalGroups) {
- + @@ -61,7 +61,7 @@ else
- + @if ((string)ViewContext.RouteData.Values["actionname"] == "New") { @@ -83,29 +83,29 @@ else
- - - - - - - - - - - - - + + + + + + + + + + + + + @if ((string)ViewContext.RouteData.Values["actionname"] == "New") { - + Back
- + @@ -115,7 +115,7 @@ else } else { - @if (Model.RoleProfileBase.PublishStatusID == 3) + @if (Model.CompetencyAssessmentBase.PublishStatusID == 3) { } @@ -123,7 +123,7 @@ else Save
- + diff --git a/DigitalLearningSolutions.Web/Views/RoleProfiles/Shared/_ProfilesGrid.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_AssessmentsGrid.cshtml similarity index 66% rename from DigitalLearningSolutions.Web/Views/RoleProfiles/Shared/_ProfilesGrid.cshtml rename to DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_AssessmentsGrid.cshtml index 3674c5a712..fd6b811502 100644 --- a/DigitalLearningSolutions.Web/Views/RoleProfiles/Shared/_ProfilesGrid.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_AssessmentsGrid.cshtml @@ -1,5 +1,5 @@ -@using DigitalLearningSolutions.Data.Models.RoleProfiles; -@model IEnumerable; +@using DigitalLearningSolutions.Data.Models.CompetencyAssessments; +@model IEnumerable; - @foreach (var roleProfile in Model) + @foreach (var competencyAssessment in Model) { - @foreach (var roleProfile in Model.RoleProfiles) + @foreach (var competencyAssessment in Model.CompetencyAssessments) { } diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/EnrolDelegateSetCompleteBy.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/EnrolDelegateSetCompleteBy.cshtml index f527dcf89b..d4d203bd1e 100644 --- a/DigitalLearningSolutions.Web/Views/Supervisor/EnrolDelegateSetCompleteBy.cshtml +++ b/DigitalLearningSolutions.Web/Views/Supervisor/EnrolDelegateSetCompleteBy.cshtml @@ -81,7 +81,7 @@

- Set a complete by date for @Model.RoleProfile.RoleProfileName + Set a complete by date for @Model.CompetencyAssessment.CompetencyAssessmentName

For example, @exampleDate.Day @exampleDate.Month @exampleDate.Year. Leave the day, month and year boxes blank if you don't want to specify a completion date. diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/EnrolDelegateSummary.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/EnrolDelegateSummary.cshtml index 8de3967863..7cb06c98f1 100644 --- a/DigitalLearningSolutions.Web/Views/Supervisor/EnrolDelegateSummary.cshtml +++ b/DigitalLearningSolutions.Web/Views/Supervisor/EnrolDelegateSummary.cshtml @@ -69,13 +69,13 @@ Self Assessment
- @Model.RoleProfile.RoleProfileName + @Model.CompetencyAssessment.CompetencyAssessmentName
- Change role profile + Change competency assessment
diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/Index.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/Index.cshtml index db4fcd24c2..a2e8acfba1 100644 --- a/DigitalLearningSolutions.Web/Views/Supervisor/Index.cshtml +++ b/DigitalLearningSolutions.Web/Views/Supervisor/Index.cshtml @@ -55,14 +55,14 @@

- @Model.DashboardData.ProfileCount Role Profiles + @Model.DashboardData.ProfileCount Competency Assessments

diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/SelectDelegateSupervisorRoleSummary.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/SelectDelegateSupervisorRoleSummary.cshtml index f883285ead..aee6d861fd 100644 --- a/DigitalLearningSolutions.Web/Views/Supervisor/SelectDelegateSupervisorRoleSummary.cshtml +++ b/DigitalLearningSolutions.Web/Views/Supervisor/SelectDelegateSupervisorRoleSummary.cshtml @@ -55,7 +55,7 @@ Self Assessment
- @Model.Item1.RoleProfile.RoleProfileName + @Model.Item1.CompetencyAssessment.CompetencyAssessmentName
@@ -91,7 +91,7 @@
@if (Model.Item1.SupervisorRoleCount > 1) { - + Change supervisor role } @@ -102,7 +102,7 @@ - + Confirm
diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/Shared/_DelegateProfileAssessmentGrid.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/Shared/_DelegateProfileAssessmentGrid.cshtml index 7e5b1e87e9..3b17eb8a36 100644 --- a/DigitalLearningSolutions.Web/Views/Supervisor/Shared/_DelegateProfileAssessmentGrid.cshtml +++ b/DigitalLearningSolutions.Web/Views/Supervisor/Shared/_DelegateProfileAssessmentGrid.cshtml @@ -38,7 +38,7 @@
Frameworks @@ -7,7 +7,7 @@
- Role Profile + Competency Assessment National Profile Link @@ -27,56 +27,56 @@
- Role Profile + Competency Assessment - @roleProfile.Brand + @competencyAssessment.Brand / - @roleProfile.RoleProfileName + @competencyAssessment.CompetencyAssessmentName National Profile Link - @(roleProfile.NRPProfessionalGroup != null ? @roleProfile.NRPProfessionalGroup : "None/Generic") - @(roleProfile.NRPSubGroupID != null ? " / " + roleProfile.NRPSubGroup : "") - @(roleProfile.NRPRoleID != null ? " / " + roleProfile.NRPRole : "") + @(competencyAssessment.NRPProfessionalGroup != null ? @competencyAssessment.NRPProfessionalGroup : "None/Generic") + @(competencyAssessment.NRPSubGroupID != null ? " / " + competencyAssessment.NRPSubGroup : "") + @(competencyAssessment.NRPRoleID != null ? " / " + competencyAssessment.NRPRole : "") Created - @roleProfile.CreatedDate.ToShortDateString() + @competencyAssessment.CreatedDate.ToShortDateString() Status - + Owner - @roleProfile.Owner + @competencyAssessment.Owner Actions - @if (roleProfile.UserRole > 1) + @if (competencyAssessment.UserRole > 1) { - + View/Edit } else { - + View } diff --git a/DigitalLearningSolutions.Web/Views/RoleProfiles/Shared/_RoleProfilesSearchAndSort.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_CompetencyAssessmentsSearchAndSort.cshtml similarity index 66% rename from DigitalLearningSolutions.Web/Views/RoleProfiles/Shared/_RoleProfilesSearchAndSort.cshtml rename to DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_CompetencyAssessmentsSearchAndSort.cshtml index d6aa3c18d1..c3e030727f 100644 --- a/DigitalLearningSolutions.Web/Views/RoleProfiles/Shared/_RoleProfilesSearchAndSort.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_CompetencyAssessmentsSearchAndSort.cshtml @@ -1,11 +1,11 @@ -@using DigitalLearningSolutions.Web.ViewModels.RoleProfiles -@model BaseRoleProfilesPageViewModel - -
-
- -
-
- -
-
+@using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments +@model BaseCompetencyAssessmentsPageViewModel + +
+
+ +
+
+ +
+
diff --git a/DigitalLearningSolutions.Web/Views/RoleProfiles/Shared/_PageSearch.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_PageSearch.cshtml similarity index 87% rename from DigitalLearningSolutions.Web/Views/RoleProfiles/Shared/_PageSearch.cshtml rename to DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_PageSearch.cshtml index 6edb778960..ab254994c8 100644 --- a/DigitalLearningSolutions.Web/Views/RoleProfiles/Shared/_PageSearch.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_PageSearch.cshtml @@ -1,13 +1,13 @@ -@using DigitalLearningSolutions.Web.ViewModels.RoleProfiles -@model BaseRoleProfilesPageViewModel - - +@using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments +@model BaseCompetencyAssessmentsPageViewModel + + diff --git a/DigitalLearningSolutions.Web/Views/RoleProfiles/Shared/_PageSort.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_PageSort.cshtml similarity index 80% rename from DigitalLearningSolutions.Web/Views/RoleProfiles/Shared/_PageSort.cshtml rename to DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_PageSort.cshtml index a8b403f8d2..a13027eeb5 100644 --- a/DigitalLearningSolutions.Web/Views/RoleProfiles/Shared/_PageSort.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_PageSort.cshtml @@ -1,26 +1,26 @@ -@using DigitalLearningSolutions.Web.ViewModels.RoleProfiles -@model BaseRoleProfilesPageViewModel - - -
- - -
- - - -
-
+@using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments +@model BaseCompetencyAssessmentsPageViewModel + + +
+ + +
+ + + +
+
diff --git a/DigitalLearningSolutions.Web/Views/RoleProfiles/Shared/_Pagination.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_Pagination.cshtml similarity index 94% rename from DigitalLearningSolutions.Web/Views/RoleProfiles/Shared/_Pagination.cshtml rename to DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_Pagination.cshtml index 3f43b6aee8..012e103877 100644 --- a/DigitalLearningSolutions.Web/Views/RoleProfiles/Shared/_Pagination.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_Pagination.cshtml @@ -1,5 +1,5 @@ -@using DigitalLearningSolutions.Web.ViewModels.RoleProfiles -@model BaseRoleProfilesPageViewModel +@using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments +@model BaseCompetencyAssessmentsPageViewModel }

Frameworks Dashboard

-

Welcome @Model.Username. You are accessing as a @(Model.IsFrameworkDeveloper ? "Framework Developer" : Model.IsFrameworkContributor ? "Framework Contributor" : "Framework Viewer") and a @(Model.IsWorkforceManager ? "Workforce Manager" : Model.IsWorkforceContributor ? "Role Profile Contributor" : "Role Profile Viewer").

+

Welcome @Model.Username. You are accessing as a @(Model.IsFrameworkDeveloper ? "Framework Developer" : Model.IsFrameworkContributor ? "Framework Contributor" : "Framework Viewer") and a @(Model.IsWorkforceManager ? "Workforce Manager" : Model.IsWorkforceContributor ? "Competency Assessment Contributor" : "Competency Assessment Viewer").

  • @@ -49,14 +49,14 @@

    - @Model.DashboardData.RoleProfileCount Role Profiles + @Model.DashboardData.CompetencyAssessmentCount Competency Assessments

    @@ -78,7 +78,7 @@ } else { - + @(toDoItem.SignOffRequired ? "Approve " : "Review ") @toDoItem.ItemName for @toDoItem.RequestorName (requested @toDoItem.Requested.ToShortDateString()) } diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_NavMenuItems.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_NavMenuItems.cshtml index b2f8dff16a..feea60f175 100644 --- a/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_NavMenuItems.cshtml +++ b/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_NavMenuItems.cshtml @@ -13,9 +13,9 @@
    • -
  • - - Role Profiles +
  • + + Competency Assessments
    • diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_PublishedWarning.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_PublishedWarning.cshtml index ac23ce8708..8d3e40011e 100644 --- a/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_PublishedWarning.cshtml +++ b/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_PublishedWarning.cshtml @@ -5,5 +5,5 @@ Framework published and in use -

    This framework has been published and its content may be in use in role profiles and self-assessments.

    You should make only minor changes to a published framework.

    Any meaningful or significant changes should be made to a new major release version of the framework.

    +

    This framework has been published and its content may be in use in competency assessments.

    You should make only minor changes to a published framework.

    Any meaningful or significant changes should be made to a new major release version of the framework.

    diff --git a/DigitalLearningSolutions.Web/Views/RoleProfiles/_AllRoleProfiles.cshtml b/DigitalLearningSolutions.Web/Views/RoleProfiles/_AllRoleProfiles.cshtml deleted file mode 100644 index 6e1f77c79e..0000000000 --- a/DigitalLearningSolutions.Web/Views/RoleProfiles/_AllRoleProfiles.cshtml +++ /dev/null @@ -1,23 +0,0 @@ -@using DigitalLearningSolutions.Web.ViewModels.RoleProfiles -@model AllRoleProfilesViewModel - -

    All Role Profiles

    -@if (!Model.RoleProfiles.Any() && Model.SearchString == null) -{ - -} -else -{ -
    - - - -
    - - - - - -} diff --git a/DigitalLearningSolutions.Web/Views/RoleProfiles/_MyRoleProfiles.cshtml b/DigitalLearningSolutions.Web/Views/RoleProfiles/_MyRoleProfiles.cshtml deleted file mode 100644 index c379477534..0000000000 --- a/DigitalLearningSolutions.Web/Views/RoleProfiles/_MyRoleProfiles.cshtml +++ /dev/null @@ -1,29 +0,0 @@ -@using DigitalLearningSolutions.Web.ViewModels.RoleProfiles -@model MyRoleProfilesViewModel - -

    My Role Profiles

    -@if (!Model.RoleProfiles.Any() && Model.SearchString == null) -{ - -} -else -{ -
    - - - -
    - - - - - -} -@if (Model.IsWorkforceManager) -{ - - Create new role profile - -} diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/EnrolDelegateOnProfileAssessment.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/EnrolDelegateOnProfileAssessment.cshtml index 4bb81944cc..35ddf60f91 100644 --- a/DigitalLearningSolutions.Web/Views/Supervisor/EnrolDelegateOnProfileAssessment.cshtml +++ b/DigitalLearningSolutions.Web/Views/Supervisor/EnrolDelegateOnProfileAssessment.cshtml @@ -40,7 +40,7 @@ } @if (errorHasOccurred) { - + }
    @@ -53,7 +53,7 @@

    Enrol on Self Assessment

    -@if (Model.RoleProfiles.Any()) +@if (Model.CompetencyAssessments.Any()) {

    Choose a self assessment

    @@ -75,31 +75,31 @@
Self assessment
- -
Brand - @roleProfile.Brand + @competencyAssessment.Brand Linked to role - @(roleProfile.NRPProfessionalGroup != null ? @roleProfile.NRPProfessionalGroup : "None/Generic") - @(roleProfile.NRPSubGroupID != null ? " / " + roleProfile.NRPSubGroup : "") - @(roleProfile.NRPRoleID != null ? " / " + roleProfile.NRPRole : "") + @(competencyAssessment.NRPProfessionalGroup != null ? @competencyAssessment.NRPProfessionalGroup : "None/Generic") + @(competencyAssessment.NRPSubGroupID != null ? " / " + competencyAssessment.NRPSubGroup : "") + @(competencyAssessment.NRPRoleID != null ? " / " + competencyAssessment.NRPRole : "") Scope - @(roleProfile.National ? "National" : "Local") + @(competencyAssessment.National ? "National" : "Local")
Role links @(delegateSelfAssessment.ProfessionalGroup != null ? delegateSelfAssessment.ProfessionalGroup : "None/Generic") @(delegateSelfAssessment.SubGroup != null ? " / " + delegateSelfAssessment.SubGroup : "") - @(delegateSelfAssessment.RoleProfile != null ? " / " + delegateSelfAssessment.RoleProfile : "") + @(delegateSelfAssessment.CompetencyAssessment != null ? " / " + delegateSelfAssessment.CompetencyAssessment : "") Last activity @delegateSelfAssessment.LastAccessed.ToShortDateString()
(@delegateSelfAssessment.LaunchCount launches) From e44b957020394fdee91a1ee4253989941a4f4634 Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Tue, 28 Jan 2025 09:26:44 +0000 Subject: [PATCH 04/36] TD-5286 Gives framework developers and contributors access to the competency assessments interface --- .../CompetencyAssessments.cs | 4 ++-- .../CompetencyAssessmentsController.cs | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs index 1441624e6f..cae052c92c 100644 --- a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs +++ b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs @@ -25,8 +25,8 @@ public IActionResult ViewCompetencyAssessments(string tabname, string? searchStr ) { var adminId = GetAdminID(); - var isWorkforceManager = GetIsWorkforceManager(); - var isWorkforceContributor = GetIsWorkforceContributor(); + var isWorkforceManager = GetIsWorkforceManager() | GetIsFrameworkDeveloper(); + var isWorkforceContributor = GetIsWorkforceContributor() | GetIsFrameworkContributor(); IEnumerable competencyAssessments; if (tabname == "All") { diff --git a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessmentsController.cs b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessmentsController.cs index 86da61c39e..88016c1eeb 100644 --- a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessmentsController.cs +++ b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessmentsController.cs @@ -50,5 +50,15 @@ private bool GetIsWorkforceContributor() var isWorkforceContributor = User.GetCustomClaimAsBool(CustomClaimTypes.IsWorkforceContributor); return isWorkforceContributor != null && (bool)isWorkforceContributor; } + private bool GetIsFrameworkDeveloper() + { + var isFrameworkDeveloper = User.GetCustomClaimAsBool(CustomClaimTypes.IsFrameworkDeveloper); + return isFrameworkDeveloper != null && (bool)isFrameworkDeveloper; + } + private bool GetIsFrameworkContributor() + { + var isFrameworkContributor = User.GetCustomClaimAsBool(CustomClaimTypes.IsFrameworkContributor); + return isFrameworkContributor != null && (bool)isFrameworkContributor; + } } } From a7f68a08f815ded4b720a41f7671659f4f7b55f5 Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Tue, 28 Jan 2025 10:16:03 +0000 Subject: [PATCH 05/36] TD-5286 Migration to add and populate the SelfAssessmentFrameworks and SelfAssessmentTaskStatus tables --- ...280929_CreateCompetencyAssessmentTables.cs | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 DigitalLearningSolutions.Data.Migrations/202501280929_CreateCompetencyAssessmentTables.cs diff --git a/DigitalLearningSolutions.Data.Migrations/202501280929_CreateCompetencyAssessmentTables.cs b/DigitalLearningSolutions.Data.Migrations/202501280929_CreateCompetencyAssessmentTables.cs new file mode 100644 index 0000000000..a75c829262 --- /dev/null +++ b/DigitalLearningSolutions.Data.Migrations/202501280929_CreateCompetencyAssessmentTables.cs @@ -0,0 +1,56 @@ +namespace DigitalLearningSolutions.Data.Migrations +{ + using FluentMigrator; + using FluentMigrator.SqlServer; + [Migration(202501280929)] + public class CreateCompetencyAssessmentTables : Migration + { + public override void Up() + { + Create.Table("SelfAssessmentFrameworks") + .WithColumn("ID").AsInt32().NotNullable().PrimaryKey().Identity() + .WithColumn("SelfAssessmentId").AsInt32().NotNullable().ForeignKey("SelfAssessments", "ID") + .WithColumn("FrameworkId").AsInt32().NotNullable().ForeignKey("Frameworks", "ID") + .WithColumn("CreatedDate").AsDateTime().NotNullable().WithDefault(SystemMethods.CurrentDateTime) + .WithColumn("CreatedByUserId").AsInt32().NotNullable().ForeignKey("Users", "ID") + .WithColumn("RemovedDate").AsDateTime().Nullable() + .WithColumn("RemovedByUserId").AsInt32().Nullable().ForeignKey("Users", "ID") + .WithColumn("AmendedDate").AsDateTime().Nullable() + .WithColumn("AmendedByUserId").AsInt32().Nullable().ForeignKey("Users", "ID"); + Create.Table("SelfAssessmentTaskStatus") + .WithColumn("ID").AsInt32().NotNullable().PrimaryKey().Identity() + .WithColumn("SelfAssessmentId").AsInt32().NotNullable().ForeignKey("SelfAssessments", "ID").Unique() + .WithColumn("IntroductoryTextTaskStatus").AsBoolean().Nullable() + .WithColumn("BrandingTaskStatus").AsBoolean().Nullable() + .WithColumn("VocabularyTaskStatus").AsBoolean().Nullable() + .WithColumn("WorkingGroupTaskStatus").AsBoolean().Nullable() + .WithColumn("NationalRoleProfileTaskStatus").AsBoolean().Nullable() + .WithColumn("FrameworkLinksTaskStatus").AsBoolean().Nullable() + .WithColumn("SelectCompetenciesTaskStatus").AsBoolean().Nullable() + .WithColumn("OptionalCompetenciesTaskStatus").AsBoolean().Nullable() + .WithColumn("RoleRequirementsTaskStatus").AsBoolean().Nullable() + .WithColumn("SupervisorRolesTaskStatus").AsBoolean().Nullable() + .WithColumn("SelfAssessmentOptionsTaskStatus").AsBoolean().Nullable() + .WithColumn("ReviewTaskStatus").AsBoolean().Nullable(); + Execute.Sql($@"INSERT INTO SelfAssessmentFrameworks (SelfAssessmentId, FrameworkId, CreatedByUserId) + SELECT sa.ID, fc.FrameworkID, aa.UserID + FROM SelfAssessments AS sa INNER JOIN + SelfAssessmentStructure AS sas ON sa.ID = sas.SelfAssessmentID INNER JOIN + FrameworkCompetencies AS fc ON sas.CompetencyID = fc.CompetencyID INNER JOIN + AdminAccounts AS aa ON sa.CreatedByAdminID = aa.ID + GROUP BY sa.ID, fc.FrameworkID, aa.UserID + "); + Execute.Sql($@"INSERT INTO SelfAssessmentTaskStatus (SelfAssessmentId, IntroductoryTextTaskStatus, BrandingTaskStatus, VocabularyTaskStatus, WorkingGroupTaskStatus, NationalRoleProfileTaskStatus, FrameworkLinksTaskStatus, SelectCompetenciesTaskStatus, OptionalCompetenciesTaskStatus, RoleRequirementsTaskStatus, SupervisorRolesTaskStatus, SelfAssessmentOptionsTaskStatus) + SELECT ID, 1,1,1,1,1,1,1,1,1,1,1 + FROM SelfAssessments AS sa + "); + } + + public override void Down() + { + Delete.Table("SelfAssessmentFrameworks"); + Delete.Table("SelfAssessmentTaskStatus"); + } + + } +} From b2c541381c94bafd621cf3d855314345e71736f4 Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Tue, 28 Jan 2025 15:49:00 +0000 Subject: [PATCH 06/36] TD-5286 Tweaks the competency assessments table --- .../DataServices/CompetencyAssessmentDataService.cs | 11 ++++++++++- .../CompetencyAssessments/CompetencyAssessment.cs | 1 + .../Shared/_AssessmentsGrid.cshtml | 10 ++++------ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs b/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs index e2af8e2aa8..a24ad4edc7 100644 --- a/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs @@ -52,6 +52,14 @@ FROM AdminUsers WHERE (AdminID = sa.CreatedByAdminID)) AS Owner, sa.Archived, sa.LastEdit, + STUFF(( + SELECT + ', ' + f.FrameworkName + FROM + Frameworks f + WHERE + f.ID = saf.FrameworkId + FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 2, '') AS LinkedFrameworks, (SELECT ProfessionalGroup FROM NRPProfessionalGroups WHERE (ID = sa.NRPProfessionalGroupID)) AS NRPProfessionalGroup, @@ -68,7 +76,8 @@ FROM NRPRoles private const string SelfAssessmentTables = @" LEFT OUTER JOIN - SelfAssessmentReviews AS sar ON sac.ID = sar.SelfAssessmentCollaboratorID AND sar.Archived IS NULL AND sar.ReviewComplete IS NULL"; + SelfAssessmentReviews AS sar ON sac.ID = sar.SelfAssessmentCollaboratorID AND sar.Archived IS NULL AND sar.ReviewComplete IS NULL + LEFT OUTER JOIN SelfAssessmentFrameworks AS saf ON sa.ID = saf.SelfAssessmentId"; private readonly IDbConnection connection; private readonly ILogger logger; diff --git a/DigitalLearningSolutions.Data/Models/CompetencyAssessments/CompetencyAssessment.cs b/DigitalLearningSolutions.Data/Models/CompetencyAssessments/CompetencyAssessment.cs index f67d03ecbd..f679ad6da9 100644 --- a/DigitalLearningSolutions.Data/Models/CompetencyAssessments/CompetencyAssessment.cs +++ b/DigitalLearningSolutions.Data/Models/CompetencyAssessments/CompetencyAssessment.cs @@ -14,6 +14,7 @@ public string? Brand public string? Owner { get; set; } public DateTime? Archived { get; set; } public DateTime LastEdit { get; set; } + public string? LinkedFrameworks { get; set; } public string? NRPProfessionalGroup { get; set; } public string? NRPSubGroup { get; set; } public string? NRPRole { get; set; } diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_AssessmentsGrid.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_AssessmentsGrid.cshtml index fd6b811502..f194524fdd 100644 --- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_AssessmentsGrid.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_AssessmentsGrid.cshtml @@ -10,7 +10,7 @@ Competency Assessment 		- National Profile Link + Framework Links Created @@ -41,11 +41,9 @@ - National Profile Link + Framework links - @(competencyAssessment.NRPProfessionalGroup != null ? @competencyAssessment.NRPProfessionalGroup : "None/Generic") - @(competencyAssessment.NRPSubGroupID != null ? " / " + competencyAssessment.NRPSubGroup : "") - @(competencyAssessment.NRPRoleID != null ? " / " + competencyAssessment.NRPRole : "") + @competencyAssessment.LinkedFrameworks @@ -71,7 +69,7 @@ @if (competencyAssessment.UserRole > 1) { - View/Edit + Manage } else From dc7b9451398baca7c8fc27bd053cbb29534e0bf9 Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Thu, 30 Jan 2025 08:15:54 +0000 Subject: [PATCH 07/36] TD-480 Amends previous migration and sets up basic services and controller for creating a new assessment --- ...280929_CreateCompetencyAssessmentTables.cs | 15 ++- .../CompetencyAssessmentDataService.cs | 118 +++++++++++++++++- .../DataServices/FrameworkDataService.cs | 2 +- .../Models/Frameworks/BrandedFramework.cs | 1 + .../CompetencyAssessments.cs | 26 ++-- .../Services/CompetencyAssessmentService.cs | 21 +++- .../Views/CompetencyAssessments/Name.cshtml | 6 +- .../ProfessionalGroup.cshtml | 6 +- .../Shared/_AssessmentsGrid.cshtml | 4 +- .../Views/Frameworks/Index.cshtml | 2 +- 10 files changed, 161 insertions(+), 40 deletions(-) diff --git a/DigitalLearningSolutions.Data.Migrations/202501280929_CreateCompetencyAssessmentTables.cs b/DigitalLearningSolutions.Data.Migrations/202501280929_CreateCompetencyAssessmentTables.cs index a75c829262..381be8cb3c 100644 --- a/DigitalLearningSolutions.Data.Migrations/202501280929_CreateCompetencyAssessmentTables.cs +++ b/DigitalLearningSolutions.Data.Migrations/202501280929_CreateCompetencyAssessmentTables.cs @@ -12,11 +12,11 @@ public override void Up() .WithColumn("SelfAssessmentId").AsInt32().NotNullable().ForeignKey("SelfAssessments", "ID") .WithColumn("FrameworkId").AsInt32().NotNullable().ForeignKey("Frameworks", "ID") .WithColumn("CreatedDate").AsDateTime().NotNullable().WithDefault(SystemMethods.CurrentDateTime) - .WithColumn("CreatedByUserId").AsInt32().NotNullable().ForeignKey("Users", "ID") + .WithColumn("CreatedByAdminId").AsInt32().NotNullable().ForeignKey("AdminAccounts", "ID") .WithColumn("RemovedDate").AsDateTime().Nullable() - .WithColumn("RemovedByUserId").AsInt32().Nullable().ForeignKey("Users", "ID") + .WithColumn("RemovedByAdminId").AsInt32().Nullable().ForeignKey("AdminAccounts", "ID") .WithColumn("AmendedDate").AsDateTime().Nullable() - .WithColumn("AmendedByUserId").AsInt32().Nullable().ForeignKey("Users", "ID"); + .WithColumn("AmendedByAdminId").AsInt32().Nullable().ForeignKey("AdminAccounts", "ID"); Create.Table("SelfAssessmentTaskStatus") .WithColumn("ID").AsInt32().NotNullable().PrimaryKey().Identity() .WithColumn("SelfAssessmentId").AsInt32().NotNullable().ForeignKey("SelfAssessments", "ID").Unique() @@ -32,13 +32,12 @@ public override void Up() .WithColumn("SupervisorRolesTaskStatus").AsBoolean().Nullable() .WithColumn("SelfAssessmentOptionsTaskStatus").AsBoolean().Nullable() .WithColumn("ReviewTaskStatus").AsBoolean().Nullable(); - Execute.Sql($@"INSERT INTO SelfAssessmentFrameworks (SelfAssessmentId, FrameworkId, CreatedByUserId) - SELECT sa.ID, fc.FrameworkID, aa.UserID + Execute.Sql($@"INSERT INTO SelfAssessmentFrameworks (SelfAssessmentId, FrameworkId, CreatedByAdminId) + SELECT sa.ID, fc.FrameworkID, sa.CreatedByAdminID FROM SelfAssessments AS sa INNER JOIN SelfAssessmentStructure AS sas ON sa.ID = sas.SelfAssessmentID INNER JOIN - FrameworkCompetencies AS fc ON sas.CompetencyID = fc.CompetencyID INNER JOIN - AdminAccounts AS aa ON sa.CreatedByAdminID = aa.ID - GROUP BY sa.ID, fc.FrameworkID, aa.UserID + FrameworkCompetencies AS fc ON sas.CompetencyID = fc.CompetencyID + GROUP BY sa.ID, fc.FrameworkID, sa.CreatedByAdminID "); Execute.Sql($@"INSERT INTO SelfAssessmentTaskStatus (SelfAssessmentId, IntroductoryTextTaskStatus, BrandingTaskStatus, VocabularyTaskStatus, WorkingGroupTaskStatus, NationalRoleProfileTaskStatus, FrameworkLinksTaskStatus, SelectCompetenciesTaskStatus, OptionalCompetenciesTaskStatus, RoleRequirementsTaskStatus, SupervisorRolesTaskStatus, SelfAssessmentOptionsTaskStatus) SELECT ID, 1,1,1,1,1,1,1,1,1,1,1 diff --git a/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs b/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs index a24ad4edc7..bde5d1000f 100644 --- a/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs @@ -1,10 +1,14 @@ namespace DigitalLearningSolutions.Data.DataServices { + using System; using System.Collections.Generic; using System.Data; using System.Linq; using Dapper; + using DigitalLearningSolutions.Data.Models.Common; using DigitalLearningSolutions.Data.Models.CompetencyAssessments; + using DigitalLearningSolutions.Data.Models.Frameworks; + using DocumentFormat.OpenXml.Wordprocessing; using Microsoft.Extensions.Logging; public interface ICompetencyAssessmentDataService @@ -24,8 +28,16 @@ public interface ICompetencyAssessmentDataService bool UpdateCompetencyAssessmentName(int competencyAssessmentId, int adminId, string competencyAssessmentName); bool UpdateCompetencyAssessmentProfessionalGroup(int competencyAssessmentId, int adminId, int? nrpProfessionalGroupID); + bool UpdateCompetencyAssessmentBranding( + int competencyAssessmentId, + int brandId, + int categoryId, + int adminId + ); + bool UpdateCompetencyAssessmentDescription(int competencyAssessmentId, int adminId, string competencyAssessmentDescription); //INSERT DATA - + int InsertCompetencyAssessment(int adminId, int centreId, string competencyAssessmentName); + bool InsertSelfAssessmentFramework(int adminId, int selfAssessmentId, int frameworkId); //DELETE DATA } @@ -121,6 +133,33 @@ FROM SelfAssessmentCollaborators ).FirstOrDefault(); } + public int InsertCompetencyAssessment(int adminId, int centreId, string competencyAssessmentName) + { + if ((competencyAssessmentName.Length == 0) | (adminId < 1)) + { + logger.LogWarning( + $"Not inserting competency assessmente as it failed server side validation. AdminId: {adminId}, competencyAssessmentName: {competencyAssessmentName}" + ); + return -1; + } + var result = connection.ExecuteScalar( + @"SELECT COUNT(*) FROM SelfAssessments WHERE [Name] = @competencyAssessmentName", + new { competencyAssessmentName } + ); + int existingSelfAssessments = Convert.ToInt32(result); + if (existingSelfAssessments > 0) + { + return -1; + } + var assessmentId = connection.QuerySingle( + @"INSERT INTO SelfAssessments ([Name], CreatedByCentreID, CreatedByAdminID) + OUTPUT INSERTED.Id + VALUES (@competencyAssessmentName, @centreId, @adminId)" + , + new { competencyAssessmentName, centreId, adminId } + ); + return assessmentId; + } public bool UpdateCompetencyAssessmentName(int competencyAssessmentId, int adminId, string competencyAssessmentName) { if ((competencyAssessmentName.Length == 0) | (adminId < 1) | (competencyAssessmentId < 1)) @@ -130,11 +169,11 @@ public bool UpdateCompetencyAssessmentName(int competencyAssessmentId, int admin ); return false; } - - var existingSelfAssessments = (int)connection.ExecuteScalar( + var result = connection.ExecuteScalar( @"SELECT COUNT(*) FROM SelfAssessments WHERE [Name] = @competencyAssessmentName AND ID <> @competencyAssessmentId", new { competencyAssessmentName, competencyAssessmentId } ); + int existingSelfAssessments = Convert.ToInt32(result); if (existingSelfAssessments > 0) { return false; @@ -179,10 +218,11 @@ ORDER BY ProfessionalGroup" public bool UpdateCompetencyAssessmentProfessionalGroup(int competencyAssessmentId, int adminId, int? nrpProfessionalGroupID) { - var sameCount = (int)connection.ExecuteScalar( + var result = connection.ExecuteScalar( @"SELECT COUNT(*) FROM CompetencyAssessments WHERE ID = @competencyAssessmentId AND NRPProfessionalGroupID = @nrpProfessionalGroupID", new { competencyAssessmentId, nrpProfessionalGroupID } ); + int sameCount = Convert.ToInt32(result); if (sameCount > 0) { //same so don't update: @@ -202,5 +242,75 @@ public bool UpdateCompetencyAssessmentProfessionalGroup(int competencyAssessment return false; } + public bool UpdateCompetencyAssessmentBranding( + int competencyAssessmentId, + int brandId, + int categoryId, + int adminId + ) + { + if ((competencyAssessmentId < 1) | (brandId < 1) | (categoryId < 1) | (adminId < 1)) + { + logger.LogWarning( + $"Not updating competency assessment as it failed server side validation. competencyAssessmentId: {competencyAssessmentId}, brandId: {brandId}, categoryId: {categoryId}, AdminId: {adminId}" + ); + return false; + } + + var numberOfAffectedRows = connection.Execute( + @"UPDATE SelfAssessments SET BrandID = @brandId, CategoryID = @categoryId, UpdatedByAdminID = @adminId + WHERE ID = @competencyAssessmentId", + new { brandId, categoryId, adminId, competencyAssessmentId } + ); + if (numberOfAffectedRows < 1) + { + logger.LogWarning( + "Not updating competency assessment as db update failed. " + + $"frameworkId: {competencyAssessmentId}, brandId: {brandId}, categoryId: {categoryId}, AdminId: {adminId}" + ); + return false; + } + + return true; + } + + public bool UpdateCompetencyAssessmentDescription(int competencyAssessmentId, int adminId, string competencyAssessmentDescription) + { + var numberOfAffectedRows = connection.Execute( + @"UPDATE SelfAssessments SET Description = @competencyAssessmentDescription, UpdatedByAdminID = @adminId + WHERE ID = @competencyAssessmentId", + new { adminId, competencyAssessmentId, competencyAssessmentDescription } + ); + if (numberOfAffectedRows < 1) + { + logger.LogWarning( + "Not updating competency assessment as db update failed. " + + $"frameworkId: {competencyAssessmentId}, competencyAssessmentDescription: {competencyAssessmentDescription}, AdminId: {adminId}" + ); + return false; + } + return true; + } + + public bool InsertSelfAssessmentFramework(int adminId, int selfAssessmentId, int frameworkId) + { + var numberOfAffectedRows = connection.Execute( + @"Insert SelfAssessmentFrameworks (SelfAssessmentId, FrameworkId, CreatedByAdminId) + VALUES (@selfAssessmentId, @frameworkId, @adminId) + WHERE NOT EXISTS (SELECT 1 FROM SelfAssessmentFrameworks WHERE SelfAssessmentId = @selfAssessmentId AND FrameworkId = @frameworkId)" + , + new { adminId, selfAssessmentId, frameworkId } + ); + if (numberOfAffectedRows < 1) + { + logger.LogWarning( + "Not inserting SelfAssessmentFrameworks record as db insert failed. " + + $"selfAssessmentId: {selfAssessmentId}, frameworkId: {frameworkId}, AdminId: {adminId}" + ); + return false; + } + + return true; + } } } diff --git a/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs b/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs index 560cf5772a..d6751ebfce 100644 --- a/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs @@ -286,7 +286,7 @@ public class FrameworkDataService : IFrameworkDataService fwr.ID AS FrameworkReviewID"; private const string BrandedFrameworkFields = - @",(SELECT BrandName + @", FW.Description, (SELECT BrandName FROM Brands WHERE (BrandID = FW.BrandID)) AS Brand, (SELECT CategoryName diff --git a/DigitalLearningSolutions.Data/Models/Frameworks/BrandedFramework.cs b/DigitalLearningSolutions.Data/Models/Frameworks/BrandedFramework.cs index f49b526831..fdcc327484 100644 --- a/DigitalLearningSolutions.Data/Models/Frameworks/BrandedFramework.cs +++ b/DigitalLearningSolutions.Data/Models/Frameworks/BrandedFramework.cs @@ -2,6 +2,7 @@ { public class BrandedFramework : BaseFramework { + public string? Description { get; set; } public string? Brand { get => brand; diff --git a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs index cae052c92c..2a2264c10f 100644 --- a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs +++ b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs @@ -179,17 +179,18 @@ public IActionResult CompetencyAssessmentName(string actionname, int competencyA [Route("/CompetencyAssessments/Name/{actionname}/{competencyAssessmentId}")] [Route("/CompetencyAssessments/Name/{actionname}")] [SetSelectedTab(nameof(NavMenuTab.CompetencyAssessments))] - public IActionResult SaveProfileName(CompetencyAssessmentBase competencyAssessmentBase, string actionname, int competencyAssessmentId = 0) + public IActionResult SaveProfileName(CompetencyAssessmentBase competencyAssessmentBase, string actionname, int competencyAssessmentId = 0, int? frameworkId = null) { if (!ModelState.IsValid) { ModelState.Remove(nameof(CompetencyAssessmentBase.CompetencyAssessmentName)); ModelState.AddModelError(nameof(CompetencyAssessmentBase.CompetencyAssessmentName), "Please enter a valid competency assessment name (between 3 and 255 characters)"); - // do something return View("Name", competencyAssessmentBase); } else { + var userCentreId = (int)GetCentreId(); + var adminId = GetAdminID(); if (actionname == "New") { var sameItems = competencyAssessmentService.GetCompetencyAssessmentByName(competencyAssessmentBase.CompetencyAssessmentName, GetAdminID()); @@ -197,30 +198,21 @@ public IActionResult SaveProfileName(CompetencyAssessmentBase competencyAssessme { ModelState.Remove(nameof(CompetencyAssessmentBase.CompetencyAssessmentName)); ModelState.AddModelError(nameof(CompetencyAssessmentBase.CompetencyAssessmentName), "Another competency assessment exists with that name. Please choose a different name."); - // do something return View("Name", competencyAssessmentBase); } - SessionNewCompetencyAssessment sessionNewCompetencyAssessment = TempData.Peek(); - sessionNewCompetencyAssessment.CompetencyAssessmentBase = competencyAssessmentBase; - TempData.Set(sessionNewCompetencyAssessment); - return RedirectToAction("CompetencyAssessmentProfessionalGroup", "CompetencyAssessments", new { actionname }); + competencyAssessmentService.InsertCompetencyAssessment(adminId, userCentreId, competencyAssessmentBase.CompetencyAssessmentName, frameworkId); } else - { - var adminId = GetAdminID(); + { + var isUpdated = competencyAssessmentService.UpdateCompetencyAssessmentName(competencyAssessmentBase.ID, adminId, competencyAssessmentBase.CompetencyAssessmentName); - if (isUpdated) - { - return RedirectToAction("ViewCompetencyAssessment", new { tabname = "Details", competencyAssessmentId }); - } - else + if (!isUpdated) { ModelState.AddModelError(nameof(CompetencyAssessmentBase.CompetencyAssessmentName), "Another competency assessment exists with that name. Please choose a different name."); - // do something return View("Name", competencyAssessmentBase); } } - + return RedirectToAction("ManageCompetencyAssessment", new { competencyAssessmentId }); } } @@ -290,7 +282,7 @@ public IActionResult SaveProfessionalGroup(CompetencyAssessmentBase competencyAs } else { - return RedirectToAction("ViewCompetencyAssessment", new { tabname = "Details", competencyAssessmentId }); + return RedirectToAction("ManageCompetencyAssessment", new { tabname = "Details", competencyAssessmentId }); } } } diff --git a/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs b/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs index 27385103bd..e867731ba5 100644 --- a/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs +++ b/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs @@ -22,13 +22,18 @@ public interface ICompetencyAssessmentService bool UpdateCompetencyAssessmentProfessionalGroup(int competencyAssessmentId, int adminId, int? nrpProfessionalGroupID); + //INSERT DATA + int InsertCompetencyAssessment(int adminId, int centreId, string competencyAssessmentName, int? frameworkId); + } public class CompetencyAssessmentService : ICompetencyAssessmentService { private readonly ICompetencyAssessmentDataService competencyAssessmentDataService; - public CompetencyAssessmentService(ICompetencyAssessmentDataService competencyAssessmentDataService) + private readonly IFrameworkDataService frameworkDataService; + public CompetencyAssessmentService(ICompetencyAssessmentDataService competencyAssessmentDataService, IFrameworkDataService frameworkDataService) { this.competencyAssessmentDataService = competencyAssessmentDataService; + this.frameworkDataService = frameworkDataService; } public IEnumerable GetAllCompetencyAssessments(int adminId) { @@ -54,6 +59,20 @@ public IEnumerable GetCompetencyAssessmentsForAdminId(int { return competencyAssessmentDataService.GetCompetencyAssessmentsForAdminId(adminId); } + public int InsertCompetencyAssessment(int adminId, int centreId, string competencyAssessmentName, int? frameworkId) + { + var assessmentId = competencyAssessmentDataService.InsertCompetencyAssessment(adminId, centreId, competencyAssessmentName); + if(assessmentId > 0 && frameworkId != null) + { + var framework = frameworkDataService.GetBrandedFrameworkByFrameworkId((int)frameworkId, adminId); + if (framework != null) { + competencyAssessmentDataService.InsertSelfAssessmentFramework(adminId, assessmentId, framework.ID); + competencyAssessmentDataService.UpdateCompetencyAssessmentDescription(adminId, assessmentId, framework.Description); + competencyAssessmentDataService.UpdateCompetencyAssessmentBranding(assessmentId, (int)framework.BrandID, (int)framework.CategoryID, adminId); + } + } + return assessmentId; + } public bool UpdateCompetencyAssessmentName(int competencyAssessmentId, int adminId, string competencyAssessmentName) { diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Name.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Name.cshtml index 493008c8a0..f5e2682dfc 100644 --- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Name.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Name.cshtml @@ -29,10 +29,10 @@ else
  1. Competency Assessments
    2. -
  2. Competency Assessment Details
    3. +
  3. Competency Assessment Details
  4. Name
-

Back to competency assessment detail

+

Back to competency assessment detail

} @@ -97,7 +97,7 @@ else Save
- + diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ProfessionalGroup.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ProfessionalGroup.cshtml index 3ce78d8b38..6ab4ab074b 100644 --- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ProfessionalGroup.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ProfessionalGroup.cshtml @@ -29,10 +29,10 @@ else
  1. Competency Assessments
    2. -
  2. Competency Assessment Details
    3. +
  3. Competency Assessment Details
  4. Name
-

Back to competency assessment detail

+

Back to competency assessment detail

} @@ -123,7 +123,7 @@ else Save
- + diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_AssessmentsGrid.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_AssessmentsGrid.cshtml index f194524fdd..6736ba804b 100644 --- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_AssessmentsGrid.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_AssessmentsGrid.cshtml @@ -68,13 +68,13 @@ Actions @if (competencyAssessment.UserRole > 1) { - + Manage } else { - + View } diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Index.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Index.cshtml index a15a6eb719..f9d417a93b 100644 --- a/DigitalLearningSolutions.Web/Views/Frameworks/Index.cshtml +++ b/DigitalLearningSolutions.Web/Views/Frameworks/Index.cshtml @@ -78,7 +78,7 @@ } else { - + @(toDoItem.SignOffRequired ? "Approve " : "Review ") @toDoItem.ItemName for @toDoItem.RequestorName (requested @toDoItem.Requested.ToShortDateString()) } From e0c17fd813b2cbbfe4354e1ee0b22c2f3c645385 Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Thu, 30 Jan 2025 08:31:45 +0000 Subject: [PATCH 08/36] Adjusts migration to allow null description on insert self assessment --- .../202501280929_CreateCompetencyAssessmentTables.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DigitalLearningSolutions.Data.Migrations/202501280929_CreateCompetencyAssessmentTables.cs b/DigitalLearningSolutions.Data.Migrations/202501280929_CreateCompetencyAssessmentTables.cs index 381be8cb3c..3ad9669e2c 100644 --- a/DigitalLearningSolutions.Data.Migrations/202501280929_CreateCompetencyAssessmentTables.cs +++ b/DigitalLearningSolutions.Data.Migrations/202501280929_CreateCompetencyAssessmentTables.cs @@ -32,6 +32,7 @@ public override void Up() .WithColumn("SupervisorRolesTaskStatus").AsBoolean().Nullable() .WithColumn("SelfAssessmentOptionsTaskStatus").AsBoolean().Nullable() .WithColumn("ReviewTaskStatus").AsBoolean().Nullable(); + Alter.Table("SelfAssessments").AlterColumn("Description").AsString(int.MaxValue).Nullable(); Execute.Sql($@"INSERT INTO SelfAssessmentFrameworks (SelfAssessmentId, FrameworkId, CreatedByAdminId) SELECT sa.ID, fc.FrameworkID, sa.CreatedByAdminID FROM SelfAssessments AS sa INNER JOIN @@ -49,6 +50,7 @@ public override void Down() { Delete.Table("SelfAssessmentFrameworks"); Delete.Table("SelfAssessmentTaskStatus"); + Alter.Table("SelfAssessments").AlterColumn("Description").AsString(int.MaxValue).NotNullable(); } } From af9c63b8149b83e96b0b06f7a107e966cfe6a4c0 Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Thu, 30 Jan 2025 11:21:40 +0000 Subject: [PATCH 09/36] TD-480 Implements create assessment controller and service --- .../CompetencyAssessmentDataService.cs | 4 +- .../CompetencyAssessments.cs | 105 +++++----------- .../CompetencyAssessmentsController.cs | 3 + .../FrameworksController/Frameworks.cs | 114 +++++++++--------- .../RedirectToErrorEmptySessionData.cs | 2 +- .../Views/CompetencyAssessments/Name.cshtml | 6 +- .../ProfessionalGroup.cshtml | 8 +- .../Frameworks/Developer/Branding.cshtml | 6 +- .../Frameworks/Developer/Collaborators.cshtml | 10 +- .../Frameworks/Developer/CustomFlags.cshtml | 4 +- .../Developer/DefaultQuestions.cshtml | 6 +- .../Frameworks/Developer/Description.cshtml | 8 +- .../Frameworks/Developer/Framework.cshtml | 1 + .../Views/Frameworks/Developer/Name.cshtml | 6 +- .../Developer/RemoveDefaultQuestion.cshtml | 8 +- .../Views/Frameworks/Developer/Review.cshtml | 4 +- .../Views/Frameworks/Developer/Similar.cshtml | 4 +- .../Views/Frameworks/Developer/Summary.cshtml | 8 +- .../Views/Frameworks/Developer/Type.cshtml | 8 +- .../Frameworks/Developer/_Details.cshtml | 10 +- 20 files changed, 140 insertions(+), 185 deletions(-) diff --git a/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs b/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs index bde5d1000f..29c9e5e6c7 100644 --- a/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs @@ -295,8 +295,8 @@ public bool UpdateCompetencyAssessmentDescription(int competencyAssessmentId, in public bool InsertSelfAssessmentFramework(int adminId, int selfAssessmentId, int frameworkId) { var numberOfAffectedRows = connection.Execute( - @"Insert SelfAssessmentFrameworks (SelfAssessmentId, FrameworkId, CreatedByAdminId) - VALUES (@selfAssessmentId, @frameworkId, @adminId) + @"INSERT INTO SelfAssessmentFrameworks (SelfAssessmentId, FrameworkId, CreatedByAdminId) + SELECT @selfAssessmentId, @frameworkId, @adminId WHERE NOT EXISTS (SELECT 1 FROM SelfAssessmentFrameworks WHERE SelfAssessmentId = @selfAssessmentId AND FrameworkId = @frameworkId)" , new { adminId, selfAssessmentId, frameworkId } diff --git a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs index 2a2264c10f..907bd33328 100644 --- a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs +++ b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs @@ -92,66 +92,15 @@ public IActionResult ViewCompetencyAssessments(string tabname, string? searchStr ); return View("Index", model); } - public IActionResult StartNewCompetencyAssessmentSession() - { - var adminId = GetAdminID(); - TempData.Clear(); - var sessionNewCompetencyAssessment = new SessionNewCompetencyAssessment(); - if (!Request.Cookies.ContainsKey(CookieName)) - { - var id = Guid.NewGuid(); - - Response.Cookies.Append( - CookieName, - id.ToString(), - new CookieOptions - { - Expires = DateTimeOffset.UtcNow.AddDays(30) - }); - - sessionNewCompetencyAssessment.Id = id; - } - else - { - if (Request.Cookies.TryGetValue(CookieName, out string idString)) - { - sessionNewCompetencyAssessment.Id = Guid.Parse(idString); - } - else - { - var id = Guid.NewGuid(); - Response.Cookies.Append( - CookieName, - id.ToString(), - new CookieOptions - { - Expires = DateTimeOffset.UtcNow.AddDays(30) - }); - sessionNewCompetencyAssessment.Id = id; - } - } - CompetencyAssessmentBase competencyAssessmentBase = new CompetencyAssessmentBase() - { - BrandID = 6, - OwnerAdminID = adminId, - National = true, - Public = true, - PublishStatusID = 1, - UserRole = 3 - }; - sessionNewCompetencyAssessment.CompetencyAssessmentBase = competencyAssessmentBase; - TempData.Set(sessionNewCompetencyAssessment); - return RedirectToAction("CompetencyAssessmentName", "CompetencyAssessments", new { actionname = "New" }); - } - - [Route("/CompetencyAssessments/Name/{actionname}/{competencyAssessmentId}")] - [Route("/CompetencyAssessments/Name/{actionname}")] + [Route("/CompetencyAssessments/{actionName}/Name/{competencyAssessmentId}")] + [Route("/CompetencyAssessments/Framework/{frameworkId}/{actionName}/Name")] + [Route("/CompetencyAssessments/{actionName}/Name")] [SetSelectedTab(nameof(NavMenuTab.CompetencyAssessments))] - public IActionResult CompetencyAssessmentName(string actionname, int competencyAssessmentId = 0) + public IActionResult CompetencyAssessmentName(string actionName, int competencyAssessmentId = 0, int? frameworkId = null) { var adminId = GetAdminID(); - CompetencyAssessmentBase? competencyAssessmentBase; + var competencyAssessmentBase = new CompetencyAssessmentBase(); if (competencyAssessmentId > 0) { competencyAssessmentBase = competencyAssessmentService.GetCompetencyAssessmentBaseById(competencyAssessmentId, adminId); @@ -165,21 +114,23 @@ public IActionResult CompetencyAssessmentName(string actionname, int competencyA return StatusCode(403); } } - else + else if( frameworkId != null ) { - SessionNewCompetencyAssessment sessionNewCompetencyAssessment = TempData.Peek(); - TempData.Set(sessionNewCompetencyAssessment); - competencyAssessmentBase = sessionNewCompetencyAssessment.CompetencyAssessmentBase; - TempData.Set(sessionNewCompetencyAssessment); + var framework = frameworkService.GetBaseFrameworkByFrameworkId((int)frameworkId, adminId); + if ( framework != null ) + { + competencyAssessmentBase.CompetencyAssessmentName = framework.FrameworkName; + } } return View("Name", competencyAssessmentBase); } [HttpPost] - [Route("/CompetencyAssessments/Name/{actionname}/{competencyAssessmentId}")] - [Route("/CompetencyAssessments/Name/{actionname}")] + [Route("/CompetencyAssessments/{actionName}/Name/{competencyAssessmentId}")] + [Route("/CompetencyAssessments/Framework/{frameworkId}/{actionName}/Name")] + [Route("/CompetencyAssessments/{actionName}/Name")] [SetSelectedTab(nameof(NavMenuTab.CompetencyAssessments))] - public IActionResult SaveProfileName(CompetencyAssessmentBase competencyAssessmentBase, string actionname, int competencyAssessmentId = 0, int? frameworkId = null) + public IActionResult SaveProfileName(CompetencyAssessmentBase competencyAssessmentBase, string actionName, int competencyAssessmentId = 0, int? frameworkId = null) { if (!ModelState.IsValid) { @@ -191,7 +142,7 @@ public IActionResult SaveProfileName(CompetencyAssessmentBase competencyAssessme { var userCentreId = (int)GetCentreId(); var adminId = GetAdminID(); - if (actionname == "New") + if (actionName == "New") { var sameItems = competencyAssessmentService.GetCompetencyAssessmentByName(competencyAssessmentBase.CompetencyAssessmentName, GetAdminID()); if (sameItems != null) @@ -216,10 +167,10 @@ public IActionResult SaveProfileName(CompetencyAssessmentBase competencyAssessme } } - [Route("/CompetencyAssessments/ProfessionalGroup/{actionname}/{competencyAssessmentId}")] - [Route("/CompetencyAssessments/ProfessionalGroup/{actionname}")] + [Route("/CompetencyAssessments/ProfessionalGroup/{actionName}/{competencyAssessmentId}")] + [Route("/CompetencyAssessments/ProfessionalGroup/{actionName}")] [SetSelectedTab(nameof(NavMenuTab.CompetencyAssessments))] - public IActionResult CompetencyAssessmentProfessionalGroup(string actionname, int competencyAssessmentId = 0) + public IActionResult CompetencyAssessmentProfessionalGroup(string actionName, int competencyAssessmentId = 0) { var adminId = GetAdminID(); CompetencyAssessmentBase? competencyAssessmentBase; @@ -253,10 +204,10 @@ public IActionResult CompetencyAssessmentProfessionalGroup(string actionname, in } [HttpPost] - [Route("/CompetencyAssessments/ProfessionalGroup/{actionname}/{competencyAssessmentId}")] - [Route("/CompetencyAssessments/ProfessionalGroup/{actionname}")] + [Route("/CompetencyAssessments/ProfessionalGroup/{actionName}/{competencyAssessmentId}")] + [Route("/CompetencyAssessments/ProfessionalGroup/{actionName}")] [SetSelectedTab(nameof(NavMenuTab.CompetencyAssessments))] - public IActionResult SaveProfessionalGroup(CompetencyAssessmentBase competencyAssessmentBase, string actionname, int competencyAssessmentId = 0) + public IActionResult SaveProfessionalGroup(CompetencyAssessmentBase competencyAssessmentBase, string actionName, int competencyAssessmentId = 0) { if (competencyAssessmentBase.NRPProfessionalGroupID == null) { @@ -265,12 +216,12 @@ public IActionResult SaveProfessionalGroup(CompetencyAssessmentBase competencyAs // do something return View("Name", competencyAssessmentBase); } - if (actionname == "New") + if (actionName == "New") { SessionNewCompetencyAssessment sessionNewCompetencyAssessment = TempData.Peek(); sessionNewCompetencyAssessment.CompetencyAssessmentBase = competencyAssessmentBase; TempData.Set(sessionNewCompetencyAssessment); - return RedirectToAction("CompetencyAssessmentSubGroup", "CompetencyAssessments", new { actionname }); + return RedirectToAction("CompetencyAssessmentSubGroup", "CompetencyAssessments", new { actionName }); } else { @@ -278,7 +229,7 @@ public IActionResult SaveProfessionalGroup(CompetencyAssessmentBase competencyAs var isUpdated = competencyAssessmentService.UpdateCompetencyAssessmentProfessionalGroup(competencyAssessmentBase.ID, adminId, competencyAssessmentBase.NRPProfessionalGroupID); if (isUpdated) { - return RedirectToAction("CompetencyAssessmentSubGroup", "CompetencyAssessments", new { actionname, competencyAssessmentId }); + return RedirectToAction("CompetencyAssessmentSubGroup", "CompetencyAssessments", new { actionName, competencyAssessmentId }); } else { @@ -287,10 +238,10 @@ public IActionResult SaveProfessionalGroup(CompetencyAssessmentBase competencyAs } } - [Route("/CompetencyAssessments/SubGroup/{actionname}/{competencyAssessmentId}")] - [Route("/CompetencyAssessments/SubGroup/{actionname}")] + [Route("/CompetencyAssessments/SubGroup/{actionName}/{competencyAssessmentId}")] + [Route("/CompetencyAssessments/SubGroup/{actionName}")] [SetSelectedTab(nameof(NavMenuTab.CompetencyAssessments))] - public IActionResult CompetencyAssessmentSubGroup(string actionname, int competencyAssessmentId = 0) + public IActionResult CompetencyAssessmentSubGroup(string actionName, int competencyAssessmentId = 0) { return View("SubGroup"); } diff --git a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessmentsController.cs b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessmentsController.cs index 88016c1eeb..c057b43776 100644 --- a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessmentsController.cs +++ b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessmentsController.cs @@ -11,18 +11,21 @@ public partial class CompetencyAssessmentsController : Controller { private readonly ICompetencyAssessmentService competencyAssessmentService; + private readonly IFrameworkService frameworkService; private readonly ICommonService commonService; private readonly IFrameworkNotificationService frameworkNotificationService; private readonly ILogger logger; private readonly IConfiguration config; public CompetencyAssessmentsController( ICompetencyAssessmentService competencyAssessmentService, + IFrameworkService frameworkService, ICommonService commonService, IFrameworkNotificationService frameworkNotificationService, ILogger logger, IConfiguration config) { this.competencyAssessmentService = competencyAssessmentService; + this.frameworkService = frameworkService; this.commonService = commonService; this.frameworkNotificationService = frameworkNotificationService; this.logger = logger; diff --git a/DigitalLearningSolutions.Web/Controllers/FrameworksController/Frameworks.cs b/DigitalLearningSolutions.Web/Controllers/FrameworksController/Frameworks.cs index de09607df3..b2f67f73e5 100644 --- a/DigitalLearningSolutions.Web/Controllers/FrameworksController/Frameworks.cs +++ b/DigitalLearningSolutions.Web/Controllers/FrameworksController/Frameworks.cs @@ -136,18 +136,18 @@ public IActionResult StartNewFrameworkSession() MultiPageFormDataFeature.AddNewFramework, TempData ); - return RedirectToAction("CreateNewFramework", "Frameworks", new { actionname = "New" }); + return RedirectToAction("CreateNewFramework", "Frameworks", new { actionName = "New" }); } - [Route("/Frameworks/Name/{actionname}/{frameworkId}")] - [Route("/Frameworks/Name/{actionname}")] + [Route("/Frameworks/Name/{actionName}/{frameworkId}")] + [Route("/Frameworks/Name/{actionName}")] [SetSelectedTab(nameof(NavMenuTab.Frameworks))] [ResponseCache(CacheProfileName = "Never")] [TypeFilter( typeof(RedirectToErrorEmptySessionData), Arguments = new object[] { nameof(MultiPageFormDataFeature.AddNewFramework) } )] - public IActionResult CreateNewFramework(string actionname, int frameworkId = 0) + public IActionResult CreateNewFramework(string actionName, int frameworkId = 0) { var adminId = GetAdminId(); DetailFramework? detailFramework; @@ -173,15 +173,15 @@ public IActionResult CreateNewFramework(string actionname, int frameworkId = 0) return View("Developer/Name", detailFramework); } [HttpPost] - [Route("/Frameworks/Name/{actionname}/{frameworkId}")] - [Route("/Frameworks/Name/{actionname}")] + [Route("/Frameworks/Name/{actionName}/{frameworkId}")] + [Route("/Frameworks/Name/{actionName}")] [SetSelectedTab(nameof(NavMenuTab.Frameworks))] [ResponseCache(CacheProfileName = "Never")] [TypeFilter( typeof(RedirectToErrorEmptySessionData), Arguments = new object[] { nameof(MultiPageFormDataFeature.AddNewFramework) } )] - public IActionResult CreateNewFramework(DetailFramework detailFramework, string actionname, int frameworkId = 0) + public IActionResult CreateNewFramework(DetailFramework detailFramework, string actionName, int frameworkId = 0) { if (!ModelState.IsValid) { @@ -189,7 +189,7 @@ public IActionResult CreateNewFramework(DetailFramework detailFramework, string ModelState.AddModelError(nameof(BaseFramework.FrameworkName), "Please enter a valid framework name (between 3 and 255 characters)"); return View("Developer/Name", detailFramework); } - if (actionname == "New") + if (actionName == "New") { SessionNewFramework sessionNewFramework = multiPageFormService.GetMultiPageFormData(MultiPageFormDataFeature.AddNewFramework, TempData).GetAwaiter().GetResult(); sessionNewFramework.DetailFramework = detailFramework; @@ -198,7 +198,7 @@ public IActionResult CreateNewFramework(DetailFramework detailFramework, string MultiPageFormDataFeature.AddNewFramework, TempData ); - return RedirectToAction("SetNewFrameworkName", new { frameworkname = detailFramework.FrameworkName, actionname }); + return RedirectToAction("SetNewFrameworkName", new { frameworkname = detailFramework.FrameworkName, actionName }); } var adminId = GetAdminId(); var isUpdated = frameworkService.UpdateFrameworkName(detailFramework.ID, adminId, detailFramework.FrameworkName); @@ -207,10 +207,10 @@ public IActionResult CreateNewFramework(DetailFramework detailFramework, string return View("Developer/Name", detailFramework); } - [Route("/Frameworks/Similar/{actionname}")] - public IActionResult SetNewFrameworkName(string frameworkname, string actionname) + [Route("/Frameworks/Similar/{actionName}")] + public IActionResult SetNewFrameworkName(string frameworkname, string actionName) { - if (actionname == "New") + if (actionName == "New") { var sessionNewFramework = multiPageFormService.GetMultiPageFormData(MultiPageFormDataFeature.AddNewFramework, TempData).GetAwaiter().GetResult(); multiPageFormService.SetMultiPageFormData( @@ -241,14 +241,14 @@ public IActionResult SetNewFrameworkName(string frameworkname, string actionname }; return View("Developer/Similar", model); } - return RedirectToAction("SaveNewFramework", "Frameworks", new { frameworkname, actionname }); + return RedirectToAction("SaveNewFramework", "Frameworks", new { frameworkname, actionName }); } - public IActionResult SaveNewFramework(string frameworkname, string actionname) + public IActionResult SaveNewFramework(string frameworkname, string actionName) { //var framework = frameworkService.CreateFramework(frameworkname, GetAdminID()); //need to create framework and move to next step. - if (actionname != "New") + if (actionName != "New") { return StatusCode(500); } @@ -258,23 +258,23 @@ public IActionResult SaveNewFramework(string frameworkname, string actionname) MultiPageFormDataFeature.AddNewFramework, TempData ); - return RedirectToAction("FrameworkDescription", "Frameworks", new { actionname }); + return RedirectToAction("FrameworkDescription", "Frameworks", new { actionName }); } - [Route("/Frameworks/Description/{actionname}/")] - [Route("/Frameworks/Description/{actionname}/{frameworkId}/")] + [Route("/Frameworks/Description/{actionName}/")] + [Route("/Frameworks/Description/{actionName}/{frameworkId}/")] [SetSelectedTab(nameof(NavMenuTab.Frameworks))] [ResponseCache(CacheProfileName = "Never")] [TypeFilter( typeof(RedirectToErrorEmptySessionData), Arguments = new object[] { nameof(MultiPageFormDataFeature.AddNewFramework) } )] - public IActionResult FrameworkDescription(string actionname, int frameworkId = 0) + public IActionResult FrameworkDescription(string actionName, int frameworkId = 0) { var adminId = GetAdminId(); var centreId = GetCentreId(); DetailFramework? framework; - if (actionname == "New") + if (actionName == "New") { var sessionNewFramework = multiPageFormService.GetMultiPageFormData(MultiPageFormDataFeature.AddNewFramework, TempData).GetAwaiter().GetResult(); framework = sessionNewFramework.DetailFramework; @@ -298,16 +298,16 @@ public IActionResult FrameworkDescription(string actionname, int frameworkId = 0 } [HttpPost] - [Route("/Frameworks/Description/{actionname}/")] - [Route("/Frameworks/Description/{actionname}/{frameworkId}/")] + [Route("/Frameworks/Description/{actionName}/")] + [Route("/Frameworks/Description/{actionName}/{frameworkId}/")] [ResponseCache(CacheProfileName = "Never")] [TypeFilter( typeof(RedirectToErrorEmptySessionData), Arguments = new object[] { nameof(MultiPageFormDataFeature.AddNewFramework) } )] - public IActionResult FrameworkDescription(DetailFramework detailFramework, string actionname, int frameworkId = 0) + public IActionResult FrameworkDescription(DetailFramework detailFramework, string actionName, int frameworkId = 0) { - if (actionname == "New") + if (actionName == "New") { var sessionNewFramework = multiPageFormService.GetMultiPageFormData(MultiPageFormDataFeature.AddNewFramework, TempData).GetAwaiter().GetResult(); sessionNewFramework.DetailFramework = detailFramework; @@ -316,7 +316,7 @@ public IActionResult FrameworkDescription(DetailFramework detailFramework, strin MultiPageFormDataFeature.AddNewFramework, TempData ); - return RedirectToAction("FrameworkType", "Frameworks", new { actionname }); + return RedirectToAction("FrameworkType", "Frameworks", new { actionName }); } detailFramework.Description = SanitizerHelper.SanitizeHtmlData(detailFramework.Description); frameworkService.UpdateFrameworkDescription(frameworkId, GetAdminId(), detailFramework.Description); @@ -324,20 +324,20 @@ public IActionResult FrameworkDescription(DetailFramework detailFramework, strin } - [Route("/Frameworks/Type/{actionname}/")] - [Route("/Frameworks/Type/{actionname}/{frameworkId}/")] + [Route("/Frameworks/Type/{actionName}/")] + [Route("/Frameworks/Type/{actionName}/{frameworkId}/")] [SetSelectedTab(nameof(NavMenuTab.Frameworks))] [ResponseCache(CacheProfileName = "Never")] [TypeFilter( typeof(RedirectToErrorEmptySessionData), Arguments = new object[] { nameof(MultiPageFormDataFeature.AddNewFramework) } )] - public IActionResult FrameworkType(string actionname, int frameworkId = 0) + public IActionResult FrameworkType(string actionName, int frameworkId = 0) { var adminId = GetAdminId(); var centreId = GetCentreId(); DetailFramework? framework; - if (actionname == "New") + if (actionName == "New") { var sessionNewFramework = multiPageFormService.GetMultiPageFormData(MultiPageFormDataFeature.AddNewFramework, TempData).GetAwaiter().GetResult(); framework = sessionNewFramework.DetailFramework; @@ -361,16 +361,16 @@ public IActionResult FrameworkType(string actionname, int frameworkId = 0) } [HttpPost] - [Route("/Frameworks/Type/{actionname}/")] - [Route("/Frameworks/Type/{actionname}/{frameworkId}/")] + [Route("/Frameworks/Type/{actionName}/")] + [Route("/Frameworks/Type/{actionName}/{frameworkId}/")] [ResponseCache(CacheProfileName = "Never")] [TypeFilter( typeof(RedirectToErrorEmptySessionData), Arguments = new object[] { nameof(MultiPageFormDataFeature.AddNewFramework) } )] - public IActionResult FrameworkType(DetailFramework detailFramework, string actionname, int frameworkId = 0) + public IActionResult FrameworkType(DetailFramework detailFramework, string actionName, int frameworkId = 0) { - if (actionname == "New") + if (actionName == "New") { var sessionNewFramework = multiPageFormService.GetMultiPageFormData(MultiPageFormDataFeature.AddNewFramework, TempData).GetAwaiter().GetResult(); sessionNewFramework.DetailFramework = detailFramework; @@ -379,26 +379,26 @@ public IActionResult FrameworkType(DetailFramework detailFramework, string actio MultiPageFormDataFeature.AddNewFramework, TempData ); - return RedirectToAction("SetNewFrameworkBrand", "Frameworks", new { actionname }); + return RedirectToAction("SetNewFrameworkBrand", "Frameworks", new { actionName }); } frameworkService.UpdateFrameworkConfig(frameworkId, GetAdminId(), detailFramework.FrameworkConfig); return RedirectToAction("ViewFramework", new { tabname = "Details", frameworkId }); } - [Route("/Frameworks/Categorise/{actionname}/")] - [Route("/Frameworks/Categorise/{actionname}/{frameworkId}/")] + [Route("/Frameworks/Categorise/{actionName}/")] + [Route("/Frameworks/Categorise/{actionName}/{frameworkId}/")] [SetSelectedTab(nameof(NavMenuTab.Frameworks))] [ResponseCache(CacheProfileName = "Never")] [TypeFilter( typeof(RedirectToErrorEmptySessionData), Arguments = new object[] { nameof(MultiPageFormDataFeature.AddNewFramework) } )] - public IActionResult SetNewFrameworkBrand(string actionname, int frameworkId = 0) + public IActionResult SetNewFrameworkBrand(string actionName, int frameworkId = 0) { var adminId = GetAdminId(); var centreId = GetCentreId(); DetailFramework? framework; - if (actionname == "New") + if (actionName == "New") { if (TempData[MultiPageFormDataFeature.AddNewFramework.TempDataKey] == null) { @@ -443,13 +443,13 @@ public IActionResult SetNewFrameworkBrand(string actionname, int frameworkId = 0 } [HttpPost] - [Route("/Frameworks/Categorise/{actionname}/")] - [Route("/Frameworks/Categorise/{actionname}/{frameworkId}/")] - public IActionResult SetNewFrameworkBrand(DetailFramework? detailFramework, string actionname, int frameworkId = 0) + [Route("/Frameworks/Categorise/{actionName}/")] + [Route("/Frameworks/Categorise/{actionName}/{frameworkId}/")] + public IActionResult SetNewFrameworkBrand(DetailFramework? detailFramework, string actionName, int frameworkId = 0) { var adminId = GetAdminId(); var centreId = GetCentreId(); - if (actionname != "New" && frameworkId > 0) + if (actionName != "New" && frameworkId > 0) { detailFramework = InsertBrandingCategoryTopicIfRequired(detailFramework); if (detailFramework == null) return RedirectToAction("SetNewFrameworkBrand", "Frameworks", new { frameworkId }); @@ -577,12 +577,12 @@ public IActionResult RemoveFrameworkFlag(RemoveCustomFlagConfirmationViewModel m } [HttpPost] - [Route("/Frameworks/Flags/{actionname}/{frameworkId}/{flagId}")] - public IActionResult EditFrameworkFlag(CustomFlagViewModel model, int frameworkId, string actionname, int flagId) + [Route("/Frameworks/Flags/{actionName}/{frameworkId}/{flagId}")] + public IActionResult EditFrameworkFlag(CustomFlagViewModel model, int frameworkId, string actionName, int flagId) { if (ModelState.IsValid) { - if (actionname == "Edit") + if (actionName == "Edit") { frameworkService.UpdateFrameworkCustomFlag(frameworkId, model.Id, model.FlagName, model.FlagGroup, model.FlagTagClass); } @@ -596,11 +596,11 @@ public IActionResult EditFrameworkFlag(CustomFlagViewModel model, int frameworkI } [HttpGet] - [Route("/Frameworks/Flags/{actionname:regex(Edit|New)}/{frameworkId}/{flagId}")] - public IActionResult EditFrameworkFlag(int frameworkId, string actionname, int flagId) + [Route("/Frameworks/Flags/{actionName:regex(Edit|New)}/{frameworkId}/{flagId}")] + public IActionResult EditFrameworkFlag(int frameworkId, string actionName, int flagId) { var model = new CustomFlagViewModel(); - if (actionname == "Edit") + if (actionName == "Edit") { var flag = frameworkService.GetCustomFlagsByFrameworkId(frameworkId, (int?)flagId).FirstOrDefault(); model = new CustomFlagViewModel() @@ -614,9 +614,9 @@ public IActionResult EditFrameworkFlag(int frameworkId, string actionname, int f return View("Developer/EditCustomFlag", model); } - [Route("/Frameworks/Collaborators/{actionname}/{frameworkId}/")] + [Route("/Frameworks/Collaborators/{actionName}/{frameworkId}/")] [ResponseCache(CacheProfileName = "Never")] - public IActionResult AddCollaborators(string actionname, int frameworkId, bool error = false) + public IActionResult AddCollaborators(string actionName, int frameworkId, bool error = false) { var adminId = GetAdminId(); var collaborators = frameworkService.GetCollaboratorsForFrameworkId(frameworkId); @@ -638,15 +638,15 @@ public IActionResult AddCollaborators(string actionname, int frameworkId, bool e } [HttpPost] - [Route("/Frameworks/Collaborators/{actionname}/{frameworkId}/")] - public IActionResult AddCollaborator(string actionname, string userEmail, bool canModify, int frameworkId) + [Route("/Frameworks/Collaborators/{actionName}/{frameworkId}/")] + public IActionResult AddCollaborator(string actionName, string userEmail, bool canModify, int frameworkId) { int? centreID = GetCentreId(); var collaboratorId = frameworkService.AddCollaboratorToFramework(frameworkId, userEmail, canModify, centreID); if (collaboratorId > 0) { frameworkNotificationService.SendFrameworkCollaboratorInvite(collaboratorId, GetAdminId()); - return RedirectToAction("AddCollaborators", "Frameworks", new { frameworkId, actionname }); + return RedirectToAction("AddCollaborators", "Frameworks", new { frameworkId, actionName }); } else { @@ -671,15 +671,15 @@ public IActionResult AddCollaborator(string actionname, string userEmail, bool c { TempData["FrameworkError"] = "User not added,Kindly try again;"; } - return RedirectToAction("AddCollaborators", "Frameworks", new { frameworkId, actionname }); + return RedirectToAction("AddCollaborators", "Frameworks", new { frameworkId, actionName }); } } - public IActionResult RemoveCollaborator(int frameworkId, string actionname, int id) + public IActionResult RemoveCollaborator(int frameworkId, string actionName, int id) { frameworkService.RemoveCollaboratorFromFramework(frameworkId, id); - return RedirectToAction("AddCollaborators", "Frameworks", new { frameworkId, actionname }); + return RedirectToAction("AddCollaborators", "Frameworks", new { frameworkId, actionName }); } [Route("/Framework/{frameworkId}/{tabname}/{frameworkCompetencyGroupId}/{frameworkCompetencyId}")] @@ -751,7 +751,7 @@ public IActionResult InsertFramework() detailFramework.Description = SanitizerHelper.SanitizeHtmlData(detailFramework.Description); var newFramework = frameworkService.CreateFramework(detailFramework, adminId); TempData.Clear(); - return RedirectToAction("AddCollaborators", "Frameworks", new { actionname = "New", frameworkId = newFramework.ID }); + return RedirectToAction("AddCollaborators", "Frameworks", new { actionName = "New", frameworkId = newFramework.ID }); } } } diff --git a/DigitalLearningSolutions.Web/ServiceFilter/RedirectToErrorEmptySessionData.cs b/DigitalLearningSolutions.Web/ServiceFilter/RedirectToErrorEmptySessionData.cs index 1a50a20ae6..ef5a5e36a0 100644 --- a/DigitalLearningSolutions.Web/ServiceFilter/RedirectToErrorEmptySessionData.cs +++ b/DigitalLearningSolutions.Web/ServiceFilter/RedirectToErrorEmptySessionData.cs @@ -34,7 +34,7 @@ public void OnActionExecuting(ActionExecutingContext context) return; } - if (context.ActionArguments.ContainsKey("actionname") && context.ActionArguments["actionname"].ToString() == "Edit") + if (context.ActionArguments.ContainsKey("actionName") && context.ActionArguments["actionName"].ToString() == "Edit") { return; } diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Name.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Name.cshtml index f5e2682dfc..104a75fc27 100644 --- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Name.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Name.cshtml @@ -8,7 +8,7 @@ @section NavMenuItems { } - @if ((string)ViewContext.RouteData.Values["actionname"] == "New") + @if ((string)ViewContext.RouteData.Values["actionName"] == "New") { @section NavBreadcrumbs { } } -@if ((string)ViewContext.RouteData.Values["actionname"] == "New") +@if ((string)ViewContext.RouteData.Values["actionName"] == "New") {

Create a new competency assessment

} @@ -73,7 +73,7 @@ else - @if ((string)ViewContext.RouteData.Values["actionname"] == "New") + @if ((string)ViewContext.RouteData.Values["actionName"] == "New") {
- @if ((string)ViewContext.RouteData.Values["actionname"] == "New") + @if ((string)ViewContext.RouteData.Values["actionName"] == "New") { - + Back
- @if ((string)ViewContext.RouteData.Values["actionname"] == "Review") + @if ((string)ViewContext.RouteData.Values["actionName"] == "Review") { Done diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/CustomFlags.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/CustomFlags.cshtml index fb49365122..279cd472da 100644 --- a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/CustomFlags.cshtml +++ b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/CustomFlags.cshtml @@ -66,7 +66,7 @@ Edit + asp-route-actionName="New"> Add custom flag diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/DefaultQuestions.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/DefaultQuestions.cshtml index f831bcabe0..29f69d03e9 100644 --- a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/DefaultQuestions.cshtml +++ b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/DefaultQuestions.cshtml @@ -66,13 +66,13 @@
Actions - + Remove @if (question.UserIsOwner) {   - + Edit } @@ -103,7 +103,7 @@ Add - + Add a new question
diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Description.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Description.cshtml index a9dd4fcd97..de7c3ef63d 100644 --- a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Description.cshtml +++ b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Description.cshtml @@ -9,7 +9,7 @@ @section NavMenuItems { } - @if ((string)ViewContext.RouteData.Values["actionname"] == "New") + @if ((string)ViewContext.RouteData.Values["actionName"] == "New") { @section NavBreadcrumbs { } } -@if ((string)ViewContext.RouteData.Values["actionname"] == "New") +@if ((string)ViewContext.RouteData.Values["actionName"] == "New") {

Framework description

} @@ -77,9 +77,9 @@ else - @if ((string)ViewContext.RouteData.Values["actionname"] == "New") + @if ((string)ViewContext.RouteData.Values["actionName"] == "New") { - + Back + Create assessment } else { diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Name.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Name.cshtml index a43cec595e..16f54436b1 100644 --- a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Name.cshtml +++ b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Name.cshtml @@ -9,7 +9,7 @@ @section NavMenuItems { } - @if ((string)ViewContext.RouteData.Values["actionname"] == "New") + @if ((string)ViewContext.RouteData.Values["actionName"] == "New") { @section NavBreadcrumbs { } } -@if ((string)ViewContext.RouteData.Values["actionname"] == "New") +@if ((string)ViewContext.RouteData.Values["actionName"] == "New") {

Create a new framework

} @@ -70,7 +70,7 @@ else - @if ((string)ViewContext.RouteData.Values["actionname"] == "New") + @if ((string)ViewContext.RouteData.Values["actionName"] == "New") { - Manage working group + Manage working group
@@ -88,7 +88,7 @@ else

There are no members of the working group for this framework who haven't already got an open review request. Use the Manage working group button below to add some more.

- Manage working group + Manage working group
} diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Similar.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Similar.cshtml index d853b735d8..51754820d4 100644 --- a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Similar.cshtml +++ b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Similar.cshtml @@ -71,10 +71,10 @@ else } distinct from @Model.FrameworkName, you can continue to create it.

- + Back - + Next
diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Summary.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Summary.cshtml index b8254e06a5..23e0764aa2 100644 --- a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Summary.cshtml +++ b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Summary.cshtml @@ -20,7 +20,7 @@ @Model.FrameworkName
- + Change
@@ -33,7 +33,7 @@ @Html.Raw(Model.Description)
- + Change
@@ -46,7 +46,7 @@ @Model.FrameworkConfig
- + Change
@@ -73,7 +73,7 @@ }
- + Change
diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Type.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Type.cshtml index a4c173e268..7237c47723 100644 --- a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Type.cshtml +++ b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Type.cshtml @@ -9,7 +9,7 @@ @section NavMenuItems { } - @if ((string)ViewContext.RouteData.Values["actionname"] == "New") + @if ((string)ViewContext.RouteData.Values["actionName"] == "New") { @section NavBreadcrumbs { } } -@if ((string)ViewContext.RouteData.Values["actionname"] == "New") +@if ((string)ViewContext.RouteData.Values["actionName"] == "New") {

Framework vocabulary

} @@ -74,9 +74,9 @@ else - @if ((string)ViewContext.RouteData.Values["actionname"] == "New") + @if ((string)ViewContext.RouteData.Values["actionName"] == "New") { - + Back -
- - - Cancel - -
- } - else - { - @if (Model.PublishStatusID == 3) + @if (!ViewData.ModelState.IsValid) + { + + } + + +
+ Choose a title that identifies scope of capabilities covered and/or the roles or levels the assessment targets. +
+ + + + + + + + + + + + + + + + + @if ((string)ViewContext.RouteData.Values["actionName"] == "New") + { + +
+ + + Cancel + +
+ } + else { - + @if (Model.PublishStatusID == 3) + { + + } + +
+ + + Cancel + +
} - -
- - - Cancel - -
- } diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Framework.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Framework.cshtml index f86922f6b5..fcd666f6a3 100644 --- a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Framework.cshtml +++ b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/Framework.cshtml @@ -1,87 +1,87 @@ @using DigitalLearningSolutions.Web.ViewModels.Frameworks; @model FrameworkViewModel; @{ - ViewData["Title"] = Model.DetailFramework.FrameworkName; - ViewData["Application"] = "Framework Service"; - ViewData["HeaderPathName"] = "Framework Service"; + ViewData["Title"] = Model.DetailFramework.FrameworkName; + ViewData["Application"] = "Framework Service"; + ViewData["HeaderPathName"] = "Framework Service"; } @section NavMenuItems { - + } - @section NavBreadcrumbs { - +@section NavBreadcrumbs { + } -
+
-

- @Model.DetailFramework.FrameworkName -

+

+ @Model.DetailFramework.FrameworkName +

-
-
+
+
-
    -
  1. -
    1
    In draft
    -
    2. -
  2. -
    2
    In review
    -
    3. -
  3. -
    3
    Published
    -
    4. -
+
    +
  1. +
    1
    In draft
    +
    2. +
  2. +
    2
    In review
    +
    3. +
  3. +
    3
    Published
    +
    4. +
- @*Preview*@ - @if (Model.DetailFramework.UserRole > 1) - { - if (Model.DetailFramework.PublishStatusID == 2) - { - Publish - } - else if (Model.DetailFramework.PublishStatusID == 3) - { - + @*Preview*@ + @if (Model.DetailFramework.UserRole > 1) + { + if (Model.DetailFramework.PublishStatusID == 2) + { + Publish + } + else if (Model.DetailFramework.PublishStatusID == 3) + { + Create assessment - } - else - { - Send for review - } - } - @if (Model.DetailFramework.FrameworkReviewID != null) - { - Submit my review - } -
+ } + else + { + Send for review + } + } + @if (Model.DetailFramework.FrameworkReviewID != null) + { + Submit my review + } +
-
- @if ((string)ViewContext.RouteData.Values["tabname"] == "Structure") - { - - } - else if ((string)ViewContext.RouteData.Values["tabname"] == "Details") - { - - } - else if ((string)ViewContext.RouteData.Values["tabname"] == "Comments") - { - - } -
+
+ @if ((string)ViewContext.RouteData.Values["tabname"] == "Structure") + { + + } + else if ((string)ViewContext.RouteData.Values["tabname"] == "Details") + { + + } + else if ((string)ViewContext.RouteData.Values["tabname"] == "Comments") + { + + } +
diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/_Structure.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/_Structure.cshtml index ca13087c27..5b9144a923 100644 --- a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/_Structure.cshtml +++ b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/_Structure.cshtml @@ -6,84 +6,86 @@ foreach (var frameworkCompetencyGroup in Model.FrameworkCompetencyGroups) { + { + CanModify=Model.DetailFramework.UserRole> + 1, + FrameworkCompetencyGroup =frameworkCompetencyGroup, + CompetencyFlags = Model.CompetencyFlags + }" + view-data='new ViewDataDictionary(ViewData) + { + { "VocabSingular", Model.VocabSingular() }, + { "VocabPlural", Model.VocabPlural() }, + { "GroupCount", Model.FrameworkCompetencyGroups.Count() } + }' /> } } else { @if (!Model.FrameworkCompetencies.Any()) { -
-

- - This is an empty framework. - -

+
+

+ + This is an empty framework. + +

@if (Model.DetailFramework.UserRole <= 1) { -

This framework doesn't contain any @Model.VocabSingular().ToLower() groups or @Model.VocabPlural().ToLower().

+

This framework doesn't contain any @Model.VocabSingular().ToLower() groups or @Model.VocabPlural().ToLower().

} @if (Model.DetailFramework.UserRole > 1) { -

Start adding @Model.VocabSingular().ToLower() groups and @Model.VocabPlural().ToLower() to this framework using the buttons below.

-

Use the Details tab above to view and edit the framework details and working group.

+

Start adding @Model.VocabSingular().ToLower() groups and @Model.VocabPlural().ToLower() to this framework using the buttons below.

+

Use the Details tab above to view and edit the framework details and working group.

} @if (Model.DetailFramework.UserRole > 0) { -

Use the Comments tab to view, add and respond to comments from working group members on this framework.

+

Use the Comments tab to view, add and respond to comments from working group members on this framework.

} @if (Model.DetailFramework.UserRole > 1) { -

When you are ready, use the Send for Review button above to request review and sign off of your framework.

+

When you are ready, use the Send for Review button above to request review and sign off of your framework.

} -
+
} else { -

No @Model.VocabSingular().ToLower() groups in this framework.

+

No @Model.VocabSingular().ToLower() groups in this framework.

} } -
+
@if (Model.FrameworkCompetencies.Any()) { foreach (var frameworkCompetency in Model.FrameworkCompetencies) { - + view-data='new ViewDataDictionary(ViewData) + { + { "VocabSingular", Model.VocabSingular() }, + {"VocabPlural", Model.VocabPlural() } + }' /> } } -
+
@if (Model.DetailFramework.UserRole > 1) { -
-
- Add @Model.VocabSingular().ToLower() group - Add ungrouped @Model.VocabSingular().ToLower() - Bulk upload/update @Model.VocabPlural().ToLower() - View for print +
+
+ Add @Model.VocabSingular().ToLower() group + Add ungrouped @Model.VocabSingular().ToLower() + Bulk upload/update @Model.VocabPlural().ToLower() + View for print +
-
} From 4a48c0c227614b930605c35a04b65b3d6078766b Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Tue, 11 Feb 2025 09:29:19 +0000 Subject: [PATCH 11/36] Resolving post-rebase merge conflict problems --- .../DataServices/FrameworkDataService.cs | 57 ++------------- .../ImportCompetencies.cs | 16 ++++- .../Services/FrameworkService.cs | 4 +- .../ImportCompetenciesFromFileService.cs | 69 +++++++++++++------ 4 files changed, 69 insertions(+), 77 deletions(-) diff --git a/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs b/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs index d6751ebfce..35ebbf7ee1 100644 --- a/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs @@ -123,7 +123,6 @@ bool zeroBased //INSERT DATA BrandedFramework CreateFramework(DetailFramework detailFramework, int adminId); - int InsertCompetencyGroup(string groupName, string? groupDescription, int adminId, int? frameworkId); int InsertCompetencyGroup(string groupName, string? groupDescription, int adminId, int? frameworkId); int InsertFrameworkCompetencyGroup(int groupId, int frameworkID, int adminId); @@ -286,7 +285,7 @@ public class FrameworkDataService : IFrameworkDataService fwr.ID AS FrameworkReviewID"; private const string BrandedFrameworkFields = - @", FW.Description, (SELECT BrandName + @",(SELECT BrandName FROM Brands WHERE (BrandID = FW.BrandID)) AS Brand, (SELECT CategoryName @@ -477,7 +476,6 @@ public BrandedFramework CreateFramework(DetailFramework detailFramework, int adm return new BrandedFramework(); } - var existingFrameworks = connection.QuerySingle( var existingFrameworks = connection.QuerySingle( @"SELECT COUNT(*) FROM Frameworks WHERE FrameworkName = @frameworkName", new { frameworkName } @@ -551,7 +549,6 @@ int adminId return GetBrandedFrameworkByFrameworkId(frameworkId, adminId); } - public int InsertCompetencyGroup(string groupName, string? groupDescription, int adminId, int? frameworkId) public int InsertCompetencyGroup(string groupName, string? groupDescription, int adminId, int? frameworkId) { if ((groupName.Length == 0) | (adminId < 1)) @@ -584,26 +581,7 @@ OUTPUT INSERTED.Id VALUES (@groupName, @groupDescription, @adminId)", new { groupName, groupDescription, adminId } ); - if (numberOfAffectedRows < 1) - { - logger.LogWarning( - "Not inserting competency group as db insert failed. " + - $"Group name: {groupName}, admin id: {adminId}" - ); - return -1; - } - existingId = connection.QuerySingle( - @"SELECT COALESCE - ((SELECT TOP (1) ID - FROM CompetencyGroups - WHERE (Name = @groupName) AND EXISTS - (SELECT 1 AS Expr1 - FROM FrameworkCompetencyGroups - WHERE (CompetencyGroupID = CompetencyGroups.ID) AND (FrameworkID = @frameworkId) OR - (CompetencyGroupID = CompetencyGroups.ID) AND (@frameworkId IS NULL))), 0) AS CompetencyGroupID", - new { groupName, groupDescription } - ); return existingId; } @@ -617,7 +595,6 @@ public int InsertFrameworkCompetencyGroup(int groupId, int frameworkId, int admi return -2; } - var existingId = connection.QuerySingle( var existingId = connection.QuerySingle( @"SELECT COALESCE ((SELECT ID FROM FrameworkCompetencyGroups WHERE CompetencyGroupID = @groupID AND FrameworkID = @frameworkID), 0) AS FrameworkCompetencyGroupID", new { groupId, frameworkId } @@ -636,19 +613,7 @@ FROM [FrameworkCompetencyGroups] WHERE ([FrameworkID] = @frameworkId)), 0)+1, @frameworkId)", new { groupId, adminId, frameworkId } ); - if (numberOfAffectedRows < 1) - { - logger.LogWarning( - "Not inserting framework competency group as db insert failed. " + - $"Group id: {groupId}, admin id: {adminId}, frameworkId: {frameworkId}" - ); - return -1; - } - existingId = connection.QuerySingle( - @"SELECT COALESCE ((SELECT ID FROM FrameworkCompetencyGroups WHERE CompetencyGroupID = @groupID AND FrameworkID = @frameworkID), 0) AS FrameworkCompetencyGroupID", - new { groupId, frameworkId } - ); return existingId; } @@ -692,7 +657,6 @@ public int InsertFrameworkCompetency( var existingId = 0; if (frameworkCompetencyGroupID == null) { - existingId = connection.QuerySingle( existingId = connection.QuerySingle( @"SELECT COALESCE ((SELECT ID FROM FrameworkCompetencies WHERE [CompetencyID] = @competencyId AND FrameworkCompetencyGroupID IS NULL), 0) AS FrameworkCompetencyID", new { competencyId, frameworkCompetencyGroupID } @@ -700,7 +664,6 @@ public int InsertFrameworkCompetency( } else { - existingId = connection.QuerySingle( existingId = connection.QuerySingle( @"SELECT COALESCE ((SELECT ID FROM FrameworkCompetencies WHERE [CompetencyID] = @competencyId AND FrameworkCompetencyGroupID = @frameworkCompetencyGroupID), 0) AS FrameworkCompetencyID", new { competencyId, frameworkCompetencyGroupID } @@ -730,7 +693,6 @@ FROM [FrameworkCompetencies] if (frameworkCompetencyGroupID == null) { - existingId = connection.QuerySingle( existingId = connection.QuerySingle( @"SELECT COALESCE ((SELECT ID FROM FrameworkCompetencies WHERE [CompetencyID] = @competencyId AND FrameworkCompetencyGroupID IS NULL), 0) AS FrameworkCompetencyID", new { competencyId, frameworkCompetencyGroupID } @@ -738,7 +700,6 @@ FROM [FrameworkCompetencies] } else { - existingId = connection.QuerySingle( existingId = connection.QuerySingle( @"SELECT COALESCE ((SELECT ID FROM FrameworkCompetencies WHERE [CompetencyID] = @competencyId AND FrameworkCompetencyGroupID = @frameworkCompetencyGroupID), 0) AS FrameworkCompetencyID", new { competencyId, frameworkCompetencyGroupID } @@ -790,7 +751,6 @@ public int AddCollaboratorToFramework(int frameworkId, string? userEmail, bool c return -3; } - var existingId = connection.QuerySingle( var existingId = connection.QuerySingle( @"SELECT COALESCE ((SELECT ID @@ -841,7 +801,6 @@ FROM FrameworkCollaborators ); } - existingId = connection.QuerySingle( existingId = connection.QuerySingle( @"SELECT COALESCE ((SELECT ID @@ -1030,7 +989,6 @@ int adminId return; } - var usedElsewhere = connection.QuerySingle( var usedElsewhere = connection.QuerySingle( @"SELECT COUNT(*) FROM FrameworkCompetencyGroups WHERE CompetencyGroupId = @competencyGroupId @@ -1089,7 +1047,7 @@ public void UpdateFrameworkCompetency(int frameworkCompetencyId, string name, st @"UPDATE Competencies SET Name = @name, Description = @description, UpdatedByAdminID = @adminId, AlwaysShowDescription = CASE WHEN @alwaysShowDescription IS NULL THEN AlwaysShowDescription ELSE @alwaysShowDescription END FROM Competencies INNER JOIN FrameworkCompetencies AS fc ON Competencies.ID = fc.CompetencyID WHERE (fc.Id = @frameworkCompetencyId)", - new { name, description, adminId, frameworkCompetencyId, alwaysShowDescription} + new { name, description, adminId, frameworkCompetencyId, alwaysShowDescription } ); if (numberOfAffectedRows < 1) { @@ -1201,7 +1159,6 @@ public void DeleteFrameworkCompetencyGroup(int frameworkCompetencyGroupId, int c } //Check if used elsewhere and delete competency group if not: - var usedElsewhere = connection.QuerySingle( var usedElsewhere = connection.QuerySingle( @"SELECT COUNT(*) FROM FrameworkCompetencyGroups WHERE CompetencyGroupId = @competencyGroupId", @@ -1209,7 +1166,6 @@ public void DeleteFrameworkCompetencyGroup(int frameworkCompetencyGroupId, int c ); if (usedElsewhere == 0) { - usedElsewhere = connection.QuerySingle( usedElsewhere = connection.QuerySingle( @"SELECT COUNT(*) FROM SelfAssessmentStructure WHERE CompetencyGroupId = @competencyGroupId", @@ -1241,7 +1197,6 @@ public void DeleteFrameworkCompetencyGroup(int frameworkCompetencyGroupId, int c public void DeleteFrameworkCompetency(int frameworkCompetencyId, int adminId) { - var competencyId = connection.QuerySingle( var competencyId = connection.QuerySingle( @"SELECT CompetencyID FROM FrameworkCompetencies WHERE ID = @frameworkCompetencyId", new { frameworkCompetencyId } @@ -1273,7 +1228,6 @@ public void DeleteFrameworkCompetency(int frameworkCompetencyId, int adminId) } //Check if used elsewhere and delete competency group if not: - var usedElsewhere = connection.QuerySingle( var usedElsewhere = connection.QuerySingle( @"SELECT COUNT(*) FROM FrameworkCompetencies WHERE CompetencyID = @competencyId", @@ -1281,7 +1235,6 @@ public void DeleteFrameworkCompetency(int frameworkCompetencyId, int adminId) ); if (usedElsewhere == 0) { - usedElsewhere = connection.QuerySingle( usedElsewhere = connection.QuerySingle( @"SELECT COUNT(*) FROM SelfAssessmentStructure WHERE CompetencyID = @competencyId", @@ -2222,7 +2175,7 @@ public void ArchiveReviewRequest(int reviewId) FROM FrameworkCollaborators WHERE (FrameworkID = FW.ID) AND (IsDeleted=0)))) AS MyFrameworksCount, - (SELECT COUNT(*) FROM SelfAssessments) AS CompetencyAssessmentCount, + (SELECT COUNT(*) FROM SelfAssessments) AS RoleProfileCount, (SELECT COUNT(*) FROM SelfAssessments AS RP LEFT OUTER JOIN SelfAssessmentCollaborators AS RPC ON RPC.SelfAssessmentID = RP.ID AND RPC.AdminID = @adminId @@ -2230,7 +2183,7 @@ FROM FrameworkCollaborators (@adminId IN (SELECT AdminID FROM SelfAssessmentCollaborators - WHERE (SelfAssessmentID = RP.ID)))) AS MyCompetencyAssessmentCount", + WHERE (SelfAssessmentID = RP.ID)))) AS MyRoleProfileCount", new { adminId } ).FirstOrDefault(); } @@ -2240,7 +2193,7 @@ public IEnumerable GetDashboardToDoItems(int adminId) return connection.Query( @"SELECT FW.ID AS FrameworkID, - 0 AS CompetencyAssessmentID, + 0 AS RoleProfileID, FW.FrameworkName AS ItemName, AU.Forename + ' ' + AU.Surname + (CASE WHEN AU.Active = 1 THEN '' ELSE ' (Inactive)' END) AS RequestorName, FWR.SignOffRequired, diff --git a/DigitalLearningSolutions.Web/Controllers/FrameworksController/ImportCompetencies.cs b/DigitalLearningSolutions.Web/Controllers/FrameworksController/ImportCompetencies.cs index 84f02d1ebf..752befe216 100644 --- a/DigitalLearningSolutions.Web/Controllers/FrameworksController/ImportCompetencies.cs +++ b/DigitalLearningSolutions.Web/Controllers/FrameworksController/ImportCompetencies.cs @@ -200,7 +200,7 @@ public IActionResult AddAssessmentQuestions(AddAssessmentQuestionsFormData model public IActionResult AddQuestionsToWhichCompetencies() { var data = GetBulkUploadData(); - if (data.DefaultQuestionIDs.Count ==0 && data.CustomAssessmentQuestionID == null) + if (data.DefaultQuestionIDs.Count == 0 && data.CustomAssessmentQuestionID == null) { return RedirectToAction("ImportSummary", "Frameworks", new { frameworkId = data.FrameworkId, tabname = data.TabName }); } @@ -245,9 +245,23 @@ public IActionResult ImportSummarySubmit() var workbook = new XLWorkbook(filePath); var results = importCompetenciesFromFileService.ProcessCompetenciesFromFile(workbook, adminId, data.FrameworkId, data.FrameworkVocubulary, data.ReorderCompetenciesOption, data.AddAssessmentQuestionsOption, data.AddCustomAssessmentQuestion ? (int)data.CustomAssessmentQuestionID : 0, data.AddDefaultAssessmentQuestions ? data.DefaultQuestionIDs : []); data.ImportCompetenciesResult = results; + //TO DO apply ordering changes if required: + if (data.ReorderCompetenciesOption == 2 && data.CompetenciesToReorderCount > 0) + { + + } setBulkUploadData(data); return RedirectToAction("UploadResults", "Frameworks", new { frameworkId = data.FrameworkId, tabname = data.TabName }); } + [Route("/Framework/{frameworkId}/{tabname}/Import/Results")] + public IActionResult UploadResults() + { + var data = GetBulkUploadData(); + FileHelper.DeleteFile(webHostEnvironment, data.CompetenciesFileName); + TempData.Clear(); + var model = new ImportCompetenciesResultsViewModel(data.ImportCompetenciesResult, data.FrameworkId, data.FrameworkName, data.FrameworkVocubulary); + return View("Developer/Import/UploadResults", model); + } [Route("CancelImport")] public IActionResult CancelImport() { diff --git a/DigitalLearningSolutions.Web/Services/FrameworkService.cs b/DigitalLearningSolutions.Web/Services/FrameworkService.cs index 3b2bc6fbd0..74bbde1d0f 100644 --- a/DigitalLearningSolutions.Web/Services/FrameworkService.cs +++ b/DigitalLearningSolutions.Web/Services/FrameworkService.cs @@ -119,14 +119,12 @@ bool zeroBased int InsertCompetencyGroup(string groupName, string? groupDescription, int adminId, int? frameworkId = null); - int InsertFrameworkCompetency(int competencyId, int? frameworkCompetencyGroupID, int adminId, int frameworkId, bool alwaysShowDescription = false); int InsertFrameworkCompetency(int competencyId, int? frameworkCompetencyGroupID, int adminId, int frameworkId, bool alwaysShowDescription = false); IEnumerable GetAllCompetenciesForAdminId(string name, int adminId); int InsertCompetency(string name, string? description, int adminId); - int InsertFrameworkCompetencyGroup(int groupId, int frameworkID, int adminId); int InsertFrameworkCompetencyGroup(int groupId, int frameworkID, int adminId); int AddCollaboratorToFramework(int frameworkId, string userEmail, bool canModify, int? centreID); @@ -676,7 +674,7 @@ public int UpdateCompetencyFlags(int frameworkId, int competencyId, int[] select } public void UpdateFrameworkCompetency(int frameworkCompetencyId, string name, string? description, int adminId, bool? alwaysShowDescription) - { + { frameworkDataService.UpdateFrameworkCompetency(frameworkCompetencyId, name, description, adminId, alwaysShowDescription); } diff --git a/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs b/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs index 06bf4b30cc..4bee1e1baf 100644 --- a/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs +++ b/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs @@ -20,7 +20,6 @@ public interface IImportCompetenciesFromFileService byte[] GetCompetencyFileForFramework(int frameworkId, bool isBlank, string vocabulary); public ImportCompetenciesResult PreProcessCompetenciesTable(IXLWorkbook workbook, string vocabulary, int frameworkId); public ImportCompetenciesResult ProcessCompetenciesFromFile(IXLWorkbook workbook, int adminUserId, int frameworkId, string vocabulary, int reorderCompetenciesOption, int addAssessmentQuestionsOption, int customAssessmentQuestionID, List defaultQuestionIds); - public ImportCompetenciesResult ProcessCompetenciesFromFile(IXLWorkbook workbook, int adminUserId, int frameworkId, string vocabulary, int reorderCompetenciesOption, int addAssessmentQuestionsOption, int customAssessmentQuestionID, List defaultQuestionIds); } public class ImportCompetenciesFromFileService : IImportCompetenciesFromFileService { @@ -72,12 +71,11 @@ private void PreProcessCompetencyRow(CompetencyTableRow competencyRow, List competencyRow.Validate(); } public ImportCompetenciesResult ProcessCompetenciesFromFile(IXLWorkbook workbook, int adminUserId, int frameworkId, string vocabulary, int reorderCompetenciesOption, int addAssessmentQuestionsOption, int customAssessmentQuestionID, List defaultQuestionIds) - public ImportCompetenciesResult ProcessCompetenciesFromFile(IXLWorkbook workbook, int adminUserId, int frameworkId, string vocabulary, int reorderCompetenciesOption, int addAssessmentQuestionsOption, int customAssessmentQuestionID, List defaultQuestionIds) { int maxFrameworkCompetencyId = frameworkService.GetMaxFrameworkCompetencyID(); int maxFrameworkCompetencyGroupId = frameworkService.GetMaxFrameworkCompetencyGroupID(); var table = OpenCompetenciesTable(workbook, vocabulary); - return ProcessCompetenciesTable(table, adminUserId, frameworkId, maxFrameworkCompetencyId, maxFrameworkCompetencyGroupId, addAssessmentQuestionsOption, customAssessmentQuestionID, defaultQuestionIds); + return ProcessCompetenciesTable(table, adminUserId, frameworkId, maxFrameworkCompetencyId, maxFrameworkCompetencyGroupId, addAssessmentQuestionsOption, reorderCompetenciesOption, customAssessmentQuestionID, defaultQuestionIds); } internal IXLTable OpenCompetenciesTable(IXLWorkbook workbook, string vocabulary) { @@ -94,7 +92,7 @@ internal IXLTable OpenCompetenciesTable(IXLWorkbook workbook, string vocabulary) } return table; } - internal ImportCompetenciesResult ProcessCompetenciesTable(IXLTable table, int adminUserId, int frameworkId, int maxFrameworkCompetencyId, int maxFrameworkCompetencyGroupId, int addAssessmentQuestionsOption, int customAssessmentQuestionID, List defaultQuestionIds) + internal ImportCompetenciesResult ProcessCompetenciesTable(IXLTable table, int adminUserId, int frameworkId, int maxFrameworkCompetencyId, int maxFrameworkCompetencyGroupId, int addAssessmentQuestionsOption, int reorderCompetenciesOption, int customAssessmentQuestionID, List defaultQuestionIds) { var competenciesRows = table.Rows().Skip(1).Select(row => new CompetencyTableRow(table, row)).ToList(); int rowCount = 0; @@ -122,7 +120,7 @@ internal ImportCompetenciesResult ProcessCompetenciesTable(IXLTable table, int a .Count(); foreach (var competencyRow in competenciesRows) { - maxFrameworkCompetencyGroupId = ProcessCompetencyRow(adminUserId, frameworkId, maxFrameworkCompetencyId, maxFrameworkCompetencyGroupId, addAssessmentQuestionsOption, customAssessmentQuestionID, defaultQuestionIds, competencyRow); + maxFrameworkCompetencyGroupId = ProcessCompetencyRow(adminUserId, frameworkId, maxFrameworkCompetencyId, maxFrameworkCompetencyGroupId, addAssessmentQuestionsOption, reorderCompetenciesOption, customAssessmentQuestionID, defaultQuestionIds, competencyRow); } // Check for changes to competency group order and apply them if appropriate: if (reorderCompetenciesOption == 2) @@ -137,7 +135,7 @@ internal ImportCompetenciesResult ProcessCompetenciesTable(IXLTable table, int a var existingGroups = frameworkService.GetFrameworkCompetencyGroups(frameworkId).Select(row => new { row.ID, row.Name }) .Distinct() .ToList(); - var placesToMove = Math.Abs(existingGroups.FindIndex(group => group.Name == distinctCompetencyGroups[i])-i); + var placesToMove = Math.Abs(existingGroups.FindIndex(group => group.Name == distinctCompetencyGroups[i]) - i); if (placesToMove > 0) { var thisGroup = existingGroups.FirstOrDefault(group => group.Name == distinctCompetencyGroups[i]); @@ -161,6 +159,7 @@ private int ProcessCompetencyRow( int maxFrameworkCompetencyId, int maxFrameworkCompetencyGroupId, int addAssessmentQuestionsOption, + int reorderCompetenciesOption, int customAssessmentQuestionID, List defaultQuestionIds, CompetencyTableRow competencyRow @@ -170,10 +169,10 @@ CompetencyTableRow competencyRow { return maxFrameworkCompetencyGroupId; } - int newCompetencyGroupId = 0; int newCompetencyId = 0; + int newFrameworkCompetencyId = 0; //If competency group is set, check if competency group exists within framework and add if not and get the Framework Competency Group ID - int ? frameworkCompetencyGroupId = null; + int? frameworkCompetencyGroupId = null; if (competencyRow.CompetencyGroup != null) { int newCompetencyGroupId = frameworkService.InsertCompetencyGroup(competencyRow.CompetencyGroup, competencyRow.GroupDescription, adminUserId, frameworkId); @@ -194,10 +193,10 @@ CompetencyTableRow competencyRow if (frameworkCompetency != null) { newCompetencyId = frameworkCompetency.CompetencyID; - if (frameworkCompetency.Name != competencyRow.Competency || frameworkCompetency.Description != competencyRow.CompetencyDescription || frameworkCompetency.AlwaysShowDescription != competencyRow.AlwaysShowDescription ) + if (frameworkCompetency.Name != competencyRow.Competency || frameworkCompetency.Description != competencyRow.CompetencyDescription || frameworkCompetency.AlwaysShowDescription != competencyRow.AlwaysShowDescription) { frameworkService.UpdateFrameworkCompetency((int)competencyRow.ID, competencyRow.Competency, competencyRow.CompetencyDescription, adminUserId, competencyRow.AlwaysShowDescription ?? false); - competencyRow.RowStatus = (competencyRow.RowStatus == RowStatus.CompetencyGroupInserted ? RowStatus.CompetencyGroupAndCompetencyUpdated: RowStatus.CompetencyUpdated); + competencyRow.RowStatus = (competencyRow.RowStatus == RowStatus.CompetencyGroupInserted ? RowStatus.CompetencyGroupAndCompetencyUpdated : RowStatus.CompetencyUpdated); } else { @@ -211,7 +210,7 @@ CompetencyTableRow competencyRow newCompetencyId = frameworkService.InsertCompetency(competencyRow.Competency, competencyRow.CompetencyDescription, adminUserId); if (newCompetencyId > 0) { - var newFrameworkCompetencyId = frameworkService.InsertFrameworkCompetency(newCompetencyId, frameworkCompetencyGroupId, adminUserId, frameworkId, competencyRow.AlwaysShowDescription ?? false); //including always show desc flag + newFrameworkCompetencyId = frameworkService.InsertFrameworkCompetency(newCompetencyId, frameworkCompetencyGroupId, adminUserId, frameworkId, competencyRow.AlwaysShowDescription ?? false); //including always show desc flag if (newFrameworkCompetencyId > maxFrameworkCompetencyId) { competencyRow.RowStatus = (competencyRow.RowStatus == RowStatus.CompetencyGroupInserted ? RowStatus.CompetencyGroupAndCompetencyInserted : RowStatus.CompetencyInserted); @@ -225,11 +224,12 @@ CompetencyTableRow competencyRow // If flags are supplied, add them: - if (competencyRow.FlagsCsv != null) + if (!string.IsNullOrWhiteSpace(competencyRow.FlagsCsv.Trim())) { var flags = competencyRow.FlagsCsv.Split(','); - int[] flagIds = []; - foreach (var flag in flags) { + var flagIds = new List(); + foreach (var flag in flags) + { int flagId = 0; var frameworkFlags = frameworkService.GetCompetencyFlagsByFrameworkId(frameworkId, null, null); if (frameworkFlags.Any()) @@ -239,6 +239,7 @@ CompetencyTableRow competencyRow if (frameworkFlag.FlagName == flag) { flagId = frameworkFlag.FlagId; + break; } } } @@ -246,30 +247,56 @@ CompetencyTableRow competencyRow { flagId = frameworkService.AddCustomFlagToFramework(frameworkId, flag, "Flag", "nhsuk-tag--white"); } - flagIds.Append(flagId); + flagIds.Add(flagId); } - if (flagIds.Any()) { - frameworkService.UpdateCompetencyFlags(frameworkId, newCompetencyId, flagIds); + if (flagIds.Count > 0) + { + var updated = frameworkService.UpdateCompetencyFlags(frameworkId, newCompetencyId, [.. flagIds]); + if (updated > 0 && competencyRow.RowStatus == RowStatus.Skipped) + { + competencyRow.RowStatus = RowStatus.CompetencyUpdated; + } } } + // Reorder competencies if required: + if (reorderCompetenciesOption == 2) + { + var frameworkCompetencyId = (int)competencyRow.ID; + var frameworkCompetency = frameworkService.GetFrameworkCompetencyById(frameworkCompetencyId); + var placesToMove = Math.Abs(frameworkCompetency.Ordering - competencyRow.CompetencyOrderNumber); + + if (placesToMove > 0) + { + var direction = frameworkCompetency.Ordering > competencyRow.CompetencyOrderNumber ? "UP" : "DOWN"; + + for (int i = 0; i < placesToMove; i++) + { + frameworkService.MoveFrameworkCompetency(frameworkCompetencyId, true, direction); + } + + competencyRow.Reordered = true; + } + } // Add assessment questions if necessary: if (defaultQuestionIds.Count > 0 | customAssessmentQuestionID > 0) { if (competencyRow.RowStatus == RowStatus.CompetencyInserted | competencyRow.RowStatus == RowStatus.CompetencyGroupAndCompetencyInserted || addAssessmentQuestionsOption == 2 && competencyRow.RowStatus == RowStatus.CompetencyUpdated | competencyRow.RowStatus == RowStatus.CompetencyGroupAndCompetencyUpdated || addAssessmentQuestionsOption == 3) { - foreach(var id in defaultQuestionIds) + foreach (var id in defaultQuestionIds) { - frameworkService.AddCompetencyAssessmentQuestion((int)competencyRow.ID, id, adminUserId); + frameworkService.AddCompetencyAssessmentQuestion(competencyRow.ID ?? newFrameworkCompetencyId, id, adminUserId); } - if(customAssessmentQuestionID > 0) + if (customAssessmentQuestionID > 0) { - frameworkService.AddCompetencyAssessmentQuestion((int)competencyRow.ID, customAssessmentQuestionID, adminUserId); + frameworkService.AddCompetencyAssessmentQuestion(competencyRow.ID ?? newFrameworkCompetencyId, customAssessmentQuestionID, adminUserId); } } } + + return maxFrameworkCompetencyGroupId; } From c5242366602d81044d851201516ecf5ede2fc518 Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Tue, 28 Jan 2025 09:07:22 +0000 Subject: [PATCH 12/36] TD-5286 Renames role profiles to competency assessments throughout the application --- .../DataServices/FrameworkDataService.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs b/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs index 35ebbf7ee1..f7165d7000 100644 --- a/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs @@ -2175,7 +2175,7 @@ public void ArchiveReviewRequest(int reviewId) FROM FrameworkCollaborators WHERE (FrameworkID = FW.ID) AND (IsDeleted=0)))) AS MyFrameworksCount, - (SELECT COUNT(*) FROM SelfAssessments) AS RoleProfileCount, + (SELECT COUNT(*) FROM SelfAssessments) AS CompetencyAssessmentCount, (SELECT COUNT(*) FROM SelfAssessments AS RP LEFT OUTER JOIN SelfAssessmentCollaborators AS RPC ON RPC.SelfAssessmentID = RP.ID AND RPC.AdminID = @adminId @@ -2183,7 +2183,7 @@ FROM FrameworkCollaborators (@adminId IN (SELECT AdminID FROM SelfAssessmentCollaborators - WHERE (SelfAssessmentID = RP.ID)))) AS MyRoleProfileCount", + WHERE (SelfAssessmentID = RP.ID)))) AS MyCompetencyAssessmentCount", new { adminId } ).FirstOrDefault(); } @@ -2193,7 +2193,7 @@ public IEnumerable GetDashboardToDoItems(int adminId) return connection.Query( @"SELECT FW.ID AS FrameworkID, - 0 AS RoleProfileID, + 0 AS CompetencyAssessmentID, FW.FrameworkName AS ItemName, AU.Forename + ' ' + AU.Surname + (CASE WHEN AU.Active = 1 THEN '' ELSE ' (Inactive)' END) AS RequestorName, FWR.SignOffRequired, From 54949e051ac75ff7a879eb7ef7e1bcd26cf5ff51 Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Thu, 30 Jan 2025 08:15:54 +0000 Subject: [PATCH 13/36] TD-480 Amends previous migration and sets up basic services and controller for creating a new assessment --- .../DataServices/FrameworkDataService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs b/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs index f7165d7000..f7e090372e 100644 --- a/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs @@ -285,7 +285,7 @@ public class FrameworkDataService : IFrameworkDataService fwr.ID AS FrameworkReviewID"; private const string BrandedFrameworkFields = - @",(SELECT BrandName + @", FW.Description, (SELECT BrandName FROM Brands WHERE (BrandID = FW.BrandID)) AS Brand, (SELECT CategoryName From 36b9da88c52547187fce6f86c9fee72b5ea3399d Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Tue, 7 Jan 2025 16:35:53 +0000 Subject: [PATCH 14/36] TD-5163 Process imported competencies --- .../ImportCompetencies.cs | 14 ---- .../Services/FrameworkService.cs | 2 + .../ImportCompetenciesFromFileService.cs | 69 ++++++------------- 3 files changed, 23 insertions(+), 62 deletions(-) diff --git a/DigitalLearningSolutions.Web/Controllers/FrameworksController/ImportCompetencies.cs b/DigitalLearningSolutions.Web/Controllers/FrameworksController/ImportCompetencies.cs index 752befe216..db170f5db1 100644 --- a/DigitalLearningSolutions.Web/Controllers/FrameworksController/ImportCompetencies.cs +++ b/DigitalLearningSolutions.Web/Controllers/FrameworksController/ImportCompetencies.cs @@ -245,23 +245,9 @@ public IActionResult ImportSummarySubmit() var workbook = new XLWorkbook(filePath); var results = importCompetenciesFromFileService.ProcessCompetenciesFromFile(workbook, adminId, data.FrameworkId, data.FrameworkVocubulary, data.ReorderCompetenciesOption, data.AddAssessmentQuestionsOption, data.AddCustomAssessmentQuestion ? (int)data.CustomAssessmentQuestionID : 0, data.AddDefaultAssessmentQuestions ? data.DefaultQuestionIDs : []); data.ImportCompetenciesResult = results; - //TO DO apply ordering changes if required: - if (data.ReorderCompetenciesOption == 2 && data.CompetenciesToReorderCount > 0) - { - - } setBulkUploadData(data); return RedirectToAction("UploadResults", "Frameworks", new { frameworkId = data.FrameworkId, tabname = data.TabName }); } - [Route("/Framework/{frameworkId}/{tabname}/Import/Results")] - public IActionResult UploadResults() - { - var data = GetBulkUploadData(); - FileHelper.DeleteFile(webHostEnvironment, data.CompetenciesFileName); - TempData.Clear(); - var model = new ImportCompetenciesResultsViewModel(data.ImportCompetenciesResult, data.FrameworkId, data.FrameworkName, data.FrameworkVocubulary); - return View("Developer/Import/UploadResults", model); - } [Route("CancelImport")] public IActionResult CancelImport() { diff --git a/DigitalLearningSolutions.Web/Services/FrameworkService.cs b/DigitalLearningSolutions.Web/Services/FrameworkService.cs index 74bbde1d0f..e8768bc6e8 100644 --- a/DigitalLearningSolutions.Web/Services/FrameworkService.cs +++ b/DigitalLearningSolutions.Web/Services/FrameworkService.cs @@ -119,12 +119,14 @@ bool zeroBased int InsertCompetencyGroup(string groupName, string? groupDescription, int adminId, int? frameworkId = null); + int InsertFrameworkCompetency(int competencyId, int? frameworkCompetencyGroupID, int adminId, int frameworkId, bool alwaysShowDescription = false); int InsertFrameworkCompetency(int competencyId, int? frameworkCompetencyGroupID, int adminId, int frameworkId, bool alwaysShowDescription = false); IEnumerable GetAllCompetenciesForAdminId(string name, int adminId); int InsertCompetency(string name, string? description, int adminId); + int InsertFrameworkCompetencyGroup(int groupId, int frameworkID, int adminId); int InsertFrameworkCompetencyGroup(int groupId, int frameworkID, int adminId); int AddCollaboratorToFramework(int frameworkId, string userEmail, bool canModify, int? centreID); diff --git a/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs b/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs index 4bee1e1baf..0c974a44eb 100644 --- a/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs +++ b/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs @@ -20,6 +20,7 @@ public interface IImportCompetenciesFromFileService byte[] GetCompetencyFileForFramework(int frameworkId, bool isBlank, string vocabulary); public ImportCompetenciesResult PreProcessCompetenciesTable(IXLWorkbook workbook, string vocabulary, int frameworkId); public ImportCompetenciesResult ProcessCompetenciesFromFile(IXLWorkbook workbook, int adminUserId, int frameworkId, string vocabulary, int reorderCompetenciesOption, int addAssessmentQuestionsOption, int customAssessmentQuestionID, List defaultQuestionIds); + public ImportCompetenciesResult ProcessCompetenciesFromFile(IXLWorkbook workbook, int adminUserId, int frameworkId, string vocabulary, int reorderCompetenciesOption, int addAssessmentQuestionsOption, int customAssessmentQuestionID, List defaultQuestionIds); } public class ImportCompetenciesFromFileService : IImportCompetenciesFromFileService { @@ -71,11 +72,12 @@ private void PreProcessCompetencyRow(CompetencyTableRow competencyRow, List competencyRow.Validate(); } public ImportCompetenciesResult ProcessCompetenciesFromFile(IXLWorkbook workbook, int adminUserId, int frameworkId, string vocabulary, int reorderCompetenciesOption, int addAssessmentQuestionsOption, int customAssessmentQuestionID, List defaultQuestionIds) + public ImportCompetenciesResult ProcessCompetenciesFromFile(IXLWorkbook workbook, int adminUserId, int frameworkId, string vocabulary, int reorderCompetenciesOption, int addAssessmentQuestionsOption, int customAssessmentQuestionID, List defaultQuestionIds) { int maxFrameworkCompetencyId = frameworkService.GetMaxFrameworkCompetencyID(); int maxFrameworkCompetencyGroupId = frameworkService.GetMaxFrameworkCompetencyGroupID(); var table = OpenCompetenciesTable(workbook, vocabulary); - return ProcessCompetenciesTable(table, adminUserId, frameworkId, maxFrameworkCompetencyId, maxFrameworkCompetencyGroupId, addAssessmentQuestionsOption, reorderCompetenciesOption, customAssessmentQuestionID, defaultQuestionIds); + return ProcessCompetenciesTable(table, adminUserId, frameworkId, maxFrameworkCompetencyId, maxFrameworkCompetencyGroupId, addAssessmentQuestionsOption, customAssessmentQuestionID, defaultQuestionIds); } internal IXLTable OpenCompetenciesTable(IXLWorkbook workbook, string vocabulary) { @@ -92,7 +94,7 @@ internal IXLTable OpenCompetenciesTable(IXLWorkbook workbook, string vocabulary) } return table; } - internal ImportCompetenciesResult ProcessCompetenciesTable(IXLTable table, int adminUserId, int frameworkId, int maxFrameworkCompetencyId, int maxFrameworkCompetencyGroupId, int addAssessmentQuestionsOption, int reorderCompetenciesOption, int customAssessmentQuestionID, List defaultQuestionIds) + internal ImportCompetenciesResult ProcessCompetenciesTable(IXLTable table, int adminUserId, int frameworkId, int maxFrameworkCompetencyId, int maxFrameworkCompetencyGroupId, int addAssessmentQuestionsOption, int customAssessmentQuestionID, List defaultQuestionIds) { var competenciesRows = table.Rows().Skip(1).Select(row => new CompetencyTableRow(table, row)).ToList(); int rowCount = 0; @@ -120,7 +122,7 @@ internal ImportCompetenciesResult ProcessCompetenciesTable(IXLTable table, int a .Count(); foreach (var competencyRow in competenciesRows) { - maxFrameworkCompetencyGroupId = ProcessCompetencyRow(adminUserId, frameworkId, maxFrameworkCompetencyId, maxFrameworkCompetencyGroupId, addAssessmentQuestionsOption, reorderCompetenciesOption, customAssessmentQuestionID, defaultQuestionIds, competencyRow); + maxFrameworkCompetencyGroupId = ProcessCompetencyRow(adminUserId, frameworkId, maxFrameworkCompetencyId, maxFrameworkCompetencyGroupId, addAssessmentQuestionsOption, customAssessmentQuestionID, defaultQuestionIds, competencyRow); } // Check for changes to competency group order and apply them if appropriate: if (reorderCompetenciesOption == 2) @@ -159,7 +161,6 @@ private int ProcessCompetencyRow( int maxFrameworkCompetencyId, int maxFrameworkCompetencyGroupId, int addAssessmentQuestionsOption, - int reorderCompetenciesOption, int customAssessmentQuestionID, List defaultQuestionIds, CompetencyTableRow competencyRow @@ -169,13 +170,13 @@ CompetencyTableRow competencyRow { return maxFrameworkCompetencyGroupId; } + int newCompetencyGroupId = 0; int newCompetencyId = 0; - int newFrameworkCompetencyId = 0; //If competency group is set, check if competency group exists within framework and add if not and get the Framework Competency Group ID - int? frameworkCompetencyGroupId = null; + int ? frameworkCompetencyGroupId = null; if (competencyRow.CompetencyGroup != null) { - int newCompetencyGroupId = frameworkService.InsertCompetencyGroup(competencyRow.CompetencyGroup, competencyRow.GroupDescription, adminUserId, frameworkId); + newCompetencyGroupId = frameworkService.InsertCompetencyGroup(competencyRow.CompetencyGroup, competencyRow.GroupDescription, adminUserId); if (newCompetencyGroupId > 0) { frameworkCompetencyGroupId = frameworkService.InsertFrameworkCompetencyGroup(newCompetencyGroupId, frameworkId, adminUserId); @@ -193,10 +194,10 @@ CompetencyTableRow competencyRow if (frameworkCompetency != null) { newCompetencyId = frameworkCompetency.CompetencyID; - if (frameworkCompetency.Name != competencyRow.Competency || frameworkCompetency.Description != competencyRow.CompetencyDescription || frameworkCompetency.AlwaysShowDescription != competencyRow.AlwaysShowDescription) + if (frameworkCompetency.Name != competencyRow.Competency || frameworkCompetency.Description != competencyRow.CompetencyDescription || frameworkCompetency.AlwaysShowDescription != competencyRow.AlwaysShowDescription ) { frameworkService.UpdateFrameworkCompetency((int)competencyRow.ID, competencyRow.Competency, competencyRow.CompetencyDescription, adminUserId, competencyRow.AlwaysShowDescription ?? false); - competencyRow.RowStatus = (competencyRow.RowStatus == RowStatus.CompetencyGroupInserted ? RowStatus.CompetencyGroupAndCompetencyUpdated : RowStatus.CompetencyUpdated); + competencyRow.RowStatus = (competencyRow.RowStatus == RowStatus.CompetencyGroupInserted ? RowStatus.CompetencyGroupAndCompetencyUpdated: RowStatus.CompetencyUpdated); } else { @@ -210,7 +211,7 @@ CompetencyTableRow competencyRow newCompetencyId = frameworkService.InsertCompetency(competencyRow.Competency, competencyRow.CompetencyDescription, adminUserId); if (newCompetencyId > 0) { - newFrameworkCompetencyId = frameworkService.InsertFrameworkCompetency(newCompetencyId, frameworkCompetencyGroupId, adminUserId, frameworkId, competencyRow.AlwaysShowDescription ?? false); //including always show desc flag + var newFrameworkCompetencyId = frameworkService.InsertFrameworkCompetency(newCompetencyId, frameworkCompetencyGroupId, adminUserId, frameworkId, competencyRow.AlwaysShowDescription ?? false); //including always show desc flag if (newFrameworkCompetencyId > maxFrameworkCompetencyId) { competencyRow.RowStatus = (competencyRow.RowStatus == RowStatus.CompetencyGroupInserted ? RowStatus.CompetencyGroupAndCompetencyInserted : RowStatus.CompetencyInserted); @@ -224,12 +225,11 @@ CompetencyTableRow competencyRow // If flags are supplied, add them: - if (!string.IsNullOrWhiteSpace(competencyRow.FlagsCsv.Trim())) + if (competencyRow.FlagsCsv != null) { var flags = competencyRow.FlagsCsv.Split(','); - var flagIds = new List(); - foreach (var flag in flags) - { + int[] flagIds = []; + foreach (var flag in flags) { int flagId = 0; var frameworkFlags = frameworkService.GetCompetencyFlagsByFrameworkId(frameworkId, null, null); if (frameworkFlags.Any()) @@ -239,7 +239,6 @@ CompetencyTableRow competencyRow if (frameworkFlag.FlagName == flag) { flagId = frameworkFlag.FlagId; - break; } } } @@ -247,56 +246,30 @@ CompetencyTableRow competencyRow { flagId = frameworkService.AddCustomFlagToFramework(frameworkId, flag, "Flag", "nhsuk-tag--white"); } - flagIds.Add(flagId); + flagIds.Append(flagId); } - if (flagIds.Count > 0) - { - var updated = frameworkService.UpdateCompetencyFlags(frameworkId, newCompetencyId, [.. flagIds]); - if (updated > 0 && competencyRow.RowStatus == RowStatus.Skipped) - { - competencyRow.RowStatus = RowStatus.CompetencyUpdated; - } + if (flagIds.Any()) { + frameworkService.UpdateCompetencyFlags(frameworkId, newCompetencyId, flagIds); } } - // Reorder competencies if required: - if (reorderCompetenciesOption == 2) - { - var frameworkCompetencyId = (int)competencyRow.ID; - var frameworkCompetency = frameworkService.GetFrameworkCompetencyById(frameworkCompetencyId); - var placesToMove = Math.Abs(frameworkCompetency.Ordering - competencyRow.CompetencyOrderNumber); - - if (placesToMove > 0) - { - var direction = frameworkCompetency.Ordering > competencyRow.CompetencyOrderNumber ? "UP" : "DOWN"; - - for (int i = 0; i < placesToMove; i++) - { - frameworkService.MoveFrameworkCompetency(frameworkCompetencyId, true, direction); - } - - competencyRow.Reordered = true; - } - } // Add assessment questions if necessary: if (defaultQuestionIds.Count > 0 | customAssessmentQuestionID > 0) { if (competencyRow.RowStatus == RowStatus.CompetencyInserted | competencyRow.RowStatus == RowStatus.CompetencyGroupAndCompetencyInserted || addAssessmentQuestionsOption == 2 && competencyRow.RowStatus == RowStatus.CompetencyUpdated | competencyRow.RowStatus == RowStatus.CompetencyGroupAndCompetencyUpdated || addAssessmentQuestionsOption == 3) { - foreach (var id in defaultQuestionIds) + foreach(var id in defaultQuestionIds) { - frameworkService.AddCompetencyAssessmentQuestion(competencyRow.ID ?? newFrameworkCompetencyId, id, adminUserId); + frameworkService.AddCompetencyAssessmentQuestion((int)competencyRow.ID, id, adminUserId); } - if (customAssessmentQuestionID > 0) + if(customAssessmentQuestionID > 0) { - frameworkService.AddCompetencyAssessmentQuestion(competencyRow.ID ?? newFrameworkCompetencyId, customAssessmentQuestionID, adminUserId); + frameworkService.AddCompetencyAssessmentQuestion((int)competencyRow.ID, customAssessmentQuestionID, adminUserId); } } } - - return maxFrameworkCompetencyGroupId; } From b97a74ea717513e45e09e5d88cd841e80c2dbae5 Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Tue, 11 Feb 2025 09:29:19 +0000 Subject: [PATCH 15/36] Resolving post-rebase merge conflict problems --- .../DataServices/FrameworkDataService.cs | 8 +-- .../ImportCompetencies.cs | 14 ++++ .../Services/FrameworkService.cs | 2 - .../ImportCompetenciesFromFileService.cs | 67 +++++++++++++------ 4 files changed, 65 insertions(+), 26 deletions(-) diff --git a/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs b/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs index f7e090372e..35ebbf7ee1 100644 --- a/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs @@ -285,7 +285,7 @@ public class FrameworkDataService : IFrameworkDataService fwr.ID AS FrameworkReviewID"; private const string BrandedFrameworkFields = - @", FW.Description, (SELECT BrandName + @",(SELECT BrandName FROM Brands WHERE (BrandID = FW.BrandID)) AS Brand, (SELECT CategoryName @@ -2175,7 +2175,7 @@ public void ArchiveReviewRequest(int reviewId) FROM FrameworkCollaborators WHERE (FrameworkID = FW.ID) AND (IsDeleted=0)))) AS MyFrameworksCount, - (SELECT COUNT(*) FROM SelfAssessments) AS CompetencyAssessmentCount, + (SELECT COUNT(*) FROM SelfAssessments) AS RoleProfileCount, (SELECT COUNT(*) FROM SelfAssessments AS RP LEFT OUTER JOIN SelfAssessmentCollaborators AS RPC ON RPC.SelfAssessmentID = RP.ID AND RPC.AdminID = @adminId @@ -2183,7 +2183,7 @@ FROM FrameworkCollaborators (@adminId IN (SELECT AdminID FROM SelfAssessmentCollaborators - WHERE (SelfAssessmentID = RP.ID)))) AS MyCompetencyAssessmentCount", + WHERE (SelfAssessmentID = RP.ID)))) AS MyRoleProfileCount", new { adminId } ).FirstOrDefault(); } @@ -2193,7 +2193,7 @@ public IEnumerable GetDashboardToDoItems(int adminId) return connection.Query( @"SELECT FW.ID AS FrameworkID, - 0 AS CompetencyAssessmentID, + 0 AS RoleProfileID, FW.FrameworkName AS ItemName, AU.Forename + ' ' + AU.Surname + (CASE WHEN AU.Active = 1 THEN '' ELSE ' (Inactive)' END) AS RequestorName, FWR.SignOffRequired, diff --git a/DigitalLearningSolutions.Web/Controllers/FrameworksController/ImportCompetencies.cs b/DigitalLearningSolutions.Web/Controllers/FrameworksController/ImportCompetencies.cs index db170f5db1..752befe216 100644 --- a/DigitalLearningSolutions.Web/Controllers/FrameworksController/ImportCompetencies.cs +++ b/DigitalLearningSolutions.Web/Controllers/FrameworksController/ImportCompetencies.cs @@ -245,9 +245,23 @@ public IActionResult ImportSummarySubmit() var workbook = new XLWorkbook(filePath); var results = importCompetenciesFromFileService.ProcessCompetenciesFromFile(workbook, adminId, data.FrameworkId, data.FrameworkVocubulary, data.ReorderCompetenciesOption, data.AddAssessmentQuestionsOption, data.AddCustomAssessmentQuestion ? (int)data.CustomAssessmentQuestionID : 0, data.AddDefaultAssessmentQuestions ? data.DefaultQuestionIDs : []); data.ImportCompetenciesResult = results; + //TO DO apply ordering changes if required: + if (data.ReorderCompetenciesOption == 2 && data.CompetenciesToReorderCount > 0) + { + + } setBulkUploadData(data); return RedirectToAction("UploadResults", "Frameworks", new { frameworkId = data.FrameworkId, tabname = data.TabName }); } + [Route("/Framework/{frameworkId}/{tabname}/Import/Results")] + public IActionResult UploadResults() + { + var data = GetBulkUploadData(); + FileHelper.DeleteFile(webHostEnvironment, data.CompetenciesFileName); + TempData.Clear(); + var model = new ImportCompetenciesResultsViewModel(data.ImportCompetenciesResult, data.FrameworkId, data.FrameworkName, data.FrameworkVocubulary); + return View("Developer/Import/UploadResults", model); + } [Route("CancelImport")] public IActionResult CancelImport() { diff --git a/DigitalLearningSolutions.Web/Services/FrameworkService.cs b/DigitalLearningSolutions.Web/Services/FrameworkService.cs index e8768bc6e8..74bbde1d0f 100644 --- a/DigitalLearningSolutions.Web/Services/FrameworkService.cs +++ b/DigitalLearningSolutions.Web/Services/FrameworkService.cs @@ -119,14 +119,12 @@ bool zeroBased int InsertCompetencyGroup(string groupName, string? groupDescription, int adminId, int? frameworkId = null); - int InsertFrameworkCompetency(int competencyId, int? frameworkCompetencyGroupID, int adminId, int frameworkId, bool alwaysShowDescription = false); int InsertFrameworkCompetency(int competencyId, int? frameworkCompetencyGroupID, int adminId, int frameworkId, bool alwaysShowDescription = false); IEnumerable GetAllCompetenciesForAdminId(string name, int adminId); int InsertCompetency(string name, string? description, int adminId); - int InsertFrameworkCompetencyGroup(int groupId, int frameworkID, int adminId); int InsertFrameworkCompetencyGroup(int groupId, int frameworkID, int adminId); int AddCollaboratorToFramework(int frameworkId, string userEmail, bool canModify, int? centreID); diff --git a/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs b/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs index 0c974a44eb..d890514318 100644 --- a/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs +++ b/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs @@ -20,7 +20,6 @@ public interface IImportCompetenciesFromFileService byte[] GetCompetencyFileForFramework(int frameworkId, bool isBlank, string vocabulary); public ImportCompetenciesResult PreProcessCompetenciesTable(IXLWorkbook workbook, string vocabulary, int frameworkId); public ImportCompetenciesResult ProcessCompetenciesFromFile(IXLWorkbook workbook, int adminUserId, int frameworkId, string vocabulary, int reorderCompetenciesOption, int addAssessmentQuestionsOption, int customAssessmentQuestionID, List defaultQuestionIds); - public ImportCompetenciesResult ProcessCompetenciesFromFile(IXLWorkbook workbook, int adminUserId, int frameworkId, string vocabulary, int reorderCompetenciesOption, int addAssessmentQuestionsOption, int customAssessmentQuestionID, List defaultQuestionIds); } public class ImportCompetenciesFromFileService : IImportCompetenciesFromFileService { @@ -72,12 +71,11 @@ private void PreProcessCompetencyRow(CompetencyTableRow competencyRow, List competencyRow.Validate(); } public ImportCompetenciesResult ProcessCompetenciesFromFile(IXLWorkbook workbook, int adminUserId, int frameworkId, string vocabulary, int reorderCompetenciesOption, int addAssessmentQuestionsOption, int customAssessmentQuestionID, List defaultQuestionIds) - public ImportCompetenciesResult ProcessCompetenciesFromFile(IXLWorkbook workbook, int adminUserId, int frameworkId, string vocabulary, int reorderCompetenciesOption, int addAssessmentQuestionsOption, int customAssessmentQuestionID, List defaultQuestionIds) { int maxFrameworkCompetencyId = frameworkService.GetMaxFrameworkCompetencyID(); int maxFrameworkCompetencyGroupId = frameworkService.GetMaxFrameworkCompetencyGroupID(); var table = OpenCompetenciesTable(workbook, vocabulary); - return ProcessCompetenciesTable(table, adminUserId, frameworkId, maxFrameworkCompetencyId, maxFrameworkCompetencyGroupId, addAssessmentQuestionsOption, customAssessmentQuestionID, defaultQuestionIds); + return ProcessCompetenciesTable(table, adminUserId, frameworkId, maxFrameworkCompetencyId, maxFrameworkCompetencyGroupId, addAssessmentQuestionsOption, reorderCompetenciesOption, customAssessmentQuestionID, defaultQuestionIds); } internal IXLTable OpenCompetenciesTable(IXLWorkbook workbook, string vocabulary) { @@ -94,7 +92,7 @@ internal IXLTable OpenCompetenciesTable(IXLWorkbook workbook, string vocabulary) } return table; } - internal ImportCompetenciesResult ProcessCompetenciesTable(IXLTable table, int adminUserId, int frameworkId, int maxFrameworkCompetencyId, int maxFrameworkCompetencyGroupId, int addAssessmentQuestionsOption, int customAssessmentQuestionID, List defaultQuestionIds) + internal ImportCompetenciesResult ProcessCompetenciesTable(IXLTable table, int adminUserId, int frameworkId, int maxFrameworkCompetencyId, int maxFrameworkCompetencyGroupId, int addAssessmentQuestionsOption, int reorderCompetenciesOption, int customAssessmentQuestionID, List defaultQuestionIds) { var competenciesRows = table.Rows().Skip(1).Select(row => new CompetencyTableRow(table, row)).ToList(); int rowCount = 0; @@ -122,7 +120,7 @@ internal ImportCompetenciesResult ProcessCompetenciesTable(IXLTable table, int a .Count(); foreach (var competencyRow in competenciesRows) { - maxFrameworkCompetencyGroupId = ProcessCompetencyRow(adminUserId, frameworkId, maxFrameworkCompetencyId, maxFrameworkCompetencyGroupId, addAssessmentQuestionsOption, customAssessmentQuestionID, defaultQuestionIds, competencyRow); + maxFrameworkCompetencyGroupId = ProcessCompetencyRow(adminUserId, frameworkId, maxFrameworkCompetencyId, maxFrameworkCompetencyGroupId, addAssessmentQuestionsOption, reorderCompetenciesOption, customAssessmentQuestionID, defaultQuestionIds, competencyRow); } // Check for changes to competency group order and apply them if appropriate: if (reorderCompetenciesOption == 2) @@ -161,6 +159,7 @@ private int ProcessCompetencyRow( int maxFrameworkCompetencyId, int maxFrameworkCompetencyGroupId, int addAssessmentQuestionsOption, + int reorderCompetenciesOption, int customAssessmentQuestionID, List defaultQuestionIds, CompetencyTableRow competencyRow @@ -170,10 +169,10 @@ CompetencyTableRow competencyRow { return maxFrameworkCompetencyGroupId; } - int newCompetencyGroupId = 0; int newCompetencyId = 0; + int newFrameworkCompetencyId = 0; //If competency group is set, check if competency group exists within framework and add if not and get the Framework Competency Group ID - int ? frameworkCompetencyGroupId = null; + int? frameworkCompetencyGroupId = null; if (competencyRow.CompetencyGroup != null) { newCompetencyGroupId = frameworkService.InsertCompetencyGroup(competencyRow.CompetencyGroup, competencyRow.GroupDescription, adminUserId); @@ -194,10 +193,10 @@ CompetencyTableRow competencyRow if (frameworkCompetency != null) { newCompetencyId = frameworkCompetency.CompetencyID; - if (frameworkCompetency.Name != competencyRow.Competency || frameworkCompetency.Description != competencyRow.CompetencyDescription || frameworkCompetency.AlwaysShowDescription != competencyRow.AlwaysShowDescription ) + if (frameworkCompetency.Name != competencyRow.Competency || frameworkCompetency.Description != competencyRow.CompetencyDescription || frameworkCompetency.AlwaysShowDescription != competencyRow.AlwaysShowDescription) { frameworkService.UpdateFrameworkCompetency((int)competencyRow.ID, competencyRow.Competency, competencyRow.CompetencyDescription, adminUserId, competencyRow.AlwaysShowDescription ?? false); - competencyRow.RowStatus = (competencyRow.RowStatus == RowStatus.CompetencyGroupInserted ? RowStatus.CompetencyGroupAndCompetencyUpdated: RowStatus.CompetencyUpdated); + competencyRow.RowStatus = (competencyRow.RowStatus == RowStatus.CompetencyGroupInserted ? RowStatus.CompetencyGroupAndCompetencyUpdated : RowStatus.CompetencyUpdated); } else { @@ -211,7 +210,7 @@ CompetencyTableRow competencyRow newCompetencyId = frameworkService.InsertCompetency(competencyRow.Competency, competencyRow.CompetencyDescription, adminUserId); if (newCompetencyId > 0) { - var newFrameworkCompetencyId = frameworkService.InsertFrameworkCompetency(newCompetencyId, frameworkCompetencyGroupId, adminUserId, frameworkId, competencyRow.AlwaysShowDescription ?? false); //including always show desc flag + newFrameworkCompetencyId = frameworkService.InsertFrameworkCompetency(newCompetencyId, frameworkCompetencyGroupId, adminUserId, frameworkId, competencyRow.AlwaysShowDescription ?? false); //including always show desc flag if (newFrameworkCompetencyId > maxFrameworkCompetencyId) { competencyRow.RowStatus = (competencyRow.RowStatus == RowStatus.CompetencyGroupInserted ? RowStatus.CompetencyGroupAndCompetencyInserted : RowStatus.CompetencyInserted); @@ -225,11 +224,12 @@ CompetencyTableRow competencyRow // If flags are supplied, add them: - if (competencyRow.FlagsCsv != null) + if (!string.IsNullOrWhiteSpace(competencyRow.FlagsCsv.Trim())) { var flags = competencyRow.FlagsCsv.Split(','); - int[] flagIds = []; - foreach (var flag in flags) { + var flagIds = new List(); + foreach (var flag in flags) + { int flagId = 0; var frameworkFlags = frameworkService.GetCompetencyFlagsByFrameworkId(frameworkId, null, null); if (frameworkFlags.Any()) @@ -239,6 +239,7 @@ CompetencyTableRow competencyRow if (frameworkFlag.FlagName == flag) { flagId = frameworkFlag.FlagId; + break; } } } @@ -246,30 +247,56 @@ CompetencyTableRow competencyRow { flagId = frameworkService.AddCustomFlagToFramework(frameworkId, flag, "Flag", "nhsuk-tag--white"); } - flagIds.Append(flagId); + flagIds.Add(flagId); } - if (flagIds.Any()) { - frameworkService.UpdateCompetencyFlags(frameworkId, newCompetencyId, flagIds); + if (flagIds.Count > 0) + { + var updated = frameworkService.UpdateCompetencyFlags(frameworkId, newCompetencyId, [.. flagIds]); + if (updated > 0 && competencyRow.RowStatus == RowStatus.Skipped) + { + competencyRow.RowStatus = RowStatus.CompetencyUpdated; + } } } + // Reorder competencies if required: + if (reorderCompetenciesOption == 2) + { + var frameworkCompetencyId = (int)competencyRow.ID; + var frameworkCompetency = frameworkService.GetFrameworkCompetencyById(frameworkCompetencyId); + var placesToMove = Math.Abs(frameworkCompetency.Ordering - competencyRow.CompetencyOrderNumber); + + if (placesToMove > 0) + { + var direction = frameworkCompetency.Ordering > competencyRow.CompetencyOrderNumber ? "UP" : "DOWN"; + + for (int i = 0; i < placesToMove; i++) + { + frameworkService.MoveFrameworkCompetency(frameworkCompetencyId, true, direction); + } + + competencyRow.Reordered = true; + } + } // Add assessment questions if necessary: if (defaultQuestionIds.Count > 0 | customAssessmentQuestionID > 0) { if (competencyRow.RowStatus == RowStatus.CompetencyInserted | competencyRow.RowStatus == RowStatus.CompetencyGroupAndCompetencyInserted || addAssessmentQuestionsOption == 2 && competencyRow.RowStatus == RowStatus.CompetencyUpdated | competencyRow.RowStatus == RowStatus.CompetencyGroupAndCompetencyUpdated || addAssessmentQuestionsOption == 3) { - foreach(var id in defaultQuestionIds) + foreach (var id in defaultQuestionIds) { - frameworkService.AddCompetencyAssessmentQuestion((int)competencyRow.ID, id, adminUserId); + frameworkService.AddCompetencyAssessmentQuestion(competencyRow.ID ?? newFrameworkCompetencyId, id, adminUserId); } - if(customAssessmentQuestionID > 0) + if (customAssessmentQuestionID > 0) { - frameworkService.AddCompetencyAssessmentQuestion((int)competencyRow.ID, customAssessmentQuestionID, adminUserId); + frameworkService.AddCompetencyAssessmentQuestion(competencyRow.ID ?? newFrameworkCompetencyId, customAssessmentQuestionID, adminUserId); } } } + + return maxFrameworkCompetencyGroupId; } From 7fbf4415d1fe76ae7fb2d64460236f71bfa09795 Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Thu, 30 Jan 2025 11:21:40 +0000 Subject: [PATCH 16/36] TD-480 Implements create assessment controller and service --- .../Views/CompetencyAssessments/Name.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Name.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Name.cshtml index 93fb40d442..5fc840dba4 100644 --- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Name.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Name.cshtml @@ -8,7 +8,7 @@ @section NavMenuItems { } -@if ((string)ViewContext.RouteData.Values["actionName"] == "New") + @if ((string)ViewContext.RouteData.Values["actionname"] == "New") { @section NavBreadcrumbs { } +

@ViewData["Title"]

+ + +
+ +

+ + @(Model.PublishStatusID == 1 ? "Draft" : Model.PublishStatusID == 2 ? "In review" : "Published") + + @Model.CompetencyAssessmentName  + Edit  name + +

+
  • From 0f0354737b62bb0939cd5a460f36c64d46d3f256 Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Wed, 5 Feb 2025 16:26:53 +0000 Subject: [PATCH 22/36] Update ManageCompetencyAssessment.cshtml --- .../ManageCompetencyAssessment.cshtml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml index ea333d2bad..6577757b40 100644 --- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml @@ -1,7 +1,7 @@ @using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments @model ManageCompetencyAssessmentViewModel @{ - ViewData["Title"] = "Manage Competency Assessment"; + ViewData["Title"] = Model.PublishStatusID == 3 ? "Manage" : "Create" + " competency assessment"; ViewData["Application"] = "Framework Service"; } @@ -26,8 +26,6 @@

    @ViewData["Title"]

    - -

    @@ -53,7 +51,7 @@

  • - Define assessment introductory description + Provide assessment introductory description
    @@ -83,7 +81,7 @@
  • - Define working group (contributors and reviewers) + Assign working group (contributors and reviewers)
    From d1646faae0d6a49ac6a267b61f5cb06f949012c0 Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Tue, 11 Feb 2025 16:14:35 +0000 Subject: [PATCH 23/36] Fixes routing of cancel button on edit name page --- .../Views/CompetencyAssessments/Name.cshtml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Name.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Name.cshtml index 9bf5c7130a..69feaf3825 100644 --- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Name.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Name.cshtml @@ -29,10 +29,10 @@ else
    1. Competency Assessments
      2. -
    2. Manage Competency Assessment
      3. +
    3. Manage Competency Assessment
    4. Name
    -

    Back to competency assessment detail

    +

    Back to competency assessment detail

    } @@ -97,7 +97,7 @@ else Save
    - + From 4abf026c0ba579eca6091ee7977f1840159dd5e5 Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Tue, 11 Feb 2025 16:21:03 +0000 Subject: [PATCH 24/36] Uses borderless summary list to disply name and status --- .../ManageCompetencyAssessment.cshtml | 35 ++++++++++++++----- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml index 6577757b40..2cd4e0cb3c 100644 --- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml @@ -27,16 +27,33 @@

    @ViewData["Title"]

    +
    -

    - - @(Model.PublishStatusID == 1 ? "Draft" : Model.PublishStatusID == 2 ? "In review" : "Published") - - @Model.CompetencyAssessmentName  - Edit  name - -

    - +
    +
    + Assessment name +
    +
    + @Model.CompetencyAssessmentName +
    +
    + + Change assessment name + +
    +
    +
    +
    + Publish status +
    +
    + + @(Model.PublishStatusID == 1 ? "Draft" : Model.PublishStatusID == 2 ? "In review" : "Published") + +
    +
    +
    +
    • From d79749e0546e89cc227a00780e9bc9cf8117045b Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Thu, 13 Feb 2025 14:46:57 +0000 Subject: [PATCH 25/36] post rebase merge conflict fix --- .../Services/ImportCompetenciesFromFileService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs b/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs index d890514318..45828f985f 100644 --- a/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs +++ b/DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs @@ -175,7 +175,7 @@ CompetencyTableRow competencyRow int? frameworkCompetencyGroupId = null; if (competencyRow.CompetencyGroup != null) { - newCompetencyGroupId = frameworkService.InsertCompetencyGroup(competencyRow.CompetencyGroup, competencyRow.GroupDescription, adminUserId); + var newCompetencyGroupId = frameworkService.InsertCompetencyGroup(competencyRow.CompetencyGroup, competencyRow.GroupDescription, adminUserId); if (newCompetencyGroupId > 0) { frameworkCompetencyGroupId = frameworkService.InsertFrameworkCompetencyGroup(newCompetencyGroupId, frameworkId, adminUserId); From d69cbcab4bf788dfcdd1b3ec083ccc3b3ee2c4b4 Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Thu, 13 Feb 2025 14:57:02 +0000 Subject: [PATCH 26/36] Post rebase fixes --- .../DataServices/FrameworkDataService.cs | 10 +++++----- .../Views/Frameworks/Index.cshtml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs b/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs index c77f818901..125a66aaca 100644 --- a/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs @@ -2175,7 +2175,7 @@ public void ArchiveReviewRequest(int reviewId) FROM FrameworkCollaborators WHERE (FrameworkID = FW.ID) AND (IsDeleted=0)))) AS MyFrameworksCount, - (SELECT COUNT(*) FROM SelfAssessments) AS RoleProfileCount, + (SELECT COUNT(*) FROM SelfAssessments) AS CompetencyAssessmentCount, (SELECT COUNT(*) FROM SelfAssessments AS RP LEFT OUTER JOIN SelfAssessmentCollaborators AS RPC ON RPC.SelfAssessmentID = RP.ID AND RPC.AdminID = @adminId @@ -2183,7 +2183,7 @@ FROM FrameworkCollaborators (@adminId IN (SELECT AdminID FROM SelfAssessmentCollaborators - WHERE (SelfAssessmentID = RP.ID)))) AS MyRoleProfileCount", + WHERE (SelfAssessmentID = RP.ID)))) AS MyCompetencyAssessmentCount", new { adminId } ).FirstOrDefault(); } @@ -2193,7 +2193,7 @@ public IEnumerable GetDashboardToDoItems(int adminId) return connection.Query( @"SELECT FW.ID AS FrameworkID, - 0 AS RoleProfileID, + 0 AS SelfAssessmentID, FW.FrameworkName AS ItemName, AU.Forename + ' ' + AU.Surname + (CASE WHEN AU.Active = 1 THEN '' ELSE ' (Inactive)' END) AS RequestorName, FWR.SignOffRequired, @@ -2205,8 +2205,8 @@ FROM FrameworkReviews AS FWR WHERE (FWC.AdminID = @adminId) AND (FWR.ReviewComplete IS NULL) AND (FWR.Archived IS NULL) UNION ALL SELECT - 0 AS SelfAssessmentID, - RP.ID AS SelfAssessmentID, + 0 AS FrameworkID, + RP.ID AS CompetencyAssessmentID, RP.Name AS ItemName, AU.Forename + ' ' + AU.Surname + (CASE WHEN AU.Active = 1 THEN '' ELSE ' (Inactive)' END) AS RequestorName, RPR.SignOffRequired, diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Index.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Index.cshtml index f9d417a93b..0af30031c3 100644 --- a/DigitalLearningSolutions.Web/Views/Frameworks/Index.cshtml +++ b/DigitalLearningSolutions.Web/Views/Frameworks/Index.cshtml @@ -31,7 +31,7 @@
      -

      +

      @Model.DashboardData.FrameworksCount Frameworks

        @@ -48,7 +48,7 @@
      • -

        +

        @Model.DashboardData.CompetencyAssessmentCount Competency Assessments

          From 9ae33a7a1059944fd3e580742b7c4084de2dd2a8 Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Thu, 13 Feb 2025 15:08:33 +0000 Subject: [PATCH 27/36] Post rebase fix --- .../Views/CompetencyAssessments/_MyCompetencyAssessments.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/_MyCompetencyAssessments.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/_MyCompetencyAssessments.cshtml index 3d15e24c08..44b6bb9b67 100644 --- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/_MyCompetencyAssessments.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/_MyCompetencyAssessments.cshtml @@ -23,7 +23,7 @@ else } @if (Model.IsWorkforceManager) { - + Create new competency assessment } From ab4d827479bae1549d6517aa0ed77077dd84af96 Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Fri, 14 Feb 2025 17:04:53 +0000 Subject: [PATCH 28/36] TD-482 Implements Edit Description MVC form --- .../CompetencyAssessmentDataService.cs | 18 ++++++ .../CompetencyAssessments.cs | 46 ++++++++++---- .../Services/CompetencyAssessmentService.cs | 11 +++- .../EditDescriptionViewModel.cs | 22 +++++++ .../EditDescription.cshtml | 62 +++++++++++++++++++ 5 files changed, 147 insertions(+), 12 deletions(-) create mode 100644 DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/EditDescriptionViewModel.cs create mode 100644 DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditDescription.cshtml diff --git a/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs b/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs index db51ab8eee..40487857e1 100644 --- a/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs @@ -38,6 +38,7 @@ int adminId ); bool UpdateCompetencyAssessmentVocabulary(int competencyAssessmentId, int adminId, string vocabulary); bool UpdateCompetencyAssessmentDescription(int competencyAssessmentId, int adminId, string competencyAssessmentDescription); + bool UpdateIntroductoryTextTaskStatus(int assessmentId, bool taskStatus); //INSERT DATA int InsertCompetencyAssessment(int adminId, int centreId, string competencyAssessmentName); bool InsertSelfAssessmentFramework(int adminId, int selfAssessmentId, int frameworkId); @@ -349,5 +350,22 @@ FROM SelfAssessmentTaskStatus ).Single(); } + public bool UpdateIntroductoryTextTaskStatus(int assessmentId, bool taskStatus) + { + var numberOfAffectedRows = connection.Execute( + @"UPDATE SelfAssessmentTaskStatus SET IntroductoryTextTaskStatus = @taskStatus + WHERE SelfAssessmentId = @assessmentId", + new { assessmentId, taskStatus } + ); + if (numberOfAffectedRows < 1) + { + logger.LogWarning( + "Not updating IntroductoryTextTaskStatus as db update failed. " + + $"assessmentId: {assessmentId}, taskStatus: {taskStatus}" + ); + return false; + } + return true; + } } } diff --git a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs index 58fc9a890e..5cf75419e3 100644 --- a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs +++ b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs @@ -5,9 +5,6 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using DigitalLearningSolutions.Web.Extensions; - using DigitalLearningSolutions.Data.Models.SessionData.CompetencyAssessments; - using Microsoft.AspNetCore.Http; - using System; using System.Collections.Generic; using DigitalLearningSolutions.Data.Enums; using DigitalLearningSolutions.Web.Attributes; @@ -15,7 +12,6 @@ public partial class CompetencyAssessmentsController { - private const string CookieName = "DLSFrameworkService"; [Route("/CompetencyAssessments/View/{tabname}/{page=1:int}")] [SetSelectedTab(nameof(NavMenuTab.CompetencyAssessments))] public IActionResult ViewCompetencyAssessments(string tabname, string? searchString = null, @@ -208,10 +204,7 @@ public IActionResult CompetencyAssessmentProfessionalGroup(string actionName, in } else { - SessionNewCompetencyAssessment sessionNewCompetencyAssessment = TempData.Peek(); - TempData.Set(sessionNewCompetencyAssessment); - competencyAssessmentBase = sessionNewCompetencyAssessment.CompetencyAssessmentBase; - TempData.Set(sessionNewCompetencyAssessment); + competencyAssessmentBase = competencyAssessmentService.GetCompetencyAssessmentBaseById(competencyAssessmentId, adminId); } var professionalGroups = competencyAssessmentService.GetNRPProfessionalGroups(); var model = new ProfessionalGroupViewModel() @@ -237,9 +230,8 @@ public IActionResult SaveProfessionalGroup(CompetencyAssessmentBase competencyAs } if (actionName == "New") { - SessionNewCompetencyAssessment sessionNewCompetencyAssessment = TempData.Peek(); - sessionNewCompetencyAssessment.CompetencyAssessmentBase = competencyAssessmentBase; - TempData.Set(sessionNewCompetencyAssessment); + //TO DO Store to self assessment + return RedirectToAction("CompetencyAssessmentSubGroup", "CompetencyAssessments", new { actionName }); } else @@ -264,5 +256,37 @@ public IActionResult CompetencyAssessmentSubGroup(string actionName, int compete { return View("SubGroup"); } + + [Route("/CompetencyAssessments/{competencyAssessmentId}/Description/")] + public IActionResult EditDescription(int competencyAssessmentId) + { + var adminId = GetAdminID(); + CompetencyAssessmentBase? competencyAssessmentBase = competencyAssessmentService.GetCompetencyAssessmentBaseById(competencyAssessmentId, adminId); + if (competencyAssessmentBase == null) + { + logger.LogWarning($"Failed to load description page for competencyAssessmentId: {competencyAssessmentId} adminId: {adminId}"); + return StatusCode(500); + } + if (competencyAssessmentBase.UserRole < 2) + { + return StatusCode(403); + } + var competencyAssessmentTaskStatus = competencyAssessmentService.GetCompetencyAssessmentTaskStatus(competencyAssessmentId, null); + var model = new EditDescriptionViewModel(competencyAssessmentBase, competencyAssessmentTaskStatus.IntroductoryTextTaskStatus); + return View(model); + } + [HttpPost] + [Route("/CompetencyAssessments/{competencyAssessmentId}/Description/")] + public IActionResult SaveDescription(EditDescriptionViewModel model) + { + if (!ModelState.IsValid) + { + return View("EditDescription", model); + } + var adminId = GetAdminID(); + var isUpdated = competencyAssessmentService.UpdateCompetencyAssessmentDescription(model.ID, adminId, model.Description); + competencyAssessmentService.UpdateIntroductoryTextTaskStatus(model.ID, model.TaskStatus ?? false); + return RedirectToAction("ManageCompetencyAssessment", new { competencyAssessmentId = model.ID }); + } } } diff --git a/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs b/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs index 4df6ffd173..4b0dd85d19 100644 --- a/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs +++ b/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs @@ -23,10 +23,11 @@ public interface ICompetencyAssessmentService bool UpdateCompetencyAssessmentName(int competencyAssessmentId, int adminId, string competencyAssessmentName); bool UpdateCompetencyAssessmentProfessionalGroup(int competencyAssessmentId, int adminId, int? nrpProfessionalGroupID); + bool UpdateIntroductoryTextTaskStatus(int assessmentId, bool taskStatus); //INSERT DATA int InsertCompetencyAssessment(int adminId, int centreId, string competencyAssessmentName, int? frameworkId); - + bool UpdateCompetencyAssessmentDescription(int iD, int adminId, string description); } public class CompetencyAssessmentService : ICompetencyAssessmentService { @@ -90,5 +91,13 @@ public CompetencyAssessmentTaskStatus GetCompetencyAssessmentTaskStatus(int asse { return competencyAssessmentDataService.GetOrInsertAndReturnAssessmentTaskStatus(assessmentId, (frameworkId != null)); } + public bool UpdateCompetencyAssessmentDescription(int competencyAssessmentId, int adminId, string description) + { + return competencyAssessmentDataService.UpdateCompetencyAssessmentDescription(competencyAssessmentId, adminId, description); + } + public bool UpdateIntroductoryTextTaskStatus(int assessmentId, bool taskStatus) + { + return competencyAssessmentDataService.UpdateIntroductoryTextTaskStatus(assessmentId, taskStatus); + } } } diff --git a/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/EditDescriptionViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/EditDescriptionViewModel.cs new file mode 100644 index 0000000000..fcb36e370f --- /dev/null +++ b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/EditDescriptionViewModel.cs @@ -0,0 +1,22 @@ +using DigitalLearningSolutions.Data.Models.CompetencyAssessments; + +namespace DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments +{ + public class EditDescriptionViewModel + { + public EditDescriptionViewModel() { } + public EditDescriptionViewModel(CompetencyAssessmentBase competencyAssessmentBase, bool? taskStatus) + { + ID = competencyAssessmentBase.ID; + CompetencyAssessmentName = competencyAssessmentBase.CompetencyAssessmentName; + Description = competencyAssessmentBase.Description; + UserRole = competencyAssessmentBase.UserRole; + TaskStatus = taskStatus; + } + public int ID { get; set; } + public string CompetencyAssessmentName { get; set; } = string.Empty; + public string? Description { get; set; } + public int UserRole { get; set; } + public bool? TaskStatus { get; set; } + } +} diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditDescription.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditDescription.cshtml new file mode 100644 index 0000000000..bbb9bda1ba --- /dev/null +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditDescription.cshtml @@ -0,0 +1,62 @@ +@using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments +@model EditDescriptionViewModel; +@{ + ViewData["Title"] = "Edit Introductory Text"; + ViewData["Application"] = "Framework Service"; +} + + +@section NavMenuItems { + +} + +@section NavBreadcrumbs { + +} + +

          Edit @Model.CompetencyAssessmentName introductory text

          +
          + @if (!ViewData.ModelState.IsValid) + { + + } + + + + + + + + + + +
          + + + Cancel + +
          + +@section scripts { + +} From eab0c2a58393b2d2998ce19cbaba638239169288 Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Fri, 14 Feb 2025 17:05:37 +0000 Subject: [PATCH 29/36] IDE formatter changes --- .../DataServices/CompetencyAssessmentDataService.cs | 4 ++-- .../Services/CompetencyAssessmentService.cs | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs b/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs index 40487857e1..c82258d84a 100644 --- a/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs @@ -253,7 +253,7 @@ public bool UpdateCompetencyAssessmentBranding( int adminId ) { - if ((competencyAssessmentId < 1) | (brandId < 1) | (categoryId < 1) | (adminId < 1)) + if ((competencyAssessmentId < 1) | (brandId < 1) | (categoryId < 1) | (adminId < 1)) { logger.LogWarning( $"Not updating competency assessment as it failed server side validation. competencyAssessmentId: {competencyAssessmentId}, brandId: {brandId}, categoryId: {categoryId}, AdminId: {adminId}" @@ -348,7 +348,7 @@ FROM SelfAssessmentTaskStatus WHERE (SelfAssessmentId = @assessmentId)", new { assessmentId } ).Single(); - + } public bool UpdateIntroductoryTextTaskStatus(int assessmentId, bool taskStatus) { diff --git a/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs b/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs index 4b0dd85d19..10dfdb1207 100644 --- a/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs +++ b/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs @@ -65,10 +65,11 @@ public IEnumerable GetCompetencyAssessmentsForAdminId(int public int InsertCompetencyAssessment(int adminId, int centreId, string competencyAssessmentName, int? frameworkId) { var assessmentId = competencyAssessmentDataService.InsertCompetencyAssessment(adminId, centreId, competencyAssessmentName); - if(assessmentId > 0 && frameworkId != null) + if (assessmentId > 0 && frameworkId != null) { var framework = frameworkDataService.GetBrandedFrameworkByFrameworkId((int)frameworkId, adminId); - if (framework != null) { + if (framework != null) + { competencyAssessmentDataService.InsertSelfAssessmentFramework(adminId, assessmentId, framework.ID); competencyAssessmentDataService.UpdateCompetencyAssessmentDescription(adminId, assessmentId, framework.Description); competencyAssessmentDataService.UpdateCompetencyAssessmentBranding(assessmentId, (int)framework.BrandID, (int)framework.CategoryID, adminId); From 833fe0aacb1a696fec37424d839152151d5cd1e2 Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Tue, 25 Feb 2025 12:58:32 +0000 Subject: [PATCH 30/36] TD-5308 Implements assessment provider and category page --- .../CompetencyAssessmentDataService.cs | 48 +++++++++-- .../CompetencyAssessment.cs | 6 ++ .../CompetencyAssessmentBase.cs | 2 +- .../CompetencyAssessments.cs | 53 +++++++++++- .../Services/CompetencyAssessmentService.cs | 27 +++++- .../EditBrandingViewModel.cs | 33 ++++++++ .../CompetencyAssessments/EditBranding.cshtml | 82 +++++++++++++++++++ .../EditDescription.cshtml | 2 +- .../ManageCompetencyAssessment.cshtml | 4 +- 9 files changed, 238 insertions(+), 19 deletions(-) create mode 100644 DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/EditBrandingViewModel.cs create mode 100644 DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditBranding.cshtml diff --git a/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs b/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs index c82258d84a..2a3347a146 100644 --- a/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs @@ -20,8 +20,8 @@ public interface ICompetencyAssessmentDataService CompetencyAssessmentBase? GetCompetencyAssessmentBaseById(int competencyAssessmentId, int adminId); - CompetencyAssessmentBase? GetCompetencyAssessmentByName(string competencyAssessmentName, int adminId); - + CompetencyAssessmentBase? GetCompetencyAssessmentBaseByName(string competencyAssessmentName, int adminId); + CompetencyAssessment? GetCompetencyAssessmentById(int competencyAssessmentId, int adminId); IEnumerable GetNRPProfessionalGroups(); CompetencyAssessmentTaskStatus GetOrInsertAndReturnAssessmentTaskStatus(int assessmentId, bool frameworkBased); @@ -32,13 +32,14 @@ public interface ICompetencyAssessmentDataService bool UpdateCompetencyAssessmentProfessionalGroup(int competencyAssessmentId, int adminId, int? nrpProfessionalGroupID); bool UpdateCompetencyAssessmentBranding( int competencyAssessmentId, + int adminId, int brandId, - int categoryId, - int adminId + int categoryId ); bool UpdateCompetencyAssessmentVocabulary(int competencyAssessmentId, int adminId, string vocabulary); bool UpdateCompetencyAssessmentDescription(int competencyAssessmentId, int adminId, string competencyAssessmentDescription); bool UpdateIntroductoryTextTaskStatus(int assessmentId, bool taskStatus); + bool UpdateBrandingTaskStatus(int assessmentId, bool taskStatus); //INSERT DATA int InsertCompetencyAssessment(int adminId, int centreId, string competencyAssessmentName); bool InsertSelfAssessmentFramework(int adminId, int selfAssessmentId, int frameworkId); @@ -56,10 +57,13 @@ public class CompetencyAssessmentDataService : ICompetencyAssessmentDataService 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"; private const string SelfAssessmentFields = - @", sa.CreatedDate, + @", sa.CategoryID, sa.CreatedDate, (SELECT BrandName FROM Brands WHERE (BrandID = sa.BrandID)) AS Brand, + (SELECT CategoryName + FROM CourseCategories + WHERE (CourseCategoryID = sa.CategoryID)) AS Category, (SELECT [Name] FROM SelfAssessments AS sa2 WHERE (ID = sa.ParentSelfAssessmentID)) AS ParentSelfAssessment, @@ -210,7 +214,7 @@ ORDER BY ProfessionalGroup" ); } - public CompetencyAssessmentBase? GetCompetencyAssessmentByName(string competencyAssessmentName, int adminId) + public CompetencyAssessmentBase? GetCompetencyAssessmentBaseByName(string competencyAssessmentName, int adminId) { return connection.Query( $@"SELECT {SelfAssessmentBaseFields} @@ -248,9 +252,9 @@ public bool UpdateCompetencyAssessmentProfessionalGroup(int competencyAssessment } public bool UpdateCompetencyAssessmentBranding( int competencyAssessmentId, + int adminId, int brandId, - int categoryId, - int adminId + int categoryId ) { if ((competencyAssessmentId < 1) | (brandId < 1) | (categoryId < 1) | (adminId < 1)) @@ -367,5 +371,33 @@ public bool UpdateIntroductoryTextTaskStatus(int assessmentId, bool taskStatus) } return true; } + + public CompetencyAssessment? GetCompetencyAssessmentById(int competencyAssessmentId, int adminId) + { + return connection.Query( + $@"SELECT {SelfAssessmentBaseFields} {SelfAssessmentFields} + FROM {SelfAssessmentBaseTables} {SelfAssessmentTables} + WHERE (sa.ID = @competencyAssessmentId)", + new { competencyAssessmentId, adminId } + ).FirstOrDefault(); + } + + public bool UpdateBrandingTaskStatus(int assessmentId, bool taskStatus) + { + var numberOfAffectedRows = connection.Execute( + @"UPDATE SelfAssessmentTaskStatus SET BrandingTaskStatus = @taskStatus + WHERE SelfAssessmentId = @assessmentId", + new { assessmentId, taskStatus } + ); + if (numberOfAffectedRows < 1) + { + logger.LogWarning( + "Not updating BrandingTaskStatus as db update failed. " + + $"assessmentId: {assessmentId}, taskStatus: {taskStatus}" + ); + return false; + } + return true; + } } } diff --git a/DigitalLearningSolutions.Data/Models/CompetencyAssessments/CompetencyAssessment.cs b/DigitalLearningSolutions.Data/Models/CompetencyAssessments/CompetencyAssessment.cs index 7824fff1eb..c5db0ca4be 100644 --- a/DigitalLearningSolutions.Data/Models/CompetencyAssessments/CompetencyAssessment.cs +++ b/DigitalLearningSolutions.Data/Models/CompetencyAssessments/CompetencyAssessment.cs @@ -9,6 +9,11 @@ public string? Brand get => brand; set => brand = GetValidOrNull(value); } + public string? Category + { + get => category; + set => category = GetValidOrNull(value); + } public string? ParentCompetencyAssessment { get; set; } public string? Owner { get; set; } public DateTime? Archived { get; set; } @@ -19,6 +24,7 @@ public string? Brand public string? NRPRole { get; set; } public int? CompetencyAssessmentReviewID { get; set; } private string? brand; + private string? category; private static string? GetValidOrNull(string? toValidate) { return toValidate != null && toValidate.ToLower() == "undefined" ? null : toValidate; diff --git a/DigitalLearningSolutions.Data/Models/CompetencyAssessments/CompetencyAssessmentBase.cs b/DigitalLearningSolutions.Data/Models/CompetencyAssessments/CompetencyAssessmentBase.cs index 840f6218bd..5fa9080ae3 100644 --- a/DigitalLearningSolutions.Data/Models/CompetencyAssessments/CompetencyAssessmentBase.cs +++ b/DigitalLearningSolutions.Data/Models/CompetencyAssessments/CompetencyAssessmentBase.cs @@ -1,6 +1,5 @@ namespace DigitalLearningSolutions.Data.Models.CompetencyAssessments { - using System; using System.ComponentModel.DataAnnotations; public class CompetencyAssessmentBase { @@ -10,6 +9,7 @@ public class CompetencyAssessmentBase public string CompetencyAssessmentName { get; set; } = string.Empty; public string? Description { get; set; } public int BrandID { get; set; } + public int CategoryID { get; set; } public int? ParentCompetencyAssessmentID { get; set; } public bool National { get; set; } public bool Public { get; set; } diff --git a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs index 5cf75419e3..3e0571783b 100644 --- a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs +++ b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs @@ -4,11 +4,16 @@ using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; - using DigitalLearningSolutions.Web.Extensions; using System.Collections.Generic; using DigitalLearningSolutions.Data.Enums; using DigitalLearningSolutions.Web.Attributes; using DigitalLearningSolutions.Web.Models.Enums; + using DigitalLearningSolutions.Web.Helpers; + using System.Linq; + using AspNetCoreGeneratedDocument; + using Microsoft.AspNetCore.Mvc.Rendering; + using DigitalLearningSolutions.Data.Models.Centres; + using DigitalLearningSolutions.Data.Models.Frameworks; public partial class CompetencyAssessmentsController { @@ -140,7 +145,7 @@ public IActionResult SaveProfileName(CompetencyAssessmentBase competencyAssessme var adminId = GetAdminID(); if (actionName == "New") { - var sameItems = competencyAssessmentService.GetCompetencyAssessmentByName(competencyAssessmentBase.CompetencyAssessmentName, GetAdminID()); + var sameItems = competencyAssessmentService.GetCompetencyAssessmentBaseByName(competencyAssessmentBase.CompetencyAssessmentName, GetAdminID()); if (sameItems != null) { ModelState.Remove(nameof(CompetencyAssessmentBase.CompetencyAssessmentName)); @@ -284,9 +289,51 @@ public IActionResult SaveDescription(EditDescriptionViewModel model) return View("EditDescription", model); } var adminId = GetAdminID(); - var isUpdated = competencyAssessmentService.UpdateCompetencyAssessmentDescription(model.ID, adminId, model.Description); + var isUpdated = competencyAssessmentService.UpdateCompetencyAssessmentDescription(model.ID, adminId, SanitizerHelper.SanitizeHtmlData(model.Description)); competencyAssessmentService.UpdateIntroductoryTextTaskStatus(model.ID, model.TaskStatus ?? false); return RedirectToAction("ManageCompetencyAssessment", new { competencyAssessmentId = model.ID }); } + [Route("/CompetencyAssessments/{competencyAssessmentId}/Branding/")] + public IActionResult EditBranding(int competencyAssessmentId) + { + var centreId = GetCentreId(); + var adminId = GetAdminID(); + var brandsList = commonService.GetBrandListForCentre((int)centreId).Select(b => new { b.BrandID, b.BrandName }).ToList(); + var categoryList = commonService.GetCategoryListForCentre((int)centreId).Select(c => new { c.CourseCategoryID, c.CategoryName }).ToList(); + var brandSelectList = new SelectList(brandsList, "BrandID", "BrandName"); + var categorySelectList = new SelectList(categoryList, "CourseCategoryID", "CategoryName"); + var competencyAssessment = competencyAssessmentService.GetCompetencyAssessmentById(competencyAssessmentId, adminId); + var competencyAssessmentTaskStatus = competencyAssessmentService.GetCompetencyAssessmentTaskStatus(competencyAssessmentId, null); + var model = new EditBrandingViewModel(competencyAssessment, brandSelectList, categorySelectList, competencyAssessmentTaskStatus.BrandingTaskStatus); + return View(model); + } + [HttpPost] + [Route("/CompetencyAssessments/{competencyAssessmentId}/Branding/")] + public IActionResult EditBranding(EditBrandingViewModel model) + { + var adminId = GetAdminID(); + var centreId = GetCentreId(); + if (!ModelState.IsValid) + { + var brandsList = commonService.GetBrandListForCentre((int)centreId).Select(b => new { b.BrandID, b.BrandName }).ToList(); + var categoryList = commonService.GetCategoryListForCentre((int)centreId).Select(c => new { c.CourseCategoryID, c.CategoryName }).ToList(); + var brandSelectList = new SelectList(brandsList, "BrandID", "BrandName"); + var categorySelectList = new SelectList(categoryList, "CourseCategoryID", "CategoryName"); + model.BrandSelectList = brandSelectList; + model.CategorySelectList = categorySelectList; + return View("EditBranding", model); + } + if(model.BrandID == 0) + { + model.BrandID = commonService.InsertBrandAndReturnId(model.Brand, (int)centreId); + } + if(model.CategoryID == 0) + { + model.CategoryID = commonService.InsertCategoryAndReturnId(model.Category, (int)centreId); + } + var isUpdated = competencyAssessmentService.UpdateCompetencyAssessmentBranding(model.ID, adminId, model.BrandID, model.CategoryID); + competencyAssessmentService.UpdateBrandingTaskStatus(model.ID, model.TaskStatus ?? false); + return RedirectToAction("ManageCompetencyAssessment", new { competencyAssessmentId = model.ID }); + } } } diff --git a/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs b/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs index 10dfdb1207..c2b516313e 100644 --- a/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs +++ b/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs @@ -13,7 +13,8 @@ public interface ICompetencyAssessmentService CompetencyAssessmentBase? GetCompetencyAssessmentBaseById(int competencyAssessmentId, int adminId); - CompetencyAssessmentBase? GetCompetencyAssessmentByName(string competencyAssessmentName, int adminId); + CompetencyAssessmentBase? GetCompetencyAssessmentBaseByName(string competencyAssessmentName, int adminId); + CompetencyAssessment? GetCompetencyAssessmentById(int competencyAssessmentId, int adminId); IEnumerable GetNRPProfessionalGroups(); @@ -24,10 +25,13 @@ public interface ICompetencyAssessmentService bool UpdateCompetencyAssessmentProfessionalGroup(int competencyAssessmentId, int adminId, int? nrpProfessionalGroupID); bool UpdateIntroductoryTextTaskStatus(int assessmentId, bool taskStatus); + bool UpdateCompetencyAssessmentDescription(int assessmentId, int adminId, string description); + bool UpdateCompetencyAssessmentBranding(int assessmentId, int adminId, int brandID, int categoryID); + bool UpdateBrandingTaskStatus(int assessmentId, bool taskStatus); //INSERT DATA int InsertCompetencyAssessment(int adminId, int centreId, string competencyAssessmentName, int? frameworkId); - bool UpdateCompetencyAssessmentDescription(int iD, int adminId, string description); + } public class CompetencyAssessmentService : ICompetencyAssessmentService { @@ -53,9 +57,9 @@ public IEnumerable GetNRPProfessionalGroups() return competencyAssessmentDataService.GetCompetencyAssessmentBaseById(competencyAssessmentId, adminId); } - public CompetencyAssessmentBase? GetCompetencyAssessmentByName(string competencyAssessmentName, int adminId) + public CompetencyAssessmentBase? GetCompetencyAssessmentBaseByName(string competencyAssessmentName, int adminId) { - return competencyAssessmentDataService.GetCompetencyAssessmentByName(competencyAssessmentName, adminId); + return competencyAssessmentDataService.GetCompetencyAssessmentBaseByName(competencyAssessmentName, adminId); } public IEnumerable GetCompetencyAssessmentsForAdminId(int adminId) @@ -100,5 +104,20 @@ public bool UpdateIntroductoryTextTaskStatus(int assessmentId, bool taskStatus) { return competencyAssessmentDataService.UpdateIntroductoryTextTaskStatus(assessmentId, taskStatus); } + + public CompetencyAssessment? GetCompetencyAssessmentById(int competencyAssessmentId, int adminId) + { + return competencyAssessmentDataService.GetCompetencyAssessmentById(competencyAssessmentId, adminId); + } + + public bool UpdateCompetencyAssessmentBranding(int assessmentId, int adminId, int brandID, int categoryID) + { + return competencyAssessmentDataService.UpdateCompetencyAssessmentBranding(assessmentId, adminId, brandID, categoryID); + } + + public bool UpdateBrandingTaskStatus(int assessmentId, bool taskStatus) + { + return competencyAssessmentDataService.UpdateBrandingTaskStatus(assessmentId, taskStatus); + } } } diff --git a/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/EditBrandingViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/EditBrandingViewModel.cs new file mode 100644 index 0000000000..b9b671c7d1 --- /dev/null +++ b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/EditBrandingViewModel.cs @@ -0,0 +1,33 @@ +using DigitalLearningSolutions.Data.Models.CompetencyAssessments; +using Microsoft.AspNetCore.Mvc.Rendering; + +namespace DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments +{ + public class EditBrandingViewModel + { + public EditBrandingViewModel() { } + public EditBrandingViewModel(CompetencyAssessment competencyAssessment, SelectList brandSelectList, SelectList categorySelectList, bool? taskStatus) + { + ID = competencyAssessment.ID; + CompetencyAssessmentName = competencyAssessment.CompetencyAssessmentName; + BrandID = competencyAssessment.BrandID; + CategoryID = competencyAssessment.CategoryID; + Brand = competencyAssessment.Brand; + Category = competencyAssessment.Category; + UserRole = competencyAssessment.UserRole; + BrandSelectList = brandSelectList; + CategorySelectList = categorySelectList; + TaskStatus = taskStatus; + } + public int ID { get; set; } + public string CompetencyAssessmentName { get; set; } + public int BrandID { get; set; } + public int CategoryID { get; set; } + public string? Brand { get; set; } + public string? Category { get; set; } + public int UserRole { get; set; } + public bool? TaskStatus { get; set; } + public SelectList? BrandSelectList { get; set; } + public SelectList? CategorySelectList { get; set; } + } +} diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditBranding.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditBranding.cshtml new file mode 100644 index 0000000000..f69c53f94e --- /dev/null +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditBranding.cshtml @@ -0,0 +1,82 @@ +@using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments +@model EditBrandingViewModel +@{ + ViewData["Title"] = "Assessment Branding"; + ViewData["Application"] = "Framework Service"; + ViewData["HeaderPathName"] = "Framework Service"; +} + +@section NavMenuItems { + +} +@section NavBreadcrumbs { + +} + +

          Edit @Model.CompetencyAssessmentName provider and category

          +

          This will be visible to users when they browse assessments. It wiull help them to identify where the assessment is from and what it contains.

          +
          + @if (!ViewData.ModelState.IsValid) + { + + } + + + +
          + + +
          +           + + + +
          + + +
          +           + + + + + + + + + + +
          + + + Cancel + +
          +@section scripts { + +} diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditDescription.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditDescription.cshtml index bbb9bda1ba..6cab75b552 100644 --- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditDescription.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditDescription.cshtml @@ -49,7 +49,7 @@ Save
          - + diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml index 2cd4e0cb3c..b35a725942 100644 --- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml @@ -77,8 +77,8 @@
        • - - Select assessment brand and category + + Specify assessment provider and category
          From b7bc83070a462253abb564b4ea1ba808633ba7f8 Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Wed, 26 Feb 2025 08:42:57 +0000 Subject: [PATCH 31/36] TD-5308 Implements edit assessment vocabulary page --- .../CompetencyAssessmentDataService.cs | 19 ++++ .../CompetencyAssessments.cs | 31 ++++++ .../Services/CompetencyAssessmentService.cs | 15 ++- .../EditVocabularyViewModel.cs | 24 +++++ .../EditVocabulary.cshtml | 98 +++++++++++++++++++ .../ManageCompetencyAssessment.cshtml | 2 +- 6 files changed, 187 insertions(+), 2 deletions(-) create mode 100644 DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/EditVocabularyViewModel.cs create mode 100644 DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditVocabulary.cshtml diff --git a/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs b/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs index 2a3347a146..2a7fc8723b 100644 --- a/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs @@ -40,6 +40,7 @@ int categoryId bool UpdateCompetencyAssessmentDescription(int competencyAssessmentId, int adminId, string competencyAssessmentDescription); bool UpdateIntroductoryTextTaskStatus(int assessmentId, bool taskStatus); bool UpdateBrandingTaskStatus(int assessmentId, bool taskStatus); + bool UpdateVocabularyTaskStatus(int assessmentId, bool taskStatus); //INSERT DATA int InsertCompetencyAssessment(int adminId, int centreId, string competencyAssessmentName); bool InsertSelfAssessmentFramework(int adminId, int selfAssessmentId, int frameworkId); @@ -399,5 +400,23 @@ public bool UpdateBrandingTaskStatus(int assessmentId, bool taskStatus) } return true; } + + public bool UpdateVocabularyTaskStatus(int assessmentId, bool taskStatus) + { + var numberOfAffectedRows = connection.Execute( + @"UPDATE SelfAssessmentTaskStatus SET VocabularyTaskStatus = @taskStatus + WHERE SelfAssessmentId = @assessmentId", + new { assessmentId, taskStatus } + ); + if (numberOfAffectedRows < 1) + { + logger.LogWarning( + "Not updating VocabularyTaskStatus as db update failed. " + + $"assessmentId: {assessmentId}, taskStatus: {taskStatus}" + ); + return false; + } + return true; + } } } diff --git a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs index 3e0571783b..652f2e087e 100644 --- a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs +++ b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs @@ -335,5 +335,36 @@ public IActionResult EditBranding(EditBrandingViewModel model) competencyAssessmentService.UpdateBrandingTaskStatus(model.ID, model.TaskStatus ?? false); return RedirectToAction("ManageCompetencyAssessment", new { competencyAssessmentId = model.ID }); } + [Route("/CompetencyAssessments/{competencyAssessmentId}/Vocabulary/")] + public IActionResult EditVocabulary(int competencyAssessmentId) + { + var adminId = GetAdminID(); + CompetencyAssessmentBase? competencyAssessmentBase = competencyAssessmentService.GetCompetencyAssessmentBaseById(competencyAssessmentId, adminId); + if (competencyAssessmentBase == null) + { + logger.LogWarning($"Failed to load Vocabulary page for competencyAssessmentId: {competencyAssessmentId} adminId: {adminId}"); + return StatusCode(500); + } + if (competencyAssessmentBase.UserRole < 2) + { + return StatusCode(403); + } + var competencyAssessmentTaskStatus = competencyAssessmentService.GetCompetencyAssessmentTaskStatus(competencyAssessmentId, null); + var model = new EditVocabularyViewModel(competencyAssessmentBase, competencyAssessmentTaskStatus.VocabularyTaskStatus); + return View(model); + } + [HttpPost] + [Route("/CompetencyAssessments/{competencyAssessmentId}/Vocabulary/")] + public IActionResult SaveVocabulary(EditVocabularyViewModel model) + { + if (!ModelState.IsValid) + { + return View("EditVocabulary", model); + } + var adminId = GetAdminID(); + var isUpdated = competencyAssessmentService.UpdateCompetencyAssessmentVocabulary(model.ID, adminId, model.Vocabulary); + competencyAssessmentService.UpdateVocabularyTaskStatus(model.ID, model.TaskStatus ?? false); + return RedirectToAction("ManageCompetencyAssessment", new { competencyAssessmentId = model.ID }); + } } } diff --git a/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs b/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs index c2b516313e..3b19d98920 100644 --- a/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs +++ b/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs @@ -1,4 +1,5 @@ using DigitalLearningSolutions.Data.DataServices; +using DigitalLearningSolutions.Data.Models.Common; using DigitalLearningSolutions.Data.Models.CompetencyAssessments; using System.Collections.Generic; @@ -28,10 +29,12 @@ public interface ICompetencyAssessmentService bool UpdateCompetencyAssessmentDescription(int assessmentId, int adminId, string description); bool UpdateCompetencyAssessmentBranding(int assessmentId, int adminId, int brandID, int categoryID); bool UpdateBrandingTaskStatus(int assessmentId, bool taskStatus); + bool UpdateCompetencyAssessmentVocabulary(int assessmentId, int adminId, string vocabulary); + bool UpdateVocabularyTaskStatus(int assessmentId, bool taskStatus); //INSERT DATA int InsertCompetencyAssessment(int adminId, int centreId, string competencyAssessmentName, int? frameworkId); - + } public class CompetencyAssessmentService : ICompetencyAssessmentService { @@ -119,5 +122,15 @@ public bool UpdateBrandingTaskStatus(int assessmentId, bool taskStatus) { return competencyAssessmentDataService.UpdateBrandingTaskStatus(assessmentId, taskStatus); } + + bool ICompetencyAssessmentService.UpdateCompetencyAssessmentVocabulary(int assessmentId, int adminId, string vocabulary) + { + return competencyAssessmentDataService.UpdateCompetencyAssessmentVocabulary(assessmentId, adminId, vocabulary); + } + + bool ICompetencyAssessmentService.UpdateVocabularyTaskStatus(int assessmentId, bool taskStatus) + { + return competencyAssessmentDataService.UpdateVocabularyTaskStatus(assessmentId, taskStatus); + } } } diff --git a/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/EditVocabularyViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/EditVocabularyViewModel.cs new file mode 100644 index 0000000000..c68c90f85e --- /dev/null +++ b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/EditVocabularyViewModel.cs @@ -0,0 +1,24 @@ +using DigitalLearningSolutions.Data.Models.CompetencyAssessments; +using System.ComponentModel.DataAnnotations; + +namespace DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments +{ + public class EditVocabularyViewModel + { + public EditVocabularyViewModel() { } + public EditVocabularyViewModel(CompetencyAssessmentBase competencyAssessmentBase, bool? taskStatus) + { + ID = competencyAssessmentBase.ID; + CompetencyAssessmentName = competencyAssessmentBase.CompetencyAssessmentName; + Vocabulary = competencyAssessmentBase.Vocabulary; + UserRole = competencyAssessmentBase.UserRole; + TaskStatus = taskStatus; + } + public int ID { get; set; } + public string CompetencyAssessmentName { get; set; } = string.Empty; + [Required(ErrorMessage = "Select a vocabulary option")] + public string Vocabulary { get; set; } + public int UserRole { get; set; } + public bool? TaskStatus { get; set; } + } +} diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditVocabulary.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditVocabulary.cshtml new file mode 100644 index 0000000000..f28b8aa53b --- /dev/null +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditVocabulary.cshtml @@ -0,0 +1,98 @@ +@using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments +@model EditVocabularyViewModel +@{ + ViewData["Title"] = "Assessment Branding"; + ViewData["Application"] = "Framework Service"; + ViewData["HeaderPathName"] = "Framework Service"; +} + +@section NavMenuItems { + +} +@section NavBreadcrumbs { + +} + +

          Edit @Model.CompetencyAssessmentName vocabulary

          +
          + @if (!ViewData.ModelState.IsValid) + { + + } + +
          + +

          + Choose assessment vocabulary - the name given to the building blocks of your assessment. +

          +           +
          +
          + + +
          + The attributes (skills, knowledge and behaviours) which individuals bring to the workplace. +
          +
          + +
          + + +
          + Defined standards of performance, focused on the outputs of work and observable performance. +
          +
          +
          + + +
          + The knowledge and skills that registered nurses must demonstrate when caring for people of all ages and across all care settings. +
          +
          +
          + + +
          + The same as capability | capabilities.
          + The term capabilities is recommended to make a clear distinction from competences. +
          +
          +
          +
          + +           + + + + + + + +
          + + + Cancel + +
          + diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml index b35a725942..92a8691086 100644 --- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml @@ -87,7 +87,7 @@
        • - + Select assessment vocabulary (@Model.Vocabulary)
          From 6276a884430b63d3e7117079260196b540861495 Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Wed, 26 Feb 2025 08:49:17 +0000 Subject: [PATCH 32/36] IDE formatter changes --- .../Views/CompetencyAssessments/EditVocabulary.cshtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditVocabulary.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditVocabulary.cshtml index f28b8aa53b..3b32db2a58 100644 --- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditVocabulary.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditVocabulary.cshtml @@ -45,7 +45,7 @@ The attributes (skills, knowledge and behaviours) which individuals bring to the workplace.
        - +
        - + From 7edf2a646fc5a1b73c2ed25289e0a204df2dcbee Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Wed, 5 Mar 2025 08:04:01 +0000 Subject: [PATCH 33/36] TD-5389 role profile links page implemented --- .../CompetencyAssessmentDataService.cs | 53 +++- .../CompetencyAssessments/NRPSubGroups.cs | 1 - .../CompetencyAssessments.cs | 83 ++++-- .../Services/CompetencyAssessmentService.cs | 27 +- .../EditRoleProfileLinksViewModel.cs | 43 +++ .../ProfessionalGroupViewModel.cs | 11 - .../EditRoleProfileLinks.cshtml | 256 ++++++++++++++++++ .../ManageCompetencyAssessment.cshtml | 2 +- .../ProfessionalGroup.cshtml | 135 --------- 9 files changed, 422 insertions(+), 189 deletions(-) create mode 100644 DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/EditRoleProfileLinksViewModel.cs delete mode 100644 DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/ProfessionalGroupViewModel.cs create mode 100644 DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditRoleProfileLinks.cshtml delete mode 100644 DigitalLearningSolutions.Web/Views/CompetencyAssessments/ProfessionalGroup.cshtml diff --git a/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs b/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs index 2a7fc8723b..983bdba073 100644 --- a/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs @@ -23,13 +23,15 @@ public interface ICompetencyAssessmentDataService CompetencyAssessmentBase? GetCompetencyAssessmentBaseByName(string competencyAssessmentName, int adminId); CompetencyAssessment? GetCompetencyAssessmentById(int competencyAssessmentId, int adminId); IEnumerable GetNRPProfessionalGroups(); + IEnumerable GetNRPSubGroups(int? nRPProfessionalGroupID); + IEnumerable GetNRPRoles(int? nRPSubGroupID); CompetencyAssessmentTaskStatus GetOrInsertAndReturnAssessmentTaskStatus(int assessmentId, bool frameworkBased); //UPDATE DATA bool UpdateCompetencyAssessmentName(int competencyAssessmentId, int adminId, string competencyAssessmentName); - bool UpdateCompetencyAssessmentProfessionalGroup(int competencyAssessmentId, int adminId, int? nrpProfessionalGroupID); + bool UpdateCompetencyRoleProfileLinks(int competencyAssessmentId, int adminId, int? professionalGroupId, int? subGroupId, int? roleId); bool UpdateCompetencyAssessmentBranding( int competencyAssessmentId, int adminId, @@ -41,6 +43,7 @@ int categoryId bool UpdateIntroductoryTextTaskStatus(int assessmentId, bool taskStatus); bool UpdateBrandingTaskStatus(int assessmentId, bool taskStatus); bool UpdateVocabularyTaskStatus(int assessmentId, bool taskStatus); + bool UpdateRoleProfileLinksTaskStatus(int assessmentId, bool taskStatus); //INSERT DATA int InsertCompetencyAssessment(int adminId, int centreId, string competencyAssessmentName); bool InsertSelfAssessmentFramework(int adminId, int selfAssessmentId, int frameworkId); @@ -225,11 +228,11 @@ ORDER BY ProfessionalGroup" ).FirstOrDefault(); } - public bool UpdateCompetencyAssessmentProfessionalGroup(int competencyAssessmentId, int adminId, int? nrpProfessionalGroupID) + public bool UpdateCompetencyRoleProfileLinks(int competencyAssessmentId, int adminId, int? professionalGroupId, int? subGroupId, int? roleId) { var result = connection.ExecuteScalar( - @"SELECT COUNT(*) FROM CompetencyAssessments WHERE ID = @competencyAssessmentId AND NRPProfessionalGroupID = @nrpProfessionalGroupID", - new { competencyAssessmentId, nrpProfessionalGroupID } + @"SELECT COUNT(*) FROM SelfAssessments WHERE ID = @competencyAssessmentId AND NRPProfessionalGroupID = @professionalGroupId AND NRPSubGroupID = @subGroupId AND NRPRoleID = @roleId", + new { competencyAssessmentId, professionalGroupId, subGroupId, roleId } ); int sameCount = Convert.ToInt32(result); if (sameCount > 0) @@ -240,9 +243,9 @@ public bool UpdateCompetencyAssessmentProfessionalGroup(int competencyAssessment //needs updating: var numberOfAffectedRows = connection.Execute( - @"UPDATE SelfAssessments SET NRPProfessionalGroupID = @nrpProfessionalGroupID, NRPSubGroupID = NULL, NRPRoleID = NULL, UpdatedByAdminID = @adminId + @"UPDATE SelfAssessments SET NRPProfessionalGroupID = @professionalGroupId, NRPSubGroupID = @subGroupId, NRPRoleID = @roleId, UpdatedByAdminID = @adminId WHERE ID = @competencyAssessmentId", - new { nrpProfessionalGroupID, adminId, competencyAssessmentId } + new { adminId, competencyAssessmentId, professionalGroupId, subGroupId, roleId } ); if (numberOfAffectedRows > 0) { @@ -418,5 +421,43 @@ public bool UpdateVocabularyTaskStatus(int assessmentId, bool taskStatus) } return true; } + + public IEnumerable GetNRPSubGroups(int? nRPProfessionalGroupID) + { + return connection.Query( + @"SELECT ID, SubGroup, Active + FROM NRPSubGroups + WHERE (Active = 1) AND (NRPProfessionalGroupID = @nRPProfessionalGroupID) + ORDER BY SubGroup", new { nRPProfessionalGroupID } + ); + } + + public IEnumerable GetNRPRoles(int? nRPSubGroupID) + { + return connection.Query( + @"SELECT ID, RoleProfile AS ProfileName, Active + FROM NRPRoles + WHERE (Active = 1) AND (NRPSubGroupID = @nRPSubGroupID) + ORDER BY RoleProfile", new { nRPSubGroupID } + ); + } + + public bool UpdateRoleProfileLinksTaskStatus(int assessmentId, bool taskStatus) + { + var numberOfAffectedRows = connection.Execute( + @"UPDATE SelfAssessmentTaskStatus SET NationalRoleProfileTaskStatus = @taskStatus + WHERE SelfAssessmentId = @assessmentId", + new { assessmentId, taskStatus } + ); + if (numberOfAffectedRows < 1) + { + logger.LogWarning( + "Not updating NationalRoleProfileTaskStatus as db update failed. " + + $"assessmentId: {assessmentId}, taskStatus: {taskStatus}" + ); + return false; + } + return true; + } } } diff --git a/DigitalLearningSolutions.Data/Models/CompetencyAssessments/NRPSubGroups.cs b/DigitalLearningSolutions.Data/Models/CompetencyAssessments/NRPSubGroups.cs index fda19bcb09..f100a6b2e2 100644 --- a/DigitalLearningSolutions.Data/Models/CompetencyAssessments/NRPSubGroups.cs +++ b/DigitalLearningSolutions.Data/Models/CompetencyAssessments/NRPSubGroups.cs @@ -4,7 +4,6 @@ public class NRPSubGroups { public int ID { get; set; } - public int NRPProfessionalGroupID { get; set; } [StringLength(255, MinimumLength = 3)] [Required] public string SubGroup { get; set; } = string.Empty; diff --git a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs index 652f2e087e..855a123e4a 100644 --- a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs +++ b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs @@ -14,6 +14,7 @@ using Microsoft.AspNetCore.Mvc.Rendering; using DigitalLearningSolutions.Data.Models.Centres; using DigitalLearningSolutions.Data.Models.Frameworks; + using Microsoft.CodeAnalysis.CSharp.Syntax; public partial class CompetencyAssessmentsController { @@ -187,10 +188,9 @@ public IActionResult ManageCompetencyAssessment(int competencyAssessmentId, int? return View("ManageCompetencyAssessment", model); } - [Route("/CompetencyAssessments/ProfessionalGroup/{actionName}/{competencyAssessmentId}")] - [Route("/CompetencyAssessments/ProfessionalGroup/{actionName}")] + [Route("/CompetencyAssessments/{competencyAssessmentId}/NationalRoleProfileLinks/{actionName}")] [SetSelectedTab(nameof(NavMenuTab.CompetencyAssessments))] - public IActionResult CompetencyAssessmentProfessionalGroup(string actionName, int competencyAssessmentId = 0) + public IActionResult EditRoleProfileLinks(int competencyAssessmentId = 0, string actionName = "EditGroup") { var adminId = GetAdminID(); CompetencyAssessmentBase? competencyAssessmentBase; @@ -212,45 +212,68 @@ public IActionResult CompetencyAssessmentProfessionalGroup(string actionName, in competencyAssessmentBase = competencyAssessmentService.GetCompetencyAssessmentBaseById(competencyAssessmentId, adminId); } var professionalGroups = competencyAssessmentService.GetNRPProfessionalGroups(); - var model = new ProfessionalGroupViewModel() - { - NRPProfessionalGroups = professionalGroups, - CompetencyAssessmentBase = competencyAssessmentBase - }; - return View("ProfessionalGroup", model); + var subGroups = competencyAssessmentService.GetNRPSubGroups(competencyAssessmentBase.NRPProfessionalGroupID); + var roles = competencyAssessmentService.GetNRPRoles(competencyAssessmentBase.NRPSubGroupID); + var competencyAssessmentTaskStatus = competencyAssessmentService.GetCompetencyAssessmentTaskStatus(competencyAssessmentId, null); + var model = new EditRoleProfileLinksViewModel(competencyAssessmentBase, professionalGroups, subGroups, roles, actionName, competencyAssessmentTaskStatus.NationalRoleProfileTaskStatus); + return View(model); } [HttpPost] - [Route("/CompetencyAssessments/ProfessionalGroup/{actionName}/{competencyAssessmentId}")] - [Route("/CompetencyAssessments/ProfessionalGroup/{actionName}")] - [SetSelectedTab(nameof(NavMenuTab.CompetencyAssessments))] - public IActionResult SaveProfessionalGroup(CompetencyAssessmentBase competencyAssessmentBase, string actionName, int competencyAssessmentId = 0) + [Route("/CompetencyAssessments/{competencyAssessmentId}/NationalRoleProfileLinks/{actionName}")] + public IActionResult EditRoleProfileLinks(EditRoleProfileLinksViewModel model, string actionName, int competencyAssessmentId = 0) { - if (competencyAssessmentBase.NRPProfessionalGroupID == null) + var adminId = GetAdminID(); + var competencyAssessmentBase = competencyAssessmentService.GetCompetencyAssessmentBaseById(competencyAssessmentId, adminId); + competencyAssessmentService.UpdateRoleProfileLinksTaskStatus(model.ID, model.TaskStatus ?? false); + if (competencyAssessmentBase == null) { - ModelState.Remove(nameof(CompetencyAssessmentBase.NRPProfessionalGroupID)); - ModelState.AddModelError(nameof(CompetencyAssessmentBase.NRPProfessionalGroupID), "Please choose a professional group" + (competencyAssessmentId == 0 ? "or Skip this step" : "") + "."); - // do something - return View("Name", competencyAssessmentBase); + logger.LogWarning($"Failed to submit role links page for competencyAssessmentId: {competencyAssessmentId} adminId: {adminId}"); + return StatusCode(500); } - if (actionName == "New") + if (competencyAssessmentBase.UserRole < 2) { - //TO DO Store to self assessment - - return RedirectToAction("CompetencyAssessmentSubGroup", "CompetencyAssessments", new { actionName }); + return StatusCode(403); } - else + if (competencyAssessmentBase.NRPProfessionalGroupID != model.ProfessionalGroupId) { - var adminId = GetAdminID(); - var isUpdated = competencyAssessmentService.UpdateCompetencyAssessmentProfessionalGroup(competencyAssessmentBase.ID, adminId, competencyAssessmentBase.NRPProfessionalGroupID); - if (isUpdated) + model.SubGroupId = null; + model.RoleId = null; + } + if (competencyAssessmentBase.NRPSubGroupID != model.SubGroupId) + { + model.RoleId = null; + } + var isUpdated = competencyAssessmentService.UpdateCompetencyRoleProfileLinks(model.ID, adminId, model.ProfessionalGroupId, model.SubGroupId, model.RoleId); + if (model.ActionName == "EditGroup") + { + if(model.ProfessionalGroupId == null) { - return RedirectToAction("CompetencyAssessmentSubGroup", "CompetencyAssessments", new { actionName, competencyAssessmentId }); + return RedirectToAction("EditRoleProfileLinks", new { actionName = "Summary", competencyAssessmentId }); } else { - return RedirectToAction("ManageCompetencyAssessment", new { tabname = "Details", competencyAssessmentId }); + return RedirectToAction("EditRoleProfileLinks", new { actionName = "EditSubGroup", competencyAssessmentId }); + } + } + else if (model.ActionName == "EditSubGroup") + { + if (model.SubGroupId == null) + { + return RedirectToAction("EditRoleProfileLinks", new { actionName = "Summary", competencyAssessmentId }); } + else + { + return RedirectToAction("EditRoleProfileLinks", new { actionName = "EditRole", competencyAssessmentId }); + } + } + else if (model.ActionName == "EditRole") + { + return RedirectToAction("EditRoleProfileLinks", new { actionName = "Summary", competencyAssessmentId }); + } + else + { + return RedirectToAction("ManageCompetencyAssessment", new { competencyAssessmentId }); } } @@ -323,11 +346,11 @@ public IActionResult EditBranding(EditBrandingViewModel model) model.CategorySelectList = categorySelectList; return View("EditBranding", model); } - if(model.BrandID == 0) + if (model.BrandID == 0) { model.BrandID = commonService.InsertBrandAndReturnId(model.Brand, (int)centreId); } - if(model.CategoryID == 0) + if (model.CategoryID == 0) { model.CategoryID = commonService.InsertCategoryAndReturnId(model.Category, (int)centreId); } diff --git a/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs b/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs index 3b19d98920..7e8cf37fdb 100644 --- a/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs +++ b/DigitalLearningSolutions.Web/Services/CompetencyAssessmentService.cs @@ -2,6 +2,7 @@ using DigitalLearningSolutions.Data.Models.Common; using DigitalLearningSolutions.Data.Models.CompetencyAssessments; using System.Collections.Generic; +using System.Threading.Tasks; namespace DigitalLearningSolutions.Web.Services { @@ -18,23 +19,24 @@ public interface ICompetencyAssessmentService CompetencyAssessment? GetCompetencyAssessmentById(int competencyAssessmentId, int adminId); IEnumerable GetNRPProfessionalGroups(); + IEnumerable GetNRPSubGroups(int? nRPProfessionalGroupID); + IEnumerable GetNRPRoles(int? nRPSubGroupID); CompetencyAssessmentTaskStatus GetCompetencyAssessmentTaskStatus(int assessmentId, int? frameworkId); //UPDATE DATA bool UpdateCompetencyAssessmentName(int competencyAssessmentId, int adminId, string competencyAssessmentName); - - bool UpdateCompetencyAssessmentProfessionalGroup(int competencyAssessmentId, int adminId, int? nrpProfessionalGroupID); + bool UpdateCompetencyRoleProfileLinks(int competencyAssessmentId, int adminId, int? professionalGroupId, int? subGroupId, int? roleId); bool UpdateIntroductoryTextTaskStatus(int assessmentId, bool taskStatus); bool UpdateCompetencyAssessmentDescription(int assessmentId, int adminId, string description); bool UpdateCompetencyAssessmentBranding(int assessmentId, int adminId, int brandID, int categoryID); bool UpdateBrandingTaskStatus(int assessmentId, bool taskStatus); bool UpdateCompetencyAssessmentVocabulary(int assessmentId, int adminId, string vocabulary); bool UpdateVocabularyTaskStatus(int assessmentId, bool taskStatus); + bool UpdateRoleProfileLinksTaskStatus(int assessmentId, bool taskStatus); //INSERT DATA int InsertCompetencyAssessment(int adminId, int centreId, string competencyAssessmentName, int? frameworkId); - } public class CompetencyAssessmentService : ICompetencyAssessmentService { @@ -91,9 +93,9 @@ public bool UpdateCompetencyAssessmentName(int competencyAssessmentId, int admin return competencyAssessmentDataService.UpdateCompetencyAssessmentName(competencyAssessmentId, adminId, competencyAssessmentName); } - public bool UpdateCompetencyAssessmentProfessionalGroup(int competencyAssessmentId, int adminId, int? nrpProfessionalGroupID) + public bool UpdateCompetencyRoleProfileLinks(int competencyAssessmentId, int adminId, int? professionalGroupId, int? subGroupId, int? roleId) { - return competencyAssessmentDataService.UpdateCompetencyAssessmentProfessionalGroup(competencyAssessmentId, adminId, nrpProfessionalGroupID); + return competencyAssessmentDataService.UpdateCompetencyRoleProfileLinks(competencyAssessmentId, adminId, professionalGroupId, subGroupId, roleId); } public CompetencyAssessmentTaskStatus GetCompetencyAssessmentTaskStatus(int assessmentId, int? frameworkId) { @@ -132,5 +134,20 @@ bool ICompetencyAssessmentService.UpdateVocabularyTaskStatus(int assessmentId, b { return competencyAssessmentDataService.UpdateVocabularyTaskStatus(assessmentId, taskStatus); } + + public IEnumerable GetNRPSubGroups(int? nRPProfessionalGroupID) + { + return competencyAssessmentDataService.GetNRPSubGroups(nRPProfessionalGroupID); + } + + public IEnumerable GetNRPRoles(int? nRPSubGroupID) + { + return competencyAssessmentDataService.GetNRPRoles(nRPSubGroupID); + } + + public bool UpdateRoleProfileLinksTaskStatus(int assessmentId, bool taskStatus) + { + return competencyAssessmentDataService.UpdateRoleProfileLinksTaskStatus(assessmentId, taskStatus); + } } } diff --git a/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/EditRoleProfileLinksViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/EditRoleProfileLinksViewModel.cs new file mode 100644 index 0000000000..54ddd177b5 --- /dev/null +++ b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/EditRoleProfileLinksViewModel.cs @@ -0,0 +1,43 @@ +namespace DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments +{ + using DigitalLearningSolutions.Data.Models.CompetencyAssessments; + using Humanizer; + using System.Collections.Generic; + using System.Linq; + + public class EditRoleProfileLinksViewModel + { + public EditRoleProfileLinksViewModel() { } + public EditRoleProfileLinksViewModel(CompetencyAssessmentBase competencyAssessmentBase, IEnumerable professionalGroups, IEnumerable subGroups, IEnumerable roles, string actionName, bool? taskStatus) + { + ID = competencyAssessmentBase.ID; + CompetencyAssessmentName = competencyAssessmentBase.CompetencyAssessmentName; + ProfessionalGroupId = competencyAssessmentBase.NRPProfessionalGroupID; + SubGroupId = competencyAssessmentBase.NRPSubGroupID; + RoleId = competencyAssessmentBase.NRPRoleID; + UserRole = competencyAssessmentBase.UserRole; + TaskStatus = taskStatus; + ProfessionalGroups = professionalGroups; + SubGroups = subGroups; + Roles = roles; + ActionName = actionName; + RoleName = Roles.FirstOrDefault(r => r.ID == RoleId)?.ProfileName ?? "Don't link assessment to a role."; + SubGroupName = SubGroups.FirstOrDefault(s => s.ID == SubGroupId)?.SubGroup ?? "Don't link assessment to a sub group."; + GroupName = ProfessionalGroups.FirstOrDefault(p => p.ID == ProfessionalGroupId)?.ProfessionalGroup ?? "Don't link assessment to a professional group."; + } + public IEnumerable ProfessionalGroups { get; set; } + public IEnumerable SubGroups { get; set; } + public IEnumerable Roles { get; set; } + public int ID { get; set; } + public string CompetencyAssessmentName { get; set; } + public string ActionName { get; set; } + public int? ProfessionalGroupId { get; set; } + public int? SubGroupId { get; set; } + public int? RoleId { get; set; } + public int UserRole { get; set; } + public bool? TaskStatus { get; set; } + public string? GroupName { get; set; } + public string? SubGroupName { get; set; } + public string? RoleName { get; set; } + } +} diff --git a/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/ProfessionalGroupViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/ProfessionalGroupViewModel.cs deleted file mode 100644 index 86ba83228b..0000000000 --- a/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/ProfessionalGroupViewModel.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments -{ - using DigitalLearningSolutions.Data.Models.CompetencyAssessments; - using System.Collections.Generic; - - public class ProfessionalGroupViewModel - { - public IEnumerable NRPProfessionalGroups { get; set; } - public CompetencyAssessmentBase CompetencyAssessmentBase { get; set; } - } -} diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditRoleProfileLinks.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditRoleProfileLinks.cshtml new file mode 100644 index 0000000000..7a3d166cbb --- /dev/null +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditRoleProfileLinks.cshtml @@ -0,0 +1,256 @@ +@using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments; +@model EditRoleProfileLinksViewModel; +@{ + ViewData["Title"] = "Edit National Role Profile Links"; + ViewData["Application"] = "Framework Service"; +} + +@section NavMenuItems { + +} + +@section NavBreadcrumbs { + +} + +

        Edit @Model.CompetencyAssessmentName national NHS role profile links

        +@if (Model.TaskStatus != null | Model.ProfessionalGroupId != null) +{ +
        + +
        +
        + Professional group +
        +
        + @Model.GroupName +
        +
        + + Change assessment name + +
        +
        + @if (Model.ProfessionalGroupId != null && Model.ActionName != "EditSubGroup") + { +
        +
        + Sub group +
        +
        + @Model.SubGroupName +
        +
        + + Change assessment name + +
        +
        + } + @if (Model.SubGroupId != null && Model.ActionName != "EditRole") + { +
        +
        + Role +
        +
        + @Model.RoleName +
        +
        + + Change assessment name + +
        +
        + } +
        +} +@if (Model.ActionName == "EditGroup") +{ +
        + @if (!ViewData.ModelState.IsValid) + { + + } + +
        + +

        + Choose the NHS national role profile professional group to associate with this assessment. +

        +         + +
        + @foreach (var professionalGroup in Model.ProfessionalGroups) + { +
        + + +
        + } +
        + +
        + + +
        +
        +
        +         + + + + + + + + + + + + +} +else if (Model.ActionName == "EditSubGroup" && Model.ProfessionalGroupId != null) +{ +
        + @if (!ViewData.ModelState.IsValid) + { + + } + +
        + +

        + Choose the role sub group to associate with this assessment. +

        +         + +
        + @foreach (var subGroup in Model.SubGroups) + { +
        + + +
        + } +
        + +
        + + +
        +
        +
        +         + + + + + + + + + + + +} +else if (Model.ActionName == "EditRole" && Model.SubGroupId != null) +{ +
        + @if (!ViewData.ModelState.IsValid) + { + + } + +
        + +

        + Choose the role to associate with this assessment. +

        +         + +
        + @foreach (var role in Model.Roles) + { +
        + + +
        + } +
        + +
        + + +
        +
        +
        +         + + + + + + + + + + + +} +else if (Model.ActionName == "Summary") +{ +
        + + + + + + + + + + + + + + +
        +} +
        + + + Cancel + +
        diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml index 92a8691086..3e4f9f34be 100644 --- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml @@ -107,7 +107,7 @@
      • - + Link assessment to National Role profiles
        diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ProfessionalGroup.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ProfessionalGroup.cshtml deleted file mode 100644 index 68c80cd634..0000000000 --- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ProfessionalGroup.cshtml +++ /dev/null @@ -1,135 +0,0 @@ -@using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments; -@model ProfessionalGroupViewModel; -@{ - ViewData["Title"] = "New Competency Assessments"; - ViewData["Application"] = "Framework Service"; -} - -@section NavMenuItems { - -} - @if ((string)ViewContext.RouteData.Values["actionName"] == "New") -{ - @section NavBreadcrumbs { - - } -} -else -{ - @section NavBreadcrumbs { - - } -} -

        National job profile - professional group

        -
        - @if (!ViewData.ModelState.IsValid) - { - - } - - - -
        - @foreach (var professionalGroup in Model.NRPProfessionalGroups) - { -
        - - -
        - } -
        - -
        - - - @if ((string)ViewContext.RouteData.Values["actionName"] == "New") - { - - Skip professional group and job role linking. - - - - } - else - { - - Don't link to professional group and job role. - - - } - -
        - -
        -         - - - - - - - - - - - - - - @if ((string)ViewContext.RouteData.Values["actionName"] == "New") - { - - Back - - -
        - - - Cancel - -
        - } - else - { - @if (Model.CompetencyAssessmentBase.PublishStatusID == 3) - { - - } - -
        - - - Cancel - -
        - } - - From 342740ce6ac209a63643ae17d8889b942bd5c61e Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Wed, 5 Mar 2025 08:16:26 +0000 Subject: [PATCH 34/36] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 63521f4a336966e47f69afcbf4ad17e119173fec Merge: f10e104b4 e90895c25 Author: rshrirohit Date: Wed Mar 5 07:53:00 2025 +0000 Merge branch 'master' into DLS-Release-v1.2.0 commit e90895c2557a4df346d9132fc4ad296f5b9c6c10 Merge: 764d023dd d77ec78a3 Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com> Date: Wed Mar 5 07:35:32 2025 +0000 Merge pull request #3146 from TechnologyEnhancedLearning/DLS-Release-v1.1.2 Dls release v1.1.2 commit d77ec78a3b169fcc79ad7d2371f19530a7fe5f3a Merge: aa5e3a9b1 fcdf44ed6 Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com> Date: Thu Feb 27 14:54:52 2025 +0000 Merge pull request #3138 from TechnologyEnhancedLearning/Develop/Fix/TD-5370-Issue-showing-requested-sign-off TD-5370- Added code to remove a pending sign-off request if the self-assessment does not include the minimum optional competencies. commit fcdf44ed60069c82f02adf78027e7c4159bba267 Author: Auldrin Possa Date: Thu Feb 27 12:41:18 2025 +0000 TD-5370- Added code to remove a pending sign-off request if the self-assessment does not include the minimum optional competencies. commit aa5e3a9b15c86ab30354d4188fc0921e42358a7e Merge: 9ab236454 4e4f7a397 Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com> Date: Thu Feb 27 12:26:41 2025 +0000 Merge pull request #3137 from TechnologyEnhancedLearning/Develop/Fixes/TD-5325-UpdatingFreshdeskApiNugetPackage TD-5325 Updating Freshdesk Api Nuget Package commit 4e4f7a39734cf4d1a9b0fea84d33349083c00b8e Author: Rohit Shrivastava Date: Thu Feb 27 09:49:53 2025 +0000 TD-5325 Updating Freshdesk Api Nuget Package commit 9ab23645442f1e9b795f62541e81bfd3de32480e Merge: 9835d1061 49be5f1d5 Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com> Date: Tue Feb 25 20:04:56 2025 +0000 Merge pull request #3134 from TechnologyEnhancedLearning/Develop/Fix/TD-5367-duplicate-self-assessments-on-Supervisor-Dashboard TD-5367-Issue showing duplicate self assessments on 'Supervisor Dashboard - My staff' screen commit 9835d106165f9a2b959130821aa0f51a557bc78d Merge: 9d20e5cf6 57133ccf1 Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com> Date: Tue Feb 25 09:02:42 2025 +0000 Merge pull request #3133 from TechnologyEnhancedLearning/Develop/Fixes/TD-5368-AddingCategoryToEmailContent TD-5368 Adding Category To Email Content commit 9d20e5cf6f11f8a86887469b1b3037d41c78a71e Merge: 2f1cdd47a bf29c8c85 Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com> Date: Tue Feb 25 09:00:42 2025 +0000 Merge pull request #3123 from TechnologyEnhancedLearning/Develop/Fixes/TD-3542-Console'500'errorisseeingonthe'Mystaff'screenwhenclicked'Supervise'linkfor'Version_2_Data_Professionsframework'assessment TD-3542 Console '500' error is seeing on the 'My staff' screen when clicked 'Supervise' link for 'Version_2_Data_Professions framework' assessment commit bf29c8c85393fc6e9dab7cc9806a97318d8708fa Author: Sherif Olaboye Date: Mon Feb 24 13:15:36 2025 +0000 TD-3542 putting the validations in the viewmodels commit b4925644f94afc1fb7c1d455b1181bc997db6c70 Merge: 7ef645657 0879dbf52 Author: Sherif Olaboye Date: Mon Feb 24 13:07:56 2025 +0000 Merge remote-tracking branch 'origin/DLS-Release-v1.1.2' into Develop/Fixes/TD-3542-Console'500'errorisseeingonthe'Mystaff'screenwhenclicked'Supervise'linkfor'Version_2_Data_Professionsframework'assessment commit 57133ccf1629b914c042bdda49c08a64c8da6e94 Author: Rohit Shrivastava Date: Mon Feb 24 12:13:26 2025 +0000 TD-5368 removing commented code commit f32043e48a6c4f69ede2b9c18b34deee413dbe0e Author: Rohit Shrivastava Date: Mon Feb 24 12:12:34 2025 +0000 TD-5368 Updating the Tracking system-centre-admin area and promote to admin area commit 49be5f1d5dfaecd889beb5669cf04bdb0a78b2fb Author: Auldrin Possa Date: Mon Feb 24 11:02:33 2025 +0000 TD-5367-Removed 'UPDATE CandidateAssessmentSupervisors..' while removing self assessment. Updated CandidateAssessmentSupervisors while enrolling self assessment. commit 2f1cdd47a83a64f530601d53c0456da26419d828 Merge: 252a5822c 28cf77785 Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com> Date: Mon Feb 24 09:08:44 2025 +0000 Merge pull request #3131 from TechnologyEnhancedLearning/Develop/Fixes/TD-5292-Issuewith'Goback'linkwhencreatingacourseandadding'Coursecontent'on'Coursesetup'screen TD-5292 Issue with 'Go back' link when creating a course and adding 'Course content' on 'Course set up' screen commit 252a5822cf4ca8581458af9b48904f66c2d7cdaf Merge: 0879dbf52 25f6523ac Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com> Date: Mon Feb 24 09:07:48 2025 +0000 Merge pull request #3126 from TechnologyEnhancedLearning/Develop/Fixes/TD-5291-Issueon'Coursesetup'screenwhenselectedFewcoursecontentfirsttimeandchangedto'All'ofthemclicking'changelink' TD-5291 Issue on 'Course set up' screen when selected Few course content first time and changed to 'All' of them clicking 'change link' commit ac656d73f91c987f7cf3aa04328cac4239680ce8 Author: Rohit Shrivastava Date: Fri Feb 21 08:41:21 2025 +0000 TD-5368 Adding Category To Email Content commit 28cf777859c56e12dcbdba67a688891dee7e38f8 Author: Sherif Olaboye Date: Mon Feb 17 11:19:20 2025 +0000 TD-5292 when clicking ‘go back’ links few course content screens are missing in between. commit 25f6523acca6ce145c176a08a26eb5e04b8a425c Author: sherif-olaboye <123654949+sherif-olaboye@users.noreply.github.com> Date: Thu Feb 13 16:29:45 2025 +0000 TD-5291 Issue on 'Course set up' screen when selected Few course content first time and changed to 'All' of them clicking 'change link' commit 6c2d6e4d2f3a7372a8824430df851722a20a2be9 Author: sherif-olaboye <123654949+sherif-olaboye@users.noreply.github.com> Date: Thu Feb 13 16:12:51 2025 +0000 TD-5292 Issue on 'Course set up' screen when selected Few course content first time and changed to 'All' of them clicking 'change link' commit 0879dbf52b12926e0d238100056c0140a0e01e74 Merge: 5dff09b95 c91614945 Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com> Date: Thu Feb 13 11:02:11 2025 +0000 Merge pull request #3118 from TechnologyEnhancedLearning/Develop/Fixes/TD-5333-Issuewithoptionalproficienciesnotretainingtopreviousstatewhenremovedandaddedthemback TD-5333 Issue with optional proficiencies not retaining to previous State when removed and added them back commit 5dff09b958bae69106c725c0c91cf18e514e2e92 Merge: ec0e37c45 6a4b4c2be Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com> Date: Wed Feb 12 16:43:49 2025 +0000 Merge pull request #3114 from TechnologyEnhancedLearning/Develop/Fixes/TD-5222-Errorwhenenrollingastaffonselfassessmentfromthetrackingsystem TD-5222 Error when enrolling a staff on self assessment from the tracking system commit 7ef645657687c9392102da0090221036e54293d9 Author: Sherif Olaboye Date: Wed Feb 12 09:37:16 2025 +0000 TD-3542 Console '500' error is seeing on the 'My staff' screen when clicked 'Supervise' link for 'Version_2_Data_Professions framework' assessment commit ec0e37c45c4bd08aabe30ee18761c52f0f13c225 Merge: 951c95fbd a78c0a801 Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com> Date: Tue Feb 11 09:19:45 2025 +0000 Merge pull request #3099 from TechnologyEnhancedLearning/Develop/Fixes/TD-5292-Issuewith'Goback'linkwhencreatingacourseandadding'Coursecontent'on'Coursesetup'screen TD-5292 Issue with 'Go back' link when creating a course and adding 'Course content' on 'Course set up' screen commit 951c95fbd3ee9c85b079dbc6bce0a3da7e40edff Merge: 1ab13f704 fc760ef54 Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com> Date: Tue Feb 11 09:14:42 2025 +0000 Merge pull request #3096 from TechnologyEnhancedLearning/Develop/Fixes/TD-5291-Issueon'Coursesetup'screenwhenselectedFewcoursecontentfirsttimeandchangedto'All'ofthemclicking'changelink' TD-5291 Issue on 'Course set up' screen when selected Few course content first time and changed to 'All' of them clicking 'change link' commit c91614945c93ac71da8a176f5b082f4e1170ec5f Author: Sherif Olaboye Date: Mon Feb 10 09:54:52 2025 +0000 TD-5333 Issue with optional proficiencies not retaining to previous state when removed and added them back commit 1ab13f704972db7b4e9facd839657a6f8b8818e0 Merge: 0584b6bb1 ef9eabdda Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com> Date: Fri Feb 7 10:49:48 2025 +0000 Merge pull request #3102 from TechnologyEnhancedLearning/Develop/Fix/TD-5306-Selfassessment-report-name-Issue TD-5306-self-assessments excel report file name format changed. commit 0584b6bb1a22f34fdb167459adbb8b48353fe73e Merge: 764d023dd 2f0d16cb6 Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com> Date: Fri Feb 7 10:48:08 2025 +0000 Merge pull request #3111 from TechnologyEnhancedLearning/Develop/feature/TD-4475-Count-of-matching-proficiencies TD-4475-Count of matching proficiencies should be shown on 'Supervisor' section same as on 'Learning Portal' for the self assessments commit 764d023dd5ba4a44ebf351dae7c01da0c9432e32 Merge: 17ad3839f 0bc5eab96 Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com> Date: Fri Feb 7 07:30:06 2025 +0000 Merge pull request #3115 from TechnologyEnhancedLearning/DLS-Release-v1.1.1 Dls release v1.1.1 commit 6a4b4c2be472e4b1fc13afaa93b8ef8d636fd34a Author: Sherif Olaboye Date: Wed Feb 5 09:11:44 2025 +0000 TD-5222 Error when enrolling a staff on self assessment from the tracking system commit 2f0d16cb654cf3ca168d9ad530cd26686efa9ee0 Author: Auldrin Possa Date: Tue Feb 4 16:20:14 2025 +0000 TD-4475-matching proficiencies count added to screen commit ef9eabdda9bd394e699e9d0f1ad151de4f17c8a2 Author: Auldrin Possa Date: Fri Jan 31 16:55:48 2025 +0000 TD-5306-self-assessments report file name format changed commit a78c0a801415ce57875946ecbb727455e6d55be7 Author: Sherif Olaboye Date: Fri Jan 31 14:00:49 2025 +0000 TD-5292 Issue with 'Go back' link when creating a course and adding 'Course content' on 'Course set up' screen commit fc760ef54148061790238616661b4a3c8521d985 Author: Sherif Olaboye Date: Fri Jan 31 10:21:49 2025 +0000 TD-5291 Issue on 'Course set up' screen when selected Few course content first time and changed to 'All' of them clicking 'change link' commit 4c1d42f401cd3937c3ede315646192b4aaa662d0 Author: Sherif Olaboye Date: Thu Jan 30 13:31:08 2025 +0000 TD-5291 Issue on 'Course set up' screen when selected Few course content first time and changed to 'All' of them clicking 'change link' commit 409b1ee9edaae17dac0e5125e5463d0fb8b9a744 Author: Sherif Olaboye Date: Thu Jan 30 12:48:35 2025 +0000 TD-5291 Issue on 'Course set up' screen when selected Few course content first time and changed to 'All' of them clicking 'change link' --- .../CourseCategoriesDataService.cs | 4 +- .../DataServices/CourseDataService.cs | 2 +- .../CandidateAssessmentsDataService.cs | 7 + .../CompetencyDataService.cs | 4 +- .../SelfAssessmentDataService.cs | 6 +- .../DataServices/SupervisorDataService.cs | 106 +++++--- .../DigitalLearningSolutions.Data.csproj | 2 +- .../Supervisor/DelegateSelfAssessment.cs | 1 + .../PromoteToAdminControllerTests.cs | 2 +- .../Services/EmailGenerationServiceTests.cs | 9 +- .../SelfAssessment.cs | 21 +- .../SupervisorController/Supervisor.cs | 12 +- .../Administrator/AdministratorController.cs | 10 +- .../SelfAssessmentReportsController.cs | 5 +- .../CourseSetup/CourseSetupController.cs | 79 ++++-- .../Delegates/PromoteToAdminController.cs | 6 +- .../Services/CourseCategoriesService.cs | 4 +- .../Services/EmailGenerationService.cs | 13 +- .../Services/SelfAssessmentService.cs | 13 +- .../EnrolDelegateSummaryViewModel.cs | 1 + .../ReviewSelfAssessmentViewModel.cs | 5 +- .../Supervisor/ReviewSelfAssessment.cshtml | 7 +- ...SelectDelegateSupervisorRoleSummary.cshtml | 11 +- .../Supervisor/VerifyMultipleResults.cshtml | 236 +++++++++--------- .../SetSectionContent.cshtml | 43 ++-- 25 files changed, 361 insertions(+), 248 deletions(-) diff --git a/DigitalLearningSolutions.Data/DataServices/CourseCategoriesDataService.cs b/DigitalLearningSolutions.Data/DataServices/CourseCategoriesDataService.cs index 1135172708..ad6e96166c 100644 --- a/DigitalLearningSolutions.Data/DataServices/CourseCategoriesDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/CourseCategoriesDataService.cs @@ -9,7 +9,7 @@ public interface ICourseCategoriesDataService { IEnumerable GetCategoriesForCentreAndCentrallyManagedCourses(int centreId); - string? GetCourseCategoryName(int categoryId); + string? GetCourseCategoryName(int? categoryId); } public class CourseCategoriesDataService : ICourseCategoriesDataService @@ -34,7 +34,7 @@ FROM CourseCategories ); } - public string? GetCourseCategoryName(int categoryId) + public string? GetCourseCategoryName(int? categoryId) { var name = connection.QueryFirstOrDefault( @"SELECT CategoryName diff --git a/DigitalLearningSolutions.Data/DataServices/CourseDataService.cs b/DigitalLearningSolutions.Data/DataServices/CourseDataService.cs index fee4f1b696..06196293a0 100644 --- a/DigitalLearningSolutions.Data/DataServices/CourseDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/CourseDataService.cs @@ -551,7 +551,7 @@ BEGIN TRANSACTION UPDATE CandidateAssessmentSupervisors SET Removed = NULL {((selfAssessmentSupervisorRoleId > 0) ? " ,SelfAssessmentSupervisorRoleID = @selfAssessmentSupervisorRoleID" : string.Empty)} - WHERE CandidateAssessmentID = @candidateAssessmentId AND SupervisorDelegateId = @supervisorDelegateId + WHERE CandidateAssessmentID = @candidateAssessmentId AND SupervisorDelegateId = @supervisorDelegateId AND SelfAssessmentSupervisorRoleID = @selfAssessmentSupervisorRoleID COMMIT TRANSACTION"; diff --git a/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs b/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs index 2390d54147..bb1dc7649f 100644 --- a/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs @@ -298,6 +298,13 @@ INNER JOIN CompetencyGroups AS CG } } + public void RemoveSignoffRequestById(int candidateAssessmentSupervisorVerificationsId) + { + var numberOfAffectedRows = connection.Execute( + @" DELETE FROM CandidateAssessmentSupervisorVerifications WHERE ID = @candidateAssessmentSupervisorVerificationsId ", + new { candidateAssessmentSupervisorVerificationsId }); + } + public void SetCompleteByDate(int selfAssessmentId, int delegateUserId, DateTime? completeByDate) { diff --git a/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CompetencyDataService.cs b/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CompetencyDataService.cs index 76a1a199bd..3c333e78e8 100644 --- a/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CompetencyDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CompetencyDataService.cs @@ -635,7 +635,7 @@ FROM SelfAssessmentResults s inner join SelfAssessmentResultSupervisorVerifications sv ON s.ID = sv.SelfAssessmentResultId AND sv.Superceded = 0 WHERE s.CompetencyID = @competencyId AND s.SelfAssessmentID = @selfAssessmentId - AND s.DelegateUserID = @delegateUserId", + AND s.DelegateUserID = @delegateUserId AND sv.Verified IS NULL", new { selfAssessmentId, delegateUserId, competencyId } ); } @@ -643,8 +643,6 @@ FROM SelfAssessmentResults s inner join public void RemoveReviewCandidateAssessmentOptionalCompetencies(int id) { - connection.Execute(@"UPDATE SelfAssessmentResults SET Result = NULL WHERE ID = @id", new { id}); - connection.Execute( @"delete from SelfAssessmentResultSupervisorVerifications WHERE SelfAssessmentResultId = @id", new { id }); diff --git a/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentDataService.cs b/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentDataService.cs index d4b87c6f78..324a1050a7 100644 --- a/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentDataService.cs @@ -78,6 +78,7 @@ int competencyId void UpdateLastAccessed(int selfAssessmentId, int delegateUserId); void RemoveSignoffRequests(int selfAssessmentId, int delegateUserId, int competencyGroupsId); + void RemoveSignoffRequestById(int candidateAssessmentSupervisorVerificationsId); void SetCompleteByDate(int selfAssessmentId, int delegateUserId, DateTime? completeByDate); void SetSubmittedDateNow(int selfAssessmentId, int delegateUserId); @@ -173,7 +174,7 @@ int GetSelfAssessmentActivityDelegatesExportCount(string searchString, string so bool IsCentreSelfAssessment(int selfAssessmentId, int centreId); bool HasMinimumOptionalCompetencies(int selfAssessmentId, int delegateUserId); int GetSelfAssessmentCategoryId(int selfAssessmentId); - void RemoveReviewCandidateAssessmentOptionalCompetencies(int id); + void RemoveReviewCandidateAssessmentOptionalCompetencies(int id); public IEnumerable GetSelfAssessmentResultswithSupervisorVerificationsForDelegateSelfAssessmentCompetency( int delegateUserId, int selfAssessmentId, @@ -683,9 +684,6 @@ BEGIN TRANSACTION UPDATE CandidateAssessments SET RemovedDate = GETUTCDATE(), RemovalMethodID = 2 WHERE ID = @candidateAssessmentsId AND RemovedDate IS NULL - UPDATE CandidateAssessmentSupervisors SET Removed = GETUTCDATE() - WHERE CandidateAssessmentID = @candidateAssessmentsId AND Removed IS NULL - COMMIT TRANSACTION END TRY BEGIN CATCH diff --git a/DigitalLearningSolutions.Data/DataServices/SupervisorDataService.cs b/DigitalLearningSolutions.Data/DataServices/SupervisorDataService.cs index c97ecf67a8..3409396ab1 100644 --- a/DigitalLearningSolutions.Data/DataServices/SupervisorDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/SupervisorDataService.cs @@ -620,20 +620,21 @@ FROM CandidateAssessmentSupervisors AS cas INNER JOIN { return connection.Query( @$"SELECT ca.ID, sa.ID AS SelfAssessmentID, sa.Name AS RoleName, sa.QuestionLabel, sa.DescriptionLabel, sa.ReviewerCommentsLabel, - sa.SupervisorSelfAssessmentReview, sa.SupervisorResultsReview, ca.StartedDate, - COALESCE(ca.LastAccessed, ca.StartedDate) AS LastAccessed, - ca.CompleteByDate, ca.LaunchCount, ca.CompletedDate, - (SELECT COUNT(*) AS Expr1 - FROM CandidateAssessmentSupervisorVerifications AS casv - WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Requested IS NOT NULL) AND (Verified IS NULL)) AS SignOffRequested, - {signedOffFields} - (SELECT COUNT(*) AS Expr1 - FROM SelfAssessmentResultSupervisorVerifications AS sarsv - WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Verified IS NULL) AND (sarsv.Superceded = 0)) AS ResultsVerificationRequests - FROM CandidateAssessmentSupervisors AS cas INNER JOIN - CandidateAssessments AS ca ON cas.CandidateAssessmentID = ca.ID INNER JOIN - SelfAssessments AS sa ON sa.ID = ca.SelfAssessmentID - WHERE (ca.ID = @candidateAssessmentId) AND (ISNULL(@adminIdCategoryID, 0) = 0 OR sa.CategoryID = @adminIdCategoryId)", new { candidateAssessmentId, adminIdCategoryId } + sa.SupervisorSelfAssessmentReview, sa.SupervisorResultsReview, ca.StartedDate, + COALESCE(ca.LastAccessed, ca.StartedDate) AS LastAccessed, + ca.CompleteByDate, ca.LaunchCount, ca.CompletedDate, + (SELECT COUNT(*) AS Expr1 + FROM CandidateAssessmentSupervisorVerifications AS casv + WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Requested IS NOT NULL) AND (Verified IS NULL)) AS SignOffRequested, + {signedOffFields} + (SELECT COUNT(*) AS Expr1 + FROM SelfAssessmentResultSupervisorVerifications AS sarsv + WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Verified IS NULL) AND (sarsv.Superceded = 0)) AS ResultsVerificationRequests, + sa.Vocabulary + FROM CandidateAssessmentSupervisors AS cas INNER JOIN + CandidateAssessments AS ca ON cas.CandidateAssessmentID = ca.ID INNER JOIN + SelfAssessments AS sa ON sa.ID = ca.SelfAssessmentID + WHERE (ca.ID = @candidateAssessmentId) AND (ISNULL(@adminIdCategoryID, 0) = 0 OR sa.CategoryID = @adminIdCategoryId)", new { candidateAssessmentId, adminIdCategoryId } ).FirstOrDefault(); } public DelegateSelfAssessment? GetSelfAssessmentBySupervisorDelegateCandidateAssessmentId(int candidateAssessmentId, int supervisorDelegateId) @@ -695,24 +696,25 @@ FROM SelfAssessmentResults AS sar2 public DelegateSelfAssessment? GetSelfAssessmentByCandidateAssessmentId(int candidateAssessmentId, int adminId, int? adminIdCategoryId) { return connection.Query( - @$"SELECT ca.ID, sa.ID AS SelfAssessmentID, sa.Name AS RoleName, sa.SupervisorSelfAssessmentReview, sa.SupervisorResultsReview, sa.ReviewerCommentsLabel, COALESCE (sasr.RoleName, 'Supervisor') AS SupervisorRoleTitle, ca.StartedDate, ca.LastAccessed, ca.CompleteByDate, ca.LaunchCount, ca.CompletedDate, r.CompetencyAssessment, sg.SubGroup, pg.ProfessionalGroup, sa.SupervisorResultsReview AS IsSupervisorResultsReviewed, - (SELECT COUNT(*) AS Expr1 - FROM CandidateAssessmentSupervisorVerifications AS casv - WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Requested IS NOT NULL) AND (Verified IS NULL)) AS SignOffRequested, - {signedOffFields} - (SELECT COUNT(*) AS Expr1 - FROM SelfAssessmentResultSupervisorVerifications AS sarsv - WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Verified IS NULL) AND (Superceded = 0)) AS ResultsVerificationRequests, - ca.NonReportable,ca.DelegateUserID + @$"SELECT ca.ID, sa.ID AS SelfAssessmentID, sa.Name AS RoleName, sa.SupervisorSelfAssessmentReview, sa.SupervisorResultsReview, sa.ReviewerCommentsLabel, COALESCE (sasr.RoleName, 'Supervisor') AS SupervisorRoleTitle, ca.StartedDate, ca.LastAccessed, ca.CompleteByDate, ca.LaunchCount, ca.CompletedDate, r.RoleProfile, sg.SubGroup, pg.ProfessionalGroup, sa.SupervisorResultsReview AS IsSupervisorResultsReviewed, + (SELECT COUNT(*) AS Expr1 + FROM CandidateAssessmentSupervisorVerifications AS casv + WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Requested IS NOT NULL) AND (Verified IS NULL)) AS SignOffRequested, + {signedOffFields} + (SELECT COUNT(*) AS Expr1 + FROM SelfAssessmentResultSupervisorVerifications AS sarsv + WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Verified IS NULL) AND (Superceded = 0)) AS ResultsVerificationRequests, + ca.NonReportable,ca.DelegateUserID, + sa.Vocabulary FROM CandidateAssessmentSupervisors AS cas INNER JOIN - CandidateAssessments AS ca ON cas.CandidateAssessmentID = ca.ID INNER JOIN - SelfAssessments AS sa ON sa.ID = ca.SelfAssessmentID INNER JOIN - SupervisorDelegates AS sd ON cas.SupervisorDelegateId = sd.ID LEFT OUTER JOIN - NRPProfessionalGroups AS pg ON sa.NRPProfessionalGroupID = pg.ID LEFT OUTER JOIN - NRPSubGroups AS sg ON sa.NRPSubGroupID = sg.ID LEFT OUTER JOIN - NRPRoles AS r ON sa.NRPRoleID = r.ID - LEFT OUTER JOIN SelfAssessmentSupervisorRoles AS sasr ON cas.SelfAssessmentSupervisorRoleID = sasr.ID - WHERE (ca.ID = @candidateAssessmentId) AND (cas.Removed IS NULL) AND (sd.SupervisorAdminID = @adminId) AND (ISNULL(@adminIdCategoryID, 0) = 0 OR sa.CategoryID = @adminIdCategoryId)", + CandidateAssessments AS ca ON cas.CandidateAssessmentID = ca.ID INNER JOIN + SelfAssessments AS sa ON sa.ID = ca.SelfAssessmentID INNER JOIN + SupervisorDelegates AS sd ON cas.SupervisorDelegateId = sd.ID LEFT OUTER JOIN + NRPProfessionalGroups AS pg ON sa.NRPProfessionalGroupID = pg.ID LEFT OUTER JOIN + NRPSubGroups AS sg ON sa.NRPSubGroupID = sg.ID LEFT OUTER JOIN + NRPRoles AS r ON sa.NRPRoleID = r.ID + LEFT OUTER JOIN SelfAssessmentSupervisorRoles AS sasr ON cas.SelfAssessmentSupervisorRoleID = sasr.ID + WHERE (ca.ID = @candidateAssessmentId) AND (cas.Removed IS NULL) AND (sd.SupervisorAdminID = @adminId) AND (ISNULL(@adminIdCategoryID, 0) = 0 OR sa.CategoryID = @adminIdCategoryId)", new { candidateAssessmentId, adminId, adminIdCategoryId } ).FirstOrDefault(); } @@ -941,18 +943,45 @@ FROM CandidateAssessmentSupervisors if (candidateAssessmentSupervisorsId == 0) { + //For a candidate assessment, only one supervisor role should be active (Removed = null) var numberOfAffectedRows = connection.Execute( - @"INSERT INTO CandidateAssessmentSupervisors (CandidateAssessmentID, SupervisorDelegateId, SelfAssessmentSupervisorRoleID) - VALUES (@candidateAssessmentId, @supervisorDelegateId, @selfAssessmentSupervisorRoleId)", new { candidateAssessmentId, supervisorDelegateId, selfAssessmentSupervisorRoleId } + @"BEGIN TRY + BEGIN TRANSACTION + UPDATE CandidateAssessmentSupervisors SET Removed = getUTCDate() WHERE CandidateAssessmentID = @candidateAssessmentId + AND SupervisorDelegateId = @supervisorDelegateId + AND Removed IS NULL + + INSERT INTO CandidateAssessmentSupervisors (CandidateAssessmentID, SupervisorDelegateId, SelfAssessmentSupervisorRoleID) + VALUES (@candidateAssessmentId, @supervisorDelegateId, @selfAssessmentSupervisorRoleId) + + COMMIT TRANSACTION + END TRY + BEGIN CATCH + ROLLBACK TRANSACTION + END CATCH", + new { candidateAssessmentId, supervisorDelegateId, selfAssessmentSupervisorRoleId } ); } else { + //For a candidate assessment, only one supervisor role should be active (Removed = null) int numberOfAffectedRows = connection.Execute( - @"UPDATE CandidateAssessmentSupervisors SET Removed = NULL WHERE CandidateAssessmentID = @candidateAssessmentId - AND SupervisorDelegateId = @supervisorDelegateId - AND SelfAssessmentSupervisorRoleId=@selfAssessmentSupervisorRoleId", - new { candidateAssessmentId, supervisorDelegateId, selfAssessmentSupervisorRoleId }); + @"BEGIN TRY + BEGIN TRANSACTION + UPDATE CandidateAssessmentSupervisors SET Removed = getUTCDate() WHERE CandidateAssessmentID = @candidateAssessmentId + AND SupervisorDelegateId = @supervisorDelegateId + AND Removed IS NULL + + UPDATE CandidateAssessmentSupervisors SET Removed = NULL WHERE CandidateAssessmentID = @candidateAssessmentId + AND SupervisorDelegateId = @supervisorDelegateId + AND SelfAssessmentSupervisorRoleId = @selfAssessmentSupervisorRoleId + + COMMIT TRANSACTION + END TRY + BEGIN CATCH + ROLLBACK TRANSACTION + END CATCH", + new { candidateAssessmentId, supervisorDelegateId, selfAssessmentSupervisorRoleId }); } } return candidateAssessmentId; @@ -966,9 +995,6 @@ BEGIN TRANSACTION UPDATE CandidateAssessments SET RemovedDate = getUTCDate(), RemovalMethodID = 2 WHERE ID = @candidateAssessmentId AND RemovedDate IS NULL - UPDATE CandidateAssessmentSupervisors SET Removed = getUTCDate() - WHERE CandidateAssessmentID = @candidateAssessmentId AND Removed IS NULL - COMMIT TRANSACTION END TRY BEGIN CATCH diff --git a/DigitalLearningSolutions.Data/DigitalLearningSolutions.Data.csproj b/DigitalLearningSolutions.Data/DigitalLearningSolutions.Data.csproj index 05556966ee..2d7bea0631 100644 --- a/DigitalLearningSolutions.Data/DigitalLearningSolutions.Data.csproj +++ b/DigitalLearningSolutions.Data/DigitalLearningSolutions.Data.csproj @@ -14,7 +14,7 @@ - + diff --git a/DigitalLearningSolutions.Data/Models/Supervisor/DelegateSelfAssessment.cs b/DigitalLearningSolutions.Data/Models/Supervisor/DelegateSelfAssessment.cs index 014de6be9f..212089f305 100644 --- a/DigitalLearningSolutions.Data/Models/Supervisor/DelegateSelfAssessment.cs +++ b/DigitalLearningSolutions.Data/Models/Supervisor/DelegateSelfAssessment.cs @@ -28,5 +28,6 @@ public class DelegateSelfAssessment public bool IsSupervisorResultsReviewed { get; set; } public bool IsAssignedToSupervisor { get; set; } public bool NonReportable { get; set; } + public string? Vocabulary { get; set; } } } diff --git a/DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/Delegates/PromoteToAdminControllerTests.cs b/DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/Delegates/PromoteToAdminControllerTests.cs index 5b84a3c962..9abc93259d 100644 --- a/DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/Delegates/PromoteToAdminControllerTests.cs +++ b/DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/Delegates/PromoteToAdminControllerTests.cs @@ -94,7 +94,7 @@ public void Summary_post_registers_delegate_with_expected_values() A._, A._, A._, A._, A._, A._, A._, A._, A._, A._, A._, A._, - A._, A._ + A._, A._, A._ )).Returns(adminRolesEmail); // When diff --git a/DigitalLearningSolutions.Web.Tests/Services/EmailGenerationServiceTests.cs b/DigitalLearningSolutions.Web.Tests/Services/EmailGenerationServiceTests.cs index 96178e2220..47cb0eff9d 100644 --- a/DigitalLearningSolutions.Web.Tests/Services/EmailGenerationServiceTests.cs +++ b/DigitalLearningSolutions.Web.Tests/Services/EmailGenerationServiceTests.cs @@ -45,6 +45,7 @@ bool isCmsManager const string supervisorFirstName = "TestAdminFirstName"; const string supervisorLastName = "TestAdminFirstName"; const string supervisorEmail = "admin@example.com"; + const string categoryName = "Digital Workplace"; const string centreName = "Test Centre Name"; @@ -65,7 +66,8 @@ bool isCmsManager isCmsAdministrator, isCmsManager, delegateEmail, - centreName + centreName, + categoryName ); // Then @@ -164,6 +166,11 @@ bool isCmsManager returnedEmail.Body.HtmlBody.Should().NotContain("
      • CMS manager
        • "); returnedEmail.Body.TextBody.Should().NotContain("CMS manager"); } + if (!string.IsNullOrEmpty(categoryName)) + { + returnedEmail.Body.HtmlBody.Should().Contain("In the Digital Workplace category."); + returnedEmail.Body.TextBody.Should().Contain("In the Digital Workplace category."); + } returnedEmail.Body.HtmlBody.Should().Contain("the next time you log in to " + centreName + "."); returnedEmail.Body.TextBody.Should().Contain("the next time you log in to " + centreName + "."); diff --git a/DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs b/DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs index 2234f7d9eb..4947c6bd75 100644 --- a/DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs +++ b/DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs @@ -1565,7 +1565,18 @@ ManageOptionalCompetenciesViewModel model } } - + + if (!selfAssessmentService.HasMinimumOptionalCompetencies(selfAssessmentId, delegateUserId)) + { + var supervisorsSignOffs = selfAssessmentService.GetSupervisorSignOffsForCandidateAssessment(selfAssessmentId, delegateUserId); + + if (supervisorsSignOffs.FirstOrDefault() is { Verified: null, Removed: null }) + { + selfAssessmentService.RemoveSignoffRequestById(supervisorsSignOffs.FirstOrDefault().ID); + } + } + + return RedirectToAction("SelfAssessmentOverview", new { selfAssessmentId, vocabulary }); } @@ -1577,9 +1588,9 @@ public IActionResult RequestSignOff(int selfAssessmentId) var delegateId = User.GetCandidateIdKnownNotNull(); var recentResults = selfAssessmentService.GetMostRecentResults(selfAssessmentId, delegateId).ToList(); var competencySummaries = CertificateHelper.CompetencySummation(recentResults); - - if (competencySummaries.QuestionsCount != competencySummaries.VerifiedCount) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 }); - + + if (competencySummaries.QuestionsCount != competencySummaries.VerifiedCount) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 }); + var assessment = selfAssessmentService.GetSelfAssessmentForCandidateById(delegateUserId, selfAssessmentId); var supervisors = selfAssessmentService.GetSignOffSupervisorsForSelfAssessmentId(selfAssessmentId, delegateUserId); @@ -1591,7 +1602,7 @@ public IActionResult RequestSignOff(int selfAssessmentId) NumberOfSelfAssessedOptionalCompetencies = optionalCompetencies.Count(x => x.IncludedInSelfAssessment) }; if (model.NumberOfSelfAssessedOptionalCompetencies < model.SelfAssessment.MinimumOptionalCompetencies) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 }); - + return View("SelfAssessments/RequestSignOff", model); } diff --git a/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs b/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs index 93c8e1f610..21b555391c 100644 --- a/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs +++ b/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs @@ -1061,8 +1061,8 @@ public IActionResult QuickAddSupervisor(int selfAssessmentId, int supervisorDele var sessionEnrolOnCompetencyAssessment = new SessionEnrolOnCompetencyAssessment() { - SelfAssessmentID = supervisorRoles.FirstOrDefault().SelfAssessmentID, - SelfAssessmentSupervisorRoleId = supervisorRoles.FirstOrDefault().ID + SelfAssessmentID = supervisorRoles.FirstOrDefault() != null ? supervisorRoles.FirstOrDefault().SelfAssessmentID : selfAssessmentId, + SelfAssessmentSupervisorRoleId = supervisorRoles.FirstOrDefault() != null ? supervisorRoles.FirstOrDefault().ID : 0 }; multiPageFormService.SetMultiPageFormData( @@ -1070,7 +1070,7 @@ public IActionResult QuickAddSupervisor(int selfAssessmentId, int supervisorDele MultiPageFormDataFeature.EnrolDelegateOnProfileAssessment, TempData ); - var supervisorRoleName = supervisorRoles.FirstOrDefault().RoleName; + var supervisorRoleName = supervisorRoles.FirstOrDefault() != null ? supervisorRoles.FirstOrDefault().RoleName : ""; var model = new EnrolDelegateSummaryViewModel { CompetencyAssessment = competencyAssessment, @@ -1328,6 +1328,9 @@ public IActionResult ConfirmNominateSupervisor(SupervisorDelegateViewModel super { registrationService.PromoteDelegateToAdmin(adminRoles, supervisorDelegate.SelfAssessmentCategory, (int)supervisorDelegateDetail.DelegateUserID, (int)User.GetCentreId(), true); + int? learningCategory = supervisorDelegate.SelfAssessmentCategory == 0 ? null : supervisorDelegate.SelfAssessmentCategory; + var learningCategoryName = courseCategoriesService.GetCourseCategoryName(learningCategory); + if (delegateUser != null && adminUser != null) { var adminRolesEmail = emailGenerationService.GenerateDelegateAdminRolesNotificationEmail( @@ -1344,7 +1347,8 @@ public IActionResult ConfirmNominateSupervisor(SupervisorDelegateViewModel super isCmsAdmin: adminRoles.IsCmsAdministrator, isCmsManager: adminRoles.IsCmsManager, primaryEmail: delegateUser.EmailAddress, - centreName: centreName + centreName: centreName, + learningCategoryName ); emailService.SendEmail(adminRolesEmail); diff --git a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/Administrator/AdministratorController.cs b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/Administrator/AdministratorController.cs index 317eec01ad..57fa350f35 100644 --- a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/Administrator/AdministratorController.cs +++ b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/Administrator/AdministratorController.cs @@ -177,8 +177,10 @@ public IActionResult EditAdminRoles(AdminRolesFormData model, int adminId) adminRoles, AdminCategoryHelper.AdminCategoryToCategoryId(model.LearningCategory) ); + int? learningCategory = model.LearningCategory == 0 ? null : model.LearningCategory; + var learningCategoryName = courseCategoriesService.GetCourseCategoryName(learningCategory); - SendNotificationEmail(adminId, adminRoles); + SendNotificationEmail(adminId, adminRoles, learningCategoryName); return RedirectToAction( "Index", @@ -190,7 +192,8 @@ public IActionResult EditAdminRoles(AdminRolesFormData model, int adminId) private void SendNotificationEmail( int adminIdToPromote, - AdminRoles adminRoles + AdminRoles adminRoles, + string learningCategoryName ) { var adminId = User.GetAdminId(); @@ -215,7 +218,8 @@ AdminRoles adminRoles isCmsAdmin: adminRoles.IsCmsAdministrator, isCmsManager: adminRoles.IsCmsManager, primaryEmail: delegateUserEmailDetails.EmailAddress, - centreName: centreName + centreName: centreName, + learningCategoryName ); emailService.SendEmail(adminRolesEmail); diff --git a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/SelfAssessmentReports/SelfAssessmentReportsController.cs b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/SelfAssessmentReports/SelfAssessmentReportsController.cs index 7af1d2f4ca..0491429fd3 100644 --- a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/SelfAssessmentReports/SelfAssessmentReportsController.cs +++ b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/SelfAssessmentReports/SelfAssessmentReportsController.cs @@ -8,11 +8,9 @@ using DigitalLearningSolutions.Web.Attributes; using DigitalLearningSolutions.Web.Models.Enums; using DigitalLearningSolutions.Data.Enums; - using System; using DigitalLearningSolutions.Data.Utilities; using DigitalLearningSolutions.Web.ViewModels.TrackingSystem.Centre.Reports; using DigitalLearningSolutions.Web.Helpers.ExternalApis; - using System.Threading.Tasks; using Microsoft.Extensions.Configuration; using DigitalLearningSolutions.Data.Extensions; using DigitalLearningSolutions.Web.Services; @@ -75,8 +73,9 @@ public IActionResult DownloadDigitalCapabilityToExcel() public IActionResult DownloadSelfAssessmentReport(int selfAssessmentId) { var centreId = User.GetCentreId(); + var selfAssessmentName = selfAssessmentService.GetSelfAssessmentNameById(selfAssessmentId); var dataFile = selfAssessmentReportService.GetSelfAssessmentExcelExportForCentre((int)centreId, selfAssessmentId); - var fileName = $"Competency Self Assessment Report - Centre {centreId} - downloaded {DateTime.Today:yyyy-MM-dd}.xlsx"; + var fileName = $"{((selfAssessmentName.Length > 50) ? selfAssessmentName.Substring(0, 50) : selfAssessmentName)} Report - Centre {centreId} - downloaded {clockUtility.UtcNow:yyyy-MM-dd}.xlsx"; return File( dataFile, FileHelper.GetContentTypeFromFileName(fileName), diff --git a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/CourseSetup/CourseSetupController.cs b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/CourseSetup/CourseSetupController.cs index 775e52ecdb..93eb9dc09e 100644 --- a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/CourseSetup/CourseSetupController.cs +++ b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/CourseSetup/CourseSetupController.cs @@ -365,7 +365,8 @@ public IActionResult SetCourseOptions(EditCourseOptionsFormData model) data!.CourseOptionsData = model.ToCourseOptionsTempData(); multiPageFormService.SetMultiPageFormData(data, MultiPageFormDataFeature.AddNewCourse, TempData); - return RedirectToAction("SetCourseContent", false); + bool editCourseContent = data?.EditCourseContent ?? false; + return RedirectToAction("SetCourseContent", editCourseContent); } [HttpGet("AddCourse/SetCourseContent")] @@ -381,7 +382,7 @@ public IActionResult SetCourseContent(bool editCourseContent) { return RedirectToAction("Summary"); } - data.EditCourseContent = editCourseContent; + data.EditCourseContent = data.EditCourseContent || editCourseContent; multiPageFormService.SetMultiPageFormData(data, MultiPageFormDataFeature.AddNewCourse, TempData); var model = data!.CourseContentData != null @@ -459,17 +460,15 @@ public IActionResult SetSectionContent(int sectionIndex) } var showDiagnostic = data.Application!.DiagAssess; - if (data.EditCourseContent) + var tutorial = GetTutorialsFromSectionContentData(data.SectionContentData, tutorials); + if (tutorial.Count() == 0) { - var tutorial = GetTutorialsFromSectionContentData(data.SectionContentData, tutorials); - var model = new SetSectionContentViewModel(section, sectionIndex, showDiagnostic, tutorial); - return View("AddNewCentreCourse/SetSectionContent", model); - } - else - { - var model = new SetSectionContentViewModel(section, sectionIndex, showDiagnostic, tutorials); - return View("AddNewCentreCourse/SetSectionContent", model); + var models = new SetSectionContentViewModel(section, sectionIndex, showDiagnostic, tutorials); + return View("AddNewCentreCourse/SetSectionContent", models); } + var model = new SetSectionContentViewModel(section, sectionIndex, showDiagnostic, tutorial); + return View("AddNewCentreCourse/SetSectionContent", model); + } @@ -500,6 +499,21 @@ string action public IActionResult Summary() { var data = multiPageFormService.GetMultiPageFormData(MultiPageFormDataFeature.AddNewCourse, TempData).GetAwaiter().GetResult(); + var updatedSections = new List(); + foreach (var item in data.CourseContentData.SelectedSectionIds) + { + var tutorialsForSection = tutorialService.GetTutorialsForSection(item).ToList(); + + var matchingSections = data.SectionContentData + .Where(section => section.Tutorials.Any(t => tutorialsForSection.Any(tf => tf.TutorialId == t.TutorialId))) + .ToList(); + + updatedSections.AddRange(matchingSections); + } + + updatedSections = updatedSections.Distinct().ToList(); + data.SectionContentData = updatedSections; + multiPageFormService.SetMultiPageFormData(data, MultiPageFormDataFeature.AddNewCourse, TempData); var model = new SummaryViewModel(data!); @@ -651,11 +665,23 @@ private IActionResult SaveSectionAndRedirect(SetSectionContentViewModel model) { data.SectionContentData = new List(); } - if (data.EditCourseContent) + var sectionsToRemove = new List(); + foreach (var section in data.SectionContentData) { - return RedirectToNextSectionOrSummary( - model.Index, - new SetCourseContentViewModel(data.CourseContentData!)); + section.Tutorials = section.Tutorials + .Where(t => !model.Tutorials.Any(newT => newT.TutorialId == t.TutorialId)) + .ToList(); + if (!section.Tutorials.Any()) + { + sectionsToRemove.Add(section); + } + } + if (sectionsToRemove.Count > 0) + { + foreach (var section in sectionsToRemove) + { + data.SectionContentData.Remove(section); + } } data!.SectionContentData!.Add( new SectionContentTempData( @@ -732,18 +758,19 @@ private static IEnumerable UpdateC private IEnumerable GetTutorialsFromSectionContentData(List sectionContentData, List sectionTutorial) { if (sectionContentData == null || sectionTutorial == null) return new List(); - var updatedRecords = sectionContentData - .SelectMany(data => data.Tutorials) - .Join(sectionTutorial, - tempData => new { tempData.TutorialId, tempData.TutorialName }, // Match on both TutorialId and TutorialName - index => new { index.TutorialId, index.TutorialName }, - (tempData, index) => new Tutorial + var updatedRecords = sectionTutorial + .GroupJoin( + sectionContentData.SelectMany(data => data.Tutorials), + tutorial => new { tutorial.TutorialId, tutorial.TutorialName }, + tempData => new { tempData.TutorialId, tempData.TutorialName }, + (tutorial, matchingTempData) => new Tutorial { - TutorialId = index.TutorialId, - TutorialName = index.TutorialName, - Status = tempData.LearningEnabled, // Updated from sectionContentData - DiagStatus = tempData.DiagnosticEnabled // Updated from sectionContentData - }) + TutorialId = tutorial.TutorialId, + TutorialName = tutorial.TutorialName, + Status = matchingTempData.Any() ? matchingTempData.First().LearningEnabled : tutorial.Status, + DiagStatus = matchingTempData.Any() ? matchingTempData.First().DiagnosticEnabled : tutorial.DiagStatus + } + ) .ToList(); return updatedRecords; diff --git a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/PromoteToAdminController.cs b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/PromoteToAdminController.cs index c579516102..21d02d0ef5 100644 --- a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/PromoteToAdminController.cs +++ b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/PromoteToAdminController.cs @@ -139,6 +139,9 @@ public IActionResult Index(AdminRolesFormData formData, int delegateId) var delegateUserEmailDetails = userService.GetDelegateById(delegateId); + int? learningCategory = formData.LearningCategory == 0 ? null : formData.LearningCategory; + var learningCategoryName = courseCategoriesService.GetCourseCategoryName(learningCategory); + if (delegateUserEmailDetails != null) { var adminRolesEmail = emailGenerationService.GenerateDelegateAdminRolesNotificationEmail( @@ -155,7 +158,8 @@ public IActionResult Index(AdminRolesFormData formData, int delegateId) isCmsAdmin: adminRoles.IsCmsAdministrator, isCmsManager: adminRoles.IsCmsManager, primaryEmail: delegateUserEmailDetails.EmailForCentreNotifications, - centreName: centreName + centreName: centreName, + categoryName: learningCategoryName ); emailService.SendEmail(adminRolesEmail); diff --git a/DigitalLearningSolutions.Web/Services/CourseCategoriesService.cs b/DigitalLearningSolutions.Web/Services/CourseCategoriesService.cs index fc136f598e..9b475e9286 100644 --- a/DigitalLearningSolutions.Web/Services/CourseCategoriesService.cs +++ b/DigitalLearningSolutions.Web/Services/CourseCategoriesService.cs @@ -7,7 +7,7 @@ namespace DigitalLearningSolutions.Web.Services public interface ICourseCategoriesService { IEnumerable GetCategoriesForCentreAndCentrallyManagedCourses(int centreId); - string? GetCourseCategoryName(int categoryId); + string? GetCourseCategoryName(int? categoryId); } public class CourseCategoriesService : ICourseCategoriesService { @@ -22,7 +22,7 @@ public IEnumerable GetCategoriesForCentreAndCentrallyManagedCourses(in return courseCategoriesDataService.GetCategoriesForCentreAndCentrallyManagedCourses(centreId); } - public string? GetCourseCategoryName(int categoryId) + public string? GetCourseCategoryName(int? categoryId) { return courseCategoriesDataService.GetCourseCategoryName(categoryId); } diff --git a/DigitalLearningSolutions.Web/Services/EmailGenerationService.cs b/DigitalLearningSolutions.Web/Services/EmailGenerationService.cs index b631d48adc..ff7a924f82 100644 --- a/DigitalLearningSolutions.Web/Services/EmailGenerationService.cs +++ b/DigitalLearningSolutions.Web/Services/EmailGenerationService.cs @@ -19,7 +19,8 @@ Email GenerateDelegateAdminRolesNotificationEmail( bool isCmsAdmin, bool isCmsManager, string primaryEmail, - string centreName + string centreName, + string categoryName ); } @@ -39,7 +40,8 @@ public Email GenerateDelegateAdminRolesNotificationEmail( bool isCmsAdmin, bool isCmsManager, string primaryEmail, - string centreName + string centreName, + string categoryName ) { const string emailSubjectLine = "New Digital Learning Solutions permissions granted"; @@ -101,6 +103,13 @@ string centreName builder.HtmlBody += "
      "; + if (!string.IsNullOrEmpty(categoryName)) + { + builder.TextBody += $@"In the {categoryName} category."; + builder.HtmlBody += $@" +

      In the {categoryName} category.

      "; + } + builder.TextBody += $@"You will be able to access the Digital Learning Solutions platform with these new access permissions the next time you log in to {centreName}."; builder.HtmlBody += $@"You will be able to access the Digital Learning Solutions platform with these new access permissions the next time you log in to {centreName}."; diff --git a/DigitalLearningSolutions.Web/Services/SelfAssessmentService.cs b/DigitalLearningSolutions.Web/Services/SelfAssessmentService.cs index ce7afea305..c9a50014fa 100644 --- a/DigitalLearningSolutions.Web/Services/SelfAssessmentService.cs +++ b/DigitalLearningSolutions.Web/Services/SelfAssessmentService.cs @@ -27,6 +27,7 @@ public interface ISelfAssessmentService void UpdateLastAccessed(int selfAssessmentId, int delegateUserId); void RemoveSignoffRequests(int selfAssessmentId, int delegateUserId, int competencyGroupsId); + void RemoveSignoffRequestById(int candidateAssessmentSupervisorVerificationsId); void IncrementLaunchCount(int selfAssessmentId, int delegateUserId); void SetCompleteByDate(int selfAssessmentId, int delegateUserId, DateTime? completeByDate); @@ -160,7 +161,7 @@ public IEnumerable GetSelfAssessmentResultswithSupervisorV int selfAssessmentId, int competencyId ); - void RemoveReviewCandidateAssessmentOptionalCompetencies(int id); + void RemoveReviewCandidateAssessmentOptionalCompetencies(int id); } public class SelfAssessmentService : ISelfAssessmentService @@ -201,6 +202,10 @@ public void RemoveSignoffRequests(int selfAssessmentId, int delegateUserId, int { selfAssessmentDataService.RemoveSignoffRequests(selfAssessmentId, delegateUserId, competencyGroupId); } + public void RemoveSignoffRequestById(int candidateAssessmentSupervisorVerificationsId) + { + selfAssessmentDataService.RemoveSignoffRequestById(candidateAssessmentSupervisorVerificationsId); + } public void IncrementLaunchCount(int selfAssessmentId, int delegateUserId) { selfAssessmentDataService.IncrementLaunchCount(selfAssessmentId, delegateUserId); @@ -467,10 +472,10 @@ public void RemoveEnrolment(int selfAssessmentId, int delegateUserId) var selfAssessmentCategoryId = selfAssessmentDataService.GetSelfAssessmentCategoryId((int)selfAssessmentId); - if (adminCategoryId > 0 && adminCategoryId != selfAssessmentCategoryId) + if (adminCategoryId > 0 && adminCategoryId != selfAssessmentCategoryId) { // return null variants of the object when the categoryID mismatches - return (new SelfAssessmentDelegatesData(), null); + return (new SelfAssessmentDelegatesData(), null); } (var delegateselfAssessments, int resultCount) = selfAssessmentDataService.GetSelfAssessmentDelegates(searchString, offSet, itemsPerPage, sortBy, sortDirection, @@ -603,7 +608,7 @@ int competencyId } public void RemoveReviewCandidateAssessmentOptionalCompetencies(int id) { - selfAssessmentDataService.RemoveReviewCandidateAssessmentOptionalCompetencies(id); + selfAssessmentDataService.RemoveReviewCandidateAssessmentOptionalCompetencies(id); } } } diff --git a/DigitalLearningSolutions.Web/ViewModels/Supervisor/EnrolDelegateSummaryViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/Supervisor/EnrolDelegateSummaryViewModel.cs index 681213e53f..ad66e71ac8 100644 --- a/DigitalLearningSolutions.Web/ViewModels/Supervisor/EnrolDelegateSummaryViewModel.cs +++ b/DigitalLearningSolutions.Web/ViewModels/Supervisor/EnrolDelegateSummaryViewModel.cs @@ -12,5 +12,6 @@ public class EnrolDelegateSummaryViewModel public string SupervisorRoleName { get; set; } public int SupervisorRoleCount { get; set; } public bool AllowSupervisorRoleSelection { get; set; } + public bool HasSupervisorRoles => !string.IsNullOrWhiteSpace(SupervisorRoleName); } } diff --git a/DigitalLearningSolutions.Web/ViewModels/Supervisor/ReviewSelfAssessmentViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/Supervisor/ReviewSelfAssessmentViewModel.cs index ea19f92d35..9a6463e28f 100644 --- a/DigitalLearningSolutions.Web/ViewModels/Supervisor/ReviewSelfAssessmentViewModel.cs +++ b/DigitalLearningSolutions.Web/ViewModels/Supervisor/ReviewSelfAssessmentViewModel.cs @@ -1,6 +1,5 @@ namespace DigitalLearningSolutions.Web.ViewModels.Supervisor { - using DigitalLearningSolutions.Data.Models.Frameworks; using DigitalLearningSolutions.Data.Models.SelfAssessments; using DigitalLearningSolutions.Data.Models.Supervisor; using DigitalLearningSolutions.Web.Helpers; @@ -15,9 +14,9 @@ public class ReviewSelfAssessmentViewModel public IEnumerable? SupervisorSignOffs { get; set; } public bool IsSupervisorResultsReviewed { get; set; } public SearchSupervisorCompetencyViewModel SearchViewModel { get; set; } - public string VocabPlural(string vocabulary) + public string VocabPlural() { - return FrameworkVocabularyHelper.VocabularyPlural(vocabulary); + return FrameworkVocabularyHelper.VocabularyPlural(DelegateSelfAssessment.Vocabulary); } public int CandidateAssessmentId { get; set; } public bool ExportToExcelHide { get; set; } diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/ReviewSelfAssessment.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/ReviewSelfAssessment.cshtml index fe90d8a161..38913441d2 100644 --- a/DigitalLearningSolutions.Web/Views/Supervisor/ReviewSelfAssessment.cshtml +++ b/DigitalLearningSolutions.Web/Views/Supervisor/ReviewSelfAssessment.cshtml @@ -96,7 +96,7 @@ } - @if(Model.CompetencySummaries.CanViewCertificate) + @if (Model.CompetencySummaries.CanViewCertificate) { } - @if(Model.DelegateSelfAssessment.SignOffRequested > 0 && Model.CompetencySummaries.VerifiedCount == Model.CompetencySummaries.QuestionsCount) + @if (Model.DelegateSelfAssessment.SignOffRequested > 0 && Model.CompetencySummaries.VerifiedCount == Model.CompetencySummaries.QuestionsCount) { Sign-off self assessment } - @if((Model.DelegateSelfAssessment.ResultsVerificationRequests > 1) && Model.CompetencySummaries.VerifiedCount < Model.CompetencySummaries.QuestionsCount) + @if ((Model.DelegateSelfAssessment.ResultsVerificationRequests > 1) && Model.CompetencySummaries.VerifiedCount < Model.CompetencySummaries.QuestionsCount) { Confirm multiple results } @@ -119,6 +119,7 @@ +

      @Model.CompetencyGroups.Sum(g => g.Count()) matching @Model.VocabPlural().ToLower()

      @if (Model.CompetencyGroups.Any()) { foreach (var competencyGroup in Model.CompetencyGroups) diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/SelectDelegateSupervisorRoleSummary.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/SelectDelegateSupervisorRoleSummary.cshtml index aee6d861fd..9c96e6b6d3 100644 --- a/DigitalLearningSolutions.Web/Views/Supervisor/SelectDelegateSupervisorRoleSummary.cshtml +++ b/DigitalLearningSolutions.Web/Views/Supervisor/SelectDelegateSupervisorRoleSummary.cshtml @@ -47,7 +47,15 @@
      -

      Supervision Summary

      +@if (!Model.Item1.HasSupervisorRoles) +{ +

      No supervisor roles have been configured for this self assessment.

      +} +else +{ + + +

      Supervision Summary

      @@ -115,3 +123,4 @@ Cancel
      +} diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/VerifyMultipleResults.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/VerifyMultipleResults.cshtml index 5857981d50..97dc08a7fa 100644 --- a/DigitalLearningSolutions.Web/Views/Supervisor/VerifyMultipleResults.cshtml +++ b/DigitalLearningSolutions.Web/Views/Supervisor/VerifyMultipleResults.cshtml @@ -1,56 +1,56 @@ @using DigitalLearningSolutions.Web.ViewModels.Supervisor; @model ReviewSelfAssessmentViewModel; @{ - ViewData["Title"] = "Review Self Assessment"; - ViewData["Application"] = "Supervisor"; - ViewData["HeaderPathName"] = "Supervisor"; + ViewData["Title"] = "Review Self Assessment"; + ViewData["Application"] = "Supervisor"; + ViewData["HeaderPathName"] = "Supervisor"; } @section NavMenuItems { - + } - @section NavBreadcrumbs { - +@section NavBreadcrumbs { + } @{ var errorHasOccurred = !ViewData.ModelState.IsValid; @@ -72,92 +72,92 @@
      } -
      +
      -

      - @Model.SupervisorDelegateDetail.FirstName @Model.SupervisorDelegateDetail.LastName -

      +

      + @Model.SupervisorDelegateDetail.FirstName @Model.SupervisorDelegateDetail.LastName +

      - +
      -
      -

      Confirm Multiple Results for @Model.DelegateSelfAssessment.RoleName

      - @if (Model.CompetencyGroups.Any()) +
      +

      Confirm Multiple Results for @Model.DelegateSelfAssessment.RoleName

      +@if (Model.CompetencyGroups.Any()) { -

      Tick each self assessment result that you wish to confirm and then click Submit

      -
      - @foreach (var competencyGroup in Model.CompetencyGroups) - { - var vocabulary = competencyGroup.First().Vocabulary; -
      - - - @competencyGroup.Key - - -
      - @if (competencyGroup.Count() > 1) - { -
      -
      - Select all @Model.VocabPlural(vocabulary).ToLower() - Deselect all @Model.VocabPlural(vocabulary).ToLower() -
      -
      - } - - - - - - - - - - @foreach (var competency in competencyGroup) - { - @foreach (var question in competency.AssessmentQuestions) +

      Tick each self assessment result that you wish to confirm and then click Submit

      + + @foreach (var competencyGroup in Model.CompetencyGroups) + { + var vocabulary = competencyGroup.First().Vocabulary; +
      + + + @competencyGroup.Key + + +
      + @if (competencyGroup.Count() > 1) { - - - - +
      +
      + Select all @Model.VocabPlural().ToLower() + Deselect all @Model.VocabPlural().ToLower() +
      +
      } - } - -
      - @vocabulary - - Question - - Response -
      - @competency.Vocabulary -
      - - -
      -
      - } -
      -
      - - Cancel -
      -
      -
      + + + + + + + + + + @foreach (var competency in competencyGroup) + { + @foreach (var question in competency.AssessmentQuestions) + { + + + + + } + } + +
      + @vocabulary + + Question + + Response +
      + @competency.Vocabulary +
      + + +
      +
      + } +
      +
      + + Cancel +
      +
      + } else { -

      - Oops. There are no results awaiting confirmation. -

      - Cancel +

      + Oops. There are no results awaiting confirmation. +

      + Cancel } @section scripts { - + } diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/AddNewCentreCourse/SetSectionContent.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/AddNewCentreCourse/SetSectionContent.cshtml index 24a7adb46f..df199588b8 100644 --- a/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/AddNewCentreCourse/SetSectionContent.cshtml +++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/AddNewCentreCourse/SetSectionContent.cshtml @@ -3,34 +3,37 @@ @model SetSectionContentViewModel @{ - ViewData["Title"] = "Set section content"; - var backLinkRouteData = new Dictionary { { "index", Model.Index.ToString() } }; + ViewData["Title"] = "Set section content"; + var sectionIndex = Model.Index == 0 ? Model.Index : Model.Index - 1; + var backLinkRouteData = new Dictionary { { "index", Model.Index.ToString() } }; }
      -
      -

      @ViewData["Title"]

      +
      +

      @ViewData["Title"]

      - + -
      - + + - + - - - @if (Model.Index == 0) - { - - } - else - { - - } -
      + + + @if (Model.Index == 0) + { + + } + else + { + + < Go back + + } +
      @section scripts { - + } From 19b0115d144256f1751db90944ddfb441ea8f59c Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Wed, 5 Mar 2025 08:17:07 +0000 Subject: [PATCH 35/36] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 342740ce6ac209a63643ae17d8889b942bd5c61e Author: kevwhitt-hee Date: Wed Mar 5 08:16:26 2025 +0000 Squashed commit of the following: commit 63521f4a336966e47f69afcbf4ad17e119173fec Merge: f10e104b4 e90895c25 Author: rshrirohit Date: Wed Mar 5 07:53:00 2025 +0000 Merge branch 'master' into DLS-Release-v1.2.0 commit e90895c2557a4df346d9132fc4ad296f5b9c6c10 Merge: 764d023dd d77ec78a3 Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com> Date: Wed Mar 5 07:35:32 2025 +0000 Merge pull request #3146 from TechnologyEnhancedLearning/DLS-Release-v1.1.2 Dls release v1.1.2 commit d77ec78a3b169fcc79ad7d2371f19530a7fe5f3a Merge: aa5e3a9b1 fcdf44ed6 Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com> Date: Thu Feb 27 14:54:52 2025 +0000 Merge pull request #3138 from TechnologyEnhancedLearning/Develop/Fix/TD-5370-Issue-showing-requested-sign-off TD-5370- Added code to remove a pending sign-off request if the self-assessment does not include the minimum optional competencies. commit fcdf44ed60069c82f02adf78027e7c4159bba267 Author: Auldrin Possa Date: Thu Feb 27 12:41:18 2025 +0000 TD-5370- Added code to remove a pending sign-off request if the self-assessment does not include the minimum optional competencies. commit aa5e3a9b15c86ab30354d4188fc0921e42358a7e Merge: 9ab236454 4e4f7a397 Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com> Date: Thu Feb 27 12:26:41 2025 +0000 Merge pull request #3137 from TechnologyEnhancedLearning/Develop/Fixes/TD-5325-UpdatingFreshdeskApiNugetPackage TD-5325 Updating Freshdesk Api Nuget Package commit 4e4f7a39734cf4d1a9b0fea84d33349083c00b8e Author: Rohit Shrivastava Date: Thu Feb 27 09:49:53 2025 +0000 TD-5325 Updating Freshdesk Api Nuget Package commit 9ab23645442f1e9b795f62541e81bfd3de32480e Merge: 9835d1061 49be5f1d5 Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com> Date: Tue Feb 25 20:04:56 2025 +0000 Merge pull request #3134 from TechnologyEnhancedLearning/Develop/Fix/TD-5367-duplicate-self-assessments-on-Supervisor-Dashboard TD-5367-Issue showing duplicate self assessments on 'Supervisor Dashboard - My staff' screen commit 9835d106165f9a2b959130821aa0f51a557bc78d Merge: 9d20e5cf6 57133ccf1 Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com> Date: Tue Feb 25 09:02:42 2025 +0000 Merge pull request #3133 from TechnologyEnhancedLearning/Develop/Fixes/TD-5368-AddingCategoryToEmailContent TD-5368 Adding Category To Email Content commit 9d20e5cf6f11f8a86887469b1b3037d41c78a71e Merge: 2f1cdd47a bf29c8c85 Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com> Date: Tue Feb 25 09:00:42 2025 +0000 Merge pull request #3123 from TechnologyEnhancedLearning/Develop/Fixes/TD-3542-Console'500'errorisseeingonthe'Mystaff'screenwhenclicked'Supervise'linkfor'Version_2_Data_Professionsframework'assessment TD-3542 Console '500' error is seeing on the 'My staff' screen when clicked 'Supervise' link for 'Version_2_Data_Professions framework' assessment commit bf29c8c85393fc6e9dab7cc9806a97318d8708fa Author: Sherif Olaboye Date: Mon Feb 24 13:15:36 2025 +0000 TD-3542 putting the validations in the viewmodels commit b4925644f94afc1fb7c1d455b1181bc997db6c70 Merge: 7ef645657 0879dbf52 Author: Sherif Olaboye Date: Mon Feb 24 13:07:56 2025 +0000 Merge remote-tracking branch 'origin/DLS-Release-v1.1.2' into Develop/Fixes/TD-3542-Console'500'errorisseeingonthe'Mystaff'screenwhenclicked'Supervise'linkfor'Version_2_Data_Professionsframework'assessment commit 57133ccf1629b914c042bdda49c08a64c8da6e94 Author: Rohit Shrivastava Date: Mon Feb 24 12:13:26 2025 +0000 TD-5368 removing commented code commit f32043e48a6c4f69ede2b9c18b34deee413dbe0e Author: Rohit Shrivastava Date: Mon Feb 24 12:12:34 2025 +0000 TD-5368 Updating the Tracking system-centre-admin area and promote to admin area commit 49be5f1d5dfaecd889beb5669cf04bdb0a78b2fb Author: Auldrin Possa Date: Mon Feb 24 11:02:33 2025 +0000 TD-5367-Removed 'UPDATE CandidateAssessmentSupervisors..' while removing self assessment. Updated CandidateAssessmentSupervisors while enrolling self assessment. commit 2f1cdd47a83a64f530601d53c0456da26419d828 Merge: 252a5822c 28cf77785 Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com> Date: Mon Feb 24 09:08:44 2025 +0000 Merge pull request #3131 from TechnologyEnhancedLearning/Develop/Fixes/TD-5292-Issuewith'Goback'linkwhencreatingacourseandadding'Coursecontent'on'Coursesetup'screen TD-5292 Issue with 'Go back' link when creating a course and adding 'Course content' on 'Course set up' screen commit 252a5822cf4ca8581458af9b48904f66c2d7cdaf Merge: 0879dbf52 25f6523ac Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com> Date: Mon Feb 24 09:07:48 2025 +0000 Merge pull request #3126 from TechnologyEnhancedLearning/Develop/Fixes/TD-5291-Issueon'Coursesetup'screenwhenselectedFewcoursecontentfirsttimeandchangedto'All'ofthemclicking'changelink' TD-5291 Issue on 'Course set up' screen when selected Few course content first time and changed to 'All' of them clicking 'change link' commit ac656d73f91c987f7cf3aa04328cac4239680ce8 Author: Rohit Shrivastava Date: Fri Feb 21 08:41:21 2025 +0000 TD-5368 Adding Category To Email Content commit 28cf777859c56e12dcbdba67a688891dee7e38f8 Author: Sherif Olaboye Date: Mon Feb 17 11:19:20 2025 +0000 TD-5292 when clicking ‘go back’ links few course content screens are missing in between. commit 25f6523acca6ce145c176a08a26eb5e04b8a425c Author: sherif-olaboye <123654949+sherif-olaboye@users.noreply.github.com> Date: Thu Feb 13 16:29:45 2025 +0000 TD-5291 Issue on 'Course set up' screen when selected Few course content first time and changed to 'All' of them clicking 'change link' commit 6c2d6e4d2f3a7372a8824430df851722a20a2be9 Author: sherif-olaboye <123654949+sherif-olaboye@users.noreply.github.com> Date: Thu Feb 13 16:12:51 2025 +0000 TD-5292 Issue on 'Course set up' screen when selected Few course content first time and changed to 'All' of them clicking 'change link' commit 0879dbf52b12926e0d238100056c0140a0e01e74 Merge: 5dff09b95 c91614945 Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com> Date: Thu Feb 13 11:02:11 2025 +0000 Merge pull request #3118 from TechnologyEnhancedLearning/Develop/Fixes/TD-5333-Issuewithoptionalproficienciesnotretainingtopreviousstatewhenremovedandaddedthemback TD-5333 Issue with optional proficiencies not retaining to previous State when removed and added them back commit 5dff09b958bae69106c725c0c91cf18e514e2e92 Merge: ec0e37c45 6a4b4c2be Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com> Date: Wed Feb 12 16:43:49 2025 +0000 Merge pull request #3114 from TechnologyEnhancedLearning/Develop/Fixes/TD-5222-Errorwhenenrollingastaffonselfassessmentfromthetrackingsystem TD-5222 Error when enrolling a staff on self assessment from the tracking system commit 7ef645657687c9392102da0090221036e54293d9 Author: Sherif Olaboye Date: Wed Feb 12 09:37:16 2025 +0000 TD-3542 Console '500' error is seeing on the 'My staff' screen when clicked 'Supervise' link for 'Version_2_Data_Professions framework' assessment commit ec0e37c45c4bd08aabe30ee18761c52f0f13c225 Merge: 951c95fbd a78c0a801 Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com> Date: Tue Feb 11 09:19:45 2025 +0000 Merge pull request #3099 from TechnologyEnhancedLearning/Develop/Fixes/TD-5292-Issuewith'Goback'linkwhencreatingacourseandadding'Coursecontent'on'Coursesetup'screen TD-5292 Issue with 'Go back' link when creating a course and adding 'Course content' on 'Course set up' screen commit 951c95fbd3ee9c85b079dbc6bce0a3da7e40edff Merge: 1ab13f704 fc760ef54 Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com> Date: Tue Feb 11 09:14:42 2025 +0000 Merge pull request #3096 from TechnologyEnhancedLearning/Develop/Fixes/TD-5291-Issueon'Coursesetup'screenwhenselectedFewcoursecontentfirsttimeandchangedto'All'ofthemclicking'changelink' TD-5291 Issue on 'Course set up' screen when selected Few course content first time and changed to 'All' of them clicking 'change link' commit c91614945c93ac71da8a176f5b082f4e1170ec5f Author: Sherif Olaboye Date: Mon Feb 10 09:54:52 2025 +0000 TD-5333 Issue with optional proficiencies not retaining to previous state when removed and added them back commit 1ab13f704972db7b4e9facd839657a6f8b8818e0 Merge: 0584b6bb1 ef9eabdda Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com> Date: Fri Feb 7 10:49:48 2025 +0000 Merge pull request #3102 from TechnologyEnhancedLearning/Develop/Fix/TD-5306-Selfassessment-report-name-Issue TD-5306-self-assessments excel report file name format changed. commit 0584b6bb1a22f34fdb167459adbb8b48353fe73e Merge: 764d023dd 2f0d16cb6 Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com> Date: Fri Feb 7 10:48:08 2025 +0000 Merge pull request #3111 from TechnologyEnhancedLearning/Develop/feature/TD-4475-Count-of-matching-proficiencies TD-4475-Count of matching proficiencies should be shown on 'Supervisor' section same as on 'Learning Portal' for the self assessments commit 764d023dd5ba4a44ebf351dae7c01da0c9432e32 Merge: 17ad3839f 0bc5eab96 Author: rshrirohit <126668828+rshrirohit@users.noreply.github.com> Date: Fri Feb 7 07:30:06 2025 +0000 Merge pull request #3115 from TechnologyEnhancedLearning/DLS-Release-v1.1.1 Dls release v1.1.1 commit 6a4b4c2be472e4b1fc13afaa93b8ef8d636fd34a Author: Sherif Olaboye Date: Wed Feb 5 09:11:44 2025 +0000 TD-5222 Error when enrolling a staff on self assessment from the tracking system commit 2f0d16cb654cf3ca168d9ad530cd26686efa9ee0 Author: Auldrin Possa Date: Tue Feb 4 16:20:14 2025 +0000 TD-4475-matching proficiencies count added to screen commit ef9eabdda9bd394e699e9d0f1ad151de4f17c8a2 Author: Auldrin Possa Date: Fri Jan 31 16:55:48 2025 +0000 TD-5306-self-assessments report file name format changed commit a78c0a801415ce57875946ecbb727455e6d55be7 Author: Sherif Olaboye Date: Fri Jan 31 14:00:49 2025 +0000 TD-5292 Issue with 'Go back' link when creating a course and adding 'Course content' on 'Course set up' screen commit fc760ef54148061790238616661b4a3c8521d985 Author: Sherif Olaboye Date: Fri Jan 31 10:21:49 2025 +0000 TD-5291 Issue on 'Course set up' screen when selected Few course content first time and changed to 'All' of them clicking 'change link' commit 4c1d42f401cd3937c3ede315646192b4aaa662d0 Author: Sherif Olaboye Date: Thu Jan 30 13:31:08 2025 +0000 TD-5291 Issue on 'Course set up' screen when selected Few course content first time and changed to 'All' of them clicking 'change link' commit 409b1ee9edaae17dac0e5125e5463d0fb8b9a744 Author: Sherif Olaboye Date: Thu Jan 30 12:48:35 2025 +0000 TD-5291 Issue on 'Course set up' screen when selected Few course content first time and changed to 'All' of them clicking 'change link' --- .../CourseCategoriesDataService.cs | 4 +- .../DataServices/CourseDataService.cs | 2 +- .../CandidateAssessmentsDataService.cs | 7 + .../CompetencyDataService.cs | 4 +- .../SelfAssessmentDataService.cs | 6 +- .../DataServices/SupervisorDataService.cs | 106 +++++--- .../DigitalLearningSolutions.Data.csproj | 2 +- .../Supervisor/DelegateSelfAssessment.cs | 1 + .../PromoteToAdminControllerTests.cs | 2 +- .../Services/EmailGenerationServiceTests.cs | 9 +- .../SelfAssessment.cs | 21 +- .../SupervisorController/Supervisor.cs | 12 +- .../Administrator/AdministratorController.cs | 10 +- .../SelfAssessmentReportsController.cs | 5 +- .../CourseSetup/CourseSetupController.cs | 79 ++++-- .../Delegates/PromoteToAdminController.cs | 6 +- .../Services/CourseCategoriesService.cs | 4 +- .../Services/EmailGenerationService.cs | 13 +- .../Services/SelfAssessmentService.cs | 13 +- .../EnrolDelegateSummaryViewModel.cs | 1 + .../ReviewSelfAssessmentViewModel.cs | 5 +- .../Supervisor/ReviewSelfAssessment.cshtml | 7 +- ...SelectDelegateSupervisorRoleSummary.cshtml | 11 +- .../Supervisor/VerifyMultipleResults.cshtml | 236 +++++++++--------- .../SetSectionContent.cshtml | 43 ++-- 25 files changed, 361 insertions(+), 248 deletions(-) diff --git a/DigitalLearningSolutions.Data/DataServices/CourseCategoriesDataService.cs b/DigitalLearningSolutions.Data/DataServices/CourseCategoriesDataService.cs index 1135172708..ad6e96166c 100644 --- a/DigitalLearningSolutions.Data/DataServices/CourseCategoriesDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/CourseCategoriesDataService.cs @@ -9,7 +9,7 @@ public interface ICourseCategoriesDataService { IEnumerable GetCategoriesForCentreAndCentrallyManagedCourses(int centreId); - string? GetCourseCategoryName(int categoryId); + string? GetCourseCategoryName(int? categoryId); } public class CourseCategoriesDataService : ICourseCategoriesDataService @@ -34,7 +34,7 @@ FROM CourseCategories ); } - public string? GetCourseCategoryName(int categoryId) + public string? GetCourseCategoryName(int? categoryId) { var name = connection.QueryFirstOrDefault( @"SELECT CategoryName diff --git a/DigitalLearningSolutions.Data/DataServices/CourseDataService.cs b/DigitalLearningSolutions.Data/DataServices/CourseDataService.cs index fee4f1b696..06196293a0 100644 --- a/DigitalLearningSolutions.Data/DataServices/CourseDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/CourseDataService.cs @@ -551,7 +551,7 @@ BEGIN TRANSACTION UPDATE CandidateAssessmentSupervisors SET Removed = NULL {((selfAssessmentSupervisorRoleId > 0) ? " ,SelfAssessmentSupervisorRoleID = @selfAssessmentSupervisorRoleID" : string.Empty)} - WHERE CandidateAssessmentID = @candidateAssessmentId AND SupervisorDelegateId = @supervisorDelegateId + WHERE CandidateAssessmentID = @candidateAssessmentId AND SupervisorDelegateId = @supervisorDelegateId AND SelfAssessmentSupervisorRoleID = @selfAssessmentSupervisorRoleID COMMIT TRANSACTION"; diff --git a/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs b/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs index 2390d54147..bb1dc7649f 100644 --- a/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs @@ -298,6 +298,13 @@ INNER JOIN CompetencyGroups AS CG } } + public void RemoveSignoffRequestById(int candidateAssessmentSupervisorVerificationsId) + { + var numberOfAffectedRows = connection.Execute( + @" DELETE FROM CandidateAssessmentSupervisorVerifications WHERE ID = @candidateAssessmentSupervisorVerificationsId ", + new { candidateAssessmentSupervisorVerificationsId }); + } + public void SetCompleteByDate(int selfAssessmentId, int delegateUserId, DateTime? completeByDate) { diff --git a/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CompetencyDataService.cs b/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CompetencyDataService.cs index 76a1a199bd..3c333e78e8 100644 --- a/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CompetencyDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CompetencyDataService.cs @@ -635,7 +635,7 @@ FROM SelfAssessmentResults s inner join SelfAssessmentResultSupervisorVerifications sv ON s.ID = sv.SelfAssessmentResultId AND sv.Superceded = 0 WHERE s.CompetencyID = @competencyId AND s.SelfAssessmentID = @selfAssessmentId - AND s.DelegateUserID = @delegateUserId", + AND s.DelegateUserID = @delegateUserId AND sv.Verified IS NULL", new { selfAssessmentId, delegateUserId, competencyId } ); } @@ -643,8 +643,6 @@ FROM SelfAssessmentResults s inner join public void RemoveReviewCandidateAssessmentOptionalCompetencies(int id) { - connection.Execute(@"UPDATE SelfAssessmentResults SET Result = NULL WHERE ID = @id", new { id}); - connection.Execute( @"delete from SelfAssessmentResultSupervisorVerifications WHERE SelfAssessmentResultId = @id", new { id }); diff --git a/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentDataService.cs b/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentDataService.cs index d4b87c6f78..324a1050a7 100644 --- a/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAssessmentDataService.cs @@ -78,6 +78,7 @@ int competencyId void UpdateLastAccessed(int selfAssessmentId, int delegateUserId); void RemoveSignoffRequests(int selfAssessmentId, int delegateUserId, int competencyGroupsId); + void RemoveSignoffRequestById(int candidateAssessmentSupervisorVerificationsId); void SetCompleteByDate(int selfAssessmentId, int delegateUserId, DateTime? completeByDate); void SetSubmittedDateNow(int selfAssessmentId, int delegateUserId); @@ -173,7 +174,7 @@ int GetSelfAssessmentActivityDelegatesExportCount(string searchString, string so bool IsCentreSelfAssessment(int selfAssessmentId, int centreId); bool HasMinimumOptionalCompetencies(int selfAssessmentId, int delegateUserId); int GetSelfAssessmentCategoryId(int selfAssessmentId); - void RemoveReviewCandidateAssessmentOptionalCompetencies(int id); + void RemoveReviewCandidateAssessmentOptionalCompetencies(int id); public IEnumerable GetSelfAssessmentResultswithSupervisorVerificationsForDelegateSelfAssessmentCompetency( int delegateUserId, int selfAssessmentId, @@ -683,9 +684,6 @@ BEGIN TRANSACTION UPDATE CandidateAssessments SET RemovedDate = GETUTCDATE(), RemovalMethodID = 2 WHERE ID = @candidateAssessmentsId AND RemovedDate IS NULL - UPDATE CandidateAssessmentSupervisors SET Removed = GETUTCDATE() - WHERE CandidateAssessmentID = @candidateAssessmentsId AND Removed IS NULL - COMMIT TRANSACTION END TRY BEGIN CATCH diff --git a/DigitalLearningSolutions.Data/DataServices/SupervisorDataService.cs b/DigitalLearningSolutions.Data/DataServices/SupervisorDataService.cs index c97ecf67a8..3409396ab1 100644 --- a/DigitalLearningSolutions.Data/DataServices/SupervisorDataService.cs +++ b/DigitalLearningSolutions.Data/DataServices/SupervisorDataService.cs @@ -620,20 +620,21 @@ FROM CandidateAssessmentSupervisors AS cas INNER JOIN { return connection.Query( @$"SELECT ca.ID, sa.ID AS SelfAssessmentID, sa.Name AS RoleName, sa.QuestionLabel, sa.DescriptionLabel, sa.ReviewerCommentsLabel, - sa.SupervisorSelfAssessmentReview, sa.SupervisorResultsReview, ca.StartedDate, - COALESCE(ca.LastAccessed, ca.StartedDate) AS LastAccessed, - ca.CompleteByDate, ca.LaunchCount, ca.CompletedDate, - (SELECT COUNT(*) AS Expr1 - FROM CandidateAssessmentSupervisorVerifications AS casv - WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Requested IS NOT NULL) AND (Verified IS NULL)) AS SignOffRequested, - {signedOffFields} - (SELECT COUNT(*) AS Expr1 - FROM SelfAssessmentResultSupervisorVerifications AS sarsv - WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Verified IS NULL) AND (sarsv.Superceded = 0)) AS ResultsVerificationRequests - FROM CandidateAssessmentSupervisors AS cas INNER JOIN - CandidateAssessments AS ca ON cas.CandidateAssessmentID = ca.ID INNER JOIN - SelfAssessments AS sa ON sa.ID = ca.SelfAssessmentID - WHERE (ca.ID = @candidateAssessmentId) AND (ISNULL(@adminIdCategoryID, 0) = 0 OR sa.CategoryID = @adminIdCategoryId)", new { candidateAssessmentId, adminIdCategoryId } + sa.SupervisorSelfAssessmentReview, sa.SupervisorResultsReview, ca.StartedDate, + COALESCE(ca.LastAccessed, ca.StartedDate) AS LastAccessed, + ca.CompleteByDate, ca.LaunchCount, ca.CompletedDate, + (SELECT COUNT(*) AS Expr1 + FROM CandidateAssessmentSupervisorVerifications AS casv + WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Requested IS NOT NULL) AND (Verified IS NULL)) AS SignOffRequested, + {signedOffFields} + (SELECT COUNT(*) AS Expr1 + FROM SelfAssessmentResultSupervisorVerifications AS sarsv + WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Verified IS NULL) AND (sarsv.Superceded = 0)) AS ResultsVerificationRequests, + sa.Vocabulary + FROM CandidateAssessmentSupervisors AS cas INNER JOIN + CandidateAssessments AS ca ON cas.CandidateAssessmentID = ca.ID INNER JOIN + SelfAssessments AS sa ON sa.ID = ca.SelfAssessmentID + WHERE (ca.ID = @candidateAssessmentId) AND (ISNULL(@adminIdCategoryID, 0) = 0 OR sa.CategoryID = @adminIdCategoryId)", new { candidateAssessmentId, adminIdCategoryId } ).FirstOrDefault(); } public DelegateSelfAssessment? GetSelfAssessmentBySupervisorDelegateCandidateAssessmentId(int candidateAssessmentId, int supervisorDelegateId) @@ -695,24 +696,25 @@ FROM SelfAssessmentResults AS sar2 public DelegateSelfAssessment? GetSelfAssessmentByCandidateAssessmentId(int candidateAssessmentId, int adminId, int? adminIdCategoryId) { return connection.Query( - @$"SELECT ca.ID, sa.ID AS SelfAssessmentID, sa.Name AS RoleName, sa.SupervisorSelfAssessmentReview, sa.SupervisorResultsReview, sa.ReviewerCommentsLabel, COALESCE (sasr.RoleName, 'Supervisor') AS SupervisorRoleTitle, ca.StartedDate, ca.LastAccessed, ca.CompleteByDate, ca.LaunchCount, ca.CompletedDate, r.CompetencyAssessment, sg.SubGroup, pg.ProfessionalGroup, sa.SupervisorResultsReview AS IsSupervisorResultsReviewed, - (SELECT COUNT(*) AS Expr1 - FROM CandidateAssessmentSupervisorVerifications AS casv - WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Requested IS NOT NULL) AND (Verified IS NULL)) AS SignOffRequested, - {signedOffFields} - (SELECT COUNT(*) AS Expr1 - FROM SelfAssessmentResultSupervisorVerifications AS sarsv - WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Verified IS NULL) AND (Superceded = 0)) AS ResultsVerificationRequests, - ca.NonReportable,ca.DelegateUserID + @$"SELECT ca.ID, sa.ID AS SelfAssessmentID, sa.Name AS RoleName, sa.SupervisorSelfAssessmentReview, sa.SupervisorResultsReview, sa.ReviewerCommentsLabel, COALESCE (sasr.RoleName, 'Supervisor') AS SupervisorRoleTitle, ca.StartedDate, ca.LastAccessed, ca.CompleteByDate, ca.LaunchCount, ca.CompletedDate, r.RoleProfile, sg.SubGroup, pg.ProfessionalGroup, sa.SupervisorResultsReview AS IsSupervisorResultsReviewed, + (SELECT COUNT(*) AS Expr1 + FROM CandidateAssessmentSupervisorVerifications AS casv + WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Requested IS NOT NULL) AND (Verified IS NULL)) AS SignOffRequested, + {signedOffFields} + (SELECT COUNT(*) AS Expr1 + FROM SelfAssessmentResultSupervisorVerifications AS sarsv + WHERE (CandidateAssessmentSupervisorID = cas.ID) AND (Verified IS NULL) AND (Superceded = 0)) AS ResultsVerificationRequests, + ca.NonReportable,ca.DelegateUserID, + sa.Vocabulary FROM CandidateAssessmentSupervisors AS cas INNER JOIN - CandidateAssessments AS ca ON cas.CandidateAssessmentID = ca.ID INNER JOIN - SelfAssessments AS sa ON sa.ID = ca.SelfAssessmentID INNER JOIN - SupervisorDelegates AS sd ON cas.SupervisorDelegateId = sd.ID LEFT OUTER JOIN - NRPProfessionalGroups AS pg ON sa.NRPProfessionalGroupID = pg.ID LEFT OUTER JOIN - NRPSubGroups AS sg ON sa.NRPSubGroupID = sg.ID LEFT OUTER JOIN - NRPRoles AS r ON sa.NRPRoleID = r.ID - LEFT OUTER JOIN SelfAssessmentSupervisorRoles AS sasr ON cas.SelfAssessmentSupervisorRoleID = sasr.ID - WHERE (ca.ID = @candidateAssessmentId) AND (cas.Removed IS NULL) AND (sd.SupervisorAdminID = @adminId) AND (ISNULL(@adminIdCategoryID, 0) = 0 OR sa.CategoryID = @adminIdCategoryId)", + CandidateAssessments AS ca ON cas.CandidateAssessmentID = ca.ID INNER JOIN + SelfAssessments AS sa ON sa.ID = ca.SelfAssessmentID INNER JOIN + SupervisorDelegates AS sd ON cas.SupervisorDelegateId = sd.ID LEFT OUTER JOIN + NRPProfessionalGroups AS pg ON sa.NRPProfessionalGroupID = pg.ID LEFT OUTER JOIN + NRPSubGroups AS sg ON sa.NRPSubGroupID = sg.ID LEFT OUTER JOIN + NRPRoles AS r ON sa.NRPRoleID = r.ID + LEFT OUTER JOIN SelfAssessmentSupervisorRoles AS sasr ON cas.SelfAssessmentSupervisorRoleID = sasr.ID + WHERE (ca.ID = @candidateAssessmentId) AND (cas.Removed IS NULL) AND (sd.SupervisorAdminID = @adminId) AND (ISNULL(@adminIdCategoryID, 0) = 0 OR sa.CategoryID = @adminIdCategoryId)", new { candidateAssessmentId, adminId, adminIdCategoryId } ).FirstOrDefault(); } @@ -941,18 +943,45 @@ FROM CandidateAssessmentSupervisors if (candidateAssessmentSupervisorsId == 0) { + //For a candidate assessment, only one supervisor role should be active (Removed = null) var numberOfAffectedRows = connection.Execute( - @"INSERT INTO CandidateAssessmentSupervisors (CandidateAssessmentID, SupervisorDelegateId, SelfAssessmentSupervisorRoleID) - VALUES (@candidateAssessmentId, @supervisorDelegateId, @selfAssessmentSupervisorRoleId)", new { candidateAssessmentId, supervisorDelegateId, selfAssessmentSupervisorRoleId } + @"BEGIN TRY + BEGIN TRANSACTION + UPDATE CandidateAssessmentSupervisors SET Removed = getUTCDate() WHERE CandidateAssessmentID = @candidateAssessmentId + AND SupervisorDelegateId = @supervisorDelegateId + AND Removed IS NULL + + INSERT INTO CandidateAssessmentSupervisors (CandidateAssessmentID, SupervisorDelegateId, SelfAssessmentSupervisorRoleID) + VALUES (@candidateAssessmentId, @supervisorDelegateId, @selfAssessmentSupervisorRoleId) + + COMMIT TRANSACTION + END TRY + BEGIN CATCH + ROLLBACK TRANSACTION + END CATCH", + new { candidateAssessmentId, supervisorDelegateId, selfAssessmentSupervisorRoleId } ); } else { + //For a candidate assessment, only one supervisor role should be active (Removed = null) int numberOfAffectedRows = connection.Execute( - @"UPDATE CandidateAssessmentSupervisors SET Removed = NULL WHERE CandidateAssessmentID = @candidateAssessmentId - AND SupervisorDelegateId = @supervisorDelegateId - AND SelfAssessmentSupervisorRoleId=@selfAssessmentSupervisorRoleId", - new { candidateAssessmentId, supervisorDelegateId, selfAssessmentSupervisorRoleId }); + @"BEGIN TRY + BEGIN TRANSACTION + UPDATE CandidateAssessmentSupervisors SET Removed = getUTCDate() WHERE CandidateAssessmentID = @candidateAssessmentId + AND SupervisorDelegateId = @supervisorDelegateId + AND Removed IS NULL + + UPDATE CandidateAssessmentSupervisors SET Removed = NULL WHERE CandidateAssessmentID = @candidateAssessmentId + AND SupervisorDelegateId = @supervisorDelegateId + AND SelfAssessmentSupervisorRoleId = @selfAssessmentSupervisorRoleId + + COMMIT TRANSACTION + END TRY + BEGIN CATCH + ROLLBACK TRANSACTION + END CATCH", + new { candidateAssessmentId, supervisorDelegateId, selfAssessmentSupervisorRoleId }); } } return candidateAssessmentId; @@ -966,9 +995,6 @@ BEGIN TRANSACTION UPDATE CandidateAssessments SET RemovedDate = getUTCDate(), RemovalMethodID = 2 WHERE ID = @candidateAssessmentId AND RemovedDate IS NULL - UPDATE CandidateAssessmentSupervisors SET Removed = getUTCDate() - WHERE CandidateAssessmentID = @candidateAssessmentId AND Removed IS NULL - COMMIT TRANSACTION END TRY BEGIN CATCH diff --git a/DigitalLearningSolutions.Data/DigitalLearningSolutions.Data.csproj b/DigitalLearningSolutions.Data/DigitalLearningSolutions.Data.csproj index 05556966ee..2d7bea0631 100644 --- a/DigitalLearningSolutions.Data/DigitalLearningSolutions.Data.csproj +++ b/DigitalLearningSolutions.Data/DigitalLearningSolutions.Data.csproj @@ -14,7 +14,7 @@ - + diff --git a/DigitalLearningSolutions.Data/Models/Supervisor/DelegateSelfAssessment.cs b/DigitalLearningSolutions.Data/Models/Supervisor/DelegateSelfAssessment.cs index 014de6be9f..212089f305 100644 --- a/DigitalLearningSolutions.Data/Models/Supervisor/DelegateSelfAssessment.cs +++ b/DigitalLearningSolutions.Data/Models/Supervisor/DelegateSelfAssessment.cs @@ -28,5 +28,6 @@ public class DelegateSelfAssessment public bool IsSupervisorResultsReviewed { get; set; } public bool IsAssignedToSupervisor { get; set; } public bool NonReportable { get; set; } + public string? Vocabulary { get; set; } } } diff --git a/DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/Delegates/PromoteToAdminControllerTests.cs b/DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/Delegates/PromoteToAdminControllerTests.cs index 5b84a3c962..9abc93259d 100644 --- a/DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/Delegates/PromoteToAdminControllerTests.cs +++ b/DigitalLearningSolutions.Web.Tests/Controllers/TrackingSystem/Delegates/PromoteToAdminControllerTests.cs @@ -94,7 +94,7 @@ public void Summary_post_registers_delegate_with_expected_values() A._, A._, A._, A._, A._, A._, A._, A._, A._, A._, A._, A._, - A._, A._ + A._, A._, A._ )).Returns(adminRolesEmail); // When diff --git a/DigitalLearningSolutions.Web.Tests/Services/EmailGenerationServiceTests.cs b/DigitalLearningSolutions.Web.Tests/Services/EmailGenerationServiceTests.cs index 96178e2220..47cb0eff9d 100644 --- a/DigitalLearningSolutions.Web.Tests/Services/EmailGenerationServiceTests.cs +++ b/DigitalLearningSolutions.Web.Tests/Services/EmailGenerationServiceTests.cs @@ -45,6 +45,7 @@ bool isCmsManager const string supervisorFirstName = "TestAdminFirstName"; const string supervisorLastName = "TestAdminFirstName"; const string supervisorEmail = "admin@example.com"; + const string categoryName = "Digital Workplace"; const string centreName = "Test Centre Name"; @@ -65,7 +66,8 @@ bool isCmsManager isCmsAdministrator, isCmsManager, delegateEmail, - centreName + centreName, + categoryName ); // Then @@ -164,6 +166,11 @@ bool isCmsManager returnedEmail.Body.HtmlBody.Should().NotContain("
    • CMS manager
      • "); returnedEmail.Body.TextBody.Should().NotContain("CMS manager"); } + if (!string.IsNullOrEmpty(categoryName)) + { + returnedEmail.Body.HtmlBody.Should().Contain("In the Digital Workplace category."); + returnedEmail.Body.TextBody.Should().Contain("In the Digital Workplace category."); + } returnedEmail.Body.HtmlBody.Should().Contain("the next time you log in to " + centreName + "."); returnedEmail.Body.TextBody.Should().Contain("the next time you log in to " + centreName + "."); diff --git a/DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs b/DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs index 2234f7d9eb..4947c6bd75 100644 --- a/DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs +++ b/DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs @@ -1565,7 +1565,18 @@ ManageOptionalCompetenciesViewModel model } } - + + if (!selfAssessmentService.HasMinimumOptionalCompetencies(selfAssessmentId, delegateUserId)) + { + var supervisorsSignOffs = selfAssessmentService.GetSupervisorSignOffsForCandidateAssessment(selfAssessmentId, delegateUserId); + + if (supervisorsSignOffs.FirstOrDefault() is { Verified: null, Removed: null }) + { + selfAssessmentService.RemoveSignoffRequestById(supervisorsSignOffs.FirstOrDefault().ID); + } + } + + return RedirectToAction("SelfAssessmentOverview", new { selfAssessmentId, vocabulary }); } @@ -1577,9 +1588,9 @@ public IActionResult RequestSignOff(int selfAssessmentId) var delegateId = User.GetCandidateIdKnownNotNull(); var recentResults = selfAssessmentService.GetMostRecentResults(selfAssessmentId, delegateId).ToList(); var competencySummaries = CertificateHelper.CompetencySummation(recentResults); - - if (competencySummaries.QuestionsCount != competencySummaries.VerifiedCount) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 }); - + + if (competencySummaries.QuestionsCount != competencySummaries.VerifiedCount) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 }); + var assessment = selfAssessmentService.GetSelfAssessmentForCandidateById(delegateUserId, selfAssessmentId); var supervisors = selfAssessmentService.GetSignOffSupervisorsForSelfAssessmentId(selfAssessmentId, delegateUserId); @@ -1591,7 +1602,7 @@ public IActionResult RequestSignOff(int selfAssessmentId) NumberOfSelfAssessedOptionalCompetencies = optionalCompetencies.Count(x => x.IncludedInSelfAssessment) }; if (model.NumberOfSelfAssessedOptionalCompetencies < model.SelfAssessment.MinimumOptionalCompetencies) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 }); - + return View("SelfAssessments/RequestSignOff", model); } diff --git a/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs b/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs index 93c8e1f610..21b555391c 100644 --- a/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs +++ b/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs @@ -1061,8 +1061,8 @@ public IActionResult QuickAddSupervisor(int selfAssessmentId, int supervisorDele var sessionEnrolOnCompetencyAssessment = new SessionEnrolOnCompetencyAssessment() { - SelfAssessmentID = supervisorRoles.FirstOrDefault().SelfAssessmentID, - SelfAssessmentSupervisorRoleId = supervisorRoles.FirstOrDefault().ID + SelfAssessmentID = supervisorRoles.FirstOrDefault() != null ? supervisorRoles.FirstOrDefault().SelfAssessmentID : selfAssessmentId, + SelfAssessmentSupervisorRoleId = supervisorRoles.FirstOrDefault() != null ? supervisorRoles.FirstOrDefault().ID : 0 }; multiPageFormService.SetMultiPageFormData( @@ -1070,7 +1070,7 @@ public IActionResult QuickAddSupervisor(int selfAssessmentId, int supervisorDele MultiPageFormDataFeature.EnrolDelegateOnProfileAssessment, TempData ); - var supervisorRoleName = supervisorRoles.FirstOrDefault().RoleName; + var supervisorRoleName = supervisorRoles.FirstOrDefault() != null ? supervisorRoles.FirstOrDefault().RoleName : ""; var model = new EnrolDelegateSummaryViewModel { CompetencyAssessment = competencyAssessment, @@ -1328,6 +1328,9 @@ public IActionResult ConfirmNominateSupervisor(SupervisorDelegateViewModel super { registrationService.PromoteDelegateToAdmin(adminRoles, supervisorDelegate.SelfAssessmentCategory, (int)supervisorDelegateDetail.DelegateUserID, (int)User.GetCentreId(), true); + int? learningCategory = supervisorDelegate.SelfAssessmentCategory == 0 ? null : supervisorDelegate.SelfAssessmentCategory; + var learningCategoryName = courseCategoriesService.GetCourseCategoryName(learningCategory); + if (delegateUser != null && adminUser != null) { var adminRolesEmail = emailGenerationService.GenerateDelegateAdminRolesNotificationEmail( @@ -1344,7 +1347,8 @@ public IActionResult ConfirmNominateSupervisor(SupervisorDelegateViewModel super isCmsAdmin: adminRoles.IsCmsAdministrator, isCmsManager: adminRoles.IsCmsManager, primaryEmail: delegateUser.EmailAddress, - centreName: centreName + centreName: centreName, + learningCategoryName ); emailService.SendEmail(adminRolesEmail); diff --git a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/Administrator/AdministratorController.cs b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/Administrator/AdministratorController.cs index 317eec01ad..57fa350f35 100644 --- a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/Administrator/AdministratorController.cs +++ b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/Administrator/AdministratorController.cs @@ -177,8 +177,10 @@ public IActionResult EditAdminRoles(AdminRolesFormData model, int adminId) adminRoles, AdminCategoryHelper.AdminCategoryToCategoryId(model.LearningCategory) ); + int? learningCategory = model.LearningCategory == 0 ? null : model.LearningCategory; + var learningCategoryName = courseCategoriesService.GetCourseCategoryName(learningCategory); - SendNotificationEmail(adminId, adminRoles); + SendNotificationEmail(adminId, adminRoles, learningCategoryName); return RedirectToAction( "Index", @@ -190,7 +192,8 @@ public IActionResult EditAdminRoles(AdminRolesFormData model, int adminId) private void SendNotificationEmail( int adminIdToPromote, - AdminRoles adminRoles + AdminRoles adminRoles, + string learningCategoryName ) { var adminId = User.GetAdminId(); @@ -215,7 +218,8 @@ AdminRoles adminRoles isCmsAdmin: adminRoles.IsCmsAdministrator, isCmsManager: adminRoles.IsCmsManager, primaryEmail: delegateUserEmailDetails.EmailAddress, - centreName: centreName + centreName: centreName, + learningCategoryName ); emailService.SendEmail(adminRolesEmail); diff --git a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/SelfAssessmentReports/SelfAssessmentReportsController.cs b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/SelfAssessmentReports/SelfAssessmentReportsController.cs index 7af1d2f4ca..0491429fd3 100644 --- a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/SelfAssessmentReports/SelfAssessmentReportsController.cs +++ b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/SelfAssessmentReports/SelfAssessmentReportsController.cs @@ -8,11 +8,9 @@ using DigitalLearningSolutions.Web.Attributes; using DigitalLearningSolutions.Web.Models.Enums; using DigitalLearningSolutions.Data.Enums; - using System; using DigitalLearningSolutions.Data.Utilities; using DigitalLearningSolutions.Web.ViewModels.TrackingSystem.Centre.Reports; using DigitalLearningSolutions.Web.Helpers.ExternalApis; - using System.Threading.Tasks; using Microsoft.Extensions.Configuration; using DigitalLearningSolutions.Data.Extensions; using DigitalLearningSolutions.Web.Services; @@ -75,8 +73,9 @@ public IActionResult DownloadDigitalCapabilityToExcel() public IActionResult DownloadSelfAssessmentReport(int selfAssessmentId) { var centreId = User.GetCentreId(); + var selfAssessmentName = selfAssessmentService.GetSelfAssessmentNameById(selfAssessmentId); var dataFile = selfAssessmentReportService.GetSelfAssessmentExcelExportForCentre((int)centreId, selfAssessmentId); - var fileName = $"Competency Self Assessment Report - Centre {centreId} - downloaded {DateTime.Today:yyyy-MM-dd}.xlsx"; + var fileName = $"{((selfAssessmentName.Length > 50) ? selfAssessmentName.Substring(0, 50) : selfAssessmentName)} Report - Centre {centreId} - downloaded {clockUtility.UtcNow:yyyy-MM-dd}.xlsx"; return File( dataFile, FileHelper.GetContentTypeFromFileName(fileName), diff --git a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/CourseSetup/CourseSetupController.cs b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/CourseSetup/CourseSetupController.cs index 775e52ecdb..93eb9dc09e 100644 --- a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/CourseSetup/CourseSetupController.cs +++ b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/CourseSetup/CourseSetupController.cs @@ -365,7 +365,8 @@ public IActionResult SetCourseOptions(EditCourseOptionsFormData model) data!.CourseOptionsData = model.ToCourseOptionsTempData(); multiPageFormService.SetMultiPageFormData(data, MultiPageFormDataFeature.AddNewCourse, TempData); - return RedirectToAction("SetCourseContent", false); + bool editCourseContent = data?.EditCourseContent ?? false; + return RedirectToAction("SetCourseContent", editCourseContent); } [HttpGet("AddCourse/SetCourseContent")] @@ -381,7 +382,7 @@ public IActionResult SetCourseContent(bool editCourseContent) { return RedirectToAction("Summary"); } - data.EditCourseContent = editCourseContent; + data.EditCourseContent = data.EditCourseContent || editCourseContent; multiPageFormService.SetMultiPageFormData(data, MultiPageFormDataFeature.AddNewCourse, TempData); var model = data!.CourseContentData != null @@ -459,17 +460,15 @@ public IActionResult SetSectionContent(int sectionIndex) } var showDiagnostic = data.Application!.DiagAssess; - if (data.EditCourseContent) + var tutorial = GetTutorialsFromSectionContentData(data.SectionContentData, tutorials); + if (tutorial.Count() == 0) { - var tutorial = GetTutorialsFromSectionContentData(data.SectionContentData, tutorials); - var model = new SetSectionContentViewModel(section, sectionIndex, showDiagnostic, tutorial); - return View("AddNewCentreCourse/SetSectionContent", model); - } - else - { - var model = new SetSectionContentViewModel(section, sectionIndex, showDiagnostic, tutorials); - return View("AddNewCentreCourse/SetSectionContent", model); + var models = new SetSectionContentViewModel(section, sectionIndex, showDiagnostic, tutorials); + return View("AddNewCentreCourse/SetSectionContent", models); } + var model = new SetSectionContentViewModel(section, sectionIndex, showDiagnostic, tutorial); + return View("AddNewCentreCourse/SetSectionContent", model); + } @@ -500,6 +499,21 @@ string action public IActionResult Summary() { var data = multiPageFormService.GetMultiPageFormData(MultiPageFormDataFeature.AddNewCourse, TempData).GetAwaiter().GetResult(); + var updatedSections = new List(); + foreach (var item in data.CourseContentData.SelectedSectionIds) + { + var tutorialsForSection = tutorialService.GetTutorialsForSection(item).ToList(); + + var matchingSections = data.SectionContentData + .Where(section => section.Tutorials.Any(t => tutorialsForSection.Any(tf => tf.TutorialId == t.TutorialId))) + .ToList(); + + updatedSections.AddRange(matchingSections); + } + + updatedSections = updatedSections.Distinct().ToList(); + data.SectionContentData = updatedSections; + multiPageFormService.SetMultiPageFormData(data, MultiPageFormDataFeature.AddNewCourse, TempData); var model = new SummaryViewModel(data!); @@ -651,11 +665,23 @@ private IActionResult SaveSectionAndRedirect(SetSectionContentViewModel model) { data.SectionContentData = new List(); } - if (data.EditCourseContent) + var sectionsToRemove = new List(); + foreach (var section in data.SectionContentData) { - return RedirectToNextSectionOrSummary( - model.Index, - new SetCourseContentViewModel(data.CourseContentData!)); + section.Tutorials = section.Tutorials + .Where(t => !model.Tutorials.Any(newT => newT.TutorialId == t.TutorialId)) + .ToList(); + if (!section.Tutorials.Any()) + { + sectionsToRemove.Add(section); + } + } + if (sectionsToRemove.Count > 0) + { + foreach (var section in sectionsToRemove) + { + data.SectionContentData.Remove(section); + } } data!.SectionContentData!.Add( new SectionContentTempData( @@ -732,18 +758,19 @@ private static IEnumerable UpdateC private IEnumerable GetTutorialsFromSectionContentData(List sectionContentData, List sectionTutorial) { if (sectionContentData == null || sectionTutorial == null) return new List(); - var updatedRecords = sectionContentData - .SelectMany(data => data.Tutorials) - .Join(sectionTutorial, - tempData => new { tempData.TutorialId, tempData.TutorialName }, // Match on both TutorialId and TutorialName - index => new { index.TutorialId, index.TutorialName }, - (tempData, index) => new Tutorial + var updatedRecords = sectionTutorial + .GroupJoin( + sectionContentData.SelectMany(data => data.Tutorials), + tutorial => new { tutorial.TutorialId, tutorial.TutorialName }, + tempData => new { tempData.TutorialId, tempData.TutorialName }, + (tutorial, matchingTempData) => new Tutorial { - TutorialId = index.TutorialId, - TutorialName = index.TutorialName, - Status = tempData.LearningEnabled, // Updated from sectionContentData - DiagStatus = tempData.DiagnosticEnabled // Updated from sectionContentData - }) + TutorialId = tutorial.TutorialId, + TutorialName = tutorial.TutorialName, + Status = matchingTempData.Any() ? matchingTempData.First().LearningEnabled : tutorial.Status, + DiagStatus = matchingTempData.Any() ? matchingTempData.First().DiagnosticEnabled : tutorial.DiagStatus + } + ) .ToList(); return updatedRecords; diff --git a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/PromoteToAdminController.cs b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/PromoteToAdminController.cs index c579516102..21d02d0ef5 100644 --- a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/PromoteToAdminController.cs +++ b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/PromoteToAdminController.cs @@ -139,6 +139,9 @@ public IActionResult Index(AdminRolesFormData formData, int delegateId) var delegateUserEmailDetails = userService.GetDelegateById(delegateId); + int? learningCategory = formData.LearningCategory == 0 ? null : formData.LearningCategory; + var learningCategoryName = courseCategoriesService.GetCourseCategoryName(learningCategory); + if (delegateUserEmailDetails != null) { var adminRolesEmail = emailGenerationService.GenerateDelegateAdminRolesNotificationEmail( @@ -155,7 +158,8 @@ public IActionResult Index(AdminRolesFormData formData, int delegateId) isCmsAdmin: adminRoles.IsCmsAdministrator, isCmsManager: adminRoles.IsCmsManager, primaryEmail: delegateUserEmailDetails.EmailForCentreNotifications, - centreName: centreName + centreName: centreName, + categoryName: learningCategoryName ); emailService.SendEmail(adminRolesEmail); diff --git a/DigitalLearningSolutions.Web/Services/CourseCategoriesService.cs b/DigitalLearningSolutions.Web/Services/CourseCategoriesService.cs index fc136f598e..9b475e9286 100644 --- a/DigitalLearningSolutions.Web/Services/CourseCategoriesService.cs +++ b/DigitalLearningSolutions.Web/Services/CourseCategoriesService.cs @@ -7,7 +7,7 @@ namespace DigitalLearningSolutions.Web.Services public interface ICourseCategoriesService { IEnumerable GetCategoriesForCentreAndCentrallyManagedCourses(int centreId); - string? GetCourseCategoryName(int categoryId); + string? GetCourseCategoryName(int? categoryId); } public class CourseCategoriesService : ICourseCategoriesService { @@ -22,7 +22,7 @@ public IEnumerable GetCategoriesForCentreAndCentrallyManagedCourses(in return courseCategoriesDataService.GetCategoriesForCentreAndCentrallyManagedCourses(centreId); } - public string? GetCourseCategoryName(int categoryId) + public string? GetCourseCategoryName(int? categoryId) { return courseCategoriesDataService.GetCourseCategoryName(categoryId); } diff --git a/DigitalLearningSolutions.Web/Services/EmailGenerationService.cs b/DigitalLearningSolutions.Web/Services/EmailGenerationService.cs index b631d48adc..ff7a924f82 100644 --- a/DigitalLearningSolutions.Web/Services/EmailGenerationService.cs +++ b/DigitalLearningSolutions.Web/Services/EmailGenerationService.cs @@ -19,7 +19,8 @@ Email GenerateDelegateAdminRolesNotificationEmail( bool isCmsAdmin, bool isCmsManager, string primaryEmail, - string centreName + string centreName, + string categoryName ); } @@ -39,7 +40,8 @@ public Email GenerateDelegateAdminRolesNotificationEmail( bool isCmsAdmin, bool isCmsManager, string primaryEmail, - string centreName + string centreName, + string categoryName ) { const string emailSubjectLine = "New Digital Learning Solutions permissions granted"; @@ -101,6 +103,13 @@ string centreName builder.HtmlBody += "
    "; + if (!string.IsNullOrEmpty(categoryName)) + { + builder.TextBody += $@"In the {categoryName} category."; + builder.HtmlBody += $@" +

    In the {categoryName} category.

    "; + } + builder.TextBody += $@"You will be able to access the Digital Learning Solutions platform with these new access permissions the next time you log in to {centreName}."; builder.HtmlBody += $@"You will be able to access the Digital Learning Solutions platform with these new access permissions the next time you log in to {centreName}."; diff --git a/DigitalLearningSolutions.Web/Services/SelfAssessmentService.cs b/DigitalLearningSolutions.Web/Services/SelfAssessmentService.cs index ce7afea305..c9a50014fa 100644 --- a/DigitalLearningSolutions.Web/Services/SelfAssessmentService.cs +++ b/DigitalLearningSolutions.Web/Services/SelfAssessmentService.cs @@ -27,6 +27,7 @@ public interface ISelfAssessmentService void UpdateLastAccessed(int selfAssessmentId, int delegateUserId); void RemoveSignoffRequests(int selfAssessmentId, int delegateUserId, int competencyGroupsId); + void RemoveSignoffRequestById(int candidateAssessmentSupervisorVerificationsId); void IncrementLaunchCount(int selfAssessmentId, int delegateUserId); void SetCompleteByDate(int selfAssessmentId, int delegateUserId, DateTime? completeByDate); @@ -160,7 +161,7 @@ public IEnumerable GetSelfAssessmentResultswithSupervisorV int selfAssessmentId, int competencyId ); - void RemoveReviewCandidateAssessmentOptionalCompetencies(int id); + void RemoveReviewCandidateAssessmentOptionalCompetencies(int id); } public class SelfAssessmentService : ISelfAssessmentService @@ -201,6 +202,10 @@ public void RemoveSignoffRequests(int selfAssessmentId, int delegateUserId, int { selfAssessmentDataService.RemoveSignoffRequests(selfAssessmentId, delegateUserId, competencyGroupId); } + public void RemoveSignoffRequestById(int candidateAssessmentSupervisorVerificationsId) + { + selfAssessmentDataService.RemoveSignoffRequestById(candidateAssessmentSupervisorVerificationsId); + } public void IncrementLaunchCount(int selfAssessmentId, int delegateUserId) { selfAssessmentDataService.IncrementLaunchCount(selfAssessmentId, delegateUserId); @@ -467,10 +472,10 @@ public void RemoveEnrolment(int selfAssessmentId, int delegateUserId) var selfAssessmentCategoryId = selfAssessmentDataService.GetSelfAssessmentCategoryId((int)selfAssessmentId); - if (adminCategoryId > 0 && adminCategoryId != selfAssessmentCategoryId) + if (adminCategoryId > 0 && adminCategoryId != selfAssessmentCategoryId) { // return null variants of the object when the categoryID mismatches - return (new SelfAssessmentDelegatesData(), null); + return (new SelfAssessmentDelegatesData(), null); } (var delegateselfAssessments, int resultCount) = selfAssessmentDataService.GetSelfAssessmentDelegates(searchString, offSet, itemsPerPage, sortBy, sortDirection, @@ -603,7 +608,7 @@ int competencyId } public void RemoveReviewCandidateAssessmentOptionalCompetencies(int id) { - selfAssessmentDataService.RemoveReviewCandidateAssessmentOptionalCompetencies(id); + selfAssessmentDataService.RemoveReviewCandidateAssessmentOptionalCompetencies(id); } } } diff --git a/DigitalLearningSolutions.Web/ViewModels/Supervisor/EnrolDelegateSummaryViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/Supervisor/EnrolDelegateSummaryViewModel.cs index 681213e53f..ad66e71ac8 100644 --- a/DigitalLearningSolutions.Web/ViewModels/Supervisor/EnrolDelegateSummaryViewModel.cs +++ b/DigitalLearningSolutions.Web/ViewModels/Supervisor/EnrolDelegateSummaryViewModel.cs @@ -12,5 +12,6 @@ public class EnrolDelegateSummaryViewModel public string SupervisorRoleName { get; set; } public int SupervisorRoleCount { get; set; } public bool AllowSupervisorRoleSelection { get; set; } + public bool HasSupervisorRoles => !string.IsNullOrWhiteSpace(SupervisorRoleName); } } diff --git a/DigitalLearningSolutions.Web/ViewModels/Supervisor/ReviewSelfAssessmentViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/Supervisor/ReviewSelfAssessmentViewModel.cs index ea19f92d35..9a6463e28f 100644 --- a/DigitalLearningSolutions.Web/ViewModels/Supervisor/ReviewSelfAssessmentViewModel.cs +++ b/DigitalLearningSolutions.Web/ViewModels/Supervisor/ReviewSelfAssessmentViewModel.cs @@ -1,6 +1,5 @@ namespace DigitalLearningSolutions.Web.ViewModels.Supervisor { - using DigitalLearningSolutions.Data.Models.Frameworks; using DigitalLearningSolutions.Data.Models.SelfAssessments; using DigitalLearningSolutions.Data.Models.Supervisor; using DigitalLearningSolutions.Web.Helpers; @@ -15,9 +14,9 @@ public class ReviewSelfAssessmentViewModel public IEnumerable? SupervisorSignOffs { get; set; } public bool IsSupervisorResultsReviewed { get; set; } public SearchSupervisorCompetencyViewModel SearchViewModel { get; set; } - public string VocabPlural(string vocabulary) + public string VocabPlural() { - return FrameworkVocabularyHelper.VocabularyPlural(vocabulary); + return FrameworkVocabularyHelper.VocabularyPlural(DelegateSelfAssessment.Vocabulary); } public int CandidateAssessmentId { get; set; } public bool ExportToExcelHide { get; set; } diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/ReviewSelfAssessment.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/ReviewSelfAssessment.cshtml index fe90d8a161..38913441d2 100644 --- a/DigitalLearningSolutions.Web/Views/Supervisor/ReviewSelfAssessment.cshtml +++ b/DigitalLearningSolutions.Web/Views/Supervisor/ReviewSelfAssessment.cshtml @@ -96,7 +96,7 @@ } - @if(Model.CompetencySummaries.CanViewCertificate) + @if (Model.CompetencySummaries.CanViewCertificate) { } - @if(Model.DelegateSelfAssessment.SignOffRequested > 0 && Model.CompetencySummaries.VerifiedCount == Model.CompetencySummaries.QuestionsCount) + @if (Model.DelegateSelfAssessment.SignOffRequested > 0 && Model.CompetencySummaries.VerifiedCount == Model.CompetencySummaries.QuestionsCount) { Sign-off self assessment } - @if((Model.DelegateSelfAssessment.ResultsVerificationRequests > 1) && Model.CompetencySummaries.VerifiedCount < Model.CompetencySummaries.QuestionsCount) + @if ((Model.DelegateSelfAssessment.ResultsVerificationRequests > 1) && Model.CompetencySummaries.VerifiedCount < Model.CompetencySummaries.QuestionsCount) { Confirm multiple results } @@ -119,6 +119,7 @@ +

    @Model.CompetencyGroups.Sum(g => g.Count()) matching @Model.VocabPlural().ToLower()

    @if (Model.CompetencyGroups.Any()) { foreach (var competencyGroup in Model.CompetencyGroups) diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/SelectDelegateSupervisorRoleSummary.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/SelectDelegateSupervisorRoleSummary.cshtml index aee6d861fd..9c96e6b6d3 100644 --- a/DigitalLearningSolutions.Web/Views/Supervisor/SelectDelegateSupervisorRoleSummary.cshtml +++ b/DigitalLearningSolutions.Web/Views/Supervisor/SelectDelegateSupervisorRoleSummary.cshtml @@ -47,7 +47,15 @@
    -

    Supervision Summary

    +@if (!Model.Item1.HasSupervisorRoles) +{ +

    No supervisor roles have been configured for this self assessment.

    +} +else +{ + + +

    Supervision Summary

    @@ -115,3 +123,4 @@ Cancel
    +} diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/VerifyMultipleResults.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/VerifyMultipleResults.cshtml index 5857981d50..97dc08a7fa 100644 --- a/DigitalLearningSolutions.Web/Views/Supervisor/VerifyMultipleResults.cshtml +++ b/DigitalLearningSolutions.Web/Views/Supervisor/VerifyMultipleResults.cshtml @@ -1,56 +1,56 @@ @using DigitalLearningSolutions.Web.ViewModels.Supervisor; @model ReviewSelfAssessmentViewModel; @{ - ViewData["Title"] = "Review Self Assessment"; - ViewData["Application"] = "Supervisor"; - ViewData["HeaderPathName"] = "Supervisor"; + ViewData["Title"] = "Review Self Assessment"; + ViewData["Application"] = "Supervisor"; + ViewData["HeaderPathName"] = "Supervisor"; } @section NavMenuItems { - + } - @section NavBreadcrumbs { - +@section NavBreadcrumbs { + } @{ var errorHasOccurred = !ViewData.ModelState.IsValid; @@ -72,92 +72,92 @@
    } -
    +
    -

    - @Model.SupervisorDelegateDetail.FirstName @Model.SupervisorDelegateDetail.LastName -

    +

    + @Model.SupervisorDelegateDetail.FirstName @Model.SupervisorDelegateDetail.LastName +

    - +
    -
    -

    Confirm Multiple Results for @Model.DelegateSelfAssessment.RoleName

    - @if (Model.CompetencyGroups.Any()) +
    +

    Confirm Multiple Results for @Model.DelegateSelfAssessment.RoleName

    +@if (Model.CompetencyGroups.Any()) { -

    Tick each self assessment result that you wish to confirm and then click Submit

    -
    - @foreach (var competencyGroup in Model.CompetencyGroups) - { - var vocabulary = competencyGroup.First().Vocabulary; -
    - - - @competencyGroup.Key - - -
    - @if (competencyGroup.Count() > 1) - { -
    -
    - Select all @Model.VocabPlural(vocabulary).ToLower() - Deselect all @Model.VocabPlural(vocabulary).ToLower() -
    -
    - } - - - - - - - - - - @foreach (var competency in competencyGroup) - { - @foreach (var question in competency.AssessmentQuestions) +

    Tick each self assessment result that you wish to confirm and then click Submit

    + + @foreach (var competencyGroup in Model.CompetencyGroups) + { + var vocabulary = competencyGroup.First().Vocabulary; +
    + + + @competencyGroup.Key + + +
    + @if (competencyGroup.Count() > 1) { - - - - +
    +
    + Select all @Model.VocabPlural().ToLower() + Deselect all @Model.VocabPlural().ToLower() +
    +
    } - } - -
    - @vocabulary - - Question - - Response -
    - @competency.Vocabulary -
    - - -
    -
    - } -
    -
    - - Cancel -
    -
    -
    + + + + + + + + + + @foreach (var competency in competencyGroup) + { + @foreach (var question in competency.AssessmentQuestions) + { + + + + + } + } + +
    + @vocabulary + + Question + + Response +
    + @competency.Vocabulary +
    + + +
    +
    + } +
    +
    + + Cancel +
    +
    + } else { -

    - Oops. There are no results awaiting confirmation. -

    - Cancel +

    + Oops. There are no results awaiting confirmation. +

    + Cancel } @section scripts { - + } diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/AddNewCentreCourse/SetSectionContent.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/AddNewCentreCourse/SetSectionContent.cshtml index 24a7adb46f..df199588b8 100644 --- a/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/AddNewCentreCourse/SetSectionContent.cshtml +++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/AddNewCentreCourse/SetSectionContent.cshtml @@ -3,34 +3,37 @@ @model SetSectionContentViewModel @{ - ViewData["Title"] = "Set section content"; - var backLinkRouteData = new Dictionary { { "index", Model.Index.ToString() } }; + ViewData["Title"] = "Set section content"; + var sectionIndex = Model.Index == 0 ? Model.Index : Model.Index - 1; + var backLinkRouteData = new Dictionary { { "index", Model.Index.ToString() } }; }
    -
    -

    @ViewData["Title"]

    +
    +

    @ViewData["Title"]

    - + -
    - + + - + - - - @if (Model.Index == 0) - { - - } - else - { - - } -
    + + + @if (Model.Index == 0) + { + + } + else + { + + < Go back + + } +
    @section scripts { - + } From 36d1cd873e0e80aa56389853325f64b0180a2315 Mon Sep 17 00:00:00 2001 From: kevwhitt-hee Date: Wed, 5 Mar 2025 08:27:09 +0000 Subject: [PATCH 36/36] Fixes link visually hidden text and summary item display logic --- .../CompetencyAssessments.cs | 4 ++-- .../EditRoleProfileLinks.cshtml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs index 855a123e4a..aee8442d14 100644 --- a/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs +++ b/DigitalLearningSolutions.Web/Controllers/CompetencyAssessmentsController/CompetencyAssessments.cs @@ -247,7 +247,7 @@ public IActionResult EditRoleProfileLinks(EditRoleProfileLinksViewModel model, s var isUpdated = competencyAssessmentService.UpdateCompetencyRoleProfileLinks(model.ID, adminId, model.ProfessionalGroupId, model.SubGroupId, model.RoleId); if (model.ActionName == "EditGroup") { - if(model.ProfessionalGroupId == null) + if (model.ProfessionalGroupId == null) { return RedirectToAction("EditRoleProfileLinks", new { actionName = "Summary", competencyAssessmentId }); } @@ -269,7 +269,7 @@ public IActionResult EditRoleProfileLinks(EditRoleProfileLinksViewModel model, s } else if (model.ActionName == "EditRole") { - return RedirectToAction("EditRoleProfileLinks", new { actionName = "Summary", competencyAssessmentId }); + return RedirectToAction("EditRoleProfileLinks", new { actionName = "Summary", competencyAssessmentId }); } else { diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditRoleProfileLinks.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditRoleProfileLinks.cshtml index 7a3d166cbb..b5faad6214 100644 --- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditRoleProfileLinks.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditRoleProfileLinks.cshtml @@ -6,7 +6,7 @@ } @section NavMenuItems { - + } @section NavBreadcrumbs { @@ -23,9 +23,9 @@ }

    Edit @Model.CompetencyAssessmentName national NHS role profile links

    -@if (Model.TaskStatus != null | Model.ProfessionalGroupId != null) +@if (Model.TaskStatus != null | Model.ActionName != "EditGroup") { -
    +
    @@ -36,7 +36,7 @@
    - Change assessment name + Change professional group link
    @@ -51,12 +51,12 @@
    - Change assessment name + Change sub group link
} - @if (Model.SubGroupId != null && Model.ActionName != "EditRole") + @if (Model.SubGroupId != null && Model.ActionName == "Summary") {
@@ -67,7 +67,7 @@
- Change assessment name + Change role profile link
@@ -244,7 +244,7 @@ else if (Model.ActionName == "Summary") - + }