Merge pull request #2784 from TechnologyEnhancedLearning/Develop/Fix/TD-4590-Choose-Supervisor-sort-order'

TD-4590- Sorted supervisor list, added email address and removed centre name

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/SupervisorDataService.cs

@@ -393,7 +393,7 @@ LEFT JOIN UserCentreDetails ucd
         public IEnumerable<SupervisorForEnrolDelegate> GetSupervisorForEnrolDelegate(int CustomisationID, int CentreID)
         {
             return connection.Query<SupervisorForEnrolDelegate>(
-                $@"SELECT AdminID, Forename + ' ' + Surname + ' (' + Email +'),' + ' ' + CentreName AS Name, Email FROM AdminUsers AS au
+                $@"SELECT AdminID, Forename + ' ' + Surname + ' (' + Email +')' AS Name, Email FROM AdminUsers AS au
                     WHERE (Supervisor = 1) AND (CentreID = @CentreID) AND (CategoryID = 0 OR
                          CategoryID = (SELECT au.CategoryID FROM Applications AS a INNER JOIN
                            Customisations AS c ON a.ApplicationID = c.ApplicationID

DigitalLearningSolutions.Data/DataServices/UserDataService/AdminUserDataService.cs

@@ -218,7 +218,8 @@ public List<AdminUser> GetAdminUsersByCentreId(int centreId)
         {
             var users = connection.Query<AdminUser>(
                 @$"{BaseSelectAdminQuery}
-                    WHERE au.Active = 1 AND au.Approved = 1 AND au.CentreId = @centreId",
+                    WHERE au.Active = 1 AND au.Approved = 1 AND au.CentreId = @centreId
+                    ORDER BY au.Forename, au.Surname",
                 new { centreId }
             ).ToList();
 
@@ -227,10 +228,10 @@ public List<AdminUser> GetAdminUsersByCentreId(int centreId)
 
         public int GetNumberOfAdminsAtCentre(int centreId)
         {
-         var count =    connection.ExecuteScalar(
-                @"SELECT COUNT(*) FROM AdminUsers WHERE CentreID = @centreId",
-                new { centreId }
-            );
+            var count = connection.ExecuteScalar(
+                   @"SELECT COUNT(*) FROM AdminUsers WHERE CentreID = @centreId",
+                   new { centreId }
+               );
             return Convert.ToInt32(count);
         }
 

DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/DelegateProgress/EditSupervisorViewModel.cs

@@ -47,7 +47,7 @@ private static IEnumerable<SelectListItem> PopulateSupervisors(
             IEnumerable<AdminUser> supervisors
         )
         {
-            var supervisorIdNames = supervisors.Select(s => (s.Id, s.FullName));
+            var supervisorIdNames = supervisors.Select(s => (s.Id, s.FullName + " (" + s.EmailAddress + ")"));
             return SelectListHelper.MapOptionsToSelectListItems(
                 supervisorIdNames,
                 supervisorId