TD-3671 fixed enrolling from 'Tracking system-Manage Delegate' view doesn't appear on 'Current activities'

Author: sherif-olaboye

DigitalLearningSolutions.Data/DataServices/ProgressDataService.cs

@@ -15,7 +15,7 @@ public interface IProgressDataService
     {
         IEnumerable<Progress> GetDelegateProgressForCourse(int delegateId, int customisationId);
 
-        void UpdateProgressSupervisorAndCompleteByDate(int progressId, int supervisorAdminId, DateTime? completeByDate);
+        void UpdateProgressSupervisorAndCompleteByDate(int progressId, int supervisorAdminId, DateTime? completeByDate,DateTime submittedTime);
 
         int CreateNewDelegateProgress(
             int delegateId,
@@ -143,15 +143,16 @@ FROM Progress
         public void UpdateProgressSupervisorAndCompleteByDate(
             int progressId,
             int supervisorAdminId,
-            DateTime? completeByDate
+            DateTime? completeByDate, DateTime submittedTime
         )
         {
             connection.Execute(
                 @"UPDATE Progress SET
                         SupervisorAdminID = @supervisorAdminId,
-                        CompleteByDate = @completeByDate
+                        CompleteByDate = @completeByDate,
+                        SubmittedTime = @submittedTime
                     WHERE ProgressID = @progressId",
-                new { progressId, supervisorAdminId, completeByDate }
+                new { progressId, supervisorAdminId, completeByDate, submittedTime }
             );
         }
 

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

@@ -348,7 +348,8 @@ public void EnrolDelegateOnGroupCourses_updates_existing_progress_record()
                     () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(
                         reusableProgressRecord.ProgressId,
                         A<int>._,
-                        A<DateTime?>._
+                        A<DateTime?>._,
+                         A<DateTime>._
                     )
                 ).MustHaveHappened();
             }
@@ -384,7 +385,8 @@ public void
                     () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(
                         reusableProgressRecord.ProgressId,
                         reusableProgressRecord.SupervisorAdminId,
-                        A<DateTime?>._
+                        A<DateTime?>._,
+                          A<DateTime>._
                     )
                 ).MustHaveHappened();
             }
@@ -420,7 +422,8 @@ public void EnrolDelegateOnGroupCourses_update_uses_course_supervisor_id_if_cour
                     () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(
                         reusableProgressRecord.ProgressId,
                         supervisorId,
-                        A<DateTime?>._
+                        A<DateTime?>._,
+                          A<DateTime>._
                     )
                 ).MustHaveHappened();
             }
@@ -456,7 +459,8 @@ public void
                     () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(
                         reusableProgressRecord.ProgressId,
                         A<int>._,
-                        null
+                        null,
+                          A<DateTime>._
                     )
                 ).MustHaveHappened();
             }
@@ -494,7 +498,8 @@ public void
                     () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(
                         reusableProgressRecord.ProgressId,
                         A<int>._,
-                        expectedFutureDate
+                        expectedFutureDate,
+                          A<DateTime>._
                     )
                 ).MustHaveHappened();
             }

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

@@ -721,7 +721,7 @@ private void DelegateMustNotHaveBeenAddedToAGroup()
         private void DelegateProgressRecordMustNotHaveBeenUpdated()
         {
             A.CallTo(
-                () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(A<int>._, A<int>._, A<DateTime?>._)
+                () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(A<int>._, A<int>._, A<DateTime?>._, A<DateTime>._)
             ).MustNotHaveHappened();
         }
 
@@ -764,7 +764,7 @@ private void DatabaseModificationsDoNothing()
             A.CallTo(() => groupsDataService.AddDelegateToGroup(A<int>._, A<int>._, A<DateTime>._, A<int>._))
                 .DoesNothing();
             A.CallTo(
-                () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(A<int>._, A<int>._, A<DateTime?>._)
+                () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(A<int>._, A<int>._, A<DateTime?>._, A<DateTime>._)
             ).DoesNothing();
             A.CallTo(
                 () => progressDataService.CreateNewDelegateProgress(

DigitalLearningSolutions.Web.Tests/Services/ProgressServiceTests.cs

@@ -58,7 +58,7 @@ public void UpdateSupervisor_does_not_update_records_if_new_supervisor_matches_c
 
             // Then
             A.CallTo(
-                () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(A<int>._, A<int>._, A<DateTime?>._)
+                () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(A<int>._, A<int>._, A<DateTime?>._, A<DateTime>._)
             ).MustNotHaveHappened();
             A.CallTo(
                 () => progressDataService.ClearAspProgressVerificationRequest(A<int>._)
@@ -83,7 +83,8 @@ public void UpdateSupervisor_updates_records_if_new_supervisor_does_not_match_cu
                 () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(
                     progressId,
                     newSupervisorId,
-                    A<DateTime?>._
+                    A<DateTime?>._,
+                    A<DateTime>._
                 )
             ).MustHaveHappened();
             A.CallTo(
@@ -105,7 +106,7 @@ public void UpdateSupervisor_sets_supervisor_id_to_0_if_new_supervisor_is_null()
 
             // Then
             A.CallTo(
-                () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(progressId, 0, A<DateTime?>._)
+                () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(progressId, 0, A<DateTime?>._, A<DateTime>._)
             ).MustHaveHappened();
             A.CallTo(
                 () => progressDataService.ClearAspProgressVerificationRequest(progressId)
@@ -122,7 +123,7 @@ public void UpdateSupervisor_throws_exception_if_no_progress_record_found()
             // Then
             Assert.Throws<ProgressNotFoundException>(() => progressService.UpdateSupervisor(progressId, null));
             A.CallTo(
-                () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(A<int>._, A<int>._, A<DateTime?>._)
+                () => progressDataService.UpdateProgressSupervisorAndCompleteByDate(A<int>._, A<int>._, A<DateTime?>._, A<DateTime>._)
             ).MustNotHaveHappened();
             A.CallTo(
                 () => progressDataService.ClearAspProgressVerificationRequest(A<int>._)

DigitalLearningSolutions.Web/Services/EnrolService.cs

@@ -102,7 +102,8 @@ public void EnrolDelegateOnCourse(int delegateId, int customisationId, int custo
                     progressDataService.UpdateProgressSupervisorAndCompleteByDate(
                         progressRecord.ProgressId,
                         supervisorAdminId ?? 0,
-                        completeByDate
+                        completeByDate,
+                        clockUtility.UtcNow
                     );
                 }
             }

DigitalLearningSolutions.Web/Services/GroupsService.cs

@@ -730,7 +730,9 @@ IEnumerable<NotificationPreference> delegateNotificationPreferences
                     progressDataService.UpdateProgressSupervisorAndCompleteByDate(
                         progressRecord.ProgressId,
                         updatedSupervisorAdminId,
-                        completeByDate
+                        completeByDate,
+                    clockUtility.UtcNow
+
                     );
                 }
             }

DigitalLearningSolutions.Web/Services/ProgressService.cs

@@ -105,7 +105,9 @@ public void UpdateSupervisor(int progressId, int? newSupervisorId)
             progressDataService.UpdateProgressSupervisorAndCompleteByDate(
                 progressId,
                 supervisorId,
-                courseInfo.CompleteBy
+                courseInfo.CompleteBy,
+                    clockUtility.UtcNow
+
             );
 
             progressDataService.ClearAspProgressVerificationRequest(progressId);