Merge pull request #3185 from TechnologyEnhancedLearning/Develop/Feauture/TD-3718-AddingLastAccessedDateinSuperAdminAdministratorsCard

TD-3718 Adding LastAccessed Date in SuperAdmin Administrators Card

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/UserDataService/AdminUserDataService.cs

@@ -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,

DigitalLearningSolutions.Web/ViewModels/SuperAdmin/Administrators/SearchableAdminAccountsViewModel.cs

@@ -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;
@@ -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;
 
@@ -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; }
     }
 }

DigitalLearningSolutions.Web/Views/SuperAdmin/AdminAccounts/_SearchableAdminAccountsCard.cshtml

@@ -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