feat(dashboard): show building next to state

src/lib/server/db/employee.ts

@@ -18,6 +18,7 @@ export async function getEmployees(
 		fname: string;
 		lname: string;
 		department: string;
+		building: string | null;
 		state: State;
 	}[]
 > {
@@ -43,6 +44,7 @@ export async function getEmployees(
 				lname: employee.lname,
 				department: employee.department,
 				entryTimestamp: sql<Date>`MAX(${employeeEntry.timestamp})`.as('entryTimestamp'),
+				entryBuilding: employeeEntry.building,
 				exitTimestamp: sql<Date | null>`MAX(${employeeExit.timestamp})`.as('exitTimestamp')
 			})
 			.from(employee)
@@ -61,7 +63,7 @@ export async function getEmployees(
 						: [])
 				)
 			)
-			.groupBy(employee.id, employee.fname, employee.lname)
+			.groupBy(employee.id, employee.email, employee.fname, employee.lname, employeeEntry.building)
 			.limit(limit)
 			.offset(offset);
 
@@ -72,6 +74,7 @@ export async function getEmployees(
 				fname: s.fname,
 				lname: s.lname,
 				department: s.department,
+				building: isInside(s.entryTimestamp, s.exitTimestamp) ? s.entryBuilding : null,
 				state: isInside(s.entryTimestamp, s.exitTimestamp) ? StateInside : StateOutside
 			};
 		});

src/lib/server/db/student.ts

@@ -18,6 +18,7 @@ export async function getStudents(
 		fname: string;
 		lname: string;
 		department: string;
+		building: string | null;
 		state: State;
 	}[]
 > {
@@ -43,6 +44,7 @@ export async function getStudents(
 				lname: student.lname,
 				department: student.department,
 				entryTimestamp: sql<Date>`MAX(${studentEntry.timestamp})`.as('entryTimestamp'),
+				entryBuilding: studentEntry.building,
 				exitTimestamp: sql<Date | null>`MAX(${studentExit.timestamp})`.as('exitTimestamp')
 			})
 			.from(student)
@@ -61,7 +63,7 @@ export async function getStudents(
 						: [])
 				)
 			)
-			.groupBy(student.id, student.index, student.fname, student.lname)
+			.groupBy(student.id, student.index, student.fname, student.lname, studentEntry.building)
 			.limit(limit)
 			.offset(offset);
 
@@ -72,6 +74,7 @@ export async function getStudents(
 				fname: s.fname,
 				lname: s.lname,
 				department: s.department,
+				building: isInside(s.entryTimestamp, s.exitTimestamp) ? s.entryBuilding : null,
 				state: isInside(s.entryTimestamp, s.exitTimestamp) ? StateInside : StateOutside
 			};
 		});

src/lib/types/person.ts

@@ -11,5 +11,6 @@ export type Person = {
 	fname: string;
 	lname: string;
 	department: string;
+	building: string | null;
 	state: State;
 };

src/routes/(dashboard)/+page.server.ts

@@ -22,6 +22,7 @@ export const load: PageServerLoad = async ({ url }) => {
 				fname: s.fname,
 				lname: s.lname,
 				department: s.department,
+				building: s.building,
 				state: s.state
 			})),
 			...employees.map((e) => ({
@@ -31,6 +32,7 @@ export const load: PageServerLoad = async ({ url }) => {
 				fname: e.fname,
 				lname: e.lname,
 				department: e.department,
+				building: e.building,
 				state: e.state
 			}))
 		];

src/routes/(dashboard)/columns.ts

@@ -28,6 +28,10 @@ export const columns: ColumnDef<Person>[] = [
 		accessorKey: 'department',
 		header: 'Department'
 	},
+	{
+		accessorKey: 'building',
+		header: 'Building'
+	},
 	{
 		accessorKey: 'state',
 		header: 'State'