Merge branch 'Release-2024.32' into Release-2024.38

Author: rshrirohit

DigitalLearningSolutions.Data.Migrations/202408141400_Alter_uspCreateProgressRecord_V3_UtcDate.cs

@@ -0,0 +1,17 @@
+namespace DigitalLearningSolutions.Data.Migrations
+{
+    using FluentMigrator;
+
+    [Migration(202408141400)]
+    public class Alter_uspCreateProgressRecord_V3_UtcDate : Migration
+    {
+        public override void Up()
+        {
+            Execute.Sql(Properties.Resources.TD_4436_Alter_uspCreateProgressRecord_V3_Up);
+        }
+        public override void Down()
+        {
+            Execute.Sql(Properties.Resources.TD_4436_Alter_uspCreateProgressRecord_V3_Down);
+        }
+    }
+}

DigitalLearningSolutions.Data.Migrations/Properties/Resources.Designer.cs

@@ -412,4 +412,10 @@
   <data name="TD_4243_Alter_GetCurrentCoursesForCandidate_V2_proc_up" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\TD-4243_Alter_GetCurrentCoursesForCandidate_V2_proc_up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
-</root>
+  <data name="TD_4436_Alter_uspCreateProgressRecord_V3_Down" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Scripts\TD-4436-Alter_uspCreateProgressRecord_V3_Down.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
+  </data>
+  <data name="TD_4436_Alter_uspCreateProgressRecord_V3_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Scripts\TD-4436-Alter_uspCreateProgressRecord_V3_Up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
+  </data>
+</root>

DigitalLearningSolutions.Data.Migrations/Properties/Resources.resx

@@ -251,7 +251,7 @@ FROM Sessions AS S1 WITH (NOLOCK)
                             WHERE S1.CandidateID = Progress.CandidateID
                               AND S1.CustomisationID = Progress.CustomisationID
                               AND S1.LoginTime >= Progress.FirstSubmittedTime),
-                            SubmittedTime = GETDATE()
+                            SubmittedTime = GETUTCDATE()
                         WHERE Progress.ProgressID = @progressId",
                 new { progressId }
             );

DigitalLearningSolutions.Data.Migrations/Scripts/TD-4436-Alter_uspCreateProgressRecord_V3_Down.sql

@@ -171,7 +171,7 @@ GROUP BY
         public void UpdateLastAccessed(int selfAssessmentId, int delegateUserId)
         {
             var numberOfAffectedRows = connection.Execute(
-                @"UPDATE CandidateAssessments SET LastAccessed = GETDATE()
+                @"UPDATE CandidateAssessments SET LastAccessed = GETUTCDATE()
                       WHERE SelfAssessmentID = @selfAssessmentId AND DelegateUserID = @delegateUserId",
                 new { selfAssessmentId, delegateUserId }
             );

DigitalLearningSolutions.Data.Migrations/Scripts/TD-4436-Alter_uspCreateProgressRecord_V3_Up.sql

@@ -13,6 +13,7 @@ namespace DigitalLearningSolutions.Web.Tests.Controllers.Login
     using DigitalLearningSolutions.Data.Models.User;
     using DigitalLearningSolutions.Data.Utilities;
     using DigitalLearningSolutions.Web.Controllers;
+    using DigitalLearningSolutions.Web.Helpers;
     using DigitalLearningSolutions.Web.Models.Enums;
     using DigitalLearningSolutions.Web.Services;
     using DigitalLearningSolutions.Web.Tests.ControllerHelpers;
@@ -59,7 +60,7 @@ public void SetUp()
             config = A.Fake<IConfiguration>();
             apiClient = A.Fake<ILearningHubUserApiClient>();
 
-
+            DateHelper.userTimeZone = DateHelper.DefaultTimeZone;
             A.CallTo(() => clockUtility.UtcNow).Returns(DateTime.UtcNow);
 
             controller = new LoginController(

DigitalLearningSolutions.Data/DataServices/CourseContentDataService.cs

@@ -259,7 +259,7 @@ public IActionResult Section(int customisationId, int sectionId)
                 courseContentService.UpdateProgress(progressId.Value);
             };
 
-            SetTempData(candidateId, customisationId);
+            SetTempData(candidateId, customisationId, progressId.Value);
 
             var model = new SectionContentViewModel(config, sectionContent, customisationId, sectionId);
             return View("Section/Section", model);
@@ -300,7 +300,7 @@ public IActionResult Diagnostic(int customisationId, int sectionId)
                 courseContentService.UpdateProgress(progressId.Value);
             };
 
-            SetTempData(candidateId, customisationId);
+            SetTempData(candidateId, customisationId, progressId.Value);
             var model = new DiagnosticAssessmentViewModel(diagnosticAssessment, customisationId, sectionId);
             return View("Diagnostic/Diagnostic", model);
         }
@@ -336,7 +336,7 @@ public IActionResult DiagnosticContent(int customisationId, int sectionId, List<
                 courseContentService.UpdateProgress(progressId.Value);
             };
 
-            SetTempData(candidateId, customisationId);
+            SetTempData(candidateId, customisationId, progressId.Value);
             var model = new DiagnosticContentViewModel(
                 config,
                 diagnosticContent,
@@ -385,7 +385,7 @@ public IActionResult PostLearning(int customisationId, int sectionId)
                 courseContentService.UpdateProgress(progressId.Value);
             };
 
-            SetTempData(candidateId, customisationId);
+            SetTempData(candidateId, customisationId, progressId.Value);
             var model = new PostLearningAssessmentViewModel(postLearningAssessment, customisationId, sectionId);
             return View("PostLearning/PostLearning", model);
         }
@@ -474,7 +474,7 @@ public async Task<IActionResult> Tutorial(int customisationId, int sectionId, in
                 courseContentService.UpdateProgress(progressId.Value);
             };
 
-            SetTempData(candidateId, customisationId);
+            SetTempData(candidateId, customisationId, progressId.Value );
             /* Course progress doesn't get updated if the auth token expires by the end of the tutorials.
               Some tutorials are longer than the default auth token lifetime of 1 hour, so we set the auth expiry to 8 hours.
               See HEEDLS-637 and HEEDLS-674 for more details */
@@ -608,7 +608,7 @@ public IActionResult CompletionSummary(int customisationId)
                 courseContentService.UpdateProgress(progressId.Value);
             };
 
-            SetTempData(candidateId, customisationId);
+            SetTempData(candidateId, customisationId, progressId.Value);
             var model = new CourseCompletionViewModel(config, courseCompletion, progressId.Value);
             return View("Completion/Completion", model);
         }

DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs

@@ -70,13 +70,16 @@ public IActionResult Index(string? returnUrl = null)
         }
 
         [HttpPost]
-        public async Task<IActionResult> Index(LoginViewModel model)
+        public async Task<IActionResult> Index(LoginViewModel model, string timeZone = "Europe/London")
         {
+            ModelState.Remove("timeZone");
             if (!ModelState.IsValid)
             {
                 return View("Index", model);
             }
 
+            DateHelper.userTimeZone = timeZone ?? DateHelper.DefaultTimeZone;
+
             var loginResult = loginService.AttemptLogin(model.Username!.Trim(), model.Password!);
 
             switch (loginResult.LoginAttemptResult)