Merge branch 'dev' of https://github.com/dikstub-rssa/simrs-fe into feat/cprj-146

app/components/app/division-position/entry-form.vue

@@ -40,7 +40,7 @@ const { defineField, errors, meta } = useForm({
 
 const [code, codeAttrs] = defineField('code')
 const [name, nameAttrs] = defineField('name')
-const [division, divisionAttrs] = defineField('division_id')
+const [division, divisionAttrs] = defineField('division_code')
 const [employee, employeeAttrs] = defineField('employee_id')
 const [headStatus, headStatusAttrs] = defineField('headStatus')
 
@@ -62,8 +62,8 @@ const headStatusStr = computed<string>({
 if (props.values) {
   if (props.values.code !== undefined) code.value = props.values.code
   if (props.values.name !== undefined) name.value = props.values.name
-  if (props.values.division_id !== undefined)
-    division.value = props.values.division_id ? Number(props.values.division_id) : null
+  if (props.values.division_code !== undefined)
+    division.value = props.values.division_code ? String(props.values.division_code) : null
   if (props.values.employee_id !== undefined)
     employee.value = props.values.employee_id ? Number(props.values.employee_id) : null
   if (props.values.headStatus !== undefined) headStatus.value = !!props.values.headStatus
@@ -72,7 +72,7 @@ if (props.values) {
 const resetForm = () => {
   code.value = ''
   name.value = ''
-  division.value = null
+  division.value = ''
   employee.value = null
   headStatus.value = false
 }
@@ -83,7 +83,7 @@ function onSubmitForm() {
     ...genBase(),
     name: name.value || '',
     code: code.value || '',
-    division_id: division.value || null,
+    division_code: division.value || '',
     employee_id: employee.value || null,
     headStatus: headStatus.value !== undefined ? headStatus.value : undefined,
   }
@@ -130,7 +130,7 @@ function onCancelForm() {
       </Cell>
       <Cell>
         <Label height="compact">Posisi Divisi</Label>
-        <Field :errMessage="errors.division_id">
+        <Field :errMessage="errors.division_code">
           <Combobox
             id="division"
             v-model="division"

app/components/app/division-position/entry.vue

@@ -18,7 +18,7 @@ import { genDivisionPosition } from '~/models/division-position'
 
 interface Props {
   schema: z.ZodSchema<any>
-  divisionId: number
+  divisionId: string
   employees: any[]
   values: any
   isLoading?: boolean

app/components/app/division/entry-form.vue

@@ -36,25 +36,25 @@ const { defineField, errors, meta } = useForm({
   initialValues: {
     code: '',
     name: '',
-    parent_id: null,
+    parent_code: null,
   } as Partial<DivisionFormData>,
 })
 
 const [code, codeAttrs] = defineField('code')
 const [name, nameAttrs] = defineField('name')
-const [parent, parentAttrs] = defineField('parent_id')
+const [parent, parentAttrs] = defineField('parent_code')
 
 // Fill fields from props.values if provided
 if (props.values) {
   if (props.values.code !== undefined) code.value = props.values.code
   if (props.values.name !== undefined) name.value = props.values.name
-  if (props.values.parent_id !== undefined) parent.value = String(props.values.parent_id)
+  if (props.values.parent_code !== undefined) parent.value = String(props.values.parent_code)
 }
 
 const resetForm = () => {
   code.value = ''
   name.value = ''
-  parent.value = null
+  parent.value = ''
 }
 
 // Form submission handler
@@ -63,7 +63,7 @@ function onSubmitForm() {
     ...genBase(),
     name: name.value || '',
     code: code.value || '',
-    parent_id: parent.value || null,
+    parent_code: parent.value || '',
   }
   emit('submit', formData, resetForm)
 }
@@ -108,7 +108,7 @@ function onCancelForm() {
       </Cell>
       <Cell>
         <Label height="compact">Divisi Induk</Label>
-        <Field :errMessage="errors.parent_id">
+        <Field :errMessage="errors.parent_code">
           <TreeSelect
             id="parent"
             v-model="parent"

app/components/app/installation-position/entry-form.vue

@@ -40,7 +40,7 @@ const { defineField, errors, meta } = useForm({
 
 const [code, codeAttrs] = defineField('code')
 const [name, nameAttrs] = defineField('name')
-const [installation, installationAttrs] = defineField('installation_id')
+const [installation, installationAttrs] = defineField('installation_code')
 const [employee, employeeAttrs] = defineField('employee_id')
 const [headStatus, headStatusAttrs] = defineField('headStatus')
 
@@ -62,8 +62,8 @@ const headStatusStr = computed<string>({
 if (props.values) {
   if (props.values.code !== undefined) code.value = props.values.code
   if (props.values.name !== undefined) name.value = props.values.name
-  if (props.values.installation_id !== undefined)
-    installation.value = props.values.installation_id ? Number(props.values.installation_id) : null
+  if (props.values.installation_code !== undefined)
+    installation.value = props.values.installation_code ? String(props.values.installation_code) : null
   if (props.values.employee_id !== undefined)
     employee.value = props.values.employee_id ? Number(props.values.employee_id) : null
   if (props.values.headStatus !== undefined) headStatus.value = !!props.values.headStatus
@@ -83,7 +83,7 @@ function onSubmitForm() {
     ...genBase(),
     name: name.value || '',
     code: code.value || '',
-    installation_id: installation.value || null,
+    installation_code: String(installation.value) || '',
     employee_id: employee.value || null,
     headStatus: headStatus.value !== undefined ? headStatus.value : undefined,
   }
@@ -130,7 +130,7 @@ function onCancelForm() {
       </Cell>
       <Cell>
         <Label height="compact">Instalasi</Label>
-        <Field :errMessage="errors.installation_id">
+        <Field :errMessage="errors.installation_code">
           <Combobox
             id="installation"
             v-model="installation"

app/components/app/specialist-position/entry-detail.vue

@@ -18,7 +18,7 @@ import { genSpecialistPosition } from '~/models/specialist-position'
 
 interface Props {
   schema: z.ZodSchema<any>
-  specialistId: number
+  specialistId: string
   employees: any[]
   values: any
   isLoading?: boolean

app/components/app/specialist-position/entry-form.vue

@@ -40,7 +40,7 @@ const { defineField, errors, meta } = useForm({
 
 const [code, codeAttrs] = defineField('code')
 const [name, nameAttrs] = defineField('name')
-const [specialist, specialistAttrs] = defineField('specialist_id')
+const [specialist, specialistAttrs] = defineField('specialist_code')
 const [employee, employeeAttrs] = defineField('employee_id')
 const [headStatus, headStatusAttrs] = defineField('headStatus')
 
@@ -62,8 +62,8 @@ const headStatusStr = computed<string>({
 if (props.values) {
   if (props.values.code !== undefined) code.value = props.values.code
   if (props.values.name !== undefined) name.value = props.values.name
-  if (props.values.specialist_id !== undefined)
-    specialist.value = props.values.specialist_id ? Number(props.values.specialist_id) : null
+  if (props.values.specialist_code !== undefined)
+    specialist.value = props.values.specialist_code ? String(props.values.specialist_code) : null
   if (props.values.employee_id !== undefined)
     employee.value = props.values.employee_id ? Number(props.values.employee_id) : null
   if (props.values.headStatus !== undefined) headStatus.value = !!props.values.headStatus
@@ -72,7 +72,7 @@ if (props.values) {
 const resetForm = () => {
   code.value = ''
   name.value = ''
-  specialist.value = null
+  specialist.value = ''
   employee.value = null
   headStatus.value = false
 }
@@ -83,7 +83,7 @@ function onSubmitForm() {
     ...genBase(),
     name: name.value || '',
     code: code.value || '',
-    specialist_id: specialist.value || null,
+    specialist_code: specialist.value || '',
     employee_id: employee.value || null,
     headStatus: headStatus.value !== undefined ? headStatus.value : undefined,
   }
@@ -130,7 +130,7 @@ function onCancelForm() {
       </Cell>
       <Cell>
         <Label height="compact">Spesialis</Label>
-        <Field :errMessage="errors.specialist_id">
+        <Field :errMessage="errors.specialist_code">
           <Combobox
             id="specialist"
             v-model="specialist"

app/components/app/specialist/entry-form.vue

@@ -36,19 +36,19 @@ const { defineField, errors, meta } = useForm({
   initialValues: {
     code: '',
     name: '',
-    unit_id: 0,
+    unit_code: '',
   } as Partial<SpecialistFormData>,
 })
 
 const [code, codeAttrs] = defineField('code')
 const [name, nameAttrs] = defineField('name')
-const [unit, unitAttrs] = defineField('unit_id')
+const [unit, unitAttrs] = defineField('unit_code')
 
 // Fill fields from props.values if provided
 if (props.values) {
   if (props.values.code !== undefined) code.value = props.values.code
   if (props.values.name !== undefined) name.value = props.values.name
-  if (props.values.unit_id !== undefined) unit.value = props.values.unit_id ? String(props.values.unit_id) : null
+  if (props.values.unit_code !== undefined) unit.value = props.values.unit_code ? String(props.values.unit_code) : null
 }
 
 const resetForm = () => {
@@ -63,7 +63,7 @@ function onSubmitForm(values: any) {
     ...genBase(),
     name: name.value || '',
     code: code.value || '',
-    unit_id: unit.value ? Number(unit.value) : null,
+    unit_code: unit.value ? String(unit.value) : null,
   }
   emit('submit', formData, resetForm)
 }

app/components/app/subspecialist-position/entry-detail.vue

@@ -18,7 +18,7 @@ import { genSubSpecialistPosition } from '~/models/subspecialist-position'
 
 interface Props {
   schema: z.ZodSchema<any>
-  subspecialistId: number
+  subspecialistId: string
   employees: any[]
   values: any
   isLoading?: boolean

app/components/app/subspecialist-position/entry-form.vue

@@ -40,7 +40,7 @@ const { defineField, errors, meta } = useForm({
 
 const [code, codeAttrs] = defineField('code')
 const [name, nameAttrs] = defineField('name')
-const [subSpecialist, subSpecialistAttrs] = defineField('subspecialist_id')
+const [subSpecialist, subSpecialistAttrs] = defineField('subspecialist_code')
 const [employee, employeeAttrs] = defineField('employee_id')
 const [headStatus, headStatusAttrs] = defineField('headStatus')
 
@@ -62,8 +62,8 @@ const headStatusStr = computed<string>({
 if (props.values) {
   if (props.values.code !== undefined) code.value = props.values.code
   if (props.values.name !== undefined) name.value = props.values.name
-  if (props.values.subspecialist_id !== undefined)
-    subSpecialist.value = props.values.subspecialist_id ? Number(props.values.subspecialist_id) : null
+  if (props.values.subspecialist_code !== undefined)
+    subSpecialist.value = props.values.subspecialist_code ? String(props.values.subspecialist_code) : null
   if (props.values.employee_id !== undefined)
     employee.value = props.values.employee_id ? Number(props.values.employee_id) : null
   if (props.values.headStatus !== undefined) headStatus.value = !!props.values.headStatus
@@ -83,7 +83,7 @@ function onSubmitForm() {
     ...genBase(),
     name: name.value || '',
     code: code.value || '',
-    subspecialist_id: subSpecialist.value || null,
+    subspecialist_code: subSpecialist.value || null,
     employee_id: employee.value || null,
     headStatus: headStatus.value !== undefined ? headStatus.value : undefined,
   }
@@ -130,7 +130,7 @@ function onCancelForm() {
       </Cell>
       <Cell>
         <Label height="compact">Sub Spesialis</Label>
-        <Field :errMessage="errors.subspecialist_id">
+        <Field :errMessage="errors.subspecialist_code">
           <Combobox
             id="specialist"
             v-model="subSpecialist"

app/components/app/subspecialist/entry-form.vue

@@ -36,20 +36,20 @@ const { defineField, errors, meta } = useForm({
   initialValues: {
     code: '',
     name: '',
-    specialist_id: 0,
+    specialist_code: '',
   } as Partial<SubspecialistFormData>,
 })
 
 const [code, codeAttrs] = defineField('code')
 const [name, nameAttrs] = defineField('name')
-const [specialist, specialistAttrs] = defineField('specialist_id')
+const [specialist, specialistAttrs] = defineField('specialist_code')
 
 // Fill fields from props.values if provided
 if (props.values) {
   if (props.values.code !== undefined) code.value = props.values.code
   if (props.values.name !== undefined) name.value = props.values.name
-  if (props.values.specialist_id !== undefined)
-    specialist.value = props.values.specialist_id ? String(props.values.specialist_id) : null
+  if (props.values.specialist_code !== undefined)
+    specialist.value = props.values.specialist_code ? String(props.values.specialist_code) : null
 }
 
 const resetForm = () => {
@@ -64,7 +64,7 @@ function onSubmitForm(values: any) {
     ...genBase(),
     name: name.value || '',
     code: code.value || '',
-    specialist_id: specialist.value ? Number(specialist.value) : null,
+    specialist_code: specialist.value ? String(specialist.value) : "",
   }
   emit('submit', formData, resetForm)
 }

app/components/app/unit-position/entry-detail.vue

@@ -1,192 +0,0 @@
-<script setup lang="ts">
-// Components
-import Block from '~/components/pub/my-ui/doc-entry/block.vue'
-import Cell from '~/components/pub/my-ui/doc-entry/cell.vue'
-import Field from '~/components/pub/my-ui/doc-entry/field.vue'
-import Label from '~/components/pub/my-ui/doc-entry/label.vue'
-import Combobox from '~/components/pub/my-ui/combobox/combobox.vue'
-
-// Types
-import type { UnitPositionFormData } from '~/schemas/unit-position.schema'
-
-// Helpers
-import type z from 'zod'
-import { toTypedSchema } from '@vee-validate/zod'
-import { useForm } from 'vee-validate'
-import { genBase } from '~/models/_base'
-import { genUnitPosition } from '~/models/unit-position'
-
-interface Props {
-  schema: z.ZodSchema<any>
-  unitId: number
-  employees: any[]
-  values: any
-  isLoading?: boolean
-  isReadonly?: boolean
-}
-
-const props = defineProps<Props>()
-
-const isLoading = props.isLoading !== undefined ? props.isLoading : false
-const isReadonly = props.isReadonly !== undefined ? props.isReadonly : false
-const emit = defineEmits<{
-  submit: [values: UnitPositionFormData, resetForm: () => void]
-  cancel: [resetForm: () => void]
-}>()
-
-const { defineField, errors, meta } = useForm({
-  validationSchema: toTypedSchema(props.schema),
-  initialValues: genUnitPosition() as Partial<UnitPositionFormData>,
-})
-
-const [code, codeAttrs] = defineField('code')
-const [name, nameAttrs] = defineField('name')
-const [employee, employeeAttrs] = defineField('employee_id')
-const [headStatus, headStatusAttrs] = defineField('headStatus')
-
-// RadioGroup uses string values; expose a string computed that maps to the boolean field
-const headStatusStr = computed<string>({
-  get() {
-    if (headStatus.value === true) return 'true'
-    if (headStatus.value === false) return 'false'
-    return ''
-  },
-  set(v: string) {
-    if (v === 'true') headStatus.value = true
-    else if (v === 'false') headStatus.value = false
-    else headStatus.value = undefined
-  },
-})
-
-// Fill fields from props.values if provided
-if (props.values) {
-  if (props.values.code !== undefined) code.value = props.values.code
-  if (props.values.name !== undefined) name.value = props.values.name
-  if (props.values.employee_id !== undefined)
-    employee.value = props.values.employee_id ? Number(props.values.employee_id) : null
-  if (props.values.headStatus !== undefined) headStatus.value = !!props.values.headStatus
-}
-
-const resetForm = () => {
-  code.value = ''
-  name.value = ''
-  employee.value = null
-  headStatus.value = false
-}
-
-// Form submission handler
-function onSubmitForm() {
-  const formData: UnitPositionFormData = {
-    ...genBase(),
-    name: name.value || '',
-    code: code.value || '',
-
-    // readonly based on detail unit
-    unit_id: props.unitId,
-
-    employee_id: employee.value || null,
-    headStatus: headStatus.value !== undefined ? headStatus.value : undefined,
-  }
-  emit('submit', formData, resetForm)
-}
-
-// Form cancel handler
-function onCancelForm() {
-  emit('cancel', resetForm)
-}
-</script>
-
-<template>
-  <form
-    id="form-unit-position"
-    @submit.prevent
-  >
-    <Block
-      labelSize="thin"
-      class="!mb-2.5 !pt-0 xl:!mb-3"
-      :colCount="1"
-    >
-      <Cell>
-        <Label height="compact">Kode Jabatan</Label>
-        <Field :errMessage="errors.code">
-          <Input
-            id="code"
-            v-model="code"
-            v-bind="codeAttrs"
-            :disabled="isLoading || isReadonly"
-          />
-        </Field>
-      </Cell>
-      <Cell>
-        <Label height="compact">Nama Jabatan</Label>
-        <Field :errMessage="errors.name">
-          <Input
-            id="name"
-            v-model="name"
-            v-bind="nameAttrs"
-            :disabled="isLoading || isReadonly"
-          />
-        </Field>
-      </Cell>
-      <Cell>
-        <Label height="compact">Pengisi Jabatan</Label>
-        <Field :errMessage="errors.employee_id">
-          <Combobox
-            id="employee"
-            v-model="employee"
-            v-bind="employeeAttrs"
-            :items="employees"
-            :is-disabled="isLoading || isReadonly"
-            placeholder="Pilih Karyawan"
-            search-placeholder="Cari Karyawan"
-            empty-message="Item tidak ditemukan"
-          />
-        </Field>
-      </Cell>
-      <Cell>
-        <Label height="compact">Status Kepala</Label>
-        <Field :errMessage="errors.headStatus">
-          <RadioGroup
-            v-model="headStatusStr"
-            v-bind="headStatusAttrs"
-            class="flex gap-4"
-          >
-            <div class="flex items-center space-x-2">
-              <RadioGroupItem
-                id="head-yes"
-                value="true"
-              />
-              <Label for="head-yes">Ya</Label>
-            </div>
-            <div class="flex items-center space-x-2">
-              <RadioGroupItem
-                id="head-no"
-                value="false"
-              />
-              <Label for="head-no">Tidak</Label>
-            </div>
-          </RadioGroup>
-        </Field>
-      </Cell>
-    </Block>
-    <div class="my-2 flex justify-end gap-2 py-2">
-      <Button
-        type="button"
-        variant="secondary"
-        class="w-[120px]"
-        @click="onCancelForm"
-      >
-        Kembali
-      </Button>
-      <Button
-        v-if="!isReadonly"
-        type="button"
-        class="w-[120px]"
-        :disabled="isLoading || !meta.valid"
-        @click="onSubmitForm"
-      >
-        Simpan
-      </Button>
-    </div>
-  </form>
-</template>

app/components/app/unit-position/entry-form.vue

@@ -40,7 +40,7 @@ const { defineField, errors, meta } = useForm({
 
 const [code, codeAttrs] = defineField('code')
 const [name, nameAttrs] = defineField('name')
-const [unit, unitAttrs] = defineField('unit_id')
+const [unit, unitAttrs] = defineField('unit_code')
 const [employee, employeeAttrs] = defineField('employee_id')
 const [headStatus, headStatusAttrs] = defineField('headStatus')
 
@@ -62,7 +62,7 @@ const headStatusStr = computed<string>({
 if (props.values) {
   if (props.values.code !== undefined) code.value = props.values.code
   if (props.values.name !== undefined) name.value = props.values.name
-  if (props.values.unit_id !== undefined) unit.value = props.values.unit_id ? Number(props.values.unit_id) : null
+  if (props.values.unit_code !== undefined) unit.value = props.values.unit_code ? String(props.values.unit_code) : null
   if (props.values.employee_id !== undefined)
     employee.value = props.values.employee_id ? Number(props.values.employee_id) : null
   if (props.values.headStatus !== undefined) headStatus.value = !!props.values.headStatus
@@ -82,7 +82,7 @@ function onSubmitForm() {
     ...genBase(),
     name: name.value || '',
     code: code.value || '',
-    unit_id: unit.value || null,
+    unit_code: unit.value || '',
     employee_id: employee.value || null,
     headStatus: headStatus.value !== undefined ? headStatus.value : undefined,
   }
@@ -129,7 +129,7 @@ function onCancelForm() {
       </Cell>
       <Cell>
         <Label height="compact">Unit</Label>
-        <Field :errMessage="errors.unit_id">
+        <Field :errMessage="errors.unit_code">
           <Combobox
             id="unit"
             v-model="unit"

app/components/app/unit/entry-form.vue

@@ -35,20 +35,20 @@ const { defineField, errors, meta } = useForm({
   initialValues: {
     code: '',
     name: '',
-    installation_id: 0,
+    installation_code: '',
   } as Partial<UnitFormData>,
 })
 
 const [code, codeAttrs] = defineField('code')
 const [name, nameAttrs] = defineField('name')
-const [installation, installationAttrs] = defineField('installation_id')
+const [installation, installationAttrs] = defineField('installation_code')
 
 // Fill fields from props.values if provided
 if (props.values) {
   if (props.values.code !== undefined) code.value = props.values.code
   if (props.values.name !== undefined) name.value = props.values.name
-  if (props.values.installation_id !== undefined)
-    installation.value = props.values.installation_id ? Number(props.values.installation_id) : null
+  if (props.values.installation_code !== undefined)
+    installation.value = props.values.installation_code ? String(props.values.installation_code) : null
 }
 
 const resetForm = () => {
@@ -62,7 +62,7 @@ function onSubmitForm() {
   const formData: UnitFormData = {
     name: name.value || '',
     code: code.value || '',
-    installation_id: installation.value ? Number(installation.value) : null,
+    installation_code: installation.value ? String(installation.value) : "",
   }
   emit('submit', formData, resetForm)
 }