Merge pull request #2780 from TechnologyEnhancedLearning/Develop/Fix/TD-4436-Enrolment-dateTime-issue

rshrirohit · web-flow · commit 572af95c6df6 · 2024-08-21T11:27:50.000+01:00
TD-4436- Date saved as UTC datetime and retrieved date as local (time zone) datetime
diff --git a/DigitalLearningSolutions.Data.Migrations/202408141400_Alter_uspCreateProgressRecord_V3_UtcDate.cs b/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);
+        }
+    }
+}
diff --git a/DigitalLearningSolutions.Data.Migrations/Properties/Resources.Designer.cs b/DigitalLearningSolutions.Data.Migrations/Properties/Resources.Designer.cs
diff --git a/DigitalLearningSolutions.Data.Migrations/Properties/Resources.resx b/DigitalLearningSolutions.Data.Migrations/Properties/Resources.resx
@@ -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>
diff --git a/DigitalLearningSolutions.Data.Migrations/Scripts/TD-4436-Alter_uspCreateProgressRecord_V3_Down.sql b/DigitalLearningSolutions.Data.Migrations/Scripts/TD-4436-Alter_uspCreateProgressRecord_V3_Down.sql
diff --git a/DigitalLearningSolutions.Data.Migrations/Scripts/TD-4436-Alter_uspCreateProgressRecord_V3_Up.sql b/DigitalLearningSolutions.Data.Migrations/Scripts/TD-4436-Alter_uspCreateProgressRecord_V3_Up.sql
diff --git a/DigitalLearningSolutions.Data/DataServices/CourseContentDataService.cs b/DigitalLearningSolutions.Data/DataServices/CourseContentDataService.cs
@@ -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 }
             );
diff --git a/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs b/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs
@@ -170,7 +170,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 }
             );
diff --git a/DigitalLearningSolutions.Web.Tests/Controllers/Login/LoginControllerTests.cs b/DigitalLearningSolutions.Web.Tests/Controllers/Login/LoginControllerTests.cs
@@ -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(
diff --git a/DigitalLearningSolutions.Web/Controllers/LoginController.cs b/DigitalLearningSolutions.Web/Controllers/LoginController.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)
diff --git a/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/ViewDelegateController.cs b/DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/ViewDelegateController.cs
@@ -16,6 +16,7 @@
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.Extensions.Configuration;
     using Microsoft.FeatureManagement.Mvc;
+    using System;
 
     [FeatureGate(FeatureFlags.RefactoredTrackingSystem)]
     [Authorize(Policy = CustomPolicies.UserCentreAdmin)]
@@ -74,6 +75,12 @@ public IActionResult Index(int delegateId, string? callType)
             var customFields = promptsService.GetDelegateRegistrationPromptsForCentre(centreId, delegateUserCard);
             var delegateCourses =
                 courseService.GetAllCoursesInCategoryForDelegate(delegateId, centreId, categoryIdFilter);
+            foreach (var course in delegateCourses)
+            {
+                course.Enrolled = (DateTime)DateHelper.GetLocalDateTime(course.Enrolled);
+                course.LastUpdated = (DateTime)DateHelper.GetLocalDateTime(course.LastUpdated);
+                course.Completed = course.Completed?.TimeOfDay == TimeSpan.Zero ? course.Completed : DateHelper.GetLocalDateTime(course.Completed);
+            }
 
             var selfAssessments =
                 selfAssessmentService.GetSelfAssessmentsForCandidate(delegateEntity.UserAccount.Id, centreId);
@@ -83,6 +90,8 @@ public IActionResult Index(int delegateId, string? callType)
                 selfassessment.SupervisorCount = selfAssessmentService.GetSupervisorsCountFromCandidateAssessmentId(selfassessment.CandidateAssessmentId);
                 selfassessment.IsSameCentre = selfAssessmentService.CheckForSameCentre(centreId, selfassessment.CandidateAssessmentId);
                 selfassessment.DelegateUserId = delegateUserCard.UserId;
+                selfassessment.StartedDate = (DateTime)DateHelper.GetLocalDateTime(selfassessment.StartedDate);
+                selfassessment.LastAccessed = DateHelper.GetLocalDateTime(selfassessment.LastAccessed);
             }
 
             var model = new ViewDelegateViewModel(delegateUserCard, customFields, delegateCourses, selfAssessments);
diff --git a/DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj b/DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj
@@ -61,22 +61,22 @@
     </ItemGroup>
 
     <ItemGroup>
-       <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
-       <PackageReference Include="FluentMigrator" Version="3.3.2" />
+        <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
+        <PackageReference Include="FluentMigrator" Version="3.3.2" />
         <PackageReference Include="FluentMigrator.Runner" Version="3.3.2" />
         <PackageReference Include="FluentMigrator.Runner.SqlServer" Version="3.3.2" />
         <PackageReference Include="FuzzySharp" Version="2.0.2" />
         <PackageReference Include="GDS.MultiPageFormData" Version="1.0.6" />
         <PackageReference Include="HtmlAgilityPack" Version="1.11.54" />
-		<PackageReference Include="HtmlSanitizer" Version="8.0.795" />
-		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.29" />
+        <PackageReference Include="HtmlSanitizer" Version="8.0.795" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.29" />
         <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.24" />
         <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.5" />
         <PackageReference Include="Microsoft.FeatureManagement" Version="3.1.0" />
         <PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="2.5.1" />
         <PackageReference Include="Microsoft.TypeScript.MSBuild" Version="5.4.2">
-          <PrivateAssets>all</PrivateAssets>
-          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.2.0" />
         <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.16" />
@@ -151,12 +151,12 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\DigitalLearningSolutions.Data.Migrations\DigitalLearningSolutions.Data.Migrations.csproj" />
-      <ProjectReference Include="..\DigitalLearningSolutions.Data\DigitalLearningSolutions.Data.csproj" />
+        <ProjectReference Include="..\DigitalLearningSolutions.Data.Migrations\DigitalLearningSolutions.Data.Migrations.csproj" />
+        <ProjectReference Include="..\DigitalLearningSolutions.Data\DigitalLearningSolutions.Data.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-      <Folder Include="ViewModels\SuperAdmin\CentreSelfAssessments\" />
+        <Folder Include="ViewModels\SuperAdmin\CentreSelfAssessments\" />
     </ItemGroup>
 
     <Target Name="PublishRunWebpack" AfterTargets="ComputeFilesToPublish">
diff --git a/DigitalLearningSolutions.Web/Helpers/CustomClaimHelper.cs b/DigitalLearningSolutions.Web/Helpers/CustomClaimHelper.cs
@@ -172,5 +172,10 @@ public static string GetCandidateNumberKnownNotNull(this ClaimsPrincipal user)
         {
             return user.GetCustomClaim(CustomClaimTypes.LearnCandidateNumber)!;
         }
+
+        public static string GetUserTimeZone(this ClaimsPrincipal user, string customClaimType)
+        {
+            return user.FindFirst(customClaimType)?.Value;
+        }
     }
 }
diff --git a/DigitalLearningSolutions.Web/Helpers/CustomClaimTypes.cs b/DigitalLearningSolutions.Web/Helpers/CustomClaimTypes.cs
@@ -27,5 +27,6 @@ public static class CustomClaimTypes
         public const string IsWorkforceManager = "IsWorkforceManager";
         public const string IsWorkforceContributor = "IsWorkforceContributor";
         public const string IsLocalWorkforceManager = "IsLocalWorkforceManager";
+        public const string UserTimeZone = "UserTimeZone";
     }
 }
diff --git a/DigitalLearningSolutions.Web/Helpers/DateHelper.cs b/DigitalLearningSolutions.Web/Helpers/DateHelper.cs
@@ -1,12 +1,16 @@
 ﻿namespace DigitalLearningSolutions.Web.Helpers
 {
     using DigitalLearningSolutions.Data.Enums;
+    using Microsoft.AspNetCore.Http;
+    using System;
 
     public static class DateHelper
     {
         public static string StandardDateFormat = Data.Helpers.DateHelper.StandardDateFormat;
 
         public static string StandardDateAndTimeFormat = "dd/MM/yyyy HH:mm";
+        public static string userTimeZone { get; set; }
+        public static string DefaultTimeZone = "Europe/London";
 
         public static string GetFormatStringForGraphLabel(ReportInterval interval)
         {
@@ -31,5 +35,22 @@ public static string GetFormatStringForDateInTable(ReportInterval interval)
                 _ => "yyyy"
             };
         }
+
+        public static DateTime? GetLocalDateTime(DateTime? dateUtc)
+        {
+            if (dateUtc == null)
+                return null;
+
+            var accessor = new HttpContextAccessor();
+            var timeZone = accessor.HttpContext.User.GetUserTimeZone(CustomClaimTypes.UserTimeZone);
+
+            if (string.IsNullOrEmpty(timeZone))
+                timeZone = DefaultTimeZone;
+
+            TimeZoneInfo timeZoneInfo = TimeZoneInfo.FindSystemTimeZoneById(timeZone);
+            DateTime localDateTime = TimeZoneInfo.ConvertTimeFromUtc((DateTime)dateUtc, timeZoneInfo);
+
+            return localDateTime;
+        }
     }
 }
diff --git a/DigitalLearningSolutions.Web/Helpers/LoginClaimsHelper.cs b/DigitalLearningSolutions.Web/Helpers/LoginClaimsHelper.cs
@@ -50,6 +50,7 @@ UserAccount userAccount
                 new Claim(CustomClaimTypes.UserId, userAccount.Id.ToString()),
                 new Claim(CustomClaimTypes.UserForename, userAccount.FirstName),
                 new Claim(CustomClaimTypes.UserSurname, userAccount.LastName),
+                new Claim(CustomClaimTypes.UserTimeZone, DateHelper.userTimeZone),
             };
 
             return claims;
diff --git a/DigitalLearningSolutions.Web/Scripts/login/login.ts b/DigitalLearningSolutions.Web/Scripts/login/login.ts
@@ -0,0 +1,5 @@
+﻿const timeZone: string = Intl.DateTimeFormat().resolvedOptions().timeZone;
+const timeZoneElement = document.getElementById("timeZone") as HTMLInputElement;
+if (timeZoneElement) {
+  timeZoneElement.value = timeZone;
+}
diff --git a/DigitalLearningSolutions.Web/Views/Login/Index.cshtml b/DigitalLearningSolutions.Web/Views/Login/Index.cshtml
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/Shared/_DelegateCourseProgressDetailsWithStatusTags.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/Shared/_DelegateCourseProgressDetailsWithStatusTags.cshtml
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/Shared/_DelegateSelfAssessmentProgressDetails.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/Shared/_DelegateSelfAssessmentProgressDetails.cshtml

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ GROUP BY`
`170`	`170`	`public void UpdateLastAccessed(int selfAssessmentId, int delegateUserId)`
`171`	`171`	`{`
`172`	`172`	`var numberOfAffectedRows = connection.Execute(`
`173`		`- @"UPDATE CandidateAssessments SET LastAccessed = GETDATE()`
	`173`	`+ @"UPDATE CandidateAssessments SET LastAccessed = GETUTCDATE()`
`174`	`174`	`WHERE SelfAssessmentID = @selfAssessmentId AND DelegateUserID = @delegateUserId",`
`175`	`175`	`new { selfAssessmentId, delegateUserId }`
`176`	`176`	`);`
Original file line number	Diff line number	Diff line change
`@@ -70,13 +70,16 @@ public IActionResult Index(string? returnUrl = null)`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`[HttpPost]`
`73`		`- public async Task<IActionResult> Index(LoginViewModel model)`
	`73`	`+ public async Task<IActionResult> Index(LoginViewModel model, string timeZone = "Europe/London")`
`74`	`74`	`{`
	`75`	`+ ModelState.Remove("timeZone");`
`75`	`76`	`if (!ModelState.IsValid)`
`76`	`77`	`{`
`77`	`78`	`return View("Index", model);`
`78`	`79`	`}`
`79`	`80`
	`81`	`+ DateHelper.userTimeZone = timeZone ?? DateHelper.DefaultTimeZone;`
	`82`	`+`
`80`	`83`	`var loginResult = loginService.AttemptLogin(model.Username!.Trim(), model.Password!);`
`81`	`84`
`82`	`85`	`switch (loginResult.LoginAttemptResult)`