Skip to content

Commit 4c310ac

Browse files
authored
Merge pull request #1431 from rit-construct-makerspace/cowsed/case-insensitive
UI Tweaks
2 parents edd0c9c + 54d349a commit 4c310ac

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

client/src/pages/makerspace_page/device_pages/DevicesPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export default function DevicesPage() {
3838
const cores: Core[] = makerspaceWithDevicesResult.data?.makerspaceByID.cores ?? [];
3939
const _dispensers: Dispenser[] = makerspaceWithDevicesResult.data?.makerspaceByID.dispensers ?? [];
4040

41-
const filteredCores: Core[] = cores.filter((core) => core.device.name.includes(searchText))
41+
const filteredCores: Core[] = cores.filter((core) => core.device.name.toLowerCase().includes(searchText.toLowerCase()))
4242

4343
return (
4444
<Stack padding={"10px"} spacing={1}>

server/src/graphql/resolvers/maintenanceTicketResolver.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,18 +165,20 @@ const MaintenanceTicketResolver = {
165165
if (args.assignedID) {
166166
const assigned = await UserRepo.getUserByID(args.assignedID);
167167
await AuditLogRepo.createAuditLog(
168-
`{user} assigned ticket #${args.id} to {user}`,
168+
`{user} assigned ticket #${args.id} for {equipment} to {user}`,
169169
"admin",
170170
makerspaceID,
171171
{ id: user.id, label: UserRepo.getUsersFullName(user) },
172+
{ id: equipRow?.id ?? 0, label: equipRow?.name ?? "unknown equipment" },
172173
{ id: assigned.id, label: UserRepo.getUsersFullName(assigned) }
173174
);
174175
} else {
175176
await AuditLogRepo.createAuditLog(
176-
`{user} unassigned ticket #${args.id}`,
177+
`{user} unassigned ticket #${args.id} for {equipment}`,
177178
"admin",
178179
makerspaceID,
179-
{ id: user.id, label: UserRepo.getUsersFullName(user) }
180+
{ id: user.id, label: UserRepo.getUsersFullName(user) },
181+
{ id: equipRow?.id ?? 0, label: equipRow?.name ?? "unknown equipment" }
180182
);
181183
}
182184
}),

0 commit comments

Comments
 (0)