include fields for id details and color description

ScottyLabs · Jun 20, 2024 · d0d0ac0 · d0d0ac0
1 parent 23d602d
commit d0d0ac0
Show file tree

Hide file tree

Showing 4 changed files with 129 additions and 19 deletions.
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -97,22 +97,25 @@ enum Permission {
 }
 
 model Item {
-  id               String     @id @default(cuid())
-  name             String
-  foundDate        DateTime
-  foundLocation    Location
-  foundDescription String
-  shortDescription String
-  categories       Category[]
-  color            Color
-  value            Value
-  identifiable     Boolean
-  retrieveLocation RetrieveLocation
-  itemLocation     String
-  longDescription  String?
-  auditLogs        AuditLog[]
-  status           Status
-  createdAt        DateTime   @default(now())
+  id                       String     @id @default(cuid())
+  name                     String
+  foundDate                DateTime
+  foundLocation            Location
+  foundDescription         String
+  shortDescription         String
+  categories               Category[]
+  color                    Color
+  otherColorDescription    String?
+  value                    Value
+  identifiable             Boolean
+  identification           String?
+  ownerNotified            String?
+  retrieveLocation         RetrieveLocation
+  itemLocation             String
+  longDescription          String?
+  auditLogs                AuditLog[]
+  status                   Status
+  createdAt                DateTime   @default(now())
 }
 
 model AuditLog {

diff --git a/src/lib/schemas.ts b/src/lib/schemas.ts
@@ -18,11 +18,14 @@ export const ItemSchema = z.object({
   shortDescription: z.string().min(3),
   categories: z.array(z.nativeEnum(Category)),
   color: z.nativeEnum(Color),
+  otherColorDescription: z.string(),
   value: z.nativeEnum(Value, {
     required_error: 'Required',
     invalid_type_error: 'Required'
   }),
   identifiable: z.boolean(),
+  identification: z.string(),
+  ownerNotified: z.string(),
   itemLocation: z.string().min(3),
   retrieveLocation: z.nativeEnum(RetrieveLocation),
   longDescription: z.string().nullish(),

diff --git a/src/pages/manage/items/[itemId].tsx b/src/pages/manage/items/[itemId].tsx
@@ -4,6 +4,7 @@ import {
   Item,
   ItemInteraction,
   Location,
+  RetrieveLocation,
   Value
 } from '@prisma/client';
 import MyListbox from 'components/Form/Listbox';
@@ -13,7 +14,7 @@ import { ItemSchema } from 'lib/schemas';
 import { useRouter } from 'next/router';
 import { NextPageWithLayout } from 'pages/_app';
 import { toast } from 'react-toastify';
-import { Categories, Colors, Locations } from 'types';
+import { Categories, Colors, Locations, RetrieveLocations } from 'types';
 import { trpc } from 'utils/trpc';
 
 type EditItemFormProps = {
@@ -30,6 +31,10 @@ function EditItemForm({ item }: EditItemFormProps) {
         .substring(0, 16) as unknown as Date
     }
   });
+
+  const idDetails = methods.watch('identifiable');
+  const selectedColor = methods.watch('color');
+
   const auditCreateMutation = trpc.audit.create.useMutation();
   const context = trpc.useContext();
   const itemMutation = trpc.item.update.useMutation({
@@ -159,6 +164,22 @@ function EditItemForm({ item }: EditItemFormProps) {
           {methods.formState.errors.color?.message}
         </label>
       </div>
+      {selectedColor === 'OTHER' ? (
+        <div>
+          <label className="label">
+            <span className="label-text">Color Details</span>
+          </label>
+          <input
+            type="text"
+            placeholder="Type here"
+            className="input-bordered input input-sm w-full"
+            {...methods.register('otherColorDescription')}
+          />
+          <label className="text-xs text-error">
+            {methods.formState.errors.otherColorDescription?.message}
+          </label>
+        </div>
+      ) : null}
       <div>
         <label className="label">
           <span className="label-text">Value</span>
@@ -194,13 +215,45 @@ function EditItemForm({ item }: EditItemFormProps) {
           {methods.formState.errors.identifiable?.message}
         </label>
       </div>
+      {idDetails ? (
+        <div>
+          <div>
+            <label className="label">
+              <span className="label-text">Identification</span>
+            </label>
+            <input
+              type="text"
+              placeholder="Andrew ID or driver's license number"
+              className="input-bordered input input-sm w-full"
+              {...methods.register('identification')}
+            />
+            <label className="text-xs text-error">
+              {methods.formState.errors.identification?.message}
+            </label>
+          </div>
+          <div>
+            <label className="label">
+              <span className="label-text">Owner Notified?</span>
+            </label>
+            <input
+              type="text"
+              placeholder="Ex. Yes-emailed, No, N/A, etc."
+              className="input-bordered input input-sm w-full"
+              {...methods.register('ownerNotified')}
+            />
+            <label className="text-xs text-error">
+              {methods.formState.errors.ownerNotified?.message}
+            </label>
+          </div>
+        </div>
+      ) : null}
       <div>
         <label className="label">
           <span className="label-text">Retrieve From</span>
         </label>
         <MyListbox
-          values={Object.values(Location)}
-          displayValue={(prop) => Locations[prop]}
+          values={Object.values(RetrieveLocation)}
+          displayValue={(prop) => RetrieveLocations[prop]}
           keyValue={(prop) => prop}
           name="retrieveLocation"
           control={methods.control}

diff --git a/src/pages/manage/items/create.tsx b/src/pages/manage/items/create.tsx
@@ -40,6 +40,9 @@ const CreateItem: NextPageWithLayout = () => {
 
   const methods = useZodForm({ schema: ItemCreateSchema });
 
+  const idDetails = methods.watch('identifiable');
+  const selectedColor = methods.watch('color');
+
   return (
     <div className="mx-auto max-w-lg">
       <h3 className="text-2xl font-bold">Add Item</h3>
@@ -176,6 +179,22 @@ const CreateItem: NextPageWithLayout = () => {
             {methods.formState.errors.color?.message}
           </label>
         </div>
+        {selectedColor === 'OTHER' ? (
+          <div>
+            <label className="label">
+              <span className="label-text">Color Details</span>
+            </label>
+            <input
+              type="text"
+              placeholder="Type here"
+              className="input-bordered input input-sm w-full"
+              {...methods.register('otherColorDescription')}
+            />
+            <label className="text-xs text-error">
+              {methods.formState.errors.otherColorDescription?.message}
+            </label>
+          </div>
+        ) : null}
         <div>
           <label className="label">
             <span className="label-text">
@@ -213,6 +232,38 @@ const CreateItem: NextPageWithLayout = () => {
             {methods.formState.errors.identifiable?.message}
           </label>
         </div>
+        {idDetails ? (
+          <div>
+            <div>
+              <label className="label">
+                <span className="label-text">Identification</span>
+              </label>
+              <input
+                type="text"
+                placeholder="Andrew ID or driver's license number"
+                className="input-bordered input input-sm w-full"
+                {...methods.register('identification')}
+              />
+              <label className="text-xs text-error">
+                {methods.formState.errors.identification?.message}
+              </label>
+            </div>
+            <div>
+              <label className="label">
+                <span className="label-text">Owner Notified?</span>
+              </label>
+              <input
+                type="text"
+                placeholder="Ex. Yes-emailed, No, N/A, etc."
+                className="input-bordered input input-sm w-full"
+                {...methods.register('ownerNotified')}
+              />
+              <label className="text-xs text-error">
+                {methods.formState.errors.ownerNotified?.message}
+              </label>
+            </div>
+          </div>
+        ) : null}
         <div>
           <label className="label">
             <span className="label-text">