Skip to content

TD-3718 Adding LastAccessed Date in SuperAdmin Administrators Card #3185

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
merged 1 commit into from
Mar 17, 2025
Merged

TD-3718 Adding LastAccessed Date in SuperAdmin Administrators Card #3185

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
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Data/DataServices/UserDataService/AdminUserDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ public IEnumerable<AdminAccount> GetAdminAccountsByUserId(int userId)
}

string BaseSelectQuery = $@"SELECT aa.ID, aa.UserID, aa.CentreID, aa.Active, aa.IsCentreAdmin, aa.IsReportsViewer, aa.IsSuperAdmin, aa.IsCentreManager,
aa.IsContentManager, aa.IsContentCreator, aa.IsSupervisor, aa.IsTrainer, aa.CategoryID, aa.IsFrameworkDeveloper, aa.IsFrameworkContributor,aa.ImportOnly,
aa.LastAccessed, aa.IsContentManager, aa.IsContentCreator, aa.IsSupervisor, aa.IsTrainer, aa.CategoryID, aa.IsFrameworkDeveloper, aa.IsFrameworkContributor,aa.ImportOnly,
aa.IsWorkforceManager, aa.IsWorkforceContributor, aa.IsLocalWorkforceManager, aa.IsNominatedSupervisor,
u.ID, u.PrimaryEmail, u.FirstName, u.LastName, u.Active, u.FailedLoginCount,
c.CentreID, c.CentreName,
Expand Down
8 changes: 6 additions & 2 deletions ...ingSolutions.Web/ViewModels/SuperAdmin/Administrators/SearchableAdminAccountsViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using DigitalLearningSolutions.Data.Models.User;
using DigitalLearningSolutions.Web.Helpers;
using DigitalLearningSolutions.Web.ViewModels.Common.SearchablePage;

using DateHelper = Helpers.DateHelper;
public class SearchableAdminAccountsViewModel : BaseFilterableViewModel
{
public readonly bool CanShowDeleteAdminButton;
Expand All @@ -28,7 +28,10 @@ ReturnPageQuery returnPageQuery
IsLocked = admin.UserAccount?.FailedLoginCount >= AuthHelper.FailedLoginThreshold;
IsAdminActive = admin.AdminAccount.Active;
IsUserActive = admin.UserAccount.Active;

if (admin.LastAccessed.HasValue)
{
LastAccessed = admin.LastAccessed.Value.ToString(DateHelper.StandardDateFormat);
}
CanShowDeactivateAdminButton = IsAdminActive && admin.AdminIdReferenceCount > 0;
CanShowDeleteAdminButton = admin.AdminIdReferenceCount == 0;

Expand All @@ -47,6 +50,7 @@ ReturnPageQuery returnPageQuery
public bool IsLocked { get; set; }
public bool IsAdminActive { get; set; }
public bool IsUserActive { get; set; }
public string? LastAccessed { get; set; }
public ReturnPageQuery ReturnPageQuery { get; set; }
}
}
8 changes: 8 additions & 0 deletions ...lLearningSolutions.Web/Views/SuperAdmin/AdminAccounts/_SearchableAdminAccountsCard.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,14 @@
<dd class="nhsuk-summary-list__actions">
</dd>
</div>
<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">
Last Accessed
</dt>
<partial name="_SummaryFieldValue" model="@Model.LastAccessed" />
<dd class="nhsuk-summary-list__actions">
</dd>
</div>
<div class="nhsuk-summary-list__row details-list-with-button__row">
<dt class="nhsuk-summary-list__key">
User Account
Expand Down
Loading