Merge branch 'Release-2024.32' into Develop/Fix/TD-4232-Course-Certificate-Console-errors

Auldrin-Possa · Auldrin-Possa · commit cb5d0adc32c9 · 2024-06-20T10:40:24.000+01:00
diff --git a/DigitalLearningSolutions.Data.Migrations/202406140805_UpdateProgressMarkSubmittedTimeAsNullable.cs b/DigitalLearningSolutions.Data.Migrations/202406140805_UpdateProgressMarkSubmittedTimeAsNullable.cs
@@ -0,0 +1,23 @@
+﻿namespace DigitalLearningSolutions.Data.Migrations
+{
+    using FluentMigrator;
+
+    [Migration(202406140805)]
+    public class UpdateProgressMarkSubmittedTimeAsNullable : Migration
+    {
+        public override void Up()
+        {
+            Alter.Table("Progress")
+                .AlterColumn("SubmittedTime")
+                .AsDateTime()
+                .Nullable();
+        }
+        public override void Down()
+        {
+            Alter.Table("Progress")
+               .AlterColumn("SubmittedTime")
+               .AsDateTime()
+               .NotNullable();
+        }
+    }
+}
diff --git a/DigitalLearningSolutions.Data/DataServices/CourseDataService.cs b/DigitalLearningSolutions.Data/DataServices/CourseDataService.cs
@@ -864,7 +864,7 @@ public IEnumerable<CourseStatistics> GetNonArchivedCourseStatisticsAtCentreFilte
 
         public IEnumerable<DelegateCourseInfo> GetDelegateCoursesInfo(int delegateId)
         {
-            return connection.Query<DelegateCourseInfo>(
+                return connection.Query<DelegateCourseInfo>(
                 $@"{selectDelegateCourseInfoQuery}
                     WHERE pr.CandidateID = @delegateId
                         AND pr.RemovedDate IS NULL
@@ -910,7 +910,7 @@ AND ap.DefaultContentTypeID <> 4
                         da.CentreID,
                         ap.ArchivedDate",
                 new { delegateId }
-            );
+            );            
         }
 
         public DelegateCourseInfo? GetDelegateCourseInfoByProgressId(int progressId)
diff --git a/DigitalLearningSolutions.Data/DataServices/ProgressDataService.cs b/DigitalLearningSolutions.Data/DataServices/ProgressDataService.cs
@@ -20,7 +20,7 @@ int CreateNewDelegateProgress(
             int delegateId,
             int customisationId,
             int customisationVersion,
-            DateTime submittedTime,
+            DateTime? submittedTime,
             int enrollmentMethodId,
             int? enrolledByAdminId,
             DateTime? completeByDate,
@@ -163,7 +163,7 @@ public int CreateNewDelegateProgress(
             int delegateId,
             int customisationId,
             int customisationVersion,
-            DateTime submittedTime,
+            DateTime? submittedTime,
             int enrollmentMethodId,
             int? enrolledByAdminId,
             DateTime? completeByDate,
diff --git a/DigitalLearningSolutions.Data/Models/Courses/DelegateCourseInfo.cs b/DigitalLearningSolutions.Data/Models/Courses/DelegateCourseInfo.cs
@@ -68,7 +68,7 @@ public DelegateCourseInfo(
             string? supervisorSurname,
             bool? supervisorAdminActive,
             DateTime enrolled,
-            DateTime lastUpdated,
+            DateTime? lastUpdated,
             DateTime? completeBy,
             DateTime? completed,
             DateTime? evaluated,
@@ -145,7 +145,7 @@ bool isDelegateActive
         public bool AllCentresCourse { get; set; }
         public int ProgressId { get; set; }
         public bool IsProgressLocked { get; set; }
-        public DateTime LastUpdated { get; set; }
+        public DateTime? LastUpdated { get; set; }
         public DateTime? CompleteBy { get; set; }
         public DateTime? RemovedDate { get; set; }
         public DateTime? Completed { get; set; }
diff --git a/DigitalLearningSolutions.Web.Tests/Controllers/SuperAdmin/UsersControllerTests.cs b/DigitalLearningSolutions.Web.Tests/Controllers/SuperAdmin/UsersControllerTests.cs
@@ -1,6 +1,4 @@
-﻿using DigitalLearningSolutions.Data.DataServices;
-using DigitalLearningSolutions.Data.DataServices.UserDataService;
-using DigitalLearningSolutions.Data.Models.Support;
+﻿using DigitalLearningSolutions.Data.Models.Support;
 using DigitalLearningSolutions.Data.Utilities;
 using DigitalLearningSolutions.Data.ViewModels.UserCentreAccount;
 using DigitalLearningSolutions.Web.Controllers.SuperAdmin;
@@ -26,13 +24,11 @@ namespace DigitalLearningSolutions.Web.Tests.Controllers.SuperAdmin
     public class UsersControllerTests
     {
         private UsersController controller = null!;
-
         private IUserService userService = null!;
         private IUserCentreAccountsService userCentreAccountsService = null!;
-        private IUserDataService userDataService=null!;
-        private ICentreRegistrationPromptsDataService centreRegistrationPromptsDataService=null!;
+        private ICentreRegistrationPromptsService centreRegistrationPromptsService=null!;
         private ISearchSortFilterPaginateService searchSortFilterPaginateService=null!;
-        private IJobGroupsDataService jobGroupsDataService=null!;
+        private IJobGroupsService jobGroupsService=null!;
         private IClockUtility clockUtility=null!;
         private static readonly List<int> EmptyListOfCentreIds = new List<int>();
         [SetUp]
@@ -41,8 +37,8 @@ public void Setup()
             userService = A.Fake<IUserService>();
             userCentreAccountsService = A.Fake<IUserCentreAccountsService>();
 
-            controller = new UsersController(userDataService, centreRegistrationPromptsDataService,
-                                            searchSortFilterPaginateService, jobGroupsDataService,userCentreAccountsService, userService, clockUtility)
+            controller = new UsersController(centreRegistrationPromptsService,
+                                            searchSortFilterPaginateService, jobGroupsService,userCentreAccountsService, userService, clockUtility)
                 .WithDefaultContext()
                 .WithMockHttpContextSession()
                 .WithMockTempData();
diff --git a/DigitalLearningSolutions.Web/Controllers/SuperAdmin/Users/UsersController.cs b/DigitalLearningSolutions.Web/Controllers/SuperAdmin/Users/UsersController.cs
@@ -1,7 +1,5 @@
 ﻿namespace DigitalLearningSolutions.Web.Controllers.SuperAdmin.Users
 {
-    using DigitalLearningSolutions.Data.DataServices;
-    using DigitalLearningSolutions.Data.DataServices.UserDataService;
     using DigitalLearningSolutions.Data.Enums;
     using DigitalLearningSolutions.Data.Helpers;
     using DigitalLearningSolutions.Data.Models.SearchSortFilterPaginate;
@@ -28,20 +26,18 @@
     [SetSelectedTab(nameof(NavMenuTab.Admins))]
     public class UsersController : Controller
     {
-        private readonly IUserDataService userDataService;
-        private readonly ICentreRegistrationPromptsDataService centreRegistrationPromptsDataService;
+        private readonly ICentreRegistrationPromptsService centreRegistrationPromptsService;
         private readonly ISearchSortFilterPaginateService searchSortFilterPaginateService;
-        private readonly IJobGroupsDataService jobGroupsDataService;
+        private readonly IJobGroupsService jobGroupsService;
         private const string UserAccountFilterCookieName = "UserAccountFilter";
         private readonly IUserService userService;
         private readonly IUserCentreAccountsService userCentreAccountsService;
         private readonly IClockUtility clockUtility;
-        public UsersController(IUserDataService userDataService, ICentreRegistrationPromptsDataService centreRegistrationPromptsDataService, ISearchSortFilterPaginateService searchSortFilterPaginateService, IJobGroupsDataService jobGroupsDataService,IUserCentreAccountsService userCentreAccountsService, IUserService userService, IClockUtility clockUtility)
+        public UsersController(ICentreRegistrationPromptsService centreRegistrationPromptsService, ISearchSortFilterPaginateService searchSortFilterPaginateService, IJobGroupsService jobGroupsService,IUserCentreAccountsService userCentreAccountsService, IUserService userService, IClockUtility clockUtility)
         {
-            this.userDataService = userDataService;
-            this.centreRegistrationPromptsDataService = centreRegistrationPromptsDataService;
+            this.centreRegistrationPromptsService = centreRegistrationPromptsService;
             this.searchSortFilterPaginateService = searchSortFilterPaginateService;
-            this.jobGroupsDataService = jobGroupsDataService;
+            this.jobGroupsService = jobGroupsService;
             this.userService = userService;
             this.userCentreAccountsService = userCentreAccountsService;
             this.clockUtility = clockUtility;
@@ -52,7 +48,7 @@ public IActionResult InactivateUserConfirmation(int userId = 0)
         {
             InactivateUserViewModel inactivateUserViewModel = new InactivateUserViewModel();
             inactivateUserViewModel.UserId = userId;
-            inactivateUserViewModel.DisplayName = this.userDataService.GetUserDisplayName(userId);
+            inactivateUserViewModel.DisplayName = this.userService.GetUserDisplayName(userId);
 
             if (TempData["SearchString"] != null)
             {
@@ -78,7 +74,7 @@ public IActionResult InactivateUserConfirmation(InactivateUserViewModel inactiva
             TempData["UserId"] = userId;
             if (inactivateUserViewModel.IsChecked)
             {
-                this.userDataService.InactivateUser(userId);
+                this.userService.InactivateUser(userId);
                 return RedirectToAction("Index", "Users", new { UserId = userId });
             }
             else
@@ -156,9 +152,9 @@ public IActionResult Index(
                 }
             }
 
-            (var UserAccounts, var ResultCount) = this.userDataService.GetUserAccounts(Search ?? string.Empty, offSet, itemsPerPage ?? 0, JobGroupId, UserStatus, EmailStatus, UserId, AuthHelper.FailedLoginThreshold);
+            (var UserAccounts, var ResultCount) = this.userService.GetUserAccounts(Search ?? string.Empty, offSet, itemsPerPage ?? 0, JobGroupId, UserStatus, EmailStatus, UserId, AuthHelper.FailedLoginThreshold);
 
-            var jobGroups = jobGroupsDataService.GetJobGroupsAlphabetical().ToList();
+            var jobGroups = jobGroupsService.GetJobGroupsAlphabetical().ToList();
             jobGroups.Insert(0, (0, "Any"));
 
             var searchSortPaginationOptions = new SearchSortFilterAndPaginateOptions(
@@ -235,7 +231,7 @@ public List<string> GetEmailStatus()
         [Route("SuperAdmin/Users/{userId=0:int}/EditUserDetails")]
         public IActionResult EditUserDetails(int userId)
         {
-            UserAccount userAccount = this.userDataService.GetUserAccountById(userId);
+            UserAccount userAccount = this.userService.GetUserAccountById(userId);
             EditUserDetailsViewModel editUserDetailsViewModel = new EditUserDetailsViewModel(userAccount);
 
             if (TempData["SearchString"] != null)
@@ -253,7 +249,7 @@ public IActionResult EditUserDetails(int userId)
             TempData["UserId"] = userId;
             TempData.Keep();
 
-            var jobGroups = jobGroupsDataService.GetJobGroupsAlphabetical().ToList();
+            var jobGroups = jobGroupsService.GetJobGroupsAlphabetical().ToList();
             ViewBag.JobGroups = SelectListHelper.MapOptionsToSelectListItems(
                 jobGroups, userAccount.JobGroupId
             );
@@ -266,9 +262,9 @@ public IActionResult EditUserDetails(EditUserDetailsViewModel editUserDetailsVie
         {
             if (ModelState.IsValid)
             {
-                if (!this.userDataService.PrimaryEmailIsInUseByOtherUser(editUserDetailsViewModel.PrimaryEmail, editUserDetailsViewModel.Id))
+                if (!this.userService.PrimaryEmailIsInUseByOtherUser(editUserDetailsViewModel.PrimaryEmail, editUserDetailsViewModel.Id))
                 {
-                    this.userDataService.UpdateUserDetailsAccount(editUserDetailsViewModel.FirstName, editUserDetailsViewModel.LastName, editUserDetailsViewModel.PrimaryEmail, editUserDetailsViewModel.JobGroupId, editUserDetailsViewModel.ProfessionalRegistrationNumber,
+                    this.userService.UpdateUserDetailsAccount(editUserDetailsViewModel.FirstName, editUserDetailsViewModel.LastName, editUserDetailsViewModel.PrimaryEmail, editUserDetailsViewModel.JobGroupId, editUserDetailsViewModel.ProfessionalRegistrationNumber,
                         ((editUserDetailsViewModel.ResetEmailVerification) ? null : editUserDetailsViewModel.EmailVerified),
                         editUserDetailsViewModel.Id);
                     return RedirectToAction("Index", "Users", new { UserId = editUserDetailsViewModel.Id });
@@ -281,7 +277,7 @@ public IActionResult EditUserDetails(EditUserDetailsViewModel editUserDetailsVie
                     );
                 }
             }
-            var jobGroups = jobGroupsDataService.GetJobGroupsAlphabetical().ToList();
+            var jobGroups = jobGroupsService.GetJobGroupsAlphabetical().ToList();
             ViewBag.JobGroups = SelectListHelper.MapOptionsToSelectListItems(
                 jobGroups, editUserDetailsViewModel.JobGroupId
             );
@@ -332,15 +328,15 @@ public IActionResult UnlockAccount(int userId, string RequestUrl= null)
         [Route("SuperAdmin/Users/{userId=0:int}/ActivateUser")]
         public IActionResult ActivateUser(int userId = 0)
         {
-            userDataService.ActivateUser(userId);
+            userService.ActivateUser(userId);
             TempData["UserId"] = userId;
             return RedirectToAction("Index", "Users", new { UserId = userId });
         }
 
         [Route("SuperAdmin/Users/{userId=0:int}/{email='':string}/VerifyEmail")]
         public IActionResult VerifyEmail(int userId = 0,string email="")
         {
-            userDataService.SetPrimaryEmailVerified(userId,email, clockUtility.UtcNow);
+            userService.SetPrimaryEmailVerified(userId,email, clockUtility.UtcNow);
             TempData["UserId"] = userId;
             return RedirectToAction("Index", "Users", new { UserId = userId });
         }
diff --git a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/GroupDelegatesController.cs b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/GroupDelegatesController.cs
@@ -158,12 +158,13 @@ public IActionResult SelectDelegateAllItems(int groupId)
             var jobGroups = jobGroupsService.GetJobGroupsAlphabetical();
             var customPrompts = promptsService.GetCentreRegistrationPrompts(centreId);
             var delegateUsers = userService.GetDelegatesNotRegisteredForGroupByGroupId(groupId, centreId);
-
+            var groups = groupsService.GetActiveGroups(centreId);
             var model = new SelectDelegateAllItemsViewModel(
                 delegateUsers,
                 jobGroups,
                 customPrompts,
-                groupId
+                groupId,
+                groups
             );
 
             return View(model);
diff --git a/DigitalLearningSolutions.Web/Services/CourseDelegatesDownloadFileService.cs b/DigitalLearningSolutions.Web/Services/CourseDelegatesDownloadFileService.cs
@@ -547,7 +547,7 @@ DataRow row
             }
             row[DelegateId] = courseDelegate.CandidateNumber;
             row[Enrolled] = courseDelegate.Enrolled.Date;
-            row[LastAccessed] = courseDelegate.LastUpdated.Date;
+            row[LastAccessed] = courseDelegate.LastUpdated?.Date;
             row[CompleteBy] = courseDelegate.CompleteBy?.Date;
             row[CompletedDate] = courseDelegate.Completed?.Date;
             row[Logins] = courseDelegate.LoginCount;
diff --git a/DigitalLearningSolutions.Web/Services/CourseService.cs b/DigitalLearningSolutions.Web/Services/CourseService.cs
@@ -607,7 +607,7 @@ public IEnumerable<AvailableCourse> GetAvailableCourses(int candidateId, int? ce
 
         public void EnrolOnSelfAssessment(int selfAssessmentId, int delegateUserId, int centreId)
         {
-            courseDataService.EnrolSelfAssessment(selfAssessmentId, delegateUserId, centreId);
+            courseDataService.EnrolOnSelfAssessment(selfAssessmentId, delegateUserId, centreId);
         }
 
         public int GetNumberOfActiveCoursesAtCentreFilteredByCategory(int centreId, int? categoryId)
diff --git a/DigitalLearningSolutions.Web/Services/EnrolService.cs b/DigitalLearningSolutions.Web/Services/EnrolService.cs
@@ -114,7 +114,7 @@ public void EnrolDelegateOnCourse(int delegateId, int customisationId, int custo
                     delegateId,
                     customisationId,
                     customisationVersion,
-                    clockUtility.UtcNow,
+                    null,
                     2,
                     enrolledByAdminId,
                 completeByDate,
diff --git a/DigitalLearningSolutions.Web/Services/UserService.cs b/DigitalLearningSolutions.Web/Services/UserService.cs
@@ -159,6 +159,7 @@ void SetCentreEmail(
 
         AdminUser? GetAdminUserById(int id);
         string GetUserDisplayName(int userId);
+
         (IEnumerable<SuperAdminDelegateAccount>, int) GetAllDelegates(
       string search, int offset, int rows, int? delegateId, string accountStatus, string lhlinkStatus, int? centreId, int failedLoginThreshold
       );
@@ -187,7 +188,12 @@ bool isWorkforceManager
         bool IsUserAlreadyAdminAtCentre(int? userId, int centreId);
         IEnumerable<AdminEntity> GetAdminsByCentreId(int centreId);
         void DeactivateAdmin(int adminId);
-
+        void ActivateUser(int userId);
+        void InactivateUser(int userId);
+        (IEnumerable<UserAccountEntity>, int recordCount) GetUserAccounts(
+           string search, int offset, int rows, int jobGroupId, string userStatus, string emailStatus, int userId, int failedLoginThreshold
+           );
+        void UpdateUserDetailsAccount(string firstName, string lastName, string primaryEmail, int jobGroupId, string? prnNumber, DateTime? emailVerified, int userId);
     }
 
     public class UserService : IUserService
@@ -873,6 +879,7 @@ public string GetUserDisplayName(int userId)
             return userDataService.GetUserDisplayName(userId);
         }
 
+
         public (IEnumerable<SuperAdminDelegateAccount>, int) GetAllDelegates(string search, int offset, int rows, int? delegateId, string accountStatus, string lhlinkStatus, int? centreId, int failedLoginThreshold)
         {
             return userDataService.GetAllDelegates(search, offset, rows, delegateId, accountStatus, lhlinkStatus, centreId, failedLoginThreshold);
@@ -932,5 +939,22 @@ public void DeactivateAdmin(int adminId)
         {
             userDataService.DeactivateAdmin(adminId);
         }
+
+        public void ActivateUser(int userId)
+        {
+            userDataService.ActivateUser(userId);
+        }
+        public void InactivateUser(int userId)
+        {
+            userDataService.InactivateUser(userId);
+        }
+        public (IEnumerable<UserAccountEntity>, int recordCount) GetUserAccounts(string search, int offset, int rows, int jobGroupId, string userStatus, string emailStatus, int userId, int failedLoginThreshold)
+        {
+            return userDataService.GetUserAccounts(search, offset, rows, jobGroupId, userStatus, emailStatus, userId, failedLoginThreshold);
+        }
+        public void UpdateUserDetailsAccount(string firstName, string lastName, string primaryEmail, int jobGroupId, string? prnNumber, DateTime? emailVerified, int userId)
+        {
+            userDataService.UpdateUserDetailsAccount(firstName, lastName, primaryEmail, jobGroupId, prnNumber, emailVerified, userId);
+        }
     }
 }
diff --git a/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/GroupDelegates/SelectDelegateAllItemsViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/GroupDelegates/SelectDelegateAllItemsViewModel.cs
@@ -11,9 +11,10 @@ public SelectDelegateAllItemsViewModel(
             IEnumerable<DelegateUserCard> delegateUserCards,
             IEnumerable<(int id, string name)> jobGroups,
             IEnumerable<CentreRegistrationPrompt> customPrompts,
-            int groupId
+            int groupId,
+            IEnumerable<(int id, string name)> groups
         )
-            : base(delegateUserCards, jobGroups, customPrompts)
+            : base(delegateUserCards, jobGroups, customPrompts, groups)
         {
             GroupId = groupId;
         }
diff --git a/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/Shared/DelegateCourseInfoViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/Shared/DelegateCourseInfoViewModel.cs
@@ -64,7 +64,7 @@ private DelegateCourseInfoViewModel(DelegateCourseInfo info)
                 : "None";
 
             CompleteBy = info.CompleteBy?.ToString(DateHelper.StandardDateAndTimeFormat);
-            LastAccessed = info.LastUpdated.ToString(DateHelper.StandardDateAndTimeFormat);
+            LastAccessed = info.LastUpdated?.ToString(DateHelper.StandardDateAndTimeFormat);
             Completed = info.Completed?.ToString(DateHelper.StandardDateAndTimeFormat);
             Evaluated = info.Evaluated?.ToString(DateHelper.StandardDateAndTimeFormat);
             RemovedDate = info.RemovedDate?.ToString(DateHelper.StandardDateAndTimeFormat);
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/Shared/_DelegateCourseProgressDetailsWithStatusTags.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/Shared/_DelegateCourseProgressDetailsWithStatusTags.cshtml
@@ -79,7 +79,7 @@
             Last access
         </dt>
         <dd class="nhsuk-summary-list__value" data-name-for-sorting="last-accessed">
-            @Model.LastAccessed
+            @(Model.LastAccessed ?? "-")
         </dd>
         <dd class="nhsuk-summary-list__actions"></dd>
     </div>

Original file line number	Diff line number	Diff line change
`@@ -547,7 +547,7 @@ DataRow row`
`547`	`547`	`}`
`548`	`548`	`row[DelegateId] = courseDelegate.CandidateNumber;`
`549`	`549`	`row[Enrolled] = courseDelegate.Enrolled.Date;`
`550`		`- row[LastAccessed] = courseDelegate.LastUpdated.Date;`
	`550`	`+ row[LastAccessed] = courseDelegate.LastUpdated?.Date;`
`551`	`551`	`row[CompleteBy] = courseDelegate.CompleteBy?.Date;`
`552`	`552`	`row[CompletedDate] = courseDelegate.Completed?.Date;`
`553`	`553`	`row[Logins] = courseDelegate.LoginCount;`
Original file line number	Diff line number	Diff line change
`@@ -607,7 +607,7 @@ public IEnumerable<AvailableCourse> GetAvailableCourses(int candidateId, int? ce`
`607`	`607`
`608`	`608`	`public void EnrolOnSelfAssessment(int selfAssessmentId, int delegateUserId, int centreId)`
`609`	`609`	`{`
`610`		`- courseDataService.EnrolSelfAssessment(selfAssessmentId, delegateUserId, centreId);`
	`610`	`+ courseDataService.EnrolOnSelfAssessment(selfAssessmentId, delegateUserId, centreId);`
`611`	`611`	`}`
`612`	`612`
`613`	`613`	`public int GetNumberOfActiveCoursesAtCentreFilteredByCategory(int centreId, int? categoryId)`