Merge branch 'Release-2024.29-Hotfix' into Release-2024.32

Author: rshrirohit

DigitalLearningSolutions.Web.Tests/Services/GroupServiceTests/GroupsServiceEnrolDelegateTests.cs

@@ -54,7 +54,7 @@ public void EnrolDelegateOnGroupCourses_adds_new_progress_record_when_no_existin
                         reusableDelegateDetails.Id,
                         reusableGroupCourse.CustomisationId,
                         reusableGroupCourse.CurrentVersion,
-                        testDate,
+                        null,
                         3,
                         null,
                         A<DateTime?>._,
@@ -97,7 +97,7 @@ public void EnrolDelegateOnGroupCourses_adds_new_progress_record_when_existing_p
                         reusableDelegateDetails.Id,
                         reusableGroupCourse.CustomisationId,
                         reusableGroupCourse.CurrentVersion,
-                        testDate,
+                        null,
                         3,
                         null,
                         A<DateTime?>._,
@@ -140,7 +140,7 @@ public void EnrolDelegateOnGroupCourses_adds_new_progress_record_when_existing_p
                         reusableDelegateDetails.Id,
                         reusableGroupCourse.CustomisationId,
                         reusableGroupCourse.CurrentVersion,
-                        testDate,
+                        null,
                         3,
                         null,
                         A<DateTime?>._,
@@ -183,11 +183,11 @@ public void
                         reusableDelegateDetails.Id,
                         reusableGroupCourse.CustomisationId,
                         reusableGroupCourse.CurrentVersion,
-                        testDate,
+                        null,
                         3,
                         null,
                         A<DateTime?>._,
-                        0 ,
+                        0,
                         testDate
                     )
                 ).MustHaveHappened();
@@ -227,7 +227,7 @@ public void
                         reusableDelegateDetails.Id,
                         reusableGroupCourse.CustomisationId,
                         reusableGroupCourse.CurrentVersion,
-                        testDate,
+                        null,
                         3,
                         null,
                         testDate.AddMonths(12),
@@ -270,7 +270,7 @@ public void
                         reusableDelegateDetails.Id,
                         reusableGroupCourse.CustomisationId,
                         reusableGroupCourse.CurrentVersion,
-                        testDate,
+                        null,
                         3,
                         null,
                         null,
@@ -315,7 +315,7 @@ public void
                         reusableDelegateDetails.Id,
                         reusableGroupCourse.CustomisationId,
                         reusableGroupCourse.CurrentVersion,
-                        testDate,
+                        null,
                         3,
                         null,
                         expectedFutureDate,

DigitalLearningSolutions.Web.Tests/Services/GroupServiceTests/GroupsServiceTests.cs

@@ -13,7 +13,7 @@
     using DigitalLearningSolutions.Data.Models.Progress;
     using DigitalLearningSolutions.Data.Models.User;
     using DigitalLearningSolutions.Data.Services;
-    
+
     using DigitalLearningSolutions.Data.Utilities;
     using DigitalLearningSolutions.Web.Services;
     using DigitalLearningSolutions.Web.Tests.TestHelpers;
@@ -802,7 +802,7 @@ private void SetupEnrolProcessFakes(
                     A<int>._,
                     A<int>._,
                     A<int>._,
-                    A<DateTime>._,
+                    A<DateTime?>._,
                     A<int>._,
                     A<int?>._,
                     A<DateTime?>._,

DigitalLearningSolutions.Web/Services/GroupsService.cs

@@ -755,7 +755,7 @@ IEnumerable<NotificationPreference> delegateNotificationPreferences
                     delegateUserId,
                     groupCourse.CustomisationId,
                     groupCourse.CurrentVersion,
-                    clockUtility.UtcNow,
+                    null,
                     3,
                     addedByAdminId,
                     completeByDate,

DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/Shared/DelegateSelfAssessmentInfoViewModel.cs

@@ -55,7 +55,7 @@ private DelegateSelfAssessmentInfoViewModel(SelfAssessmentDelegate delegateInfo)
             EnrolmentMethod = delegateInfo.EnrolmentMethodId switch
             {
                 1 => "Self enrolled",
-                2 => enrolledByFullName == null ? "Admin/supervisor enrolled" : "Enrolled by " + enrolledByFullName,
+                2 => enrolledByFullName == null ? "Admin/supervisor enrolled" : "Enrolled by Admin/Supervisor - " + enrolledByFullName,
                 3 => "Group",
                 _ => "System",
             };

DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/Shared/_DelegateSelfAssessmentProgressDetails.cshtml

@@ -61,7 +61,7 @@
                 string enrolmentMethod = Model.EnrolmentMethodId switch
                 {
                     1 => "Self enrolled",
-                    2 => Model.EnrolledByFullName != null ? "Enrolled by Supervisor - " + Model.EnrolledByFullName : "Admin/supervisor enrolled",
+                    2 => Model.EnrolledByFullName != null ? "Enrolled by Admin/Supervisor - " + Model.EnrolledByFullName : "Admin/Supervisor enrolled",
                     3 => "Group",
                     _ => "System",
                 };