From ac00a9940d600e0bc6ddda18820354598290cf7a Mon Sep 17 00:00:00 2001 From: axgu <86838870+axgu@users.noreply.github.com> Date: Sat, 24 Feb 2024 16:58:15 -0500 Subject: [PATCH 1/2] fix location filtering --- src/components/ItemGrid.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ItemGrid.tsx b/src/components/ItemGrid.tsx index 3ad739f..4b5b980 100644 --- a/src/components/ItemGrid.tsx +++ b/src/components/ItemGrid.tsx @@ -41,7 +41,7 @@ export default function ItemGrid({ query }: Props) { (!categories.length || item.categories.some((category) => categories.includes(category))) && (!colors.length || colors.includes(item.color)) && - (!locations.length || locations.includes(item.retrieveLocation)) && + (!locations.length || locations.includes(item.foundLocation)) && (!date || item.foundDate.getTime() > date.getTime()) ); From c9025b2e2763230cecb2451e1ec01e6c67fb799a Mon Sep 17 00:00:00 2001 From: axgu <86838870+axgu@users.noreply.github.com> Date: Sat, 20 Apr 2024 15:52:02 -0400 Subject: [PATCH 2/2] change retrieve locations field --- src/pages/manage/items/create.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pages/manage/items/create.tsx b/src/pages/manage/items/create.tsx index 0bb7ef6..9ea4c3e 100644 --- a/src/pages/manage/items/create.tsx +++ b/src/pages/manage/items/create.tsx @@ -8,6 +8,7 @@ import { Color, ItemInteraction, Location, + RetrieveLocation, Value } from '@prisma/client'; import MyListbox from 'components/Form/Listbox'; @@ -208,8 +209,8 @@ const CreateItem: NextPageWithLayout = () => { Locations[prop]} + values={Object.values(RetrieveLocation)} + displayValue={(prop) => RetrieveLocation[prop]} keyValue={(prop) => prop} name="retrieveLocation" control={methods.control}