Skip to content

Commit 5d4dd9c

Browse files
committed
TD-3716-Adding LastAccessed Date In Admin Card
1 parent b5cf544 commit 5d4dd9c

File tree

5 files changed

+22
-0
lines changed

5 files changed

+22
-0
lines changed

DigitalLearningSolutions.Data/DataServices/UserDataService/AdminUserDataService.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ FROM AdminAccounts AS aa
105105
aa.IsSupervisor,
106106
aa.IsTrainer,
107107
aa.CategoryID,
108+
aa.LastAccessed,
108109
CASE
109110
WHEN aa.CategoryID IS NULL THEN 'All'
110111
ELSE cc.CategoryName

DigitalLearningSolutions.Data/Models/User/AdminAccount.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
namespace DigitalLearningSolutions.Data.Models.User
22
{
3+
using System;
4+
35
public class AdminAccount
46
{
57
public int Id { get; set; }
@@ -26,6 +28,7 @@ public class AdminAccount
2628
public bool IsWorkforceContributor { get; set; }
2729
public bool IsLocalWorkforceManager { get; set; }
2830
public bool IsNominatedSupervisor { get; set; }
31+
public DateTime? LastAccessed { get; set; }
2932

3033
public bool IsCmsAdministrator => ImportOnly && IsContentManager;
3134
public bool IsCmsManager => IsContentManager && !ImportOnly;

DigitalLearningSolutions.Data/Models/User/AdminEntity.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using DigitalLearningSolutions.Data.Helpers;
44
using DigitalLearningSolutions.Data.Models.Centres;
55
using DigitalLearningSolutions.Data.Models.SearchSortFilterPaginate;
6+
using System;
67

78
public class AdminEntity : BaseSearchableItem
89
{
@@ -72,6 +73,7 @@ public override string SearchableName
7273
public bool IsSuperAdmin => AdminAccount.IsSuperAdmin;
7374
public bool IsReportsViewer => AdminAccount.IsReportsViewer;
7475
public bool IsActive => AdminAccount.Active;
76+
public DateTime? LastAccessed => AdminAccount.LastAccessed;
7577

7678
}
7779
}

DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Centre/Administrator/SearchableAdminViewModel.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
using DigitalLearningSolutions.Data.Models.User;
66
using DigitalLearningSolutions.Web.Helpers;
77
using DigitalLearningSolutions.Web.ViewModels.Common.SearchablePage;
8+
using System;
9+
using DateHelper = Helpers.DateHelper;
810

911
public class SearchableAdminViewModel : BaseFilterableViewModel
1012
{
@@ -23,6 +25,10 @@ ReturnPageQuery returnPageQuery
2325
EmailAddress = admin.EmailForCentreNotifications;
2426
IsLocked = admin.UserAccount.FailedLoginCount >= AuthHelper.FailedLoginThreshold;
2527
IsActive = admin.AdminAccount.Active;
28+
if (admin.LastAccessed.HasValue)
29+
{
30+
LastAccessed = admin.LastAccessed.Value.ToString(DateHelper.StandardDateFormat);
31+
}
2632
CanShowDeactivateAdminButton =
2733
UserPermissionsHelper.LoggedInAdminCanDeactivateUser(admin.AdminAccount, loggedInAdminAccount);
2834

@@ -46,6 +52,8 @@ ReturnPageQuery returnPageQuery
4652

4753
public bool IsActive { get; set; }
4854

55+
public string? LastAccessed { get; set; }
56+
4957
public ReturnPageQuery ReturnPageQuery { get; set; }
5058
}
5159
}

DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Administrator/_SearchableAdminCard.cshtml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,14 @@
3535
@Model.CategoryName
3636
</dd>
3737
</div>
38+
<div class="nhsuk-summary-list__row">
39+
<dt class="nhsuk-summary-list__key">
40+
Last accessed
41+
</dt>
42+
<dd class="nhsuk-summary-list__value">
43+
@(Model.LastAccessed != null ? Model.LastAccessed : "-")
44+
</dd>
45+
</div>
3846
</dl>
3947

4048
@if (Model.IsLocked)

0 commit comments

Comments
 (0)