Skip to content

I don't remember why or when I was doing this. #1377

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

Draft
jSylvestre wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

I don't remember why or when I was doing this. #1377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b48e6cf
I don't remember why or when I was doing this.
jSylvestre Oct 23, 2025
3643f19
Merge branch 'master' into JCS/DuplicateUserCheck
jSylvestre Oct 24, 2025
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: 2 additions & 0 deletions Keas.Mvc/ClientApp/src/components/People/BioContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && (
Expand All @@ -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 && (
Expand Down
10 changes: 7 additions & 3 deletions Keas.Mvc/Controllers/Api/PeopleController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion Keas.Mvc/Resources/PeopleQueries.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down