Merge pull request #2821 from TechnologyEnhancedLearning/Develop/Fix/TD-4671-Delegate-activities-Course-DateTime-Issue

TD-4671-Course enrolled, lastupdated and completed date converted to local date time

Author: rshrirohit

DigitalLearningSolutions.Web/Controllers/LoginController.cs

@@ -179,6 +179,7 @@ public async Task<IActionResult> ChooseCentre(int centreId, string? returnUrl)
         {
             var userEntity = userService.GetUserById(User.GetUserIdKnownNotNull());
             var centreAccountSet = userEntity?.GetCentreAccountSet(centreId);
+            DateHelper.userTimeZone ??= User.GetUserTimeZone(CustomClaimTypes.UserTimeZone);
 
             if (centreAccountSet?.IsCentreActive != true)
             {

DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/ActivityDelegatesController.cs

@@ -22,6 +22,7 @@
     using System;
     using System.Collections.Generic;
     using System.Linq;
+    using DateHelper = DigitalLearningSolutions.Web.Helpers.DateHelper;
 
     [FeatureGate(FeatureFlags.RefactoredTrackingSystem)]
     [Authorize(Policy = CustomPolicies.UserCentreAdmin)]
@@ -221,11 +222,17 @@ public IActionResult Index(
                         (courseDelegatesData, resultCount) = courseDelegatesService.GetCoursesAndCourseDelegatesPerPageForCentre(searchString ?? string.Empty, offSet, itemsPerPage ?? 0, sortBy, sortDirection,
                             customisationId, centreId, adminCategoryId, isDelegateActive, isProgressLocked, removed, hasCompleted, answer1, answer2, answer3);
                     }
+                    foreach (var courseDelegate in courseDelegatesData.Delegates)
+                    {
+                        courseDelegate.Enrolled = (DateTime)DateHelper.GetLocalDateTime(courseDelegate.Enrolled);
+                        courseDelegate.LastUpdated = DateHelper.GetLocalDateTime(courseDelegate.LastUpdated);
+                        courseDelegate.Completed = courseDelegate.Completed?.TimeOfDay == TimeSpan.Zero ? courseDelegate.Completed : DateHelper.GetLocalDateTime(courseDelegate.Completed);
+                    }
                 }
                 else
                 {
                     (selfAssessmentDelegatesData, resultCount) = selfAssessmentService.GetSelfAssessmentDelegatesPerPage(searchString ?? string.Empty, offSet, itemsPerPage ?? 0, sortBy, sortDirection,
-                        selfAssessmentId, centreId, isDelegateActive, removed, submitted, signedOff);
+                    selfAssessmentId, centreId, isDelegateActive, removed, submitted, signedOff);
 
                     if (selfAssessmentDelegatesData?.Delegates?.Count() == 0 && resultCount > 0)
                     {

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

@@ -1,7 +1,14 @@
 @using DigitalLearningSolutions.Data.Helpers
+@using DateHelper = DigitalLearningSolutions.Web.Helpers.DateHelper
 @using DigitalLearningSolutions.Web.Models.Enums
 @using DigitalLearningSolutions.Web.ViewModels.TrackingSystem.Delegates.Shared
 @model DelegateCourseInfoViewModel
+@{
+    var courseCompleted = Model.Completed != null ?
+            Convert.ToDateTime(Model.Completed).TimeOfDay == TimeSpan.Zero ? Convert.ToDateTime(Model.Completed).ToString(DateHelper.StandardDateFormat) :
+            Convert.ToDateTime(Model.Completed).ToString(DateHelper.StandardDateAndTimeFormat)
+            : "-";
+}
 
 <dl class="nhsuk-summary-list details-list-with-button word-break">
     @if (Model.AccessedVia.Equals(DelegateAccessRoute.ActivityDelegates))
@@ -55,7 +62,7 @@
             Complete by
         </dt>
         <dd class="nhsuk-summary-list__value" data-name-for-sorting="complete-by-date">
-            @(Model.CompleteBy ?? "-")
+            @(Model.CompleteBy != null ? Convert.ToDateTime(Model.CompleteBy).ToString(DateHelper.StandardDateFormat) : "-")
         </dd>
         <dd class="nhsuk-summary-list__actions">
             <a data-return-page-enabled="true"
@@ -84,7 +91,7 @@
             Completed
         </dt>
         <dd class="nhsuk-summary-list__value" data-name-for-sorting="completed-date">
-            @(Model.Completed ?? "-")
+            @(courseCompleted)
         </dd>
         <dd class="nhsuk-summary-list__actions">
             <a data-return-page-enabled="true"