From 457b927c4fd1e818eace02016c25e6cb052a47e9 Mon Sep 17 00:00:00 2001
From: riefive <rie.five@gmail.com>
Date: Fri, 26 Sep 2025 12:37:47 +0700
Subject: [PATCH] chore: restucture list and entry form

---
 app/components/app/equipment/entry-form.vue      | 16 +++++++++-------
 app/components/app/tools/entry-form.vue          | 16 +++++++++-------
 app/components/content/employee/entry.vue        |  2 +-
 app/components/content/equipment/list.vue        |  9 +++++----
 app/components/content/material/entry.vue        |  4 ++--
 app/components/content/medicine-method/list.vue  | 14 ++++++++++++--
 .../content/specialist-intern/entry.vue          |  2 +-
 app/components/content/tools/list.vue            |  9 +++++----
 app/models/medicine.ts                           |  5 +++++
 app/schemas/{device.ts => device.schema.ts}      |  0
 app/schemas/{material.ts => material.schema.ts}  |  0
 app/schemas/medicine.schema.ts                   | 12 ++++++++++++
 12 files changed, 61 insertions(+), 28 deletions(-)
 rename app/schemas/{device.ts => device.schema.ts} (100%)
 rename app/schemas/{material.ts => material.schema.ts} (100%)
 create mode 100644 app/schemas/medicine.schema.ts

diff --git a/app/components/app/equipment/entry-form.vue b/app/components/app/equipment/entry-form.vue
index bb2b0545..5820a495 100644
--- a/app/components/app/equipment/entry-form.vue
+++ b/app/components/app/equipment/entry-form.vue
@@ -1,16 +1,18 @@
 <script setup lang="ts">
-// types
-import type z from 'zod'
-import type { MaterialFormData } from '~/schemas/material'
-// helpers
-import { useForm } from 'vee-validate'
-import { toTypedSchema } from '@vee-validate/zod'
-// components
+// Components
 import Block from '~/components/pub/custom-ui/doc-entry/block.vue'
 import Cell from '~/components/pub/custom-ui/doc-entry/cell.vue'
 import Field from '~/components/pub/custom-ui/doc-entry/field.vue'
 import Label from '~/components/pub/custom-ui/doc-entry/label.vue'
 
+// Types
+import type z from 'zod'
+import type { MaterialFormData } from '~/schemas/material.schema'
+
+// Helpers
+import { useForm } from 'vee-validate'
+import { toTypedSchema } from '@vee-validate/zod'
+
 interface Props {
   schema: z.ZodSchema<any>
   uoms: any[]
diff --git a/app/components/app/tools/entry-form.vue b/app/components/app/tools/entry-form.vue
index e3ae799e..ef072a75 100644
--- a/app/components/app/tools/entry-form.vue
+++ b/app/components/app/tools/entry-form.vue
@@ -1,16 +1,18 @@
 <script setup lang="ts">
-// helpers
-import { toTypedSchema } from '@vee-validate/zod'
-import { useForm } from 'vee-validate'
-// types
-import type z from 'zod'
-import type { DeviceFormData } from '~/schemas/device'
-// components
+// Components
 import Block from '~/components/pub/custom-ui/doc-entry/block.vue'
 import Cell from '~/components/pub/custom-ui/doc-entry/cell.vue'
 import Field from '~/components/pub/custom-ui/doc-entry/field.vue'
 import Label from '~/components/pub/custom-ui/doc-entry/label.vue'
 
+// Helpers
+import { toTypedSchema } from '@vee-validate/zod'
+import { useForm } from 'vee-validate'
+
+// Types
+import type z from 'zod'
+import type { DeviceFormData } from '~/schemas/device.schema'
+
 interface Props {
   schema: z.ZodSchema<any>
   uoms: any[]
diff --git a/app/components/content/employee/entry.vue b/app/components/content/employee/entry.vue
index 509baad0..2c65d604 100644
--- a/app/components/content/employee/entry.vue
+++ b/app/components/content/employee/entry.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import Action from '~/components/pub/custom-ui/nav-footer/ba-dr-su.vue'
-import { MaterialSchema, type MaterialFormData } from '~/schemas/material'
+import { MaterialSchema, type MaterialFormData } from '~/schemas/material.schema'
 
 const data = ref({
   name: '',
diff --git a/app/components/content/equipment/list.vue b/app/components/content/equipment/list.vue
index f1139074..9f3adb2b 100644
--- a/app/components/content/equipment/list.vue
+++ b/app/components/content/equipment/list.vue
@@ -1,16 +1,17 @@
 <script setup lang="ts">
-import { MaterialSchema, type MaterialFormData } from '~/schemas/material'
-import { usePaginatedList } from '~/composables/usePaginatedList'
-import { ActionEvents, type HeaderPrep } from '~/components/pub/custom-ui/data/types'
+// Components
 import Dialog from '~/components/pub/base/modal/dialog.vue'
 import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
 import AppEquipmentEntryForm from '~/components/app/equipment/entry-form.vue'
 import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
 
-// helpers
+// Helpers
+import { usePaginatedList } from '~/composables/usePaginatedList'
 import { toast } from '~/components/pub/ui/toast'
 
 // Types
+import { ActionEvents, type HeaderPrep } from '~/components/pub/custom-ui/data/types'
+import { MaterialSchema, type MaterialFormData } from '~/schemas/material.schema'
 import type { Uom } from '~/models/uom'
 
 // Handlers
diff --git a/app/components/content/material/entry.vue b/app/components/content/material/entry.vue
index 50d68455..3fa3bfd2 100644
--- a/app/components/content/material/entry.vue
+++ b/app/components/content/material/entry.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 // types
-import type { MaterialFormData } from '~/schemas/material'
-import { MaterialSchema } from '~/schemas/material'
+import type { MaterialFormData } from '~/schemas/material.schema'
+import { MaterialSchema } from '~/schemas/material.schema'
 
 const isLoading = ref(false)
 const uoms = [
diff --git a/app/components/content/medicine-method/list.vue b/app/components/content/medicine-method/list.vue
index 46ce2680..c4c16450 100644
--- a/app/components/content/medicine-method/list.vue
+++ b/app/components/content/medicine-method/list.vue
@@ -1,13 +1,21 @@
 
 <script setup lang="ts">
-import { usePaginatedList } from '~/composables/usePaginatedList'
-import { ActionEvents, type HeaderPrep } from '~/components/pub/custom-ui/data/types'
+// Components
 import Dialog from '~/components/pub/base/modal/dialog.vue'
 import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
 import AppMedicineMethodEntryForm from '~/components/app/medicine-method/entry-form.vue'
 import AppMedicineMethodList from '~/components/app/medicine-method/list.vue'
 import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
+
+// Helpers
+import { usePaginatedList } from '~/composables/usePaginatedList'
 import { toast } from '~/components/pub/ui/toast'
+
+// Types
+import { ActionEvents, type HeaderPrep } from '~/components/pub/custom-ui/data/types'
+import { MedicineBaseSchema, type MedicineBaseFormData } from '~/schemas/medicine.schema'
+
+// Handlers
 import {
   recId,
   recAction,
@@ -21,6 +29,8 @@ import {
   handleActionRemove,
   handleCancelForm,
 } from '~/handlers/medicine-method.handler'
+
+// Services
 import { getMedicineMethods, getMedicineMethodDetail } from '~/services/medicine-method.service'
 
 const title = ref('')
diff --git a/app/components/content/specialist-intern/entry.vue b/app/components/content/specialist-intern/entry.vue
index 7fa6a0b6..3d0ec6c1 100644
--- a/app/components/content/specialist-intern/entry.vue
+++ b/app/components/content/specialist-intern/entry.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import Action from '~/components/pub/custom-ui/nav-footer/ba-dr-su.vue'
-import { MaterialSchema, type MaterialFormData } from '~/schemas/material'
+import { MaterialSchema, type MaterialFormData } from '~/schemas/material.schema'
 
 const data = ref({
   name: '',
diff --git a/app/components/content/tools/list.vue b/app/components/content/tools/list.vue
index 89c379d5..b6362b72 100644
--- a/app/components/content/tools/list.vue
+++ b/app/components/content/tools/list.vue
@@ -1,16 +1,17 @@
 <script setup lang="ts">
-import { DeviceSchema, type DeviceFormData } from '~/schemas/device'
-import { usePaginatedList } from '~/composables/usePaginatedList'
-import { ActionEvents, type HeaderPrep } from '~/components/pub/custom-ui/data/types'
+// Components
 import Dialog from '~/components/pub/base/modal/dialog.vue'
 import Header from '~/components/pub/custom-ui/nav-header/prep.vue'
 import AppToolsEntryForm from '~/components/app/tools/entry-form.vue'
 import RecordConfirmation from '~/components/pub/custom-ui/confirmation/record-confirmation.vue'
 
-// helpers
+// Helpers
+import { usePaginatedList } from '~/composables/usePaginatedList'
 import { toast } from '~/components/pub/ui/toast'
 
 // Types
+import { ActionEvents, type HeaderPrep } from '~/components/pub/custom-ui/data/types'
+import { DeviceSchema, type DeviceFormData } from '~/schemas/device.schema'
 import type { Uom } from '~/models/uom'
 
 // Handlers
diff --git a/app/models/medicine.ts b/app/models/medicine.ts
index 382c76e2..1d01991b 100644
--- a/app/models/medicine.ts
+++ b/app/models/medicine.ts
@@ -1,3 +1,8 @@
+export interface MedicineBase {
+  name: string
+  code: string
+}
+
 export interface Medicine {
   id: string
   name: string
diff --git a/app/schemas/device.ts b/app/schemas/device.schema.ts
similarity index 100%
rename from app/schemas/device.ts
rename to app/schemas/device.schema.ts
diff --git a/app/schemas/material.ts b/app/schemas/material.schema.ts
similarity index 100%
rename from app/schemas/material.ts
rename to app/schemas/material.schema.ts
diff --git a/app/schemas/medicine.schema.ts b/app/schemas/medicine.schema.ts
new file mode 100644
index 00000000..13f01d15
--- /dev/null
+++ b/app/schemas/medicine.schema.ts
@@ -0,0 +1,12 @@
+import { z } from 'zod'
+import type { MedicineBase } from '~/models/medicine'
+
+const MedicineBaseSchema = 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')
+})
+
+type MedicineBaseFormData = z.infer<typeof MedicineBaseSchema> & MedicineBase
+
+export { MedicineBaseSchema }
+export type { MedicineBaseFormData }