-
+
@@ -403,10 +403,10 @@ watch(
diff --git a/app/components/app/person-address/entry-form.vue b/app/components/app/person-address/entry-form.vue
index c12ed0c0..1c9998d7 100644
--- a/app/components/app/person-address/entry-form.vue
+++ b/app/components/app/person-address/entry-form.vue
@@ -160,7 +160,9 @@ watch(
:validation-schema="formSchema"
:validate-on-mount="false"
validation-mode="onSubmit"
- :initial-values="initialValues ? { locationType: 'domicile', ...initialValues } : { locationType: 'domicile' }"
+ :initial-values="
+ initialValues ? { locationType_code: 'domicile', ...initialValues } : { locationType_code: 'domicile' }
+ "
>
-
+
@@ -251,7 +253,7 @@ watch(
{
regency_code: currentAddressValues.regency_code || undefined,
district_code: currentAddressValues.district_code || undefined,
village_code: currentAddressValues.village_code || undefined,
- postalCode_code: currentAddressValues.postalCode_code || undefined,
+ postalRegion_code: currentAddressValues.postalRegion_code || undefined,
address: currentAddressValues.address || undefined,
rt: currentAddressValues.rt || undefined,
rw: currentAddressValues.rw || undefined,
@@ -64,10 +64,7 @@ onMounted(() => {
// #endregion
// #region Functions
-// #endregion region
-
-// #region Utilities & event handlers
-async function submitAll() {
+async function sendRequest() {
const [patient, address, addressRelative, families, contacts, emergencyContact] = await Promise.all([
personPatientForm.value?.validate(),
personAddressForm.value?.validate(),
@@ -95,6 +92,7 @@ async function submitAll() {
}
const formData = genPatient(formDataRequest)
+ console.log(formData)
payload.value = formData
try {
@@ -120,6 +118,21 @@ async function submitAll() {
// Handle error - show error message to user
}
}
+// #endregion region
+
+// #region Utilities & event handlers
+async function handleActionClick(eventType: string) {
+ if (eventType === 'submit') {
+ await sendRequest()
+ return
+ }
+
+ if (eventType === 'cancel') {
+ navigateTo({
+ name: 'client-patient',
+ })
+ }
+}
// #endregion
// #region Watchers
@@ -141,7 +154,7 @@ watch(
regency_code: currentAddressValues.regency_code || undefined,
district_code: currentAddressValues.district_code || undefined,
village_code: currentAddressValues.village_code || undefined,
- postalCode_code: currentAddressValues.postalCode_code || undefined,
+ postalRegion_code: currentAddressValues.postalRegion_code || undefined,
address: currentAddressValues.address || undefined,
rt: currentAddressValues.rt || undefined,
rw: currentAddressValues.rw || undefined,
@@ -172,7 +185,7 @@ watch(
regency_code: newAddressValues.regency_code || undefined,
district_code: newAddressValues.district_code || undefined,
village_code: newAddressValues.village_code || undefined,
- postalCode_code: newAddressValues.postalCode_code || undefined,
+ postalRegion_code: newAddressValues.postalRegion_code || undefined,
address: newAddressValues.address || undefined,
rt: newAddressValues.rt || undefined,
rw: newAddressValues.rw || undefined,
@@ -191,7 +204,7 @@ watch(
if (
(isSameAddress === true || isSameAddress === '1') &&
personAddressForm.value?.values &&
- personAddressRelativeForm.value
+ personAddressRelativeForm.value?.values
) {
// Ketika isSameAddress diubah menjadi true, copy alamat sekarang ke alamat KTP
const currentAddressValues = personAddressForm.value.values
@@ -202,7 +215,7 @@ watch(
regency_code: currentAddressValues.regency_code || undefined,
district_code: currentAddressValues.district_code || undefined,
village_code: currentAddressValues.village_code || undefined,
- postalCode_code: currentAddressValues.postalCode_code || undefined,
+ postalRegion_code: currentAddressValues.postalRegion_code || undefined,
address: currentAddressValues.address || undefined,
rt: currentAddressValues.rt || undefined,
rw: currentAddressValues.rw || undefined,
@@ -249,7 +262,7 @@ watch(
/>
diff --git a/app/composables/usePostalCodes.ts b/app/composables/usePostalRegion.ts
similarity index 65%
rename from app/composables/usePostalCodes.ts
rename to app/composables/usePostalRegion.ts
index d2e8ff34..79b04955 100644
--- a/app/composables/usePostalCodes.ts
+++ b/app/composables/usePostalRegion.ts
@@ -1,23 +1,23 @@
import { ref, computed, watch, readonly, type Ref } from 'vue'
import { refDebounced } from '@vueuse/core'
-import type { PostalCode } from '~/models/postal-code'
+import type { PostalRegion } from '~/models/postal-region'
import type { SelectItem } from '~/components/pub/my-ui/form/select.vue'
-import * as postalCodeService from '../services/postal-code.service'
+import * as postalRegionService from '~/services/postal-region.service'
// Global cache untuk postal codes berdasarkan village code
-const postalCodesCache = ref>(new Map())
+const postalRegionCache = ref>(new Map())
const loadingStates = ref>(new Map())
const errorStates = ref>(new Map())
-export function usePostalCodes(villageCode: Ref | string | undefined) {
+export function usePostalRegion(villageCode: Ref | string | undefined) {
// Convert villageCode ke ref jika bukan ref
const villageCodeRef = typeof villageCode === 'string' || villageCode === undefined ? ref(villageCode) : villageCode
- // Computed untuk mendapatkan postalCodes berdasarkan village code
- const postalCodes = computed(() => {
+ // Computed untuk mendapatkan postalRegion berdasarkan village code
+ const postalRegion = computed(() => {
const code = villageCodeRef.value
if (!code) return []
- return postalCodesCache.value.get(code) || []
+ return postalRegionCache.value.get(code) || []
})
// Computed untuk loading state
@@ -35,22 +35,22 @@ export function usePostalCodes(villageCode: Ref | string | u
})
// Computed untuk format SelectItem
- const postalCodeOptions = computed(() => {
- return postalCodes.value.map((postalCode) => ({
- label: postalCode.code,
- value: postalCode.code,
- searchValue: postalCode.code,
+ const postalRegionOptions = computed(() => {
+ return postalRegion.value.map((postalRegion) => ({
+ label: postalRegion.code,
+ value: postalRegion.code,
+ searchValue: postalRegion.code,
}))
})
- // Function untuk fetch postalCodes berdasarkan village code
- async function fetchPostalCodes(villageCodeParam?: string, forceRefresh = false, isUserAction = false) {
+ // Function untuk fetch postalRegion berdasarkan village code
+ async function fetchpostalRegion(villageCodeParam?: string, forceRefresh = false, isUserAction = false) {
const code = villageCodeParam || villageCodeRef.value
if (!code) return
// Jika user action atau force refresh, selalu fetch
// Jika bukan user action dan sudah ada cache, skip
- if (!isUserAction && !forceRefresh && postalCodesCache.value.has(code)) {
+ if (!isUserAction && !forceRefresh && postalRegionCache.value.has(code)) {
return
}
@@ -71,15 +71,15 @@ export function usePostalCodes(villageCode: Ref | string | u
errorStates.value.set(code, null)
try {
- const response = await postalCodeService.getList({
+ const response = await postalRegionService.getList({
sort: 'code:asc',
'village-code': code,
'page-no-limit': true,
})
if (response.success) {
- const postalCodesData = response.body.data || []
- postalCodesCache.value.set(code, postalCodesData)
+ const postalRegionData = response.body.data || []
+ postalRegionCache.value.set(code, postalRegionData)
} else {
errorStates.value.set(code, 'Gagal memuat data kode pos')
console.error('Failed to fetch postal codes:', response)
@@ -93,20 +93,20 @@ export function usePostalCodes(villageCode: Ref | string | u
}
}
- // Function untuk mencari postalCode berdasarkan code
- function getPostalCodeByCode(code: string): PostalCode | undefined {
+ // Function untuk mencari postalRegion berdasarkan code
+ function getpostalRegionByCode(code: string): PostalRegion | undefined {
const villageCode = villageCodeRef.value
if (!villageCode) return undefined
- const postalCodesForVillage = postalCodesCache.value.get(villageCode) || []
- return postalCodesForVillage.find((postalCode) => postalCode.code === code)
+ const postalRegionForVillage = postalRegionCache.value.get(villageCode) || []
+ return postalRegionForVillage.find((postalRegion) => postalRegion.code === code)
}
// Function untuk clear cache village tertentu
function clearCache(villageCodeParam?: string) {
const code = villageCodeParam || villageCodeRef.value
if (code) {
- postalCodesCache.value.delete(code)
+ postalRegionCache.value.delete(code)
loadingStates.value.delete(code)
errorStates.value.delete(code)
}
@@ -114,16 +114,16 @@ export function usePostalCodes(villageCode: Ref | string | u
// Function untuk clear semua cache
function clearAllCache() {
- postalCodesCache.value.clear()
+ postalRegionCache.value.clear()
loadingStates.value.clear()
errorStates.value.clear()
}
// Function untuk refresh data
- function refreshPostalCodes(villageCodeParam?: string) {
+ function refreshpostalRegion(villageCodeParam?: string) {
const code = villageCodeParam || villageCodeRef.value
if (code) {
- return fetchPostalCodes(code, true)
+ return fetchpostalRegion(code, true)
}
}
@@ -137,7 +137,7 @@ export function usePostalCodes(villageCode: Ref | string | u
if (newCode && newCode !== oldCode) {
// Jika ada oldCode berarti user action (ganti pilihan)
const isUserAction = !!oldCode
- fetchPostalCodes(newCode, false, isUserAction)
+ fetchpostalRegion(newCode, false, isUserAction)
}
},
{ immediate: true },
@@ -145,25 +145,25 @@ export function usePostalCodes(villageCode: Ref | string | u
return {
// Data
- postalCodes: readonly(postalCodes),
- postalCodeOptions,
+ postalRegion: readonly(postalRegion),
+ postalRegionOptions,
// State
isLoading: readonly(isLoading),
error: readonly(error),
// Methods
- fetchPostalCodes,
- refreshPostalCodes,
- getPostalCodeByCode,
+ fetchpostalRegion,
+ refreshpostalRegion,
+ getpostalRegionByCode,
clearCache,
clearAllCache,
}
}
// Export untuk direct access ke cached data (jika diperlukan)
-export const usePostalCodesCache = () => ({
- postalCodesCache: readonly(postalCodesCache),
+export const usepostalRegionCache = () => ({
+ postalRegionCache: readonly(postalRegionCache),
loadingStates: readonly(loadingStates),
errorStates: readonly(errorStates),
})
diff --git a/app/lib/constants.ts b/app/lib/constants.ts
index 526ca4b8..b850b1bb 100644
--- a/app/lib/constants.ts
+++ b/app/lib/constants.ts
@@ -85,6 +85,7 @@ export const religionCodes: Record = {
hindu: 'Hindu',
buda: 'Buda',
konghucu: 'Konghucu',
+ other: 'Kepercayaan Lain',
}
export const educationCodes: Record = {
@@ -349,3 +350,5 @@ export const addressLocationTypeCode: Record = {
identity: 'Alamat KTP',
domicile: 'Alamat Domisili',
}
+
+export type AddressLocationTypeCode = keyof typeof addressLocationTypeCode
diff --git a/app/models/patient.ts b/app/models/patient.ts
index 04112e87..6066ed14 100644
--- a/app/models/patient.ts
+++ b/app/models/patient.ts
@@ -38,6 +38,7 @@ export interface genPatientProps {
}
export function genPatient(props: genPatientProps): Patient {
+ console.log(props)
const { patient, residentAddress, cardAddress, familyData, contacts, responsible } = props
const addresses: PersonAddress[] = [{ ...genBase(), person_id: 0, ...residentAddress }]
@@ -46,7 +47,29 @@ export function genPatient(props: genPatientProps): Patient {
// jika alamat ktp sama dengan domisili saat ini
if (cardAddress.isSameAddress) {
- addresses.push({ ...genBase(), ...residentAddress, person_id: 0, locationType: 'identity' })
+ addresses.push({
+ ...genBase(),
+ ...residentAddress,
+ person_id: 0,
+ locationType_code: cardAddress.locationType_code || 'identity'
+ })
+ } else {
+ // jika alamat berbeda, tambahkan alamat relatif
+ // Pastikan semua field yang diperlukan ada
+ const relativeAddress = {
+ ...genBase(),
+ person_id: 0,
+ locationType_code: cardAddress.locationType_code || 'identity',
+ address: cardAddress.address || '',
+ province_code: cardAddress.province_code || '',
+ regency_code: cardAddress.regency_code || '',
+ district_code: cardAddress.district_code || '',
+ village_code: cardAddress.village_code || '',
+ postalRegion_code: cardAddress.postalRegion_code || '',
+ rt: cardAddress.rt,
+ rw: cardAddress.rw,
+ }
+ addresses.push(relativeAddress)
}
// add data orang tua
@@ -129,7 +152,7 @@ export function genPatient(props: genPatientProps): Patient {
newBornStatus: patient.isNewBorn,
person_id: 0,
id: 0,
- number: '0x000000000000000000000000000000',
+ number: '',
createdAt: new Date().toISOString(),
updatedAt: new Date().toISOString(),
deletedAt: null,
diff --git a/app/models/person-address.ts b/app/models/person-address.ts
index 841c6318..c425bc3c 100644
--- a/app/models/person-address.ts
+++ b/app/models/person-address.ts
@@ -1,25 +1,26 @@
import { type Base, genBase } from './_base'
-import type { PostalCode } from './postal-code'
+import type { AddressLocationTypeCode } from '~/lib/constants'
+import type { PostalRegion } from './postal-region'
import { toTitleCase } from '~/lib/utils'
-
export interface PersonAddress extends Base {
person_id: number
- locationType: string
+ locationType_code: AddressLocationTypeCode
address: string
rt?: string
rw?: string
- postalCode_code?: string
+ postalRegion_code?: string
village_code: string
// preload
- postalCode?: PostalCode | null
+ postalRegion?: PostalRegion | null
+ locationType?: AddressLocationTypeCode
}
export function genPersonAddress(): PersonAddress {
return {
...genBase(),
person_id: 0,
- locationType: '',
+ locationType_code: '',
address: '',
village_code: '',
}
@@ -28,7 +29,7 @@ export function genPersonAddress(): PersonAddress {
export function formatAddress(builder?: PersonAddress) {
if (!builder) return ''
- const village = builder?.postalCode?.village
+ const village = builder?.postalRegion?.village
const district = village?.district
const regency = district?.regency
const province = regency?.province
@@ -39,7 +40,7 @@ export function formatAddress(builder?: PersonAddress) {
district?.name,
toTitleCase(regency?.name || ''),
toTitleCase(province?.name || ''),
- builder?.postalCode_code,
+ builder?.postalRegion_code,
].filter(Boolean)
return parts.join(', ')
diff --git a/app/models/postal-code.ts b/app/models/postal-region.ts
similarity index 71%
rename from app/models/postal-code.ts
rename to app/models/postal-region.ts
index b03115c4..581d0bc7 100644
--- a/app/models/postal-code.ts
+++ b/app/models/postal-region.ts
@@ -1,6 +1,7 @@
import { type Base, genBase } from './_base'
import type { Village } from './village'
-export interface PostalCode extends Base {
+
+export interface PostalRegion extends Base {
code: string
village_code: string
@@ -8,7 +9,7 @@ export interface PostalCode extends Base {
village?: Village | null
}
-export function genPostalCode(): PostalCode {
+export function genPostalRegion(): PostalRegion {
return {
...genBase(),
code: '',
diff --git a/app/schemas/patient.schema.ts b/app/schemas/patient.schema.ts
index cfe2d69e..f915fbf0 100644
--- a/app/schemas/patient.schema.ts
+++ b/app/schemas/patient.schema.ts
@@ -15,12 +15,12 @@ const IsNewBornSchema = z
const PatientSchema = z
.object({
// Data Diri Pasien
- identityNumber: z
- .string({
- required_error: 'Mohon lengkapi NIK',
- })
- .min(16, 'NIK harus berupa angka 16 digit')
- .regex(/^\d+$/, 'NIK harus berupa angka 16 digit'),
+ identityNumber: z.string().optional(),
+ // .string({
+ // required_error: 'Mohon lengkapi NIK',
+ // })
+ // .min(16, 'NIK harus berupa angka 16 digit')
+ // .regex(/^\d+$/, 'NIK harus berupa angka 16 digit'),
// identityCardFile: z.instanceof(File, { message: 'File KTP harus dipilih' }),
// familyCardFile: z.instanceof(File, { message: 'File KK harus dipilih' }),
@@ -106,26 +106,42 @@ const PatientSchema = z
note: z.string().optional(),
drivingLicenseNumber: z.string().optional(),
})
- .refine((data) => {
- // Jika disability = 'TIDAK', maka disabilityType harus kosong atau undefined
- if (data.disability === 'TIDAK') {
- return !data.disabilityType || data.disabilityType.trim() === ''
- }
- return true
- }, {
- message: "Jenis Disabilitas harus kosong jika Status Disabilitas = 'TIDAK'",
- path: ['disabilityType'],
- })
- .refine((data) => {
- // Jika disability = 'YA', maka disabilityType wajib diisi
- if (data.disability === 'YA') {
- return !!data.disabilityType?.trim()
- }
- return true
- }, {
- message: 'Mohon pilih Jenis Disabilitas',
- path: ['disabilityType'],
- })
+ .refine(
+ (data) => {
+ // Jika disability = 'TIDAK', maka disabilityType harus kosong atau undefined
+ if (data.disability === 'TIDAK') {
+ return !data.disabilityType || data.disabilityType.trim() === ''
+ }
+ return true
+ },
+ {
+ message: "Jenis Disabilitas harus kosong jika Status Disabilitas = 'TIDAK'",
+ path: ['disabilityType'],
+ },
+ )
+ .refine(
+ (data) => {
+ // Jika disability = 'YA', maka disabilityType wajib diisi
+ if (data.disability === 'YA') {
+ return !!data.disabilityType?.trim()
+ }
+ return true
+ },
+ {
+ message: 'Mohon pilih Jenis Disabilitas',
+ path: ['disabilityType'],
+ },
+ )
+ // .refine((data) => {
+ // // Jika nationality = 'WNA', maka passportNumber wajib diisi
+ // if (data.nationality === 'WNA') {
+ // return !!data.passportNumber?.trim()
+ // }
+ // return true
+ // }, {
+ // message: 'Nomor Paspor wajib diisi untuk Warga Negara Asing',
+ // path: ['passportNumber'],
+ // })
.transform((data) => {
// Transform untuk backend: hanya kirim disabilityType sesuai kondisi
return {
diff --git a/app/schemas/person-address-relative.schema.ts b/app/schemas/person-address-relative.schema.ts
index 64f75f5e..091da1df 100644
--- a/app/schemas/person-address-relative.schema.ts
+++ b/app/schemas/person-address-relative.schema.ts
@@ -22,7 +22,7 @@ const PersonAddressRelativeSchema = z
'regency_code',
'district_code',
'village_code',
- 'postalCode_code',
+ 'postalRegion_code',
'address',
]
@@ -48,7 +48,7 @@ function getRequiredMessage(field: string): string {
regency_code: 'Mohon pilih kabupaten/kota',
district_code: 'Mohon pilih kecamatan',
village_code: 'Mohon pilih kelurahan',
- postalCode_code: 'Mohon lengkapi kode pos',
+ postalRegion_code: 'Mohon lengkapi kode pos',
address: 'Mohon lengkapi alamat',
}
return messages[field] || `${field} wajib diisi`
diff --git a/app/schemas/person-address.schema.ts b/app/schemas/person-address.schema.ts
index 7a17696b..3e991bad 100644
--- a/app/schemas/person-address.schema.ts
+++ b/app/schemas/person-address.schema.ts
@@ -1,7 +1,7 @@
import { z } from 'zod'
const PersonAddressSchema = z.object({
- locationType: z.string({
+ locationType_code: z.string({
required_error: 'Mohon pilih jenis alamat',
}),
address: z.string({
@@ -19,7 +19,7 @@ const PersonAddressSchema = z.object({
village_code: z.string({
required_error: 'Mohon pilih kelurahan',
}),
- postalCode_code: z.string({
+ postalRegion_code: z.string({
required_error: 'Mohon lengkapi kode pos',
}),
// .min(5, 'Kode pos harus berupa angka 5 digit')
diff --git a/app/services/postal-code.service.ts b/app/services/postal-region.service.ts
similarity index 83%
rename from app/services/postal-code.service.ts
rename to app/services/postal-region.service.ts
index 1562bb47..8273dca0 100644
--- a/app/services/postal-code.service.ts
+++ b/app/services/postal-region.service.ts
@@ -1,8 +1,8 @@
// Base service for postal code operations
import * as base from './_crud-base'
-const path = '/api/v1/postal-code'
-const name = 'postal-code'
+const path = '/api/v1/postal-region'
+const name = 'postal-region'
export function create(data: any) {
return base.create(path, data, name)