Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: Release 2024.38
merged 1 commit into from
Sep 9, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions DigitalLearningSolutions.Web/Controllers/LoginController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
9 changes: 8 additions & 1 deletion ...LearningSolutions.Web/Controllers/TrackingSystem/Delegates/ActivityDelegatesController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down Expand Up @@ -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)
{
Expand Down
11 changes: 9 additions & 2 deletions ...Solutions.Web/Views/TrackingSystem/Delegates/Shared/_DelegateCourseProgressDetails.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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))
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down