diff --git a/Keas.Mvc/ClientApp/src/components/People/BioContainer.tsx b/Keas.Mvc/ClientApp/src/components/People/BioContainer.tsx
index 8ca754cb0..036488d69 100644
--- a/Keas.Mvc/ClientApp/src/components/People/BioContainer.tsx
+++ b/Keas.Mvc/ClientApp/src/components/People/BioContainer.tsx
@@ -56,6 +56,7 @@ const BioContainer = (props: IProps) => {
{props.person.email &&
Email
}
{props.person.userId &&
User Id
}
+ {props.person.user?.email &&
User email2
}
{props.person.homePhone &&
Home
}
{props.person.teamPhone &&
Team
}
{props.person.supervisor && (
@@ -65,6 +66,7 @@ const BioContainer = (props: IProps) => {
{props.person.email &&
{props.person.email}
}
{props.person.userId &&
{props.person.userId}
}
+ {props.person.user?.email &&
{props.person.user?.email}
}
{props.person.homePhone &&
{props.person.homePhone}
}
{props.person.teamPhone &&
{props.person.teamPhone}
}
{props.person.supervisor && (
diff --git a/Keas.Mvc/Controllers/Api/PeopleController.cs b/Keas.Mvc/Controllers/Api/PeopleController.cs
index 64281f4fb..fe6ea6819 100644
--- a/Keas.Mvc/Controllers/Api/PeopleController.cs
+++ b/Keas.Mvc/Controllers/Api/PeopleController.cs
@@ -67,8 +67,12 @@ public async Task
List(ApiParameterModels.Filter filter = ApiPara
var sql = PeopleQueries.List;
+
var result = _context.Database.GetDbConnection().Query(sql, new { teamId, active1, active2 });
+
+
+
var people = result.Select(r => new
{
person = new Person
@@ -80,9 +84,9 @@ public async Task List(ApiParameterModels.Filter filter = ApiPara
User = r.UserId == null ? null : new User
{
Id = r.UserId,
- FirstName = r.FirstName,
- LastName = r.LastName,
- Email = r.Email,
+ FirstName = r.UFirstName,
+ LastName = r.ULastName,
+ Email = r.UEmail,
Pronouns = r.Pronouns
},
Tags = r.Tags,
diff --git a/Keas.Mvc/Resources/PeopleQueries.cs b/Keas.Mvc/Resources/PeopleQueries.cs
index db5a57526..97ce509b1 100644
--- a/Keas.Mvc/Resources/PeopleQueries.cs
+++ b/Keas.Mvc/Resources/PeopleQueries.cs
@@ -1,6 +1,6 @@
public static class PeopleQueries
{
- public static string List = @"select People.*, U.Pronouns, SUP.FirstName SupervisorFirstName, SUP.LastName SupervisorLastName, SUP.Email SupervisorEmail, SUP.UserId SupervisorUserId, EquipmentCount, AccessCount, KeyCount, WorkstationCount,
+ public static string List = @"select People.*, U.Pronouns, U.Email as UEmail, U.FirstName as UFirstName, U.LastName as ULastName, SUP.FirstName SupervisorFirstName, SUP.LastName SupervisorLastName, SUP.Email SupervisorEmail, SUP.UserId SupervisorUserId, EquipmentCount, AccessCount, KeyCount, WorkstationCount,
cast(CASE WHEN EXISTS(SELECT * FROM People emp WHERE emp.SupervisorId = people.id) THEN 1 ELSE 0 END as bit) as isSupervisor
from (select People.Id, count(E.Id) as EquipmentCount
from People