Skip to content

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

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
rshrirohit merged 1 commit into from
Aug 21, 2024
Merged

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

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/SupervisorDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 6 additions & 5 deletions DigitalLearningSolutions.Data/DataServices/UserDataService/AdminUserDataService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand All @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion ...tions.Web/ViewModels/TrackingSystem/Delegates/DelegateProgress/EditSupervisorViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down