From 98d5a9ad43f2084f8e6bfd9cc5284461d9d10420 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 14 Jan 2026 18:11:13 +0700 Subject: [PATCH 1/5] fix(checkout-check):API isSeminar --- src/views/HomeView.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index 17b5def..30cd2c0 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -383,9 +383,12 @@ async function getCheck() { mapRef.value?.requestLocationPermission() return } + showLoader() + const isSeminar = endTimeAfternoon.value === '14:30' ? 'Y' : 'N' + await http - .get(config.API.checkoutCheck) + .get(config.API.checkoutCheck + `/${isSeminar}`) .then(async (res) => { checkStatus.value = await res.data.result.status.toLocaleUpperCase() if (checkStatus.value == 'ABSENT') { From 159f0803f24d6c276eceb47c34e59a60d09de950 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Fri, 16 Jan 2026 10:52:27 +0700 Subject: [PATCH 2/5] fix:Display_notify --- src/views/HomeView.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index 30cd2c0..a64742b 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -385,7 +385,7 @@ async function getCheck() { } showLoader() - const isSeminar = endTimeAfternoon.value === '14:30' ? 'Y' : 'N' + const isSeminar = model.value === 'ไปประชุม / อบรม / สัมมนา' ? 'Y' : 'N' await http .get(config.API.checkoutCheck + `/${isSeminar}`) @@ -401,7 +401,10 @@ async function getCheck() { new Intl.DateTimeFormat('en-US', options).format( new Date(res.data.result.serverTime) ) ?? '' - const endTimeAfternoonVal = endTimeAfternoon.value ?? '' + const endTimeAfternoonVal = + new Intl.DateTimeFormat('en-US', options).format( + new Date(res.data.result.endTime) + ) ?? '' // dialog ยืนยันการลงเวลาออกงาน dialogConfirm( From 62d757a343c7bf5060f1e94f711d4eac2da838be Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Fri, 16 Jan 2026 18:18:49 +0700 Subject: [PATCH 3/5] feat:popupPrivacy --- src/api/api.checkin.ts | 7 +- src/api/index.ts | 3 +- src/components/PopupPrivacy.vue | 315 ++++++++++++++++++++++++++++++++ src/views/MainView.vue | 8 + 4 files changed, 329 insertions(+), 4 deletions(-) create mode 100644 src/components/PopupPrivacy.vue diff --git a/src/api/api.checkin.ts b/src/api/api.checkin.ts index a0078fa..8172c07 100644 --- a/src/api/api.checkin.ts +++ b/src/api/api.checkin.ts @@ -13,8 +13,9 @@ export default { fileByFile: (name: string, group: string, id: string, fileName: string) => `${urlFile}/file/${name}/${group}/${id}/${fileName}`, - changePassword:`${orgKeycloak}/user/change-password`, - resetPassword:`${orgKeycloak}/user/reset-password`, + changePassword: `${orgKeycloak}/user/change-password`, + resetPassword: `${orgKeycloak}/user/reset-password`, - checkoutCheck:`${leave}/user/checkout-check` + checkoutCheck: `${leave}/user/checkout-check`, + privacy: `${env.API_URI}/org/profile/privacy`, } diff --git a/src/api/index.ts b/src/api/index.ts index 1a28e27..bac9d68 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -10,7 +10,8 @@ export const apiUrlConfig = import.meta.env.VITE_API_URI_CONFIG const config = ref({ development: { // API_URI: "https://localhost:7260/api", - API_URI: 'https://bma-ehr.frappet.synology.me/api/v1', + // API_URI: 'https://bma-ehr.frappet.synology.me/api/v1', + API_URI: 'https://hrmsbkk.case-collection.com/api/v1', }, test: { API_URI: 'http://localhost:5010/api/v1', diff --git a/src/components/PopupPrivacy.vue b/src/components/PopupPrivacy.vue new file mode 100644 index 0000000..5677e9d --- /dev/null +++ b/src/components/PopupPrivacy.vue @@ -0,0 +1,315 @@ + + + + + diff --git a/src/views/MainView.vue b/src/views/MainView.vue index 572e08b..37151eb 100644 --- a/src/views/MainView.vue +++ b/src/views/MainView.vue @@ -13,6 +13,7 @@ import type { notiType } from '@/interface/index/Main' import type { Noti } from '@/interface/response/Main' import DialogHeader from '@/components/DialogHeader.vue' +import PopupPrivacy from '@/components/PopupPrivacy.vue' const mixin = useCounterMixin() const { @@ -23,6 +24,7 @@ const { success, showLoader, } = mixin + const router = useRouter() const $q = useQuasar() @@ -53,6 +55,9 @@ const reNewPassWord = ref('') const isPwdOld = ref(true) const isPwdNewOld = ref(true) const isPwdReNewOld = ref(true) + +const modalPrivacy = ref(false) + /** * ฟังก์ชั่นดึงข้อมูลจำนวนการแจ้งเตือน */ @@ -168,6 +173,7 @@ async function fetchKeycloakPosition() { .get(config.API.keycloakPosition()) .then(async (res) => { const data = await res.data.result + modalPrivacy.value = !data.privacyCheckin ? true : false //เช็คว่ามีรูปไหม ถ้ามีรูปเรียกข้อมูลรูป if (data.avatarName) { await getImg(data.profileId, data.avatarName) @@ -599,6 +605,8 @@ onMounted(async () => { + +