From fda1d5d92a4ef97bedc2efa368f0dcc7ab236cc3 Mon Sep 17 00:00:00 2001 From: yosaphatprs Date: Mon, 1 Dec 2025 11:22:27 +0700 Subject: [PATCH] fix: fix search record --- .../modules/validation/validation.controller.ts | 4 ++-- .../src/modules/validation/validation.service.ts | 10 +++++----- .../src/views/dashboard/validasi/ValidasiView.vue | 15 +++++++-------- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/backend/api/src/modules/validation/validation.controller.ts b/backend/api/src/modules/validation/validation.controller.ts index 4531b50..13d944b 100644 --- a/backend/api/src/modules/validation/validation.controller.ts +++ b/backend/api/src/modules/validation/validation.controller.ts @@ -15,7 +15,7 @@ export class ValidationController { @Query('skip') skip: number, @Query('page') page: number, @Query('orderBy') orderBy: string, - @Query('searchIdRecord') searchIdRecord: string, + @Query('search') search: string, @Query('order') order: 'asc' | 'desc', @Query('kelompok_data') kelompok_data: string, @Query('aksi') aksi: string, @@ -26,7 +26,7 @@ export class ValidationController { skip, page, orderBy, - searchIdRecord, + search, order, kelompok_data, aksi, diff --git a/backend/api/src/modules/validation/validation.service.ts b/backend/api/src/modules/validation/validation.service.ts index c813877..f43c428 100644 --- a/backend/api/src/modules/validation/validation.service.ts +++ b/backend/api/src/modules/validation/validation.service.ts @@ -116,7 +116,7 @@ export class ValidationService { page, orderBy, order, - searchIdRecord, + search, kelompok_data, aksi, status, @@ -132,9 +132,9 @@ export class ValidationService { skip: skipValue, orderBy: orderBy ? { [orderBy]: order || 'asc' } : { created_at: 'desc' }, where: { - record_id: searchIdRecord + record_id: search ? { - contains: searchIdRecord, + contains: search, } : undefined, table_name: @@ -147,9 +147,9 @@ export class ValidationService { }); const totalCount = await this.prisma.validation_queue.count({ where: { - record_id: searchIdRecord + record_id: search ? { - contains: searchIdRecord, + contains: search, } : undefined, table_name: diff --git a/frontend/hospital-log/src/views/dashboard/validasi/ValidasiView.vue b/frontend/hospital-log/src/views/dashboard/validasi/ValidasiView.vue index ae3a91e..4a9e8ed 100644 --- a/frontend/hospital-log/src/views/dashboard/validasi/ValidasiView.vue +++ b/frontend/hospital-log/src/views/dashboard/validasi/ValidasiView.vue @@ -26,7 +26,6 @@ interface ApiResponse { } const data = ref([]); -const searchValidation = ref(""); const sortBy = ref("created_at"); const router = useRouter(); const route = useRoute(); @@ -52,8 +51,8 @@ const updateQueryParams = () => { pageSize: pagination.pageSize.value.toString(), }; - if (searchValidation.value) { - query.search = searchValidation.value; + if (searchId.value) { + query.search = searchId.value; } if (sortBy.value !== "id") { @@ -180,7 +179,7 @@ const fetchData = async () => { : "", aksi: filters.value.aksi !== "initial" ? filters.value.aksi : "", status: filters.value.status !== "initial" ? filters.value.status : "", - ...(searchValidation.value && { validation: searchValidation.value }), + ...(searchId.value && { search: searchId.value }), }); const result = await api.get( @@ -249,7 +248,7 @@ watch(sortOrder, () => { fetchData(); }); -watch(searchValidation, (newValue, oldValue) => { +watch(searchId, (newValue, oldValue) => { if (oldValue && !newValue) { pagination.reset(); fetchData(); @@ -282,7 +281,7 @@ watch( onMounted(async () => { if (route.query.search) { - searchValidation.value = route.query.search as string; + searchId.value = route.query.search as string; } if (route.query.sortBy) { sortBy.value = route.query.sortBy as string; @@ -391,8 +390,8 @@ onMounted(async () => { >