Merge branch 'dev' into feat/consultation-82

app/schemas/device.schema.ts

@@ -7,7 +7,7 @@ const DeviceSchema = z.object({
   uom_code: z.string({ required_error: 'Kode unit harus diisi' }).min(1, 'Kode unit harus diisi'),
 })
 
-type DeviceFormData = z.infer<typeof DeviceSchema> & Device
+type DeviceFormData = z.infer<typeof DeviceSchema> & Partial<Device>
 
 export { DeviceSchema }
 export type { DeviceFormData }

app/schemas/division-position.schema.ts

@@ -0,0 +1,21 @@
+import { z } from 'zod'
+import type { DivisionPosition } from '~/models/division-position'
+
+const DivisionPositionSchema = z.object({
+  code: z.string({ required_error: 'Kode harus diisi' }).min(1, 'Kode minimum 1 karakter'),
+  name: z.string({ required_error: 'Nama harus diisi' }).min(1, 'Nama minimum 1 karakter'),
+  headStatus: z.boolean().optional().nullable(),
+  division_id: z.union([
+    z.string({ required_error: 'Divisi Induk harus diisi' }),
+    z.number({ required_error: 'Divisi Induk harus diisi' })
+  ]).optional().nullable(),
+  employee_id: z.union([
+    z.string({ required_error: 'Karyawan harus diisi' }),
+    z.number({ required_error: 'Karyawan harus diisi' })
+  ]).optional().nullable(),
+})
+
+type DivisionPositionFormData = z.infer<typeof DivisionPositionSchema> & Partial<DivisionPosition>
+
+export { DivisionPositionSchema }
+export type { DivisionPositionFormData }

app/schemas/division.schema.ts

@@ -1,6 +1,5 @@
 import { z } from 'zod'
 import type { Division } from '~/models/division'
-import type { DivisionPosition } from '~/models/division-position'
 
 const DivisionSchema = z.object({
   code: z.string({ required_error: 'Kode harus diisi' }).min(1, 'Kode minimum 1 karakter'),
@@ -9,10 +8,9 @@ const DivisionSchema = z.object({
     z.string({ required_error: 'Divisi Induk harus diisi' }),
     z.number({ required_error: 'Divisi Induk harus diisi' })
   ]).optional().nullable(),
-  division_id: z.string({ required_error: 'Divisi Induk harus diisi' }).optional().nullable(),
 })
 
-type DivisionFormData = z.infer<typeof DivisionSchema> & (Division | DivisionPosition)
+type DivisionFormData = z.infer<typeof DivisionSchema> & Partial<Division>
 
 export { DivisionSchema }
 export type { DivisionFormData }

app/schemas/infra.schema.ts

@@ -14,7 +14,7 @@ const InfraSchema = z.object({
   unit_id: z.union([z.string(), z.number()]).nullable().optional(),
 })
 
-type InfraFormData = z.infer<typeof InfraSchema> & Infra
+type InfraFormData = z.infer<typeof InfraSchema> & Partial<Infra>
 
 export { InfraSchema }
 export type { InfraFormData }

app/schemas/installation.schema.ts

@@ -1,4 +1,5 @@
 import { z } from 'zod'
+import type { Installation } from "~/models/installation"
 
 export const InstallationSchema = z.object({
   code: z.string().min(1, 'Kode wajib diisi'),
@@ -6,4 +7,4 @@ export const InstallationSchema = z.object({
   encounterClass_code: z.string().min(1, 'Encounter Class wajib diisi').optional(),
 })
 
-export type InstallationFormData = z.infer<typeof InstallationSchema>
+export type InstallationFormData = z.infer<typeof InstallationSchema> & Partial<Installation>

app/schemas/material.schema.ts

@@ -8,7 +8,7 @@ const MaterialSchema = z.object({
   stock: z.preprocess((val) => Number(val), z.number({ invalid_type_error: 'Stok harus berupa angka' }).min(1, 'Stok harus lebih besar dari 0')),
 })
 
-type MaterialFormData = z.infer<typeof MaterialSchema> & Material
+type MaterialFormData = z.infer<typeof MaterialSchema> & Partial<Material>
 
 export { MaterialSchema }
 export type { MaterialFormData }

app/schemas/specialist.schema.ts

@@ -10,7 +10,7 @@ const SpecialistSchema = z.object({
     .nullable(),
 })
 
-type SpecialistFormData = z.infer<typeof SpecialistSchema> & Specialist
+type SpecialistFormData = z.infer<typeof SpecialistSchema> & Partial<Specialist>
 
 export { SpecialistSchema }
 export type { SpecialistFormData }

app/schemas/subspecialist.schema.ts

@@ -13,7 +13,7 @@ const SubspecialistSchema = z.object({
     .nullable(),
 })
 
-type SubspecialistFormData = z.infer<typeof SubspecialistSchema> & Subspecialist
+type SubspecialistFormData = z.infer<typeof SubspecialistSchema> & Partial<Subspecialist>
 
 export { SubspecialistSchema }
 export type { SubspecialistFormData }

app/schemas/unit.schema.ts

@@ -13,7 +13,7 @@ const UnitSchema = z.object({
     .nullable(),
 })
 
-type UnitFormData = z.infer<typeof UnitSchema> & Unit
+type UnitFormData = z.infer<typeof UnitSchema> & Partial<Unit>
 
 export { UnitSchema }
 export type { UnitFormData }

app/schemas/uom.schema.ts

@@ -1,4 +1,4 @@
-import { BaseSchema, type BaseFormData } from './my-ui.schema'
+import { BaseSchema, type BaseFormData } from './base.schema'
 
 export { BaseSchema as UomSchema }
 export type { BaseFormData as UomFormData }