From b48e6cf2ba0d688c6b3260b514582ec66caa3927 Mon Sep 17 00:00:00 2001
From: Jason Sylvestre <jsylvestre@ucdavis.edu>
Date: Thu, 23 Oct 2025 07:25:38 -0700
Subject: [PATCH] I don't remember why or when I was doing this.

---
 .../ClientApp/src/components/People/BioContainer.tsx   |  2 ++
 Keas.Mvc/Controllers/Api/PeopleController.cs           | 10 +++++++---
 Keas.Mvc/Resources/PeopleQueries.cs                    |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

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) => {
               <div className='person-label-list'>
                 {props.person.email && <p className='person-label'>Email</p>}
                 {props.person.userId && <p className='person-label'>User Id</p>}
+                {props.person.user?.email && <p className='person-label'>User email2</p>}
                 {props.person.homePhone && <p className='person-label'>Home</p>}
                 {props.person.teamPhone && <p className='person-label'>Team</p>}
                 {props.person.supervisor && (
@@ -65,6 +66,7 @@ const BioContainer = (props: IProps) => {
               <div>
                 {props.person.email && <p>{props.person.email}</p>}
                 {props.person.userId && <p>{props.person.userId}</p>}
+                {props.person.user?.email && <p>{props.person.user?.email}</p>}
                 {props.person.homePhone && <p>{props.person.homePhone}</p>}
                 {props.person.teamPhone && <p>{props.person.teamPhone}</p>}
                 {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<IActionResult> 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<IActionResult> 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