From 8160e53e935740ba3847570fb974c2f0a4735d76 Mon Sep 17 00:00:00 2001 From: kur0nek-o Date: Wed, 8 May 2024 08:23:48 +0700 Subject: [PATCH] fix: filters --- src/components/Form/FiltersType/Type10.vue | 9 +++------ src/components/Form/FiltersType/Type11.vue | 9 +++------ src/components/Form/FiltersType/Type12.vue | 9 +++------ src/components/Form/FiltersType/Type13.vue | 9 +++------ src/components/Form/FiltersType/Type17Keluhan.vue | 9 +++------ src/components/Form/FiltersType/Type2.vue | 10 ++++------ src/components/Form/FiltersType/Type3.vue | 9 +++------ src/components/Form/FiltersType/Type4.vue | 9 +++------ src/stores/auth.ts | 6 ++++-- 9 files changed, 29 insertions(+), 50 deletions(-) diff --git a/src/components/Form/FiltersType/Type10.vue b/src/components/Form/FiltersType/Type10.vue index 2b1d7fd..5351a53 100755 --- a/src/components/Form/FiltersType/Type10.vue +++ b/src/components/Form/FiltersType/Type10.vue @@ -89,16 +89,13 @@ onMounted(() => { keys.forEach((key: any, index: any) => { if (filterPresets.value[key]) { presetValues[index].value = filterPresets.value[key] - - if (key !== 'uid') { - setFunctions[index](filterPresets.value[key]) - } + setFunctions[index](filterPresets.value[key]) } }) + } else { + fetchUid() } - fetchUid() - emit('update:filters', data.value) }) diff --git a/src/components/Form/FiltersType/Type11.vue b/src/components/Form/FiltersType/Type11.vue index 980e457..8a8001f 100755 --- a/src/components/Form/FiltersType/Type11.vue +++ b/src/components/Form/FiltersType/Type11.vue @@ -165,16 +165,13 @@ onMounted(() => { keys.forEach((key: any, index: any) => { if (filterPresets.value[key]) { presetValues[index].value = filterPresets.value[key] - - if (key !== 'uid') { - setFunctions[index](filterPresets.value[key]) - } + setFunctions[index](filterPresets.value[key]) } }) + } else { + fetchUid() } - fetchUid() - emit('update:filters', data.value) }) diff --git a/src/components/Form/FiltersType/Type12.vue b/src/components/Form/FiltersType/Type12.vue index 37db3d8..3ffbc49 100755 --- a/src/components/Form/FiltersType/Type12.vue +++ b/src/components/Form/FiltersType/Type12.vue @@ -122,16 +122,13 @@ onMounted(() => { keys.forEach((key: any, index: any) => { if (filterPresets.value[key]) { presetValues[index].value = filterPresets.value[key] - - if (key !== 'uid') { - setFunctions[index](filterPresets.value[key]) - } + setFunctions[index](filterPresets.value[key]) } }) + } else { + fetchUid() } - fetchUid() - emit('update:filters', data.value) }) diff --git a/src/components/Form/FiltersType/Type13.vue b/src/components/Form/FiltersType/Type13.vue index b675bbc..ce3b591 100755 --- a/src/components/Form/FiltersType/Type13.vue +++ b/src/components/Form/FiltersType/Type13.vue @@ -90,16 +90,13 @@ onMounted(() => { keys.forEach((key: any, index: any) => { if (filterPresets.value[key]) { presetValues[index].value = filterPresets.value[key] - - if (key !== 'uid') { - setFunctions[index](filterPresets.value[key]) - } + setFunctions[index](filterPresets.value[key]) } }) + } else { + fetchUid() } - fetchUid() - emit('update:filters', data.value) }) diff --git a/src/components/Form/FiltersType/Type17Keluhan.vue b/src/components/Form/FiltersType/Type17Keluhan.vue index 9612260..77b4085 100755 --- a/src/components/Form/FiltersType/Type17Keluhan.vue +++ b/src/components/Form/FiltersType/Type17Keluhan.vue @@ -173,16 +173,13 @@ onMounted(() => { keys.forEach((key: any, index: any) => { if (filterPresets.value[key]) { presetValues[index].value = filterPresets.value[key] - - if (key !== 'uid') { - setFunctions[index](filterPresets.value[key]) - } + setFunctions[index](filterPresets.value[key]) } }) + } else { + fetchUid() } - fetchUid() - emit('update:filters', data.value) }) diff --git a/src/components/Form/FiltersType/Type2.vue b/src/components/Form/FiltersType/Type2.vue index df7125a..46e26b2 100755 --- a/src/components/Form/FiltersType/Type2.vue +++ b/src/components/Form/FiltersType/Type2.vue @@ -155,16 +155,14 @@ onMounted(() => { if (filterPresets.value[key]) { presetValues[index].value = filterPresets.value[key] - if (key !== 'regional' || key !== 'uid') { - setFunctions[index](filterPresets.value[key]) - } + setFunctions[index](filterPresets.value[key]) } }) + } else { + fetchRegional() + fetchUid() } - fetchRegional() - fetchUid() - emit('update:filters', data.value) }) diff --git a/src/components/Form/FiltersType/Type3.vue b/src/components/Form/FiltersType/Type3.vue index e157781..0877df9 100755 --- a/src/components/Form/FiltersType/Type3.vue +++ b/src/components/Form/FiltersType/Type3.vue @@ -88,16 +88,13 @@ onMounted(() => { keys.forEach((key: any, index: any) => { if (filterPresets.value[key]) { presetValues[index].value = filterPresets.value[key] - - if (key !== 'uid') { - setFunctions[index](filterPresets.value[key]) - } + setFunctions[index](filterPresets.value[key]) } }) + } else { + fetchUid() } - fetchUid() - emit('update:filters', data.value) }) diff --git a/src/components/Form/FiltersType/Type4.vue b/src/components/Form/FiltersType/Type4.vue index ef68e9a..ecb1ec4 100755 --- a/src/components/Form/FiltersType/Type4.vue +++ b/src/components/Form/FiltersType/Type4.vue @@ -99,16 +99,13 @@ onMounted(() => { keys.forEach((key: any, index: any) => { if (filterPresets.value[key]) { presetValues[index].value = filterPresets.value[key] - - if (key !== 'uid') { - setFunctions[index](filterPresets.value[key]) - } + setFunctions[index](filterPresets.value[key]) } }) + } else { + fetchUid() } - fetchUid() - emit('update:filters', data.value) }) diff --git a/src/stores/auth.ts b/src/stores/auth.ts index 8551d47..f157460 100755 --- a/src/stores/auth.ts +++ b/src/stores/auth.ts @@ -51,7 +51,7 @@ export const useAuthStore = defineStore('auth', () => { if (response.status) { const data = response.user - writeData('token', 'secret-token') + // writeData('token', 'secret-token') writeData('user_name', data.username) writeData('user_access', 'Petugas') writeData('user_uid', data.namaUid) @@ -64,7 +64,9 @@ export const useAuthStore = defineStore('auth', () => { type: 'success' }) - window.location.reload() + console.log(filterPresets.value) + console.log(data) + // window.location.reload() } else { dispatchNotification({ title: 'Login Gagal',