Merge pull request #2862 from TechnologyEnhancedLearning/Develop/Fixe…

…s/TD-4471-Issueswith'Search'functionalitywhenJSturnedoffon'Trackingsystem-Centreadministrators'screen TD-4471 Issues with 'Search' functionality when JS turned off on 'Tracking system - Centre administrators' screen
TechnologyEnhancedLearning · Oct 17, 2024 · 1c6b8bd · 1c6b8bd
2 parents 7eef360 + c611e00
commit 1c6b8bd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/DigitalLearningSolutions.Data/Helpers/NameQueryHelper.cs b/DigitalLearningSolutions.Data/Helpers/NameQueryHelper.cs
@@ -6,5 +6,12 @@ public static string GetSortableFullName(string? firstName, string lastName)
         {
             return string.IsNullOrWhiteSpace(firstName) ? lastName : $"{lastName}, {firstName}";
         }
+
+        public static string GetSortableFullName(string? firstName, string lastName, string? primaryEmail, string? centreEmail)
+        {
+            var name = string.IsNullOrWhiteSpace(firstName) ? lastName : $"{lastName}, {firstName}";
+         var   email = CentreEmailHelper.GetEmailForCentreNotifications(  primaryEmail!,  centreEmail  );
+            return $"{name} ({email})";
+        }
     }
 }
diff --git a/DigitalLearningSolutions.Data/Models/User/AdminEntity.cs b/DigitalLearningSolutions.Data/Models/User/AdminEntity.cs
@@ -48,7 +48,7 @@ public AdminEntity(
         public override string SearchableName
         {
             get => SearchableNameOverrideForFuzzySharp ??
-                   NameQueryHelper.GetSortableFullName(UserAccount.FirstName, UserAccount.LastName);
+                   NameQueryHelper.GetSortableFullName(UserAccount.FirstName, UserAccount.LastName, UserAccount.PrimaryEmail, UserCentreDetails?.Email);
             set => SearchableNameOverrideForFuzzySharp = value;
         }
 

diff --git a/...gSolutions.Web/Controllers/TrackingSystem/Centre/Administrator/AdministratorController.cs b/...gSolutions.Web/Controllers/TrackingSystem/Centre/Administrator/AdministratorController.cs
@@ -68,7 +68,7 @@ public IActionResult Index(
                 Request,
                 AdminFilterCookieName
             );
-
+            searchString = searchString == null ? null : searchString.Trim();
             var centreId = User.GetCentreIdKnownNotNull();
             var adminsAtCentre = userService.GetAdminsByCentreId(centreId);
             var categories = courseCategoriesService.GetCategoriesForCentreAndCentrallyManagedCourses(centreId);