diff --git a/.claude/agent-memory/hrms-checkin-expert/MEMORY.md b/.claude/agent-memory/hrms-checkin-expert/MEMORY.md
new file mode 100644
index 0000000..bb4f782
--- /dev/null
+++ b/.claude/agent-memory/hrms-checkin-expert/MEMORY.md
@@ -0,0 +1,14 @@
+# HRMS Check-in Expert Memory
+
+## Features
+
+- [No Position Assignment Page](feature_no_position_page.md) - Implementation for users without organization position assignment
+
+## Project Issues & Fixes
+
+- [Position Orientation Change Fix](issue_position_orientation_change_fix.md) - Fix for position map not displaying on screen orientation changes
+- [Active Camera Scope](project_active_camera_scope.md) - Current camera issue work should stay in HomeView.vue, not legacy MapView.vue
+- [Front Camera Preview Alignment](issue_front_camera_preview_alignment.md) - Keep popup preview orientation aligned with normalized saved photos
+- [iOS Native Photo Mirroring](issue_ios_native_photo_mirroring.md) - Do not flip iOS native-capture photos during normalization
+- [iOS Native Camera Popup](issue_ios_native_camera_popup_control.md) - Inline-first on iOS; native activates only after inline fails (prior native-first seed was reverted)
+- [iOS 16 Inline White Preview](issue_ios16_inline_camera_white_preview.md) - Safari iOS 16 white preview needs single mount plus explicit video readiness
diff --git a/.claude/agent-memory/hrms-checkin-expert/feature_no_position_page.md b/.claude/agent-memory/hrms-checkin-expert/feature_no_position_page.md
new file mode 100644
index 0000000..c72acc5
--- /dev/null
+++ b/.claude/agent-memory/hrms-checkin-expert/feature_no_position_page.md
@@ -0,0 +1,68 @@
+---
+name: No Position Assignment Page
+description: Feature implementation for users without organization position assignment
+type: reference
+---
+
+## No Position Assignment Page Feature
+
+When a user doesn't have a position assignment (สังกัด), they are redirected to a dedicated page explaining they are not part of the organization structure.
+
+### Files Created/Modified
+
+1. **Created:** `/Users/waruneeta/Desktop/ChamomindWorking/HRMSProject/hrms-checkin/src/views/NoPositionView.vue`
+   - Displays message in Thai: "ไม่พบข้อมูลสังกัด"
+   - Shows icon and explanation text
+   - "ตกลง" (OK) button that shows confirmation dialog
+   - After confirmation, performs logout and clears positionKeycloak store
+
+2. **Modified:** `/Users/waruneeta/Desktop/ChamomindWorking/HRMSProject/hrms-checkin/src/router/index.ts`
+   - Added new route `/no-position` with `Auth: false`
+   - Enhanced router guard to check for position data
+   - Redirects to `/no-position` if user has no organization assignment
+
+3. **Modified:** `/Users/waruneeta/Desktop/ChamomindWorking/HRMSProject/hrms-checkin/src/views/MainView.vue`
+   - Updated `fetchKeycloakPosition()` function
+   - Checks if `organization` object exists and has any data
+   - Redirects to `/no-position` if no organization data found
+
+### Logic Flow
+
+1. User logs in successfully
+2. `MainView.vue` calls `fetchKeycloakPosition()` in `onMounted()`
+3. API returns position data from `/org/profile/keycloak/position`
+4. System checks if `organization` object has any non-null values (root, child1-4)
+5. If no organization data exists:
+   - User is redirected to `/no-position`
+   - User sees message explaining they need to contact staff
+   - User clicks "ตกลง" to logout
+   - Staff adds them to organization structure
+   - User can login again
+
+### Position Data Structure
+
+```typescript
+interface KeycloakPosition {
+  privacyCheckin: boolean
+  avatarName?: string
+  profileId: string
+  organization?: Organization
+}
+
+interface Organization {
+  root?: string
+  child1?: string
+  child2?: string
+  child3?: string
+  child4?: string
+}
+```
+
+A user is considered to have "no position" when all organization fields (root, child1, child2, child3, child4) are null or undefined.
+
+### Thai UI Messages
+
+- Page title: "ไม่พบข้อมูลสังกัด"
+- Description: "ท่านยังไม่มีสังกัดในโครงสร้างองค์กร กรุณาติดต่อเจ้าหน้าที่เพื่อดำเนินการเพิ่มข้อมูล"
+- Confirmation dialog: "ยืนยันการออกจากระบบ" - "ท่านจะถูกนำออกจากระบบเพื่อให้เจ้าหน้าที่ดำเนินการเพิ่มข้อมูลสังกัดในโครงสร้างองค์กร"
+- Button: "ตกลง"
diff --git a/.claude/agent-memory/hrms-checkin-expert/issue_front_camera_preview_alignment.md b/.claude/agent-memory/hrms-checkin-expert/issue_front_camera_preview_alignment.md
new file mode 100644
index 0000000..f78b23d
--- /dev/null
+++ b/.claude/agent-memory/hrms-checkin-expert/issue_front_camera_preview_alignment.md
@@ -0,0 +1,11 @@
+---
+name: front_camera_preview_alignment
+description: HomeView inline camera flow should show a non-mirrored preview and keep the saved/uploaded image in the same orientation the user saw while shooting
+type: project
+---
+
+When fixing front-camera capture issues in `HomeView.vue`, keep the in-page preview and the final saved/uploaded image in the same non-mirrored orientation.
+
+**Why:** Users rejected flows where the live in-page preview looked mirrored or differed from the final image. The expected behavior is “what I see while shooting is what gets used.”
+
+**How to apply:** In the inline `simple-vue-camera` flow, avoid extra front-camera mirroring in either preview styling or snapshot normalization. Treat the in-page preview as the canonical orientation for `img`/`fileImg`.
diff --git a/.claude/agent-memory/hrms-checkin-expert/issue_ios16_inline_camera_white_preview.md b/.claude/agent-memory/hrms-checkin-expert/issue_ios16_inline_camera_white_preview.md
new file mode 100644
index 0000000..791f98e
--- /dev/null
+++ b/.claude/agent-memory/hrms-checkin-expert/issue_ios16_inline_camera_white_preview.md
@@ -0,0 +1,11 @@
+---
+name: ios16-inline-camera-white-preview
+description: Safari iOS 16 inline preview can stay white when multiple simple-vue-camera instances mount and playback readiness is assumed too early
+type: project
+---
+
+In `HomeView.vue`, Safari on iOS 16.x can show a white in-page camera preview when more than one `simple-vue-camera` instance is mounted for responsive layouts and the app treats `camera.start()` as sufficient proof that the preview is rendering.
+
+**Why:** `simple-vue-camera` uses a hard-coded `id="video"` internally and does not explicitly call `video.play()` during `start()`. On mobile/xs, mounting both desktop and mobile camera components at once creates a fragile setup for Safari, where the active preview can remain white even though permission and stream startup succeeded.
+
+**How to apply:** Keep only the active responsive camera instance mounted in `HomeView.vue`, and after `camera.start()` explicitly prepare/check the underlying video element (`playsinline`, `muted`, `play()`, non-zero dimensions, ready state). If the preview still does not become render-ready, remount once and then fall back to native capture.
diff --git a/.claude/agent-memory/hrms-checkin-expert/issue_ios_native_camera_popup_control.md b/.claude/agent-memory/hrms-checkin-expert/issue_ios_native_camera_popup_control.md
new file mode 100644
index 0000000..22792d0
--- /dev/null
+++ b/.claude/agent-memory/hrms-checkin-expert/issue_ios_native_camera_popup_control.md
@@ -0,0 +1,11 @@
+---
+name: ios_native_camera_popup_control
+description: iOS uses inline camera first (same as Android); native fallback triggers only after inline fails. The prior "native-first on iOS" approach was reverted per product requirement.
+type: project
+---
+
+In `HomeView.vue`, the inline camera is **always attempted first** on iOS (and every other platform).  The hidden `<input type="file" capture="user">` is only activated by `switchToNativePhotoCapture()` / `enableNativePhotoCaptureFallback()` after inline capture is proven to fail.
+
+**Why:** The product requirement is "use inline camera whenever the device supports inline capture; use native device capture only when inline is not supported or fails."  iOS Safari supports `getUserMedia` since iOS 14.3, so inline-first is viable.  A prior session hard-coded `useNativePhotoCapture = computed(() => isIOSDevice || preferNativePhotoCapture.value)`, bypassing inline on iOS entirely — that line was reverted.
+
+**How to apply:** `preferNativePhotoCapture` must start `false` on all devices.  Never seed it with `isIOSDevice`.  All failure paths (`openCamera` permission denied, `camera.start()` throw, invalid snapshot blob, invalid image on submit) already call `switchToNativePhotoCapture()` which sets `preferNativePhotoCapture = true` so subsequent taps go directly to native — covering the first-tap fallback automatically.
diff --git a/.claude/agent-memory/hrms-checkin-expert/issue_ios_native_photo_mirroring.md b/.claude/agent-memory/hrms-checkin-expert/issue_ios_native_photo_mirroring.md
new file mode 100644
index 0000000..77f33ef
--- /dev/null
+++ b/.claude/agent-memory/hrms-checkin-expert/issue_ios_native_photo_mirroring.md
@@ -0,0 +1,11 @@
+---
+name: ios_native_photo_mirroring
+description: Native photo capture on iOS in HomeView should not be horizontally mirrored during normalization
+type: project
+---
+
+For `HomeView.vue`, native photo capture on iOS should not apply horizontal mirroring during image normalization.
+
+**Why:** The iOS fallback uses the native still-photo picker, and the returned photo can already be in the correct orientation. Applying the same mirror correction used for other front-camera paths flips the image incorrectly on iOS.
+
+**How to apply:** Keep platform-specific normalization for native capture. Do not assume the iOS file-input photo path behaves the same as `simple-vue-camera` snapshots or Android fallback capture.
diff --git a/.claude/agent-memory/hrms-checkin-expert/issue_position_orientation_change.md b/.claude/agent-memory/hrms-checkin-expert/issue_position_orientation_change.md
new file mode 100644
index 0000000..7abffd3
--- /dev/null
+++ b/.claude/agent-memory/hrms-checkin-expert/issue_position_orientation_change.md
@@ -0,0 +1,48 @@
+---
+name: position_orientation_change_fix
+description: Fix for position map not displaying on screen orientation changes
+type: project
+---
+
+## Issue: Position/Geolocation Not Displaying on Screen Orientation Changes
+
+**Problem:**
+The ArcGIS map component (`AscGISMap.vue`) failed to display or update position when the screen orientation changed between portrait and landscape modes.
+
+**Root Cause:**
+1. The component uses `v-if="$q.screen.gt.xs"` for conditional rendering of different layouts
+2. When orientation changes, the ArcGIS MapView doesn't automatically resize to fit the new container dimensions
+3. ArcGIS MapView requires manual `resize()` call when its container's size changes
+
+**Solution Implemented:**
+Added screen resize handling to `src/components/AscGISMap.vue`:
+
+1. **Added state tracking:**
+   - `isMapInitialized` ref to track when map is ready
+   - `isInitializing` ref to prevent concurrent initializations
+
+2. **Added `handleMapResize()` function:**
+   - Checks if mapView exists and isn't destroyed
+   - Uses `nextTick()` to ensure DOM updates complete before resizing
+   - Calls `mapView.value.resize()` to update map dimensions
+
+3. **Added watcher on `$q.screen.gt.xs`:**
+   - Triggers when screen size crosses the xs breakpoint
+   - Waits for DOM update via `nextTick()`
+   - Calls `handleMapResize()` to adjust map
+
+4. **Added window resize event listener:**
+   - Falls back for orientation changes that might not trigger Quasar's screen watcher
+   - Debounced with 300ms timeout to avoid excessive calls
+   - Properly cleaned up on component unmount
+
+**Files Modified:**
+- `src/components/AscGISMap.vue` - Added resize handling logic
+
+**Best Practices Applied:**
+- Proper cleanup of event listeners in `onBeforeUnmount`
+- Debouncing resize events for performance
+- Using `nextTick()` to ensure DOM synchronization
+- Checking for destroyed state before calling map methods
+
+**Note:** The Google Maps component (`MapCheckin.vue`) was not affected as `vue3-google-map` handles resize automatically.
diff --git a/.claude/agent-memory/hrms-checkin-expert/project_active_camera_scope.md b/.claude/agent-memory/hrms-checkin-expert/project_active_camera_scope.md
new file mode 100644
index 0000000..a10c142
--- /dev/null
+++ b/.claude/agent-memory/hrms-checkin-expert/project_active_camera_scope.md
@@ -0,0 +1,11 @@
+---
+name: Active camera investigation scope
+description: Current camera issue investigations should focus on HomeView.vue; the legacy Google Map MapView.vue flow is not in active use
+type: project
+---
+
+Current camera issue work should focus on `HomeView.vue`; do not investigate or modify the legacy Google Map `MapView.vue` flow for this issue.
+
+**Why:** The user clarified that `MapView.vue` is an older Google Map implementation from earlier work and is not the path currently used in production for this check-in flow.
+
+**How to apply:** For follow-up debugging or fixes related to the current camera/upload issue, scope analysis and implementation to `HomeView.vue` unless the user explicitly re-opens `MapView.vue`.
diff --git a/.claude/agents/hrms-checkin-expert.md b/.claude/agents/hrms-checkin-expert.md
new file mode 100644
index 0000000..0e771b6
--- /dev/null
+++ b/.claude/agents/hrms-checkin-expert.md
@@ -0,0 +1,234 @@
+---
+name: "hrms-checkin-expert"
+description: "Use this agent when implementing or modifying check-in/check-out functionality in the HRMS application. This includes:\\n\\n<example>\\nContext: User is developing a new check-in validation feature.\\nuser: \"I need to add validation to prevent duplicate check-ins within the same hour\"\\nassistant: \"I'll use the hrms-checkin-expert agent to implement this validation following best practices.\"\\n<commentary>\\nSince this is core check-in functionality that requires careful consideration of edge cases and performance, the specialized agent should handle it.\\n</commentary>\\n</example>\\n\\n<example>\\nContext: User is refactoring the geolocation verification logic.\\nuser: \"The location verification is taking too long. Can you optimize it?\"\\nassistant: \"Let me use the hrms-checkin-expert agent to analyze and optimize the geolocation verification performance.\"\\n<commentary>\\nPerformance optimization of check-in features requires deep knowledge of the system architecture and best practices.\\n</commentary>\\n</example>\\n\\n<example>\\nContext: User has just written a new API function for check-in history.\\nuser: \"Here's the new function to fetch check-in history with pagination\"\\nassistant: \"Great! Now I'll use the hrms-checkin-expert agent to review this code for best practices and potential issues.\"\\n<commentary>\\nCode review of check-in-related code should be done by the specialized agent to ensure it meets performance and quality standards.\\n</commentary>\\n</example>\\n\\n<example>\\nContext: User is about to implement camera integration for photo verification.\\nuser: \"I need to add photo capture when users check in\"\\nassistant: \"I'll engage the hrms-checkin-expert agent to implement this feature with proper error handling and privacy considerations.\"\\n<commentary>\\nCamera integration for check-in requires expertise in both the technical implementation and the privacy/consent flow.\\n</commentary>\\n</example>"
+model: opus
+color: red
+memory: project
+---
+
+You are a Senior Vue 3 Developer specializing in the HRMS Check-in/Check-out system for Bangkok Metropolitan Administration (BMA). You have deep expertise in Vue 3 Composition API, TypeScript, Pinia state management, and geolocation-based attendance systems.
+
+**Your Core Responsibilities:**
+
+1. **Performance Optimization**:
+   - Minimize redundant API calls and state updates
+   - Use computed properties and watchers efficiently
+   - Implement lazy loading for map APIs and camera features
+   - Optimize re-renders by properly structuring reactive data
+   - Debounce user inputs and location updates (300-500ms)
+   - Cache API responses when appropriate (check-in history, user position)
+
+2. **Best Practice Implementation**:
+   - Follow Vue 3 Composition API patterns with `<script setup>`
+   - Use TypeScript interfaces for all API responses and data structures
+   - Implement proper error boundaries and error handling
+   - Write reusable composables for common logic (location, camera, permissions)
+   - Keep components focused and single-purpose
+   - Use Pinia stores for shared state, component `ref`/`reactive` for local state
+   - Implement proper cleanup in `onUnmounted` hooks (event listeners, timers)
+
+3. **Check-in System Specifics**:
+   - Validate time windows for check-in/check-out (consider late arrival thresholds)
+   - Handle geolocation verification with appropriate timeout and error states
+   - Implement camera capture with proper permission handling and fallbacks
+   - Respect privacy consent flow before accessing sensitive features
+   - Handle offline scenarios gracefully (PWA capabilities)
+   - Prevent duplicate check-ins within time windows
+   - Convert dates to Thai Buddhist Era (BE) for all user-facing displays
+   - Use `date-fns-tz` with Asia/Bangkok timezone for accurate time handling
+
+4. **Code Quality Standards**:
+   - Write self-documenting code with clear variable names in English
+   - Add TypeScript types for all function parameters and return values
+   - Include JSDoc comments for complex functions and composables
+   - Use async/await consistently for asynchronous operations
+   - Implement proper loading states during API calls and location requests
+   - Handle edge cases: network failures, permission denials, timeout scenarios
+   - Use environment variables for all configuration (API URLs, SSO endpoints)
+
+5. **Error Handling Patterns**:
+   - Use `messageError()` from the mixin store for consistent error dialogs
+   - Implement user-friendly Thai error messages
+   - Log technical errors for debugging while showing user-friendly messages
+   - Handle 401 responses with automatic logout via Keycloak
+   - Prevent dialog overlap using `activeErrorDialog` tracking
+
+6. **Project-Specific Conventions**:
+   - Import from src using `@` alias (e.g., `@/api/checkin`)
+   - Use Quasar components (`q-btn`, `q-dialog`, `q-spinner-cube`, etc.)
+   - Follow existing API structure: endpoints in `src/api/`, interfaces in `src/interface/response/`
+   - Thai language for all UI text and user-facing content
+   - Status labels: ABSENT→'ขาดราชการ', NORMAL→'ปกติ', LATE→'สาย'
+   - Date formatting: use `date2Thai()` and `monthYear2Thai()` from mixin store
+   - API date format: `yyyy-MM-dd` or `yyyy-MM-dd HH:mm:ss`
+
+7. **Testing Considerations**:
+   - Write testable code with pure functions where possible
+   - Consider unit tests for composables and utility functions
+   - Handle edge cases in tests: offline mode, permission denials, timeouts
+
+8. **Security & Privacy**:
+   - Never expose tokens or sensitive data in logs or error messages
+   - Always check privacy consent before accessing camera/location
+   - Validate all user inputs on both client and server side
+   - Use HTTPS for all API communications
+
+**Update your agent memory** as you discover:
+- Common performance bottlenecks in the check-in flow (e.g., slow location verification, API response times)
+- Recurring bugs or edge cases in geolocation/camera handling
+- Successful optimization patterns and their impact
+- Code patterns that violate best practices and should be refactored
+- Business logic rules for check-in validation (time windows, duplicate prevention, etc.)
+
+**When Implementing Features:**
+1. First, analyze the existing codebase patterns in `src/api/`, `src/stores/`, and `src/composables/`
+2. Consider the full user flow including error states and loading indicators
+3. Think about offline scenarios and how the app should behave
+4. Ensure proper cleanup of resources (timers, event listeners, subscriptions)
+5. Test with slow networks and permission denials
+6. Verify Thai date formatting is correct for all user-facing dates
+
+**When Reviewing Code:**
+1. Check for performance anti-patterns (unnecessary re-renders, missing debounce, redundant API calls)
+2. Verify proper TypeScript typing and null safety
+3. Ensure error handling covers all edge cases
+4. Confirm cleanup in lifecycle hooks
+5. Check for adherence to Quasar and Vue 3 best practices
+6. Validate that privacy consent is respected for sensitive features
+
+You prioritize code maintainability, performance, and user experience while following the established patterns in this HRMS codebase.
+
+# Persistent Agent Memory
+
+You have a persistent, file-based memory system at `/Users/waruneeta/Desktop/ChamomindWorking/HRMSProject/hrms-checkin/.claude/agent-memory/hrms-checkin-expert/`. This directory already exists — write to it directly with the Write tool (do not run mkdir or check for its existence).
+
+You should build up this memory system over time so that future conversations can have a complete picture of who the user is, how they'd like to collaborate with you, what behaviors to avoid or repeat, and the context behind the work the user gives you.
+
+If the user explicitly asks you to remember something, save it immediately as whichever type fits best. If they ask you to forget something, find and remove the relevant entry.
+
+## Types of memory
+
+There are several discrete types of memory that you can store in your memory system:
+
+<types>
+<type>
+    <name>user</name>
+    <description>Contain information about the user's role, goals, responsibilities, and knowledge. Great user memories help you tailor your future behavior to the user's preferences and perspective. Your goal in reading and writing these memories is to build up an understanding of who the user is and how you can be most helpful to them specifically. For example, you should collaborate with a senior software engineer differently than a student who is coding for the very first time. Keep in mind, that the aim here is to be helpful to the user. Avoid writing memories about the user that could be viewed as a negative judgement or that are not relevant to the work you're trying to accomplish together.</description>
+    <when_to_save>When you learn any details about the user's role, preferences, responsibilities, or knowledge</when_to_save>
+    <how_to_use>When your work should be informed by the user's profile or perspective. For example, if the user is asking you to explain a part of the code, you should answer that question in a way that is tailored to the specific details that they will find most valuable or that helps them build their mental model in relation to domain knowledge they already have.</how_to_use>
+    <examples>
+    user: I'm a data scientist investigating what logging we have in place
+    assistant: [saves user memory: user is a data scientist, currently focused on observability/logging]
+
+    user: I've been writing Go for ten years but this is my first time touching the React side of this repo
+    assistant: [saves user memory: deep Go expertise, new to React and this project's frontend — frame frontend explanations in terms of backend analogues]
+    </examples>
+</type>
+<type>
+    <name>feedback</name>
+    <description>Guidance the user has given you about how to approach work — both what to avoid and what to keep doing. These are a very important type of memory to read and write as they allow you to remain coherent and responsive to the way you should approach work in the project. Record from failure AND success: if you only save corrections, you will avoid past mistakes but drift away from approaches the user has already validated, and may grow overly cautious.</description>
+    <when_to_save>Any time the user corrects your approach ("no not that", "don't", "stop doing X") OR confirms a non-obvious approach worked ("yes exactly", "perfect, keep doing that", accepting an unusual choice without pushback). Corrections are easy to notice; confirmations are quieter — watch for them. In both cases, save what is applicable to future conversations, especially if surprising or not obvious from the code. Include *why* so you can judge edge cases later.</when_to_save>
+    <how_to_use>Let these memories guide your behavior so that the user does not need to offer the same guidance twice.</how_to_use>
+    <body_structure>Lead with the rule itself, then a **Why:** line (the reason the user gave — often a past incident or strong preference) and a **How to apply:** line (when/where this guidance kicks in). Knowing *why* lets you judge edge cases instead of blindly following the rule.</body_structure>
+    <examples>
+    user: don't mock the database in these tests — we got burned last quarter when mocked tests passed but the prod migration failed
+    assistant: [saves feedback memory: integration tests must hit a real database, not mocks. Reason: prior incident where mock/prod divergence masked a broken migration]
+
+    user: stop summarizing what you just did at the end of every response, I can read the diff
+    assistant: [saves feedback memory: this user wants terse responses with no trailing summaries]
+
+    user: yeah the single bundled PR was the right call here, splitting this one would've just been churn
+    assistant: [saves feedback memory: for refactors in this area, user prefers one bundled PR over many small ones. Confirmed after I chose this approach — a validated judgment call, not a correction]
+    </examples>
+</type>
+<type>
+    <name>project</name>
+    <description>Information that you learn about ongoing work, goals, initiatives, bugs, or incidents within the project that is not otherwise derivable from the code or git history. Project memories help you understand the broader context and motivation behind the work the user is doing within this working directory.</description>
+    <when_to_save>When you learn who is doing what, why, or by when. These states change relatively quickly so try to keep your understanding of this up to date. Always convert relative dates in user messages to absolute dates when saving (e.g., "Thursday" → "2026-03-05"), so the memory remains interpretable after time passes.</when_to_save>
+    <how_to_use>Use these memories to more fully understand the details and nuance behind the user's request and make better informed suggestions.</how_to_use>
+    <body_structure>Lead with the fact or decision, then a **Why:** line (the motivation — often a constraint, deadline, or stakeholder ask) and a **How to apply:** line (how this should shape your suggestions). Project memories decay fast, so the why helps future-you judge whether the memory is still load-bearing.</body_structure>
+    <examples>
+    user: we're freezing all non-critical merges after Thursday — mobile team is cutting a release branch
+    assistant: [saves project memory: merge freeze begins 2026-03-05 for mobile release cut. Flag any non-critical PR work scheduled after that date]
+
+    user: the reason we're ripping out the old auth middleware is that legal flagged it for storing session tokens in a way that doesn't meet the new compliance requirements
+    assistant: [saves project memory: auth middleware rewrite is driven by legal/compliance requirements around session token storage, not tech-debt cleanup — scope decisions should favor compliance over ergonomics]
+    </examples>
+</type>
+<type>
+    <name>reference</name>
+    <description>Stores pointers to where information can be found in external systems. These memories allow you to remember where to look to find up-to-date information outside of the project directory.</description>
+    <when_to_save>When you learn about resources in external systems and their purpose. For example, that bugs are tracked in a specific project in Linear or that feedback can be found in a specific Slack channel.</when_to_save>
+    <how_to_use>When the user references an external system or information that may be in an external system.</how_to_use>
+    <examples>
+    user: check the Linear project "INGEST" if you want context on these tickets, that's where we track all pipeline bugs
+    assistant: [saves reference memory: pipeline bugs are tracked in Linear project "INGEST"]
+
+    user: the Grafana board at grafana.internal/d/api-latency is what oncall watches — if you're touching request handling, that's the thing that'll page someone
+    assistant: [saves reference memory: grafana.internal/d/api-latency is the oncall latency dashboard — check it when editing request-path code]
+    </examples>
+</type>
+</types>
+
+## What NOT to save in memory
+
+- Code patterns, conventions, architecture, file paths, or project structure — these can be derived by reading the current project state.
+- Git history, recent changes, or who-changed-what — `git log` / `git blame` are authoritative.
+- Debugging solutions or fix recipes — the fix is in the code; the commit message has the context.
+- Anything already documented in CLAUDE.md files.
+- Ephemeral task details: in-progress work, temporary state, current conversation context.
+
+These exclusions apply even when the user explicitly asks you to save. If they ask you to save a PR list or activity summary, ask what was *surprising* or *non-obvious* about it — that is the part worth keeping.
+
+## How to save memories
+
+Saving a memory is a two-step process:
+
+**Step 1** — write the memory to its own file (e.g., `user_role.md`, `feedback_testing.md`) using this frontmatter format:
+
+```markdown
+---
+name: {{memory name}}
+description: {{one-line description — used to decide relevance in future conversations, so be specific}}
+type: {{user, feedback, project, reference}}
+---
+
+{{memory content — for feedback/project types, structure as: rule/fact, then **Why:** and **How to apply:** lines}}
+```
+
+**Step 2** — add a pointer to that file in `MEMORY.md`. `MEMORY.md` is an index, not a memory — each entry should be one line, under ~150 characters: `- [Title](file.md) — one-line hook`. It has no frontmatter. Never write memory content directly into `MEMORY.md`.
+
+- `MEMORY.md` is always loaded into your conversation context — lines after 200 will be truncated, so keep the index concise
+- Keep the name, description, and type fields in memory files up-to-date with the content
+- Organize memory semantically by topic, not chronologically
+- Update or remove memories that turn out to be wrong or outdated
+- Do not write duplicate memories. First check if there is an existing memory you can update before writing a new one.
+
+## When to access memories
+- When memories seem relevant, or the user references prior-conversation work.
+- You MUST access memory when the user explicitly asks you to check, recall, or remember.
+- If the user says to *ignore* or *not use* memory: Do not apply remembered facts, cite, compare against, or mention memory content.
+- Memory records can become stale over time. Use memory as context for what was true at a given point in time. Before answering the user or building assumptions based solely on information in memory records, verify that the memory is still correct and up-to-date by reading the current state of the files or resources. If a recalled memory conflicts with current information, trust what you observe now — and update or remove the stale memory rather than acting on it.
+
+## Before recommending from memory
+
+A memory that names a specific function, file, or flag is a claim that it existed *when the memory was written*. It may have been renamed, removed, or never merged. Before recommending it:
+
+- If the memory names a file path: check the file exists.
+- If the memory names a function or flag: grep for it.
+- If the user is about to act on your recommendation (not just asking about history), verify first.
+
+"The memory says X exists" is not the same as "X exists now."
+
+A memory that summarizes repo state (activity logs, architecture snapshots) is frozen in time. If the user asks about *recent* or *current* state, prefer `git log` or reading the code over recalling the snapshot.
+
+## Memory and other forms of persistence
+Memory is one of several persistence mechanisms available to you as you assist the user in a given conversation. The distinction is often that memory can be recalled in future conversations and should not be used for persisting information that is only useful within the scope of the current conversation.
+- When to use or update a plan instead of memory: If you are about to start a non-trivial implementation task and would like to reach alignment with the user on your approach you should use a Plan rather than saving this information to memory. Similarly, if you already have a plan within the conversation and you have changed your approach persist that change by updating the plan rather than saving a memory.
+- When to use or update tasks instead of memory: When you need to break your work in current conversation into discrete steps or keep track of your progress use tasks instead of saving to memory. Tasks are great for persisting information about the work that needs to be done in the current conversation, but memory should be reserved for information that will be useful in future conversations.
+
+- Since this memory is project-scope and shared with your team via version control, tailor your memories to this project
+
+## MEMORY.md
+
+Your MEMORY.md is currently empty. When you save new memories, they will appear here.
diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 0000000..ab969b1
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1,185 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Project Overview
+
+This is an HRMS (Human Resource Management System) check-in/check-out web application built for the Bangkok Metropolitan Administration (BMA). The application allows employees to record their work attendance using geolocation verification and camera features.
+
+**Tech Stack:**
+- Vue 3 with Composition API and TypeScript 4.7.4
+- Vite for build tooling
+- Quasar Framework for UI components
+- Pinia for state management
+- Vue Router for routing
+- Keycloak for authentication
+- ArcGIS API and Google Maps for location features
+- PWA capabilities with offline support
+- Docker deployment with nginx
+
+**Development Server:** Runs on port 3008
+
+## Common Commands
+
+```bash
+# Development
+npm run dev                    # Start dev server on port 3008
+
+# Building
+npm run build                  # Build for production
+npm run preview                # Preview production build on port 3008
+
+# Testing
+npm run test:unit              # Run unit tests with vitest
+npm run test:e2e               # Run e2e tests with cypress
+npm run test:e2e:dev           # Run cypress in dev mode
+
+# Code Quality
+npm run lint                   # Lint and auto-fix code
+npm run format                 # Format code with prettier
+npm run type-check             # TypeScript type checking
+
+# Docker
+docker buildx build --platform=linux/amd64 -f docker/Dockerfile . -t hrms-checkin:0.1
+```
+
+## Architecture
+
+### Directory Structure
+
+```
+src/
+├── api/               # API layer modules (checkin, history, message)
+├── components/        # Reusable Vue components
+├── composables/       # Vue composables (e.g., usePermissions)
+├── interface/         # TypeScript type definitions
+│   └── response/      # API response types
+├── plugins/           # Vue plugins (auth, http, keycloak)
+├── router/            # Vue Router configuration
+├── stores/            # Pinia stores for state management
+├── style/             # Global styles and Quasar variables
+├── utils/             # Utility functions
+└── views/             # Page-level Vue components
+```
+
+### Key Architecture Patterns
+
+**Authentication Flow:**
+- Uses Keycloak for SSO authentication
+- Tokens stored in cookies with `BMAHRISCKI_KEYCLOAK_IDENTITY` key
+- Auth state managed in `src/plugins/auth.ts`
+- Router guards enforce authentication on protected routes
+- 401 responses trigger automatic logout via axios interceptor
+
+**State Management:**
+- `stores/mixin.ts` - Global utilities (Thai date formatting, dialogs, loaders, error handling)
+- `stores/chekin.ts` - Check-in history and status management
+- `stores/privacy.ts` - Privacy consent management
+- `stores/positionKeycloak.ts` - User position/role data
+
+**API Layer:**
+- Base axios instance in `src/plugins/http.ts` with automatic token injection
+- API endpoints organized by feature in `src/api/`
+- Environment-specific API URLs configured in `src/api/index.ts`
+- Production API URL set via `VITE_API_URI_CONFIG` env variable
+
+**Routing:**
+- Main layout (`MainView`) wraps authenticated routes
+- Protected routes require `meta.Auth: true`
+- Auth check runs in router beforeEach guard
+- Public routes: `/login`, `/auth`, `/reset-password`, `/history`
+
+**Geolocation & Maps:**
+- ArcGIS JS API for advanced mapping features
+- Google Maps integration for location services
+- Camera integration for check-in photo verification
+- Privacy consent required before accessing camera/location
+
+**Date/Time Handling:**
+- Thai Buddhist calendar (BE) conversion (+543 years)
+- Thai month names (full and abbreviated)
+- `date-fns-tz` for timezone handling (Asia/Bangkok)
+- Fiscal year calculation (October start)
+
+### Component Conventions
+
+- Components use Quasar UI components (`q-btn`, `q-dialog`, etc.)
+- Thai language throughout the UI
+- Custom dialogs use `CustomDialog.vue` component
+- Loading states use Quasar's `QSpinnerCube`
+- Error dialogs prevent overlap with `activeErrorDialog` tracking
+
+### Localization
+
+- Quasar configured with Thai language (`quasar/lang/th`)
+- All UI text in Thai
+- Date formatting uses `date2Thai()` and `monthYear2Thai()` from mixin store
+- Status labels translated: ABSENT→'ขาดราชการ', NORMAL→'ปกติ', LATE→'สาย'
+
+### Environment Variables
+
+Required in `.env.production`:
+- `VITE_API_URI_CONFIG` - Production API base URL
+- `VITE_URL_SSO` - Keycloak SSO logout URL
+- `VITE_URL_USER` - User service URL for redirects
+- `VITE_URL_LANDING` - Landing page URL
+
+**Note:** `.env.local` uses `:` instead of `=` for variable assignment (non-standard format that works with the current setup)
+- `VITE_API_URI_CONFIG` - Production API base URL
+- `VITE_URL_SSO` - Keycloak SSO logout URL
+- `VITE_URL_USER` - User service URL for redirects
+
+### PWA Configuration
+
+- Auto-update registration with `vite-plugin-pwa`
+- Manifest: "HRMS-Checkin" / "HRMS Checkin"
+- Icons: 192x192 and 512x512 PNG
+- Service worker registered in `src/registerServiceWorker.ts`
+
+### Import Aliases
+
+- `@` is configured as an alias for the `src/` directory
+- Use this for all imports from within the source directory
+
+### Environment Variable Substitution (Docker)
+
+The Docker build uses a multi-stage pattern:
+1. **Build stage**: Node.js Alpine builds the static assets with `npm run build`
+2. **Production stage**: nginx serves the static files
+- Environment variables (`VITE_API_URI_CONFIG`, `VITE_URL_SSO`, `VITE_URL_LANDING`, `VITE_URL_USER`) are substituted at container runtime via `entrypoint.sh` using `sed`
+- Built JS files contain placeholder values that get replaced with actual values at startup
+
+### Testing Patterns
+
+- Unit tests: `*.spec.{js,ts}` - Run with Vitest in jsdom environment
+- E2E tests: `*.cy.{js,ts}` - Run with Cypress
+- E2E test server runs on port 4173 (via `start-server-and-test`)
+
+### HTTP Interceptor Behavior
+
+- The axios interceptor in `http.ts` detects 401/403 responses but automatic logout is currently disabled (commented out)
+- 401 handling is done manually in `messageError()` from the mixin store
+
+## Development Notes
+
+**When adding new features:**
+1. Create API functions in `src/api/`
+2. Define TypeScript interfaces in `src/interface/response/`
+3. Use Pinia stores for complex state, composables for reusable logic
+4. Follow Thai localization patterns for user-facing text
+5. Ensure privacy consent flow for camera/location features
+
+**When working with dates:**
+- Always use `date2Thai()` or `convertDateToAPI()` from mixin store
+- Dates stored in BE format (year + 543)
+- API expects `yyyy-MM-dd` or `yyyy-MM-dd HH:mm:ss` format
+
+**When handling errors:**
+- Use `messageError()` from mixin store for consistent error dialogs
+- 401 errors trigger automatic logout
+- Dialog overlap prevention built into error handling
+
+**When running tests:**
+- Unit tests use Vitest with jsdom environment
+- E2E tests use Cypress with baseUrl: `http://localhost:4173`
+- Test files follow pattern: `*.cy.{js,ts}` or `*.spec.{js,ts}`
diff --git a/package.json b/package.json
index 4f831c6..c36ed30 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
     "keycloak-js": "^22.0.2",
     "moment": "^2.29.4",
     "pinia": "^2.1.4",
+    "pinia-plugin-persistedstate": "^3.2.3",
     "quasar": "^2.11.1",
     "register-service-worker": "^1.7.2",
     "simple-vue-camera": "^1.1.3",
diff --git a/src/api/api.checkin.ts b/src/api/api.checkin.ts
index 28caa30..fe69e5f 100644
--- a/src/api/api.checkin.ts
+++ b/src/api/api.checkin.ts
@@ -9,7 +9,8 @@ export default {
   checkStatus: () => `${leave}/check-status`,
 
   keycloakLogSSO: `${env.API_URI}/org/keycloak/log/sso`,
-  keycloakPosition: () => `${env.API_URI}/org/profile/keycloak/position`,
+  keycloakPosition: () =>
+    `${env.API_URI}/org/profile/keycloak/position-checkin`,
   fileByFile: (name: string, group: string, id: string, fileName: string) =>
     `${urlFile}/file/${name}/${group}/${id}/${fileName}`,
 
diff --git a/src/assets/markers/marker-blue.svg b/src/assets/markers/marker-blue.svg
new file mode 100644
index 0000000..e617e4c
--- /dev/null
+++ b/src/assets/markers/marker-blue.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24" fill="none">
+  <path d="M12 2c-3.866 0-7 3.134-7 7 0 5.25 7 13 7 13s7-7.75 7-13c0-3.866-3.134-7-7-7Z" fill="#1E88E5"/>
+  <circle cx="12" cy="9" r="3" fill="#fff"/>
+</svg>
diff --git a/src/assets/markers/marker-red.svg b/src/assets/markers/marker-red.svg
new file mode 100644
index 0000000..39353ad
--- /dev/null
+++ b/src/assets/markers/marker-red.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24" fill="none">
+  <path d="M12 2c-3.866 0-7 3.134-7 7 0 5.25 7 13 7 13s7-7.75 7-13c0-3.866-3.134-7-7-7Z" fill="#E53935"/>
+  <circle cx="12" cy="9" r="3" fill="#fff"/>
+</svg>
diff --git a/src/components/AscGISMap.vue b/src/components/AscGISMap.vue
index 7651b7c..ec1eb0b 100644
--- a/src/components/AscGISMap.vue
+++ b/src/components/AscGISMap.vue
@@ -1,199 +1,415 @@
 <script setup lang="ts">
-import { ref } from 'vue'
+import {
+  computed,
+  ref,
+  shallowRef,
+  onBeforeUnmount,
+  onMounted,
+  watch,
+  nextTick,
+} from 'vue'
 import { loadModules } from 'esri-loader'
 import axios from 'axios'
 import { useCounterMixin } from '@/stores/mixin'
 import { useQuasar } from 'quasar'
 import { usePrivacyStore } from '@/stores/privacy'
+import markerRedUrl from '@/assets/markers/marker-red.svg?url'
+import markerBlueUrl from '@/assets/markers/marker-blue.svg?url'
 
 const mixin = useCounterMixin()
 const { messageError } = mixin
 const privacyStore = usePrivacyStore()
 
 const emit = defineEmits(['update:location'])
+
+// Accept initial POI from parent to prevent skeleton on re-mount
+const props = defineProps<{
+  initialPOI?: string
+}>()
+
 const $q = useQuasar()
 
+// Throttle mechanism to prevent excessive location updates
+const LOCATION_UPDATE_THROTTLE_MS = 500
+let lastLocationUpdate = 0
+
+// Track if map is initialized to prevent re-initialization
+const isMapInitialized = ref<boolean>(false)
+const isInitializing = ref<boolean>(false)
+const currentScreenSize = ref<boolean>($q.screen.gt.xs) // Track screen size to detect changes
+const mobileMapExpanded = ref<boolean>(true)
+
 function updateLocation(latitude: number, longitude: number, namePOI: string) {
+  const now = Date.now()
+  // Skip update if called too frequently (within throttle period)
+  if (now - lastLocationUpdate < LOCATION_UPDATE_THROTTLE_MS) {
+    return
+  }
+  lastLocationUpdate = now
   // ส่ง event ไปยัง parent component เพื่ออัพเดทค่า props
   emit('update:location', latitude, longitude, namePOI)
 }
 
-const poiPlaceName = ref<string>('') // ชื่อพื้นที่ใกล้เคียง
+const poiPlaceName = ref<string>(props.initialPOI || '') // ชื่อพื้นที่ใกล้เคียง - use initialPOI if provided
+const mapView = shallowRef<any>(null) // Store mapView reference for cleanup (use shallowRef to avoid reactivity issues)
+const desktopMapContainerRef = ref<HTMLElement | null>(null)
+const mobileMapContainerRef = ref<HTMLElement | null>(null)
+const isMapVisible = computed(
+  () => !!mapView.value && !mapView.value.destroyed && isMapInitialized.value
+)
 
-// Replace ArcGIS api key
+// Unique container ID for each component instance to avoid conflicts
+const mapContainerId = `mapViewDisplay_${Math.random()
+  .toString(36)
+  .substring(2, 9)}`
+
+// ArcGIS API key from environment variable
 const apiKey = ref<string>(
   'YLATgWuywoeRLHn6KImj5rg7UaP8bJoR9jiTldoCVBHlqFIebwMSA5wIXEmcYhwXwMHkmNISEYtUz3x0oiGIIx0bIXXnUwi0OzupoOEtDrQIsRPVtor7gaPpXEmH8TrNaMT3snf6zO_yujHLGzborg-L9aeAjTJn4ndL6f8qFmRzYcX93E2vyA-7XCufLYTRsdTE5Aq-9hnx1q9PmYVMqhAZpL7dWqn3JgO33fRXetk.'
-  // 'AAPK4f700a4324d04e9f8a1a134e0771ac45FXWawdCl-OotFfr52gz9XKxTDJTpDzw_YYcwbmKDDyAJswf14FoPyw0qBkN64DvP'
 )
 const zoomMap = ref<number>(18)
+const textTooltip = ref<string>(
+  'พื้นที่ใกล้เคียงคือ สถานที่สำคัญรอบตัวคุณ (ไม่ใช่ตำแหน่งปัจจุบัน)'
+)
+let attachRetryTimer: number | undefined
+let mapInitVersion = 0
+let isRecoveryReinitializing = false
+
+function getActiveMapContainer() {
+  return $q.screen.gt.xs
+    ? desktopMapContainerRef.value
+    : mobileMapContainerRef.value
+}
+
+async function waitForActiveMapContainer(maxAttempts = 25, delayMs = 120) {
+  for (let i = 0; i < maxAttempts; i += 1) {
+    await nextTick()
+    const container = getActiveMapContainer()
+
+    if (container && container.clientWidth > 0 && container.clientHeight > 0) {
+      return container
+    }
+
+    await new Promise((resolve) => setTimeout(resolve, delayMs))
+  }
+
+  return null
+}
+
+function clearAttachRetryTimer() {
+  if (attachRetryTimer) {
+    clearTimeout(attachRetryTimer)
+    attachRetryTimer = undefined
+  }
+}
+
+async function recoverMapByReinitialize() {
+  if (isRecoveryReinitializing) {
+    return
+  }
+
+  isRecoveryReinitializing = true
+
+  try {
+    mapInitVersion += 1
+    isInitializing.value = false
+    clearAttachRetryTimer()
+
+    if (mapView.value && !mapView.value.destroyed) {
+      mapView.value.destroy()
+      mapView.value = null
+    }
+
+    isMapInitialized.value = false
+    await nextTick()
+    await initializeMap()
+  } finally {
+    isRecoveryReinitializing = false
+  }
+}
+
+function reattachAndResizeMap(retry = 0) {
+  if (!mapView.value || mapView.value.destroyed) {
+    return
+  }
+
+  const activeContainer = getActiveMapContainer()
+
+  if (
+    !activeContainer ||
+    activeContainer.clientWidth === 0 ||
+    activeContainer.clientHeight === 0
+  ) {
+    if (retry < 15) {
+      clearAttachRetryTimer()
+      attachRetryTimer = window.setTimeout(() => {
+        reattachAndResizeMap(retry + 1)
+      }, 140)
+    } else if (!isRecoveryReinitializing) {
+      void recoverMapByReinitialize()
+    }
+    return
+  }
+
+  clearAttachRetryTimer()
+
+  nextTick(() => {
+    if (!mapView.value || mapView.value.destroyed) {
+      return
+    }
+
+    if (mapView.value.container !== activeContainer) {
+      mapView.value.container = null
+      mapView.value.container = activeContainer
+    }
+
+    mapView.value.resize()
+    mapView.value.requestRender?.()
+    mapView.value
+      .goTo(
+        {
+          center: mapView.value.center,
+          zoom: mapView.value.zoom,
+        },
+        { animate: false }
+      )
+      .catch(() => {
+        // Ignore interrupted goTo during rapid orientation changes.
+      })
+  })
+}
 
 async function initializeMap() {
+  if (isInitializing.value || (mapView.value && !mapView.value.destroyed)) {
+    return
+  }
+
+  const initVersion = ++mapInitVersion
+
+  isInitializing.value = true
+
   try {
     // Load modules of ArcGIS
-    loadModules([
-      'esri/config',
-      'esri/Map',
-      'esri/views/MapView',
-      'esri/geometry/Point',
-      'esri/Graphic',
-      'esri/layers/TileLayer',
-    ]).then(async ([esriConfig, Map, MapView, Point, Graphic, TileLayer]) => {
-      // Set apiKey
-      // esriConfig.apiKey =
-      //   'AAPK4f700a4324d04e9f8a1a134e0771ac45FXWawdCl-OotFfr52gz9XKxTDJTpDzw_YYcwbmKDDyAJswf14FoPyw0qBkN64DvP'
+    const [esriConfig, Map, MapView, Point, Graphic, TileLayer] =
+      await loadModules([
+        'esri/config',
+        'esri/Map',
+        'esri/views/MapView',
+        'esri/geometry/Point',
+        'esri/Graphic',
+        // 'esri/layers/TileLayer',
+      ])
+    // Set apiKey
+    // esriConfig.apiKey =
+    //   'AAPK4f700a4324d04e9f8a1a134e0771ac45FXWawdCl-OotFfr52gz9XKxTDJTpDzw_YYcwbmKDDyAJswf14FoPyw0qBkN64DvP'
 
-      // Create a FeatureLayer using a custom server URL
-      // const hillshadeLayer = new TileLayer({
-      //   url: `https://bmagis.bangkok.go.th/arcgis/rest/services/cache/BMA_3D_2D_Cache/MapServer`,
-      // })
+    // Create a FeatureLayer using a custom server URL
+    // const hillshadeLayer = new TileLayer({
+    //   url: `https://bmagis.bangkok.go.th/arcgis/rest/services/cache/BMA_3D_2D_Cache/MapServer`,
+    // })
 
-      const map = new Map({
-        basemap: 'streets',
-        // basemap: 'arcgis-topographic',
-        // layers: [hillshadeLayer],
-      })
+    const map = new Map({
+      basemap: 'streets',
+      // basemap: 'arcgis-topographic',
+      // layers: [hillshadeLayer],
+    })
 
-      navigator.geolocation.getCurrentPosition(async (position) => {
-        const { latitude, longitude } = position.coords
+    if (initVersion !== mapInitVersion) {
+      return
+    }
 
-        const mapView = new MapView({
-          container: 'mapViewDisplay',
-          map: map,
-          center: {
-            latitude: latitude,
-            longitude: longitude,
-          }, // Set the initial map center current position
-
-          zoom: zoomMap.value,
-          constraints: {
-            snapToZoom: false, // Disables snapping to the zoom level
-            minZoom: zoomMap.value, // Set minimum zoom level
-            maxZoom: zoomMap.value, // Set maximum zoom level (same as minZoom for fixed zoom)
-          },
-
-          ui: {
-            components: [], // Empty array to remove all default UI components
-          },
+    const position = await new Promise<GeolocationPosition>(
+      (resolve, reject) => {
+        navigator.geolocation.getCurrentPosition(resolve, reject, {
+          enableHighAccuracy: true,
+          timeout: 10000,
         })
+      }
+    )
 
-        // ตำแหน่งของผู้ใช้
-        const userPoint = new Point({ longitude, latitude })
-        const userSymbol = {
+    if (initVersion !== mapInitVersion) {
+      return
+    }
+
+    const { latitude, longitude } = position.coords
+
+    const mapContainer = await waitForActiveMapContainer()
+
+    if (!mapContainer || initVersion !== mapInitVersion) {
+      isMapInitialized.value = false
+      return
+    }
+
+    mapView.value = new MapView({
+      container: mapContainer,
+      map: map,
+      center: {
+        latitude: latitude,
+        longitude: longitude,
+      }, // Set the initial map center current position
+
+      zoom: zoomMap.value,
+      constraints: {
+        snapToZoom: false, // Disables snapping to the zoom level
+        minZoom: zoomMap.value, // Set minimum zoom level
+        maxZoom: zoomMap.value, // Set maximum zoom level (same as minZoom for fixed zoom)
+      },
+
+      ui: {
+        components: [], // Empty array to remove all default UI components
+      },
+    })
+
+    await mapView.value.when()
+
+    if (initVersion !== mapInitVersion) {
+      if (mapView.value && !mapView.value.destroyed) {
+        mapView.value.destroy()
+      }
+      mapView.value = null
+      return
+    }
+
+    isMapInitialized.value = true
+    reattachAndResizeMap()
+
+    // ตำแหน่งของผู้ใช้
+    const userPoint = new Point({ longitude, latitude })
+    const userSymbol = {
+      type: 'picture-marker',
+      url: markerRedUrl,
+      width: '32px',
+      height: '32px',
+    }
+    const userGraphic = new Graphic({
+      geometry: userPoint,
+      symbol: userSymbol,
+    })
+    mapView.value.graphics.add(userGraphic)
+    // Get POI place ยิงไปขอที่ server ของกทม.ก่อน
+    // await axios
+    //   .get(
+    //     'https://bmagis.bangkok.go.th/portal/sharing/servers/e4732c3a9fe549ab8bc697573b468f68/rest/services/World/GeocodeServer/reverseGeocode/',
+    //     {
+    //       params: {
+    //         f: 'json', // Format JSON response
+    //         distance: 2000,
+    //         category: 'POI',
+    //         location: {
+    //           spatialReference: { wkid: 4326 },
+    //           x: longitude,
+    //           y: latitude,
+    //         },
+    //         token: apiKey.value,
+    //       },
+    //     }
+    //   )
+    //   .then((response) => {
+    //     // console.log('poi', response.data.location)
+    //     poiPlaceName.value = response.data.address
+    //       ? response.data.address.PlaceName === ''
+    //         ? response.data.address.ShortLabel
+    //         : response.data.address.PlaceName
+    //       : 'ไม่พบข้อมูล'
+    //     const poiPoint = new Point({
+    //       longitude: response.data.location.x,
+    //       latitude: response.data.location.y,
+    //     })
+    //     const poiSymbol = {
+    //       type: 'picture-marker',
+    //       url: markerBlueUrl,
+    //       width: '32px',
+    //       height: '32px',
+    //     }
+    //     const poiGraphic = new Graphic({
+    //       geometry: poiPoint,
+    //       symbol: poiSymbol,
+    //     })
+    //     mapView.value.graphics.add(poiGraphic)
+    //     // อัปเดตการแสดงผลให้แสดงทั้งตำแหน่งของผู้ใช้และ POI
+    //     mapView.value.goTo({
+    //       target: [userPoint, poiPoint],
+    //       zoom: zoomMap.value,
+    //     })
+
+    //     // Mark map as initialized
+    //     isMapInitialized.value = true
+
+    //     updateLocation(latitude, longitude, poiPlaceName.value)
+    //   })
+    //   .catch(async (error) => {
+    // console.error('Error fetching points of interest:', error)
+    // Get POI place ยิงไปขอที่ server arcgis ไม่ต้องใช้ token
+    await axios
+      .get(
+        'https://geocode.arcgis.com/arcgis/rest/services/World/GeocodeServer/reverseGeocode/',
+        {
+          params: {
+            f: 'json', // Format JSON response
+            distance: 2000,
+            category: 'POI',
+            location: {
+              spatialReference: { wkid: 4326 },
+              x: longitude,
+              y: latitude,
+            },
+          },
+        }
+      )
+      .then((response) => {
+        if (initVersion !== mapInitVersion || !mapView.value) {
+          return
+        }
+
+        // console.log('poi', response.data.location)
+        poiPlaceName.value = response.data.address
+          ? response.data.address.PlaceName === ''
+            ? response.data.address.ShortLabel
+            : response.data.address.PlaceName
+          : 'ไม่พบข้อมูล'
+        const poiPoint = new Point({
+          longitude: response.data.location.x,
+          latitude: response.data.location.y,
+        })
+        const poiSymbol = {
           type: 'picture-marker',
-          url: 'http://maps.google.com/mapfiles/ms/icons/red.png',
+          url: markerBlueUrl,
           width: '32px',
           height: '32px',
         }
-        const userGraphic = new Graphic({
-          geometry: userPoint,
-          symbol: userSymbol,
+        const poiGraphic = new Graphic({
+          geometry: poiPoint,
+          symbol: poiSymbol,
+        })
+        mapView.value.graphics.add(poiGraphic)
+        // อัปเดตการแสดงผลให้แสดงทั้งตำแหน่งของผู้ใช้และ POI
+        mapView.value.goTo({
+          target: [userPoint, poiPoint],
+          zoom: zoomMap.value,
         })
-        mapView.graphics.add(userGraphic)
-        // Get POI place ยิงไปขอที่ server ของกทม.ก่อน
-        await axios
-          .get(
-            'https://bmagis.bangkok.go.th/portal/sharing/servers/e4732c3a9fe549ab8bc697573b468f68/rest/services/World/GeocodeServer/reverseGeocode/',
-            {
-              params: {
-                f: 'json', // Format JSON response
-                distance: 2000,
-                category: 'POI',
-                location: {
-                  spatialReference: { wkid: 4326 },
-                  x: longitude,
-                  y: latitude,
-                },
-                token: apiKey.value,
-              },
-            }
-          )
-          .then((response) => {
-            // console.log('poi', response.data.location)
-            poiPlaceName.value = response.data.address
-              ? response.data.address.PlaceName === ''
-                ? response.data.address.ShortLabel
-                : response.data.address.PlaceName
-              : 'ไม่พบข้อมูล'
-            const poiPoint = new Point({
-              longitude: response.data.location.x,
-              latitude: response.data.location.y,
-            })
-            const poiSymbol = {
-              type: 'picture-marker',
-              url: 'http://maps.google.com/mapfiles/ms/icons/blue.png',
-              width: '32px',
-              height: '32px',
-            }
-            const poiGraphic = new Graphic({
-              geometry: poiPoint,
-              symbol: poiSymbol,
-            })
-            mapView.graphics.add(poiGraphic)
-            // อัปเดตการแสดงผลให้แสดงทั้งตำแหน่งของผู้ใช้และ POI
-            mapView.goTo({
-              target: [userPoint, poiPoint],
-              zoom: zoomMap.value,
-            })
 
-            updateLocation(latitude, longitude, poiPlaceName.value)
-          })
-          .catch(async (error) => {
-            // console.error('Error fetching points of interest:', error)
-            // Get POI place ยิงไปขอที่ server arcgis ไม่ต้องใช้ token
-            await axios
-              .get(
-                'https://geocode.arcgis.com/arcgis/rest/services/World/GeocodeServer/reverseGeocode/',
-                {
-                  params: {
-                    f: 'json', // Format JSON response
-                    distance: 2000,
-                    category: 'POI',
-                    location: {
-                      spatialReference: { wkid: 4326 },
-                      x: longitude,
-                      y: latitude,
-                    },
-                  },
-                }
-              )
-              .then((response) => {
-                // console.log('poi', response.data.location)
-                poiPlaceName.value = response.data.address
-                  ? response.data.address.PlaceName === ''
-                    ? response.data.address.ShortLabel
-                    : response.data.address.PlaceName
-                  : 'ไม่พบข้อมูล'
-                const poiPoint = new Point({
-                  longitude: response.data.location.x,
-                  latitude: response.data.location.y,
-                })
-                const poiSymbol = {
-                  type: 'picture-marker',
-                  url: 'http://maps.google.com/mapfiles/ms/icons/blue.png',
-                  width: '32px',
-                  height: '32px',
-                }
-                const poiGraphic = new Graphic({
-                  geometry: poiPoint,
-                  symbol: poiSymbol,
-                })
-                mapView.graphics.add(poiGraphic)
-                // อัปเดตการแสดงผลให้แสดงทั้งตำแหน่งของผู้ใช้และ POI
-                mapView.goTo({
-                  target: [userPoint, poiPoint],
-                  zoom: zoomMap.value,
-                })
-
-                updateLocation(latitude, longitude, poiPlaceName.value)
-              })
-              .catch((error) => {
-                // console.error('Error fetching points of interest:', error)
-              })
-          })
+        updateLocation(latitude, longitude, poiPlaceName.value)
       })
-    })
+      .catch(() => {
+        if (initVersion !== mapInitVersion) {
+          return
+        }
+        poiPlaceName.value = poiPlaceName.value || 'ไม่พบข้อมูล'
+        updateLocation(latitude, longitude, poiPlaceName.value)
+      })
+
+    if (initVersion === mapInitVersion) {
+      reattachAndResizeMap()
+    }
   } catch (error) {
+    if (initVersion === mapInitVersion) {
+      isMapInitialized.value = false
+    }
     console.error('Error loading the map', error)
+  } finally {
+    if (initVersion === mapInitVersion) {
+      isInitializing.value = false
+    }
   }
 }
 
@@ -268,14 +484,126 @@ const requestLocationPermission = () => {
   )
 }
 
+// Also add a resize event listener as a fallback for orientation changes
+// that might not trigger the Quasar screen watcher
+let resizeTimeout: number | undefined
+const handleWindowResize = () => {
+  // Debounce resize events to avoid excessive calls
+  if (resizeTimeout) {
+    clearTimeout(resizeTimeout)
+  }
+  resizeTimeout = window.setTimeout(() => {
+    handleMapResize()
+  }, 300)
+}
+
+/**
+ * Handle map resize when screen orientation changes
+ * ArcGIS MapView needs to be manually resized when its container changes dimensions
+ * Only call resize() if the map is fully initialized
+ */
+function handleMapResize() {
+  if (mapView.value && !mapView.value.destroyed && isMapInitialized.value) {
+    // Use nextTick to ensure the DOM has finished updating before resizing
+    reattachAndResizeMap()
+  }
+}
+
+/**
+ * Watch for screen size/orientation changes
+ * When the screen size changes (e.g., portrait to landscape), we need to re-initialize the map
+ * because the container div changes between desktop and mobile versions
+ */
+watch(
+  () => $q.screen.gt.xs,
+  async (newValue) => {
+    // Skip if no actual change (same layout)
+    if (newValue === currentScreenSize.value) {
+      return
+    }
+
+    currentScreenSize.value = newValue
+    if (!newValue) {
+      mobileMapExpanded.value = true
+    }
+    mapInitVersion += 1
+    isInitializing.value = false
+    clearAttachRetryTimer()
+
+    // Always destroy and re-initialize when screen size changes
+    // This ensures the map is attached to the correct container
+    if (mapView.value && !mapView.value.destroyed) {
+      mapView.value.destroy()
+      mapView.value = null
+    }
+
+    // Reset initialization state
+    isMapInitialized.value = false
+
+    // Wait for DOM to update with new layout
+    await nextTick()
+    await waitForActiveMapContainer(30, 100)
+
+    // Re-initialize the map
+    if (privacyStore.isAccepted) {
+      await initializeMap()
+
+      if (!mapView.value || mapView.value.destroyed) {
+        await recoverMapByReinitialize()
+      }
+
+      reattachAndResizeMap()
+    }
+  }
+)
+
+// Watch for initialPOI prop changes to update poiPlaceName
+watch(
+  () => props.initialPOI,
+  (newValue) => {
+    if (newValue && newValue !== poiPlaceName.value) {
+      poiPlaceName.value = newValue
+    }
+  }
+)
+
+// Set up resize event listener on mount
+onMounted(async () => {
+  window.addEventListener('resize', handleWindowResize)
+
+  // Component can be remounted after orientation/layout switches.
+  // Recreate map automatically when consent is already granted.
+  if (privacyStore.isAccepted && (!mapView.value || mapView.value.destroyed)) {
+    await waitForActiveMapContainer(30, 100)
+    await initializeMap()
+    reattachAndResizeMap()
+  }
+})
+
+// Cleanup map resources when component unmounts
+onBeforeUnmount(() => {
+  clearAttachRetryTimer()
+
+  if (mapView.value) {
+    mapView.value.destroy()
+    mapView.value = null
+  }
+  // Clean up resize event listener
+  window.removeEventListener('resize', handleWindowResize)
+  // Clear timeout if it exists
+  if (resizeTimeout) {
+    clearTimeout(resizeTimeout)
+  }
+})
+
 defineExpose({
   requestLocationPermission,
 })
 </script>
 
 <template>
-  <!-- Loading skeleton -->
-  <div v-if="!poiPlaceName" class="col-12">
+  <!-- Loading skeleton - show until map is visible -->
+  <div v-if="!isMapVisible" class="col-12">
     <q-skeleton
       :height="$q.screen.gt.xs ? '35vh' : '45px'"
       width="100%"
@@ -285,16 +613,16 @@ defineExpose({
   </div>
 
   <q-card
-    v-show="poiPlaceName"
     bordered
     flat
     class="col-12 bg-grey-2 shadow-0"
+    :class="{ 'map-hidden': !isMapVisible }"
     :style="$q.screen.gt.xs ? ';' : 'border-radius: 20px'"
   >
     <div v-if="$q.screen.gt.xs">
       <div
-        id="mapViewDisplay"
-        ref="mapElement"
+        :id="mapContainerId"
+        ref="desktopMapContainerRef"
         style="height: 35vh; pointer-events: none"
       ></div>
 
@@ -306,6 +634,11 @@ defineExpose({
         "
       >
         พื้นที่ใกล้เคียง
+        <q-icon name="mdi-information-outline" size="xs" class="q-mr-xs" />
+
+        <q-tooltip anchor="top middle" self="bottom middle" :offset="[0, 5]">
+          {{ textTooltip }}
+        </q-tooltip>
         <span class="q-px-sm">:</span>
         {{ poiPlaceName }}
       </div>
@@ -313,22 +646,37 @@ defineExpose({
 
     <q-card v-else style="border-radius: 20px">
       <q-expansion-item
-        class="shadow-1 overflow-hidden bg-grey-4 text-left"
+        v-model="mobileMapExpanded"
+        class="shadow-1 overflow-hidden bg-grey-4 text-left q-pa-xs"
         style="border-radius: 20px"
         dense
         default-opened
       >
         <template v-slot:header>
           <q-item-section avatar class="q-pr-none expanAS">
-            <q-avatar icon="mdi-map-marker" />
+            <q-icon name="mdi-map-marker" color="primary" />
           </q-item-section>
-
           <q-item-section>
-            {{ poiPlaceName }}
+            <q-item-label caption class="text-grey-7">
+              พื้นที่ใกล้เคียง
+              <q-icon
+                name="mdi-information-outline"
+                size="xs"
+                class="q-mr-xs cursor-pointer"
+                @click.stop="$q.dialog({ message: textTooltip, ok: 'ตกลง' })"
+              />
+            </q-item-label>
+            <q-item-label class="text-weight-medium text-grey-9">
+              {{ poiPlaceName || '-' }}
+            </q-item-label>
           </q-item-section>
         </template>
 
-        <div id="mapViewDisplay" style="height: 20vh"></div>
+        <div
+          :id="mapContainerId"
+          ref="mobileMapContainerRef"
+          style="height: 20vh"
+        ></div>
       </q-expansion-item>
     </q-card>
   </q-card>
@@ -338,4 +686,8 @@ defineExpose({
 .expanAS.q-item__section--avatar {
   min-width: 40px !important;
 }
+
+.map-hidden {
+  visibility: hidden;
+}
 </style>
diff --git a/src/components/AscGISMapTime.vue b/src/components/AscGISMapTime.vue
index 7360980..1264791 100644
--- a/src/components/AscGISMapTime.vue
+++ b/src/components/AscGISMapTime.vue
@@ -1,9 +1,8 @@
 <script setup lang="ts">
-import { onMounted, ref } from 'vue'
+import { nextTick, onBeforeUnmount, onMounted, shallowRef, ref } from 'vue'
 import { loadModules } from 'esri-loader'
 import axios from 'axios'
-
-import type { LocationObject } from '@/interface/index/Main'
+import markerRedUrl from '@/assets/markers/marker-red.svg?url'
 
 const emit = defineEmits(['update:location'])
 
@@ -20,8 +19,67 @@ const apiKey = ref<string>(
   // 'AAPK4f700a4324d04e9f8a1a134e0771ac45FXWawdCl-OotFfr52gz9XKxTDJTpDzw_YYcwbmKDDyAJswf14FoPyw0qBkN64DvP'
 )
 const zoomMap = ref<number>(18)
+const mapViewRef = shallowRef<any>(null)
+const mapContainerRef = ref<HTMLElement | null>(null)
+const mapRenderKey = ref<number>(0)
+let resizeTimer: ReturnType<typeof setTimeout> | null = null
+let resizeRetryCount = 0
+const MAX_RESIZE_RETRY = 8
+const isRecreatingMap = ref<boolean>(false)
+
+function scheduleMapResize() {
+  if (resizeTimer) {
+    clearTimeout(resizeTimer)
+  }
+
+  // Delay a little to wait for viewport + CSS layout to settle after rotation.
+  resizeTimer = setTimeout(async () => {
+    await nextTick()
+
+    if (!mapViewRef.value || !mapContainerRef.value) {
+      return
+    }
+
+    const container = mapContainerRef.value
+    const mapView = mapViewRef.value
+
+    if (container.clientWidth === 0 || container.clientHeight === 0) {
+      if (resizeRetryCount < MAX_RESIZE_RETRY) {
+        resizeRetryCount += 1
+        scheduleMapResize()
+      }
+      return
+    }
+
+    resizeRetryCount = 0
+
+    // Force canvas to bind to the current element after repeated rotations.
+    if (mapView.container !== container) {
+      mapView.container = null
+      await nextTick()
+      mapView.container = container
+    }
+
+    mapView.resize()
+    mapView
+      .goTo(
+        {
+          center: mapView.center,
+          zoom: mapView.zoom,
+        },
+        { animate: false }
+      )
+      .catch(() => {
+        // Ignore interruption errors from rapid orientation changes.
+      })
+  }, 300)
+}
 
 async function initializeMap() {
+  if (mapViewRef.value || !mapContainerRef.value) {
+    return
+  }
+
   try {
     // Load modules of ArcGIS
     loadModules([
@@ -67,7 +125,7 @@ async function initializeMap() {
 
           // สร้าง MapView
           const mapView = new MapView({
-            container: 'mapViewDisplay', // div ที่จะแสดงแผนที่
+            container: mapContainerRef.value, // div ที่จะแสดงแผนที่
             map: map,
             center: {
               latitude: latitude,
@@ -79,10 +137,11 @@ async function initializeMap() {
               components: [], // Empty array to remove all default UI components
             },
           })
+          mapViewRef.value = mapView
 
           // สร้างสัญลักษณ์ของหมุด
           const markerSymbol = new PictureMarkerSymbol({
-            url: 'https://maps.google.com/mapfiles/ms/icons/red-dot.png', // รูปหมุด
+            url: markerRedUrl,
             width: '32px',
             height: '32px',
           })
@@ -98,9 +157,42 @@ async function initializeMap() {
             position: 'top-right', // ตำแหน่งของ Search widget
           })
 
+          // ถ้าได้ token จาก กทม. มา
+          // await axios
+          //   .get(
+          //     'https://bmagis.bangkok.go.th/portal/sharing/servers/e4732c3a9fe549ab8bc697573b468f68/rest/services/World/GeocodeServer/reverseGeocode/',
+          //     {
+          //       params: {
+          //         f: 'json', // Format JSON response
+          //         distance: 2000,
+          //         category: 'POI',
+          //         location: {
+          //           spatialReference: { wkid: 4326 },
+          //           x: longitude,
+          //           y: latitude,
+          //         },
+          //         token: apiKey.value,
+          //       },
+          //     }
+          //   )
+          //   .then((response) => {
+          //     console.log('poi', response.data.location)
+          //     poiPlaceName.value = response.data.address
+          //       ? response.data.address.PlaceName === ''
+          //         ? response.data.address.ShortLabel
+          //         : response.data.address.PlaceName
+          //       : 'ไม่พบข้อมูล'
+          //     const poiPoint = new Point({
+          //       longitude: response.data.location.x,
+          //       latitude: response.data.location.y,
+          //     })
+
+          //     updateLocation(latitude, longitude, poiPlaceName.value)
+          //   })
+          //   .catch(async () => {
           await axios
             .get(
-              'https://bmagis.bangkok.go.th/portal/sharing/servers/e4732c3a9fe549ab8bc697573b468f68/rest/services/World/GeocodeServer/reverseGeocode/',
+              'https://geocode.arcgis.com/arcgis/rest/services/World/GeocodeServer/reverseGeocode/',
               {
                 params: {
                   f: 'json', // Format JSON response
@@ -111,52 +203,20 @@ async function initializeMap() {
                     x: longitude,
                     y: latitude,
                   },
-                  token: apiKey.value,
                 },
               }
             )
             .then((response) => {
-              console.log('poi', response.data.location)
+              // console.log('poi', response.data.location)
               poiPlaceName.value = response.data.address
                 ? response.data.address.PlaceName === ''
                   ? response.data.address.ShortLabel
                   : response.data.address.PlaceName
                 : 'ไม่พบข้อมูล'
-              const poiPoint = new Point({
-                longitude: response.data.location.x,
-                latitude: response.data.location.y,
-              })
 
-              updateLocation(latitude, longitude, poiPlaceName.value)
-            })
-            .catch(async () => {
-              await axios
-                .get(
-                  'https://geocode.arcgis.com/arcgis/rest/services/World/GeocodeServer/reverseGeocode/',
-                  {
-                    params: {
-                      f: 'json', // Format JSON response
-                      distance: 2000,
-                      category: 'POI',
-                      location: {
-                        spatialReference: { wkid: 4326 },
-                        x: longitude,
-                        y: latitude,
-                      },
-                    },
-                  }
-                )
-                .then((response) => {
-                  // console.log('poi', response.data.location)
-                  poiPlaceName.value = response.data.address
-                    ? response.data.address.PlaceName === ''
-                      ? response.data.address.ShortLabel
-                      : response.data.address.PlaceName
-                    : 'ไม่พบข้อมูล'
-
-                  updateLocation(longitude, latitude, poiPlaceName.value)
-                })
+              updateLocation(longitude, latitude, poiPlaceName.value)
             })
+          // })
 
           let searchMarker: any = null
 
@@ -186,9 +246,41 @@ async function initializeMap() {
               symbol: markerSymbol,
             })
             if (searchMarker) {
+              // await axios
+              //   .get(
+              //     'https://bmagis.bangkok.go.th/portal/sharing/servers/e4732c3a9fe549ab8bc697573b468f68/rest/services/World/GeocodeServer/reverseGeocode/',
+              //     {
+              //       params: {
+              //         f: 'json', // Format JSON response
+              //         distance: 2000,
+              //         category: 'POI',
+              //         location: {
+              //           spatialReference: { wkid: 4326 },
+              //           x: longitude,
+              //           y: latitude,
+              //         },
+              //         token: apiKey.value,
+              //       },
+              //     }
+              //   )
+              //   .then((response) => {
+              //     console.log('poi', response.data.location)
+              //     poiPlaceName.value = response.data.address
+              //       ? response.data.address.PlaceName === ''
+              //         ? response.data.address.ShortLabel
+              //         : response.data.address.PlaceName
+              //       : 'ไม่พบข้อมูล'
+              //     const poiPoint = new Point({
+              //       longitude: response.data.location.x,
+              //       latitude: response.data.location.y,
+              //     })
+
+              //     updateLocation(latitude, longitude, poiPlaceName.value)
+              //   })
+              //   .catch(async () => {
               await axios
                 .get(
-                  'https://bmagis.bangkok.go.th/portal/sharing/servers/e4732c3a9fe549ab8bc697573b468f68/rest/services/World/GeocodeServer/reverseGeocode/',
+                  'https://geocode.arcgis.com/arcgis/rest/services/World/GeocodeServer/reverseGeocode/',
                   {
                     params: {
                       f: 'json', // Format JSON response
@@ -199,52 +291,20 @@ async function initializeMap() {
                         x: longitude,
                         y: latitude,
                       },
-                      token: apiKey.value,
                     },
                   }
                 )
                 .then((response) => {
-                  console.log('poi', response.data.location)
+                  // console.log('poi', response.data.location)
                   poiPlaceName.value = response.data.address
                     ? response.data.address.PlaceName === ''
                       ? response.data.address.ShortLabel
                       : response.data.address.PlaceName
                     : 'ไม่พบข้อมูล'
-                  const poiPoint = new Point({
-                    longitude: response.data.location.x,
-                    latitude: response.data.location.y,
-                  })
 
-                  updateLocation(latitude, longitude, poiPlaceName.value)
-                })
-                .catch(async () => {
-                  await axios
-                    .get(
-                      'https://geocode.arcgis.com/arcgis/rest/services/World/GeocodeServer/reverseGeocode/',
-                      {
-                        params: {
-                          f: 'json', // Format JSON response
-                          distance: 2000,
-                          category: 'POI',
-                          location: {
-                            spatialReference: { wkid: 4326 },
-                            x: longitude,
-                            y: latitude,
-                          },
-                        },
-                      }
-                    )
-                    .then((response) => {
-                      // console.log('poi', response.data.location)
-                      poiPlaceName.value = response.data.address
-                        ? response.data.address.PlaceName === ''
-                          ? response.data.address.ShortLabel
-                          : response.data.address.PlaceName
-                        : 'ไม่พบข้อมูล'
-
-                      updateLocation(longitude, latitude, poiPlaceName.value)
-                    })
+                  updateLocation(longitude, latitude, poiPlaceName.value)
                 })
+              // })
             }
 
             mapView.graphics.add(searchMarker)
@@ -275,9 +335,41 @@ async function initializeMap() {
             } else {
               searchMarker.geometry = point // ย้ายหมุดไปยังตำแหน่งใหม่
               if (searchMarker) {
+                // await axios
+                //   .get(
+                //     'https://bmagis.bangkok.go.th/portal/sharing/servers/e4732c3a9fe549ab8bc697573b468f68/rest/services/World/GeocodeServer/reverseGeocode/',
+                //     {
+                //       params: {
+                //         f: 'json', // Format JSON response
+                //         distance: 2000,
+                //         category: 'POI',
+                //         location: {
+                //           spatialReference: { wkid: 4326 },
+                //           x: lon,
+                //           y: lat,
+                //         },
+                //         token: apiKey.value,
+                //       },
+                //     }
+                //   )
+                //   .then((response) => {
+                //     console.log('poi', response.data.location)
+                //     poiPlaceName.value = response.data.address
+                //       ? response.data.address.PlaceName === ''
+                //         ? response.data.address.ShortLabel
+                //         : response.data.address.PlaceName
+                //       : 'ไม่พบข้อมูล'
+                //     const poiPoint = new Point({
+                //       longitude: response.data.location.x,
+                //       latitude: response.data.location.y,
+                //     })
+
+                //     updateLocation(latitude, longitude, poiPlaceName.value)
+                //   })
+                //   .catch(async () => {
                 await axios
                   .get(
-                    'https://bmagis.bangkok.go.th/portal/sharing/servers/e4732c3a9fe549ab8bc697573b468f68/rest/services/World/GeocodeServer/reverseGeocode/',
+                    'https://geocode.arcgis.com/arcgis/rest/services/World/GeocodeServer/reverseGeocode/',
                     {
                       params: {
                         f: 'json', // Format JSON response
@@ -288,52 +380,20 @@ async function initializeMap() {
                           x: lon,
                           y: lat,
                         },
-                        token: apiKey.value,
                       },
                     }
                   )
                   .then((response) => {
-                    console.log('poi', response.data.location)
+                    // console.log('poi', response.data.location)
                     poiPlaceName.value = response.data.address
                       ? response.data.address.PlaceName === ''
                         ? response.data.address.ShortLabel
                         : response.data.address.PlaceName
                       : 'ไม่พบข้อมูล'
-                    const poiPoint = new Point({
-                      longitude: response.data.location.x,
-                      latitude: response.data.location.y,
-                    })
 
-                    updateLocation(latitude, longitude, poiPlaceName.value)
-                  })
-                  .catch(async () => {
-                    await axios
-                      .get(
-                        'https://geocode.arcgis.com/arcgis/rest/services/World/GeocodeServer/reverseGeocode/',
-                        {
-                          params: {
-                            f: 'json', // Format JSON response
-                            distance: 2000,
-                            category: 'POI',
-                            location: {
-                              spatialReference: { wkid: 4326 },
-                              x: lon,
-                              y: lat,
-                            },
-                          },
-                        }
-                      )
-                      .then((response) => {
-                        // console.log('poi', response.data.location)
-                        poiPlaceName.value = response.data.address
-                          ? response.data.address.PlaceName === ''
-                            ? response.data.address.ShortLabel
-                            : response.data.address.PlaceName
-                          : 'ไม่พบข้อมูล'
-
-                        updateLocation(lat, lon, poiPlaceName.value)
-                      })
+                    updateLocation(lat, lon, poiPlaceName.value)
                   })
+                // })
               }
             }
 
@@ -350,14 +410,64 @@ async function initializeMap() {
   }
 }
 
+async function recreateMapOnOrientationChange() {
+  if (isRecreatingMap.value) {
+    return
+  }
+
+  isRecreatingMap.value = true
+
+  try {
+    if (resizeTimer) {
+      clearTimeout(resizeTimer)
+      resizeTimer = null
+    }
+
+    if (mapViewRef.value) {
+      mapViewRef.value.destroy()
+      mapViewRef.value = null
+    }
+
+    mapRenderKey.value += 1
+    await nextTick()
+    await initializeMap()
+    scheduleMapResize()
+  } finally {
+    isRecreatingMap.value = false
+  }
+}
+
 onMounted(async () => {
   await initializeMap()
+
+  window.addEventListener('resize', scheduleMapResize)
+  window.addEventListener('orientationchange', recreateMapOnOrientationChange)
+  window.addEventListener('pageshow', scheduleMapResize)
+})
+
+onBeforeUnmount(() => {
+  window.removeEventListener('resize', scheduleMapResize)
+  window.removeEventListener(
+    'orientationchange',
+    recreateMapOnOrientationChange
+  )
+  window.removeEventListener('pageshow', scheduleMapResize)
+
+  if (resizeTimer) {
+    clearTimeout(resizeTimer)
+    resizeTimer = null
+  }
+
+  if (mapViewRef.value) {
+    mapViewRef.value.destroy()
+    mapViewRef.value = null
+  }
 })
 </script>
 
 <template>
   <q-card bordered flat class="col-12 bg-grey-2 shadow-0">
-    <div id="mapViewDisplay" style="height: 35vh"></div>
+    <div :key="mapRenderKey" ref="mapContainerRef" style="height: 35vh"></div>
 
     <div
       :class="
diff --git a/src/components/DialogDebug.vue b/src/components/DialogDebug.vue
index fb151e3..798ce47 100644
--- a/src/components/DialogDebug.vue
+++ b/src/components/DialogDebug.vue
@@ -305,6 +305,9 @@ function onClose() {
               </q-uploader>
             </div>
             <div class="col-12">
+              <div class="text-caption text-grey-8 q-mb-sm">
+                ผู้ดูแลระบบจะติดต่อกลับผ่านทางอีเมลที่ท่านระบุ กรุณาตรวจสอบอีเมลของท่านเป็นระยะ
+              </div>
               <div class="row col-12 q-col-gutter-sm">
                 <div class="col-xs-12 col-md-6 col-lg-6">
                   <q-input
@@ -315,10 +318,11 @@ function onClose() {
                     class="inputgreen"
                     hide-bottom-space
                     :rules="[
-                      () =>
-                        !!formData.email ||
-                        !!formData.phone ||
-                        'กรุณากรอกอีเมลหรือเบอร์โทรติดต่อกลับ',
+                      (val: string) => !!val || 'กรุณากรอกที่อยู่อีเมล',
+                      (val: string) => {
+                        const emailPattern = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+                        return emailPattern.test(val) || 'กรุณากรอกที่อยู่อีเมลในรูปแบบที่ถูกต้อง';
+                      }
                     ]"
                   />
                 </div>
@@ -330,12 +334,6 @@ function onClose() {
                     v-model="formData.phone"
                     class="inputgreen"
                     hide-bottom-space
-                    :rules="[
-                      () =>
-                        !!formData.email ||
-                        !!formData.phone ||
-                        'กรุณากรอกอีเมลหรือเบอร์โทรติดต่อกลับ',
-                    ]"
                   />
                 </div>
               </div>
diff --git a/src/components/FormTime.vue b/src/components/FormTime.vue
index c299e4f..79a8f68 100644
--- a/src/components/FormTime.vue
+++ b/src/components/FormTime.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref, watch, onMounted, reactive } from 'vue'
-import { PropType } from 'vue'
+import type { PropType } from 'vue'
 import { useQuasar } from 'quasar'
 import moment from 'moment'
 
@@ -38,10 +38,7 @@ const props = defineProps({
   },
   fetchData: {
     type: Function,
-    require: true,
-    default: () => {
-      console.log('fetchData func')
-    },
+    required: true,
   },
   action: {
     type: String,
diff --git a/src/components/MapCheckin.vue b/src/components/MapCheckin.vue
index 5429b4e..6925eaa 100644
--- a/src/components/MapCheckin.vue
+++ b/src/components/MapCheckin.vue
@@ -1,6 +1,11 @@
 <script setup lang="ts">
-import { ref, onMounted } from 'vue'
+import { ref, onMounted, onBeforeUnmount } from 'vue'
 import { GoogleMap, Marker } from 'vue3-google-map'
+import { useQuasar } from 'quasar'
+
+const $q = useQuasar()
+
+const googleMapsApiKey = 'AIzaSyBzPSF5NxUZ1G8DKBnJvJPTqCR0Ct2xf58'
 
 declare var google: any
 const center = ref<any>()
@@ -29,11 +34,32 @@ function findNearestPlace() {
       },
       (error) => {
         console.error(error)
-        console.log('erroe')
+        // Show user-friendly error message
+        let errorMessage = 'ไม่สามารถระบุตำแหน่งได้'
+        switch (error.code) {
+          case error.PERMISSION_DENIED:
+            errorMessage = 'คุณปฏิเสธการอนุญาตให้เข้าถึงตำแหน่ง'
+            break
+          case error.POSITION_UNAVAILABLE:
+            errorMessage = 'ข้อมูลตำแหน่งไม่พร้อมใช้งาน'
+            break
+          case error.TIMEOUT:
+            errorMessage = 'หมดเวลาในการระบุตำแหน่ง'
+            break
+        }
+        $q.notify({
+          type: 'negative',
+          message: errorMessage,
+          position: 'top',
+        })
       }
     )
   } else {
-    console.error('เบราว์เซอร์ไม่รองรับการระบุตำแหน่ง')
+    $q.notify({
+      type: 'negative',
+      message: 'เบราว์เซอร์ไม่รองรับการระบุตำแหน่ง',
+      position: 'top',
+    })
   }
 }
 
@@ -69,6 +95,14 @@ function findNearestPlaceFromAPI(userLocation: any) {
 onMounted(() => {
   findNearestPlace()
 })
+
+// Cleanup resources
+onBeforeUnmount(() => {
+  // Clear location reference to prevent memory leaks
+  center.value = undefined
+  location.value = ''
+  test.value = undefined
+})
 </script>
 
 <template>
@@ -80,7 +114,7 @@ onMounted(() => {
   >
     <div style="width: 100%; height: 90%">
       <GoogleMap
-        api-key="AIzaSyBzPSF5NxUZ1G8DKBnJvJPTqCR0Ct2xf58"
+        :api-key="googleMapsApiKey"
         style="width: 100%; height: 100%"
         :center="center"
         :zoom="15"
diff --git a/src/components/PopUp.vue b/src/components/PopUp.vue
index 98c5850..f28f22e 100644
--- a/src/components/PopUp.vue
+++ b/src/components/PopUp.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref, watch } from 'vue'
-import { PropType } from 'vue'
+import type { PropType } from 'vue'
 
 import type { DataCheckIn } from '@/interface/index/Main'
 
diff --git a/src/components/PopupPrivacy.vue b/src/components/PopupPrivacy.vue
index 4493fab..1bd816b 100644
--- a/src/components/PopupPrivacy.vue
+++ b/src/components/PopupPrivacy.vue
@@ -4,9 +4,11 @@ import { useQuasar } from 'quasar'
 import http from '@/plugins/http'
 import config from '@/app.config'
 import { usePrivacyStore } from '@/stores/privacy'
+import { usePositionKeycloakStore } from '@/stores/positionKeycloak'
 
 const $q = useQuasar()
 const privacyStore = usePrivacyStore()
+const positionKeycloakStore = usePositionKeycloakStore()
 
 const modal = defineModel<boolean>('modal', {
   required: true,
@@ -78,6 +80,12 @@ const handleAccept = async () => {
       accept: true,
     })
     privacyStore.setAccepted(true)
+
+    // อัปเดต privacyCheckin ใน positionKeycloak store ด้วย
+    if (positionKeycloakStore.dataPositionKeycloak) {
+      positionKeycloakStore.dataPositionKeycloak.privacyCheckin = true
+    }
+
     modal.value = false
   } catch (error) {}
 }
@@ -89,7 +97,7 @@ const toggleDetails = () => {
 
 const checkIfScrollable = () => {
   nextTick(() => {
-    const container = scrollContainer.value?.$el || scrollContainer.value
+    const container = (scrollContainer.value as any)?.$el || scrollContainer.value
     if (container) {
       const { scrollHeight, clientHeight } = container
 
diff --git a/src/components/TableHistory.vue b/src/components/TableHistory.vue
index 5d13e66..c364c30 100644
--- a/src/components/TableHistory.vue
+++ b/src/components/TableHistory.vue
@@ -2,42 +2,42 @@
 import { ref, watch } from 'vue'
 
 import { useCounterMixin } from '@/stores/mixin'
-import { useChekIn } from '@/stores/chekin'
+import { useCheckIn } from '@/stores/checkin'
 
-import { is, type QTableProps } from 'quasar'
+import type { QTableProps } from 'quasar'
 import type { Pagination, DataCheckIn } from '@/interface/index/Main'
 
 import Popup from '@/components/PopUp.vue' // dialog เพิ่ม/ขอแก้ไขลงเวลากรณีพิเศษ
 import SkeletonTable from '@/components/SkeletonTable.vue' // skeleton table
 
 const { date2Thai } = useCounterMixin()
-const stores = useChekIn()
+const stores = useCheckIn()
 
 /** props ข้อมูลจาก Components Page HistoryView */
 const props = defineProps({
   paging: {
     type: Boolean,
-    defualt: false,
+    default: false,
   },
   pageSize: {
     type: Number,
-    defualt: 10,
+    default: 10,
   },
   page: {
     type: Number,
-    defualt: 1,
+    default: 1,
   },
   maxPage: {
     type: Number,
-    defualt: 1,
+    default: 1,
   },
   total: {
     type: Number,
-    defualt: 0,
+    default: 0,
   },
   tab: {
     type: String,
-    defualt: '',
+    default: '',
     required: true,
   },
   fetchData: {
@@ -62,15 +62,15 @@ const selected = ref<string[]>([])
 const columns = ref<QTableProps['columns']>(
   props.tab == 'history'
     ? [
-        {
-          name: 'checkInDate',
-          align: 'left',
-          label: 'วัน/เดือน/ปี',
-          sortable: true,
-          field: 'checkInDate',
-          headerStyle: 'font-size: 14px',
-          style: 'font-size: 14px; width:15%;',
-        },
+        // {
+        //   name: 'checkInDate',
+        //   align: 'left',
+        //   label: 'วัน/เดือน/ปี',
+        //   sortable: true,
+        //   field: 'checkInDate',
+        //   headerStyle: 'font-size: 14px',
+        //   style: 'font-size: 14px; width:15%;',
+        // },
         {
           name: 'checkInTime',
           align: 'left',
@@ -79,6 +79,9 @@ const columns = ref<QTableProps['columns']>(
           field: 'checkInTime',
           headerStyle: 'font-size: 14px',
           style: 'font-size: 14px; width:15%;',
+          format: (val: string, row: DataCheckIn) => {
+            return `${row.checkInDate} ${val} น.`
+          },
         },
         {
           name: 'checkInLocation',
@@ -107,7 +110,9 @@ const columns = ref<QTableProps['columns']>(
           headerStyle: 'font-size: 14px',
           style: 'font-size: 14px; width:15%;',
           format: (val: string, row: DataCheckIn) => {
-            return row.checkOutStatus != '-' && val ? val : '-'
+            return row.checkOutStatus != '-' && val
+              ? `${row.checkOutDate} ${val} น.`
+              : '-'
           },
         },
         {
@@ -182,7 +187,6 @@ const columns = ref<QTableProps['columns']>(
 )
 const visibleColumns = ref<string[]>([
   'checkInDateTime',
-  'checkInDate',
   'checkInTime',
   'checkInLocation',
   'checkInStatus',
@@ -254,7 +258,7 @@ function classStatus(status: string) {
     case 'ปฏิบัติงานไม่ครบตามกำหนดเวลา':
       return 'text-orange-8'
     default:
-      break
+      return ''
   }
 }
 
diff --git a/src/components/ToolBar.vue b/src/components/ToolBar.vue
index ab54d66..c95111d 100644
--- a/src/components/ToolBar.vue
+++ b/src/components/ToolBar.vue
@@ -2,14 +2,14 @@
 import { onMounted, ref, watch } from 'vue'
 
 import { useCounterMixin } from '@/stores/mixin'
-import { useChekIn } from '@/stores/chekin'
+import { useCheckIn } from '@/stores/checkin'
 import { calculateFiscalYear } from '@/utils/function'
 
 import type { DataDateMonthObject } from '@/interface/index/Main'
 
 import Popup from '@/components/PopUp.vue'
 
-const stores = useChekIn()
+const stores = useCheckIn()
 const { monthYear2Thai } = useCounterMixin()
 
 /**
@@ -18,11 +18,11 @@ const { monthYear2Thai } = useCounterMixin()
 const props = defineProps({
   fetchData: {
     type: Function,
-    require: true,
+    required: true,
   },
   tab: {
     type: String,
-    require: true,
+    required: true,
   },
 })
 const emit = defineEmits(['update:year'])
@@ -43,8 +43,6 @@ function filterYearFn(type: string) {
   const year = type === 'year' ? filterYear.value : dateMonth.value.year
   const month = dateMonth.value.month
 
-  console.log(year, month)
-
   // ตรวจสอบค่าก่อนส่ง
   if (isNaN(Number(year)) || isNaN(Number(month))) {
     console.warn('Invalid year or month value:', { year, month })
diff --git a/src/composables/usePermissions.ts b/src/composables/usePermissions.ts
index ecf1ef3..b92ed29 100644
--- a/src/composables/usePermissions.ts
+++ b/src/composables/usePermissions.ts
@@ -1,52 +1,171 @@
-import { useQuasar } from 'quasar'
+import { onBeforeUnmount, ref } from 'vue'
 import { usePrivacyStore } from '@/stores/privacy'
 
+type BrowserPermissionState = PermissionState | 'unsupported'
+
+type PermissionQueryName = 'camera' | 'geolocation'
+
 export function usePermissions() {
-  const $q = useQuasar()
   const privacyStore = usePrivacyStore()
+  const cameraPermissionState = ref<BrowserPermissionState>('prompt')
+  const locationPermissionState = ref<BrowserPermissionState>('prompt')
 
-  // const checkCameraPermission = (): boolean => {
-  //   if (!privacyStore.isAccepted) {
-  //     privacyStore.modalPrivacy = true
-  //     $q.notify({
-  //       type: 'warning',
-  //       message: 'กรุณายอมรับนโยบายคุ้มครองข้อมูลส่วนบุคคลก่อนใช้งานกล้อง',
-  //       position: 'top',
-  //     })
-  //     return false
-  //   }
-  //   return true
-  // }
+  let cameraPermissionStatus: PermissionStatus | null = null
+  let locationPermissionStatus: PermissionStatus | null = null
 
-  // const checkLocationPermission = (): boolean => {
-  //   if (!privacyStore.isAccepted) {
-  //     privacyStore.modalPrivacy = true
-  //     $q.notify({
-  //       type: 'warning',
-  //       message: 'กรุณายอมรับนโยบายคุ้มครองข้อมูลส่วนบุคคลก่อนใช้งานแผนที่',
-  //       position: 'top',
-  //     })
-  //     return false
-  //   }
-  //   return true
-  // }
+  const isPermissionsApiSupported = () =>
+    typeof navigator !== 'undefined' && 'permissions' in navigator
+
+  const setPermissionState = (
+    target: typeof cameraPermissionState | typeof locationPermissionState,
+    state: BrowserPermissionState
+  ) => {
+    target.value = state
+  }
+
+  const setPermissionChangeListener = (
+    name: PermissionQueryName,
+    status: PermissionStatus
+  ) => {
+    status.onchange = () => {
+      const target =
+        name === 'camera' ? cameraPermissionState : locationPermissionState
+      setPermissionState(target, status.state)
+    }
+  }
+
+  async function queryPermissionState(name: PermissionQueryName) {
+    if (!isPermissionsApiSupported()) {
+      return null
+    }
+
+    try {
+      return await navigator.permissions.query({ name } as PermissionDescriptor)
+    } catch (error) {
+      return null
+    }
+  }
+
+  async function syncPermissionState(name: PermissionQueryName) {
+    const target =
+      name === 'camera' ? cameraPermissionState : locationPermissionState
+    const previousStatus =
+      name === 'camera' ? cameraPermissionStatus : locationPermissionStatus
+
+    if (previousStatus) {
+      previousStatus.onchange = null
+    }
+
+    const status = await queryPermissionState(name)
+    if (!status) {
+      if (target.value === 'prompt') {
+        setPermissionState(target, 'unsupported')
+      }
+      return
+    }
+
+    if (name === 'camera') {
+      cameraPermissionStatus = status
+    } else {
+      locationPermissionStatus = status
+    }
+
+    setPermissionState(target, status.state)
+    setPermissionChangeListener(name, status)
+  }
+
+  async function syncPermissionStates() {
+    await Promise.all([
+      syncPermissionState('camera'),
+      syncPermissionState('geolocation'),
+    ])
+  }
 
   const checkPrivacyAccepted = (): boolean => {
     if (!privacyStore.isAccepted) {
       privacyStore.modalPrivacy = true
-      // $q.notify({
-      //   type: 'warning',
-      //   message: 'กรุณายอมรับนโยบายคุ้มครองข้อมูลส่วนบุคคลก่อนใช้งาน',
-      //   position: 'center',
-      // })
       return false
     }
     return true
   }
 
+  async function requestCameraPermission() {
+    if (!checkPrivacyAccepted()) {
+      return false
+    }
+
+    if (cameraPermissionState.value === 'granted') {
+      return true
+    }
+
+    if (!navigator.mediaDevices?.getUserMedia) {
+      setPermissionState(cameraPermissionState, 'unsupported')
+      return false
+    }
+
+    try {
+      const stream = await navigator.mediaDevices.getUserMedia({
+        video: { facingMode: 'user' },
+        audio: false,
+      })
+
+      stream.getTracks().forEach((track) => track.stop())
+      setPermissionState(cameraPermissionState, 'granted')
+      return true
+    } catch (error) {
+      setPermissionState(cameraPermissionState, 'denied')
+      return false
+    } finally {
+      await syncPermissionState('camera')
+    }
+  }
+
+  async function requestLocationPermission() {
+    if (!checkPrivacyAccepted()) {
+      return false
+    }
+
+    if (locationPermissionState.value === 'granted') {
+      return true
+    }
+
+    if (!navigator.geolocation) {
+      setPermissionState(locationPermissionState, 'unsupported')
+      return false
+    }
+
+    return new Promise<boolean>((resolve) => {
+      navigator.geolocation.getCurrentPosition(
+        async () => {
+          setPermissionState(locationPermissionState, 'granted')
+          await syncPermissionState('geolocation')
+          resolve(true)
+        },
+        async () => {
+          setPermissionState(locationPermissionState, 'denied')
+          await syncPermissionState('geolocation')
+          resolve(false)
+        }
+      )
+    })
+  }
+
+  onBeforeUnmount(() => {
+    if (cameraPermissionStatus) {
+      cameraPermissionStatus.onchange = null
+    }
+
+    if (locationPermissionStatus) {
+      locationPermissionStatus.onchange = null
+    }
+  })
+
   return {
-    // checkCameraPermission,
-    // checkLocationPermission,
+    cameraPermissionState,
+    locationPermissionState,
     checkPrivacyAccepted,
+    syncPermissionStates,
+    requestCameraPermission,
+    requestLocationPermission,
   }
 }
diff --git a/src/interface/index/Main.ts b/src/interface/index/Main.ts
index 14def36..5d82bd2 100644
--- a/src/interface/index/Main.ts
+++ b/src/interface/index/Main.ts
@@ -38,6 +38,7 @@ interface DataCheckIn {
   checkInLocation: string
   checkInStatus: string
   checkInTime: string
+  checkOutDate: string
   checkOutLocation: string
   checkOutStatus: string
   checkOutTime: string
diff --git a/src/interface/keycloak-position.ts b/src/interface/keycloak-position.ts
new file mode 100644
index 0000000..dfd2680
--- /dev/null
+++ b/src/interface/keycloak-position.ts
@@ -0,0 +1,29 @@
+/**
+ * Interface for Keycloak position data from /org/profile/keycloak/position API
+ */
+export interface KeycloakPosition {
+  /** Privacy consent status */
+  privacyCheckin: boolean
+  /** Profile image filename */
+  avatarName?: string
+  /** User profile ID */
+  profileId: string
+  /** Organization hierarchy data */
+  organization?: Organization
+}
+
+/**
+ * Organization hierarchy structure
+ */
+export interface Organization {
+  /** Top level organization */
+  root?: string
+  /** Child level 1 */
+  child1?: string
+  /** Child level 2 */
+  child2?: string
+  /** Child level 3 */
+  child3?: string
+  /** Child level 4 */
+  child4?: string
+}
diff --git a/src/main.ts b/src/main.ts
index fb28e50..b04278c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -3,6 +3,7 @@ import App from '@/App.vue'
 import '@/registerServiceWorker'
 import router from '@/router'
 import { createPinia } from 'pinia'
+import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'
 import { Quasar, Dialog, Notify, Loading } from 'quasar'
 import '@vuepic/vue-datepicker/dist/main.css'
 import quasarUserOptions from '@/quasar-user-options'
@@ -14,6 +15,7 @@ import http from '@/plugins/http'
 
 const app = createApp(App)
 const pinia = createPinia()
+pinia.use(piniaPluginPersistedstate)
 
 app.use(router)
 app.use(pinia)
diff --git a/src/plugins/http.ts b/src/plugins/http.ts
index 9020cb6..378006f 100644
--- a/src/plugins/http.ts
+++ b/src/plugins/http.ts
@@ -2,7 +2,7 @@ import Axios, { type AxiosRequestConfig, type AxiosResponse } from 'axios'
 import { getToken } from './auth'
 
 const http = Axios.create({
-  timeout: 1000000000, // เพิ่มค่า timeout
+  timeout: 30000, // 30 seconds - reasonable timeout for API calls
   headers: {
     'X-Requested-With': 'XMLHttpRequest',
   },
@@ -30,6 +30,7 @@ http.interceptors.response.use(
       // eslint-disable-next-line no-prototype-builtins
       if (error.hasOwnProperty('response')) {
         if (error.response.status === 401 || error.response.status === 403) {
+          // TODO: Implement proper logout logic on 401/403
           // Store.commit("SET_ERROR_MESSAGE", error.response.data.message);
           // Store.commit("REMOVE_ACCESS_TOKEN")
         }
diff --git a/src/plugins/keycloak.ts b/src/plugins/keycloak.ts
index bb382dd..f1660ed 100644
--- a/src/plugins/keycloak.ts
+++ b/src/plugins/keycloak.ts
@@ -1,6 +1,8 @@
 // // authen with keycloak client
 // import Keycloak from 'keycloak-js'
 
+export {}
+
 // const ACCESS_TOKEN = 'BMAHRIS_KEYCLOAK_IDENTITY'
 // const REFRESH_TOKEN = 'BMAHRIS_KEYCLOAK_REFRESH'
 // const keycloakConfig = {
diff --git a/src/router/index.ts b/src/router/index.ts
index 23e3edb..8346697 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -5,6 +5,7 @@ import MainView from '@/views/MainView.vue'
 
 const loginView = () => import('@/views/login.vue')
 const resetPasswordView = () => import('@/views/ResetPassword.vue')
+const noPositionView = () => import('@/views/NoPositionView.vue')
 
 import { authenticated, logout } from '@/plugins/auth'
 
@@ -24,14 +25,14 @@ const router = createRouter({
             Auth: true,
           },
         },
-        {
-          path: '/map',
-          name: 'map',
-          component: MapView,
-          meta: {
-            Auth: true,
-          },
-        },
+        // {
+        //   path: '/map',
+        //   name: 'map',
+        //   component: MapView,
+        //   meta: {
+        //     Auth: true,
+        //   },
+        // },
         {
           path: '/about',
           name: 'about',
@@ -87,19 +88,63 @@ const router = createRouter({
         Auth: false,
       },
     },
+    {
+      path: '/no-position',
+      name: 'no-position',
+      component: noPositionView,
+      meta: {
+        Auth: false,
+      },
+    },
   ],
 })
 
 // authen with keycloak client
 router.beforeEach(async (to, from, next) => {
+  // ตรวจสอบเส้นทางพิเศษที่ไม่ต้องตรวจสอบสิทธิ์
+  const publicPaths = ['/login', '/auth', '/reset-password', '/no-position']
+  if (publicPaths.includes(to.path)) {
+    next()
+    return
+  }
+
+  // ตรวจสอบการ authenticate
   if (to.meta.Auth) {
     const checkAuthen = await authenticated()
     if (!checkAuthen && to.meta.Auth) {
       logout()
+      return
     }
-  } else {
-    next()
   }
+
+  // ตรวจสอบว่าผู้ใช้มีข้อมูลสังกัดหรือไม่
+  // ต้องทำการ dynamic import เนื่องจากเป็นการใช้งาน Pinia store ใน router
+  if (to.path !== '/no-position') {
+    try {
+      const { usePositionKeycloakStore } = await import('@/stores/positionKeycloak')
+      const positionKeycloakStore = usePositionKeycloakStore()
+      const dataPositionKeycloak = positionKeycloakStore.dataPositionKeycloak
+
+      // ถ้ามีข้อมูล positionKeycloak แล้ว ให้ตรวจสอบว่ามี organization หรือไม่
+      if (dataPositionKeycloak) {
+        const hasOrganization =
+          dataPositionKeycloak.organization &&
+          (dataPositionKeycloak.organization.root ||
+            dataPositionKeycloak.organization.child1 ||
+            dataPositionKeycloak.organization.child2 ||
+            dataPositionKeycloak.organization.child3 ||
+            dataPositionKeycloak.organization.child4)
+
+        if (!hasOrganization) {
+          next('/no-position')
+          return
+        }
+      }
+    } catch (error) {
+      console.error('Error checking position:', error)
+    }
+  }
+
   next()
 })
 
diff --git a/src/stores/chekin.ts b/src/stores/checkin.ts
similarity index 96%
rename from src/stores/chekin.ts
rename to src/stores/checkin.ts
index bf27004..47f0694 100644
--- a/src/stores/chekin.ts
+++ b/src/stores/checkin.ts
@@ -8,7 +8,7 @@ const mixin = useCounterMixin()
 const { date2Thai } = mixin
 
 /** store for checkin history*/
-export const useChekIn = defineStore('checkin', () => {
+export const useCheckIn = defineStore('checkin', () => {
   const year = ref<number>(calculateFiscalYear(new Date())) //ปีงบประมาณ
   const rows = ref<Datalist[]>([])
   const tab = ref<string>('history')
@@ -33,6 +33,7 @@ export const useChekIn = defineStore('checkin', () => {
       editStatus: e.editStatus != '' ? convertEditStatus(e.editStatus) : '',
       editReason: e.editReason,
       isEdit: e.isEdit,
+      checkOutDate: e.checkOutDate ? date2Thai(e.checkOutDate) : null,
     }))
     rows.value = dataList
   }
diff --git a/src/stores/positionKeycloak.ts b/src/stores/positionKeycloak.ts
index c3a1ec0..22ffb52 100644
--- a/src/stores/positionKeycloak.ts
+++ b/src/stores/positionKeycloak.ts
@@ -1,65 +1,78 @@
 import { ref } from 'vue'
 import { defineStore } from 'pinia'
+import type { KeycloakPosition } from '@/interface/keycloak-position'
 
-export const usePositionKeycloakStore = defineStore('positionKeycloak', () => {
-  const menuData = ref<string[]>([
-    'ลงเวลาปฏิบัติงาน',
-    'ประวัติการลงเวลา',
-    'รายการลงเวลากรณีพิเศษ',
-  ])
-  const dataPositionKeycloak = ref<any>(null)
+export const usePositionKeycloakStore = defineStore(
+  'positionKeycloak',
+  () => {
+    const menuData = ref<string[]>([
+      'ลงเวลาปฏิบัติงาน',
+      'ประวัติการลงเวลา',
+      'รายการลงเวลากรณีพิเศษ',
+    ])
+    const dataPositionKeycloak = ref<KeycloakPosition | null>(null)
+    const profileImg = ref<string>('')
 
-  function setPositionKeycloak(data: any) {
-    dataPositionKeycloak.value = data
-  }
-
-  function findOrgName(obj: any) {
-    if (obj) {
-      let name =
-        obj.child4 != null &&
-        obj.child4 !== '' &&
-        obj.child3 != null &&
-        obj.child3 !== ''
-          ? obj.child4 + (obj.child3 ? '/' : '')
-          : obj.child4 != null && obj.child4 !== ''
-          ? obj.child4
-          : ''
-
-      name +=
-        obj.child3 != null &&
-        obj.child3 !== '' &&
-        obj.child2 != null &&
-        obj.child2 !== ''
-          ? obj.child3 + (obj.child2 ? '/' : '')
-          : obj.child3 != null && obj.child3 !== ''
-          ? obj.child3
-          : ''
-
-      name +=
-        obj.child2 != null &&
-        obj.child2 !== '' &&
-        obj.child1 != null &&
-        obj.child1 !== ''
-          ? obj.child2 + (obj.child1 ? '/' : '')
-          : obj.child2 != null && obj.child2 !== ''
-          ? obj.child2
-          : ''
-
-      name +=
-        obj.child1 != null &&
-        obj.child1 !== '' &&
-        obj.root != null &&
-        obj.root !== ''
-          ? obj.child1 + (obj.root ? '/' : '')
-          : obj.child1 != null && obj.child1 !== ''
-          ? obj.child1
-          : ''
-      name += obj.root != null && obj.root !== '' ? obj.root : ''
-      return name == '' ? '-' : name
-    } else {
-      return ''
+    function setPositionKeycloak(data: KeycloakPosition) {
+      dataPositionKeycloak.value = data
     }
-  }
 
-  return { setPositionKeycloak, dataPositionKeycloak, findOrgName, menuData }
-})
+    /**
+     * ตั้งค่ารูปโปรไฟล์ผู้ใช้งาน
+     * @param url URL ของรูปโปรไฟล์
+     */
+    function setProfileImg(url: string) {
+      profileImg.value = url
+    }
+
+    /**
+     * ล้างข้อมูล Keycloak position (ใช้เมื่อ logout)
+     */
+    function clearPositionKeycloak() {
+      dataPositionKeycloak.value = null
+      profileImg.value = ''
+      // ลบ localStorage ด้วยเพื่อให้แน่ใจว่าข้อมูลหายจริง
+      localStorage.removeItem('positionKeycloak')
+    }
+
+    /**
+     * สร้างชื่อหน่วยงานจากข้อมูลลำดับชั้นองค์กร
+     * @param obj ข้อมูลองค์กรที่มีโครงสร้าง child4 -> child3 -> child2 -> child1 -> root
+     * @returns ชื่อหน่วยงานในรูปแบบ string เชื่อมด้วย /
+     */
+    function findOrgName(obj: KeycloakPosition | null): string {
+      if (!obj?.organization) {
+        return ''
+      }
+
+      const org = obj.organization
+      const levels = ['child4', 'child3', 'child2', 'child1', 'root'] as const
+      const parts: string[] = []
+
+      for (const level of levels) {
+        const value = org[level]
+        if (value) {
+          parts.push(value)
+        }
+      }
+
+      return parts.length > 0 ? parts.join('/') : '-'
+    }
+
+    return {
+      setPositionKeycloak,
+      clearPositionKeycloak,
+      setProfileImg,
+      dataPositionKeycloak,
+      profileImg,
+      findOrgName,
+      menuData,
+    }
+  },
+  {
+    persist: {
+      key: 'positionKeycloak',
+      storage: localStorage, // ใช้ localStorage เพื่อให้ข้อมูลอยู่ถาวร
+    },
+  }
+)
diff --git a/src/views/HistoryView.vue b/src/views/HistoryView.vue
index a2f007f..089d697 100644
--- a/src/views/HistoryView.vue
+++ b/src/views/HistoryView.vue
@@ -5,7 +5,7 @@ import { useQuasar } from 'quasar'
 import { useRouter } from 'vue-router'
 import http from '@/plugins/http'
 import config from '@/app.config'
-import { useChekIn } from '@/stores/chekin'
+import { useCheckIn } from '@/stores/checkin'
 import { useCounterMixin } from '@/stores/mixin'
 import { calculateFiscalYear } from '@/utils/function'
 
@@ -14,7 +14,7 @@ import ToolBar from '@/components/ToolBar.vue' // เมนู Herder
 
 const $q = useQuasar() //ใช้ noti quasar
 const router = useRouter()
-const stores = useChekIn()
+const stores = useCheckIn()
 const { showLoader, hideLoader, messageError } = useCounterMixin()
 const { fetchHistoryList } = stores
 
@@ -195,7 +195,7 @@ watch(
                 :tab="stores.tab"
               />
               <TableHistory
-                :fetchData="functionFetch"
+                :fetch-data="functionFetch"
                 :page-size="pageSize"
                 :total="total"
                 :page="page"
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 055346d..9b76ae3 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -1,7 +1,15 @@
 <script setup lang="ts">
-import { ref, reactive, onMounted, watch, onBeforeUnmount } from 'vue'
+import {
+  ref,
+  reactive,
+  onMounted,
+  watch,
+  onBeforeUnmount,
+  computed,
+  nextTick,
+} from 'vue'
 import { useQuasar } from 'quasar'
-import moment from 'moment'
+import { format } from 'date-fns'
 import Camera from 'simple-vue-camera'
 
 import config from '@/app.config'
@@ -9,6 +17,7 @@ import http from '@/plugins/http'
 import { useCounterMixin } from '@/stores/mixin'
 import { usePermissions } from '@/composables/usePermissions'
 import { usePrivacyStore } from '@/stores/privacy'
+import { usePositionKeycloakStore } from '@/stores/positionKeycloak'
 
 import type { FormRef, OptionReason } from '@/interface/response/checkin'
 
@@ -17,10 +26,34 @@ import MapCheck from '@/components/AscGISMap.vue'
 const mixin = useCounterMixin()
 const { date2Thai, showLoader, hideLoader, messageError, dialogConfirm } = mixin
 const $q = useQuasar()
-const { checkPrivacyAccepted } = usePermissions()
+const {
+  cameraPermissionState,
+  checkPrivacyAccepted,
+  syncPermissionStates,
+  requestCameraPermission,
+} = usePermissions()
 const privacyStore = usePrivacyStore()
+const positionKeycloakStore = usePositionKeycloakStore()
 const MOCK_CHECK_DELAY_MS = 800
 
+// เช็คว่าผู้ใช้มีข้อมูลสังกัดหรือไม่
+const hasOrganization = computed(() => {
+  const data = positionKeycloakStore.dataPositionKeycloak
+  if (!data || !data.organization) return false
+
+  const org = data.organization
+  // ตรวจสอบว่ามีค่าที่ไม่ใช่ null, undefined หรือ string ว่าง
+  const hasValue = (val: string | null | undefined) => val && val.trim() !== ''
+
+  return !!(
+    hasValue(org.root) ||
+    hasValue(org.child1) ||
+    hasValue(org.child2) ||
+    hasValue(org.child3) ||
+    hasValue(org.child4)
+  )
+})
+
 const modalTime = ref<boolean>(false) // Dailog ลงเวลาเข้างานของคุณ
 const checkStatus = ref<string>('')
 const statusCheckin = ref<boolean>(true) // สถานะเวลา เข้า,ออก
@@ -30,10 +63,40 @@ const msgCheckTime = ref<string>('') // ข้อความแจ้งเต
 const isDisabledCheckTime = ref<boolean>(true) // ข้อความแจ้งเตือน
 const isErr = ref<boolean | null>(null) // ข้อความแจ้งเตือน
 const endTimeAfternoon = ref<string>('12:00:00') //เวลาเช็คเอาท์ตามรอบ
+const crossDayCheckoutWarning = ref<string>('')
 
 const isLoadingCheckTime = ref<boolean>(false) // ตัวแปรสำหรับการโหลด
 const disabledBtn = ref<boolean>(false)
 
+function parseApiDateTime(value?: string | null) {
+  if (!value) return null
+
+  const normalizedValue = value.includes('T') ? value : value.replace(' ', 'T')
+  const parsedDate = new Date(normalizedValue)
+  return Number.isNaN(parsedDate.getTime()) ? null : parsedDate
+}
+
+function isSameCalendarDay(firstDate: Date, secondDate: Date) {
+  return (
+    firstDate.getFullYear() === secondDate.getFullYear() &&
+    firstDate.getMonth() === secondDate.getMonth() &&
+    firstDate.getDate() === secondDate.getDate()
+  )
+}
+
+function updateCrossDayCheckoutWarning(checkInTime?: string | null) {
+  crossDayCheckoutWarning.value = ''
+
+  const checkInDate = parseApiDateTime(checkInTime)
+  if (!checkInDate) return
+
+  if (!isSameCalendarDay(checkInDate, new Date())) {
+    crossDayCheckoutWarning.value = `คุณยังไม่ได้ลงเวลาออกของวันที่ ${date2Thai(
+      checkInDate
+    )} กรุณาลงเวลาออกก่อน จึงจะลงเวลาเข้าของวันนี้ได้`
+  }
+}
+
 /**
  * fetch เช็คเวลาต้องลงเวลาเข้าหรือออกงาน
  */
@@ -46,6 +109,7 @@ async function fetchCheckTime(load: any = true) {
 
       statusCheckin.value = data.checkInId ? false : true
       checkInId.value = data.checkInId ? data.checkInId : ''
+      updateCrossDayCheckoutWarning(data.checkInTime)
       endTimeAfternoon.value = data.endTimeAfternoon
       isDisabledCheckTime.value = isDisabledCheckTime.value ? true : false
     })
@@ -69,15 +133,16 @@ const formattedM = ref()
 const formattedH = ref()
 const formattedHH = ref()
 const formattedA = ref()
+const clockInterval = ref<ReturnType<typeof setInterval> | undefined>()
 
 /** function อัพเดทเวลา*/
 function updateClock() {
-  const date = Date.now()
-  const hh = moment(date).format('HH')
-  const mm = moment(date).format('mm')
-  const ss = moment(date).format('ss')
-  const HH = moment(date).format('hh')
-  const A = moment(date).format('a')
+  const date = new Date()
+  const hh = format(date, 'HH')
+  const mm = format(date, 'mm')
+  const ss = format(date, 'ss')
+  const HH = format(date, 'hh')
+  const A = format(date, 'a')
 
   formattedS.value = ss
   formattedM.value = mm
@@ -85,7 +150,6 @@ function updateClock() {
   formattedHH.value = HH
   formattedA.value = A
 }
-setInterval(updateClock, 1000)
 
 /** form-data */
 const formLocation = reactive({
@@ -98,6 +162,7 @@ const useLocation = ref<string>('') //กรณีเลือกนอกสถ
 const fileImg = ref<any>() //รูปถ่ายสถานที่
 const remark = ref<string>('') //ข้อความหมายเหตุที่ต้องการระบุเพิ่ม
 const checkInId = ref<string>('') //Id ลงเวลา check-in ล่าสุดที่ยังไม่ลงเวลาออก
+const MIN_CAPTURE_FILE_SIZE_BYTES = 5 * 1024
 
 /**
  *  funciton เรียกพิกัดละติจูด พิกัดลองติจูด
@@ -130,6 +195,131 @@ function wait(ms: number) {
   return new Promise((resolve) => setTimeout(resolve, ms))
 }
 
+function getCameraVideoElement() {
+  return camera.value?.video
+}
+
+function prepareInlineCameraVideo(videoElement: HTMLVideoElement) {
+  videoElement.autoplay = true
+  videoElement.muted = true
+  videoElement.setAttribute('autoplay', '')
+  videoElement.setAttribute('muted', '')
+  videoElement.setAttribute('playsinline', '')
+  videoElement.setAttribute('webkit-playsinline', 'true')
+}
+
+function isInlineCameraPreviewReady(videoElement: HTMLVideoElement) {
+  return (
+    Boolean(videoElement.srcObject) &&
+    videoElement.videoWidth > 0 &&
+    videoElement.videoHeight > 0 &&
+    videoElement.readyState >= HTMLMediaElement.HAVE_CURRENT_DATA
+  )
+}
+
+async function waitForCameraInstance() {
+  for (let attempt = 0; attempt < 10; attempt += 1) {
+    await nextTick()
+
+    if (camera.value) {
+      return camera.value
+    }
+
+    await wait(50)
+  }
+
+  return null
+}
+
+async function stopInlineCamera() {
+  camera.value?.stop()
+  cameraIsOn.value = false
+}
+
+async function remountInlineCameraComponent() {
+  await stopInlineCamera()
+  cameraMountKey.value += 1
+  await nextTick()
+  await wait(INLINE_CAMERA_REMOUNT_DELAY_MS)
+}
+
+async function ensureInlineCameraPreviewReady() {
+  const deadline = Date.now() + INLINE_CAMERA_PREVIEW_TIMEOUT_MS
+  let lastPlaybackError: unknown = null
+
+  while (Date.now() < deadline) {
+    const videoElement = getCameraVideoElement()
+
+    if (videoElement) {
+      prepareInlineCameraVideo(videoElement)
+
+      if (isInlineCameraPreviewReady(videoElement)) {
+        return
+      }
+
+      if (videoElement.srcObject) {
+        try {
+          await videoElement.play()
+        } catch (error) {
+          lastPlaybackError = error
+        }
+      }
+    }
+
+    await wait(INLINE_CAMERA_PREVIEW_POLL_MS)
+  }
+
+  if (lastPlaybackError instanceof Error) {
+    throw lastPlaybackError
+  }
+
+  throw new Error('Inline camera preview did not become ready in time')
+}
+
+async function syncActiveCameraDevices() {
+  const devices: any = await camera.value?.devices(['videoinput'])
+  if (!devices) {
+    return
+  }
+
+  availableCameras.value = devices
+
+  const activeId = camera.value?.currentDeviceID()
+  const activeIdx = activeId
+    ? devices.findIndex((device: any) => device.deviceId === activeId)
+    : -1
+  currentCameraIndex.value = activeIdx >= 0 ? activeIdx : 0
+  currentCameraType.value = resolveCameraType(
+    devices[currentCameraIndex.value]?.label || '',
+    'front'
+  )
+}
+
+async function startInlineCamera(recoveryAttempt = 0): Promise<void> {
+  const cameraInstance = await waitForCameraInstance()
+
+  if (!cameraInstance) {
+    throw new Error('Camera component is unavailable')
+  }
+
+  try {
+    currentCameraType.value = 'front'
+    await cameraInstance.start()
+    await ensureInlineCameraPreviewReady()
+    await syncActiveCameraDevices()
+    cameraIsOn.value = true
+  } catch (error) {
+    await stopInlineCamera()
+
+    if (recoveryAttempt < MAX_INLINE_CAMERA_RECOVERY_ATTEMPTS) {
+      await remountInlineCameraComponent()
+      return startInlineCamera(recoveryAttempt + 1)
+    }
+
+    throw error
+  }
+}
+
 async function getDelayedFreshPosition() {
   const firstPosition = await getCurrentPositionAsync({
     enableHighAccuracy: true,
@@ -137,7 +327,10 @@ async function getDelayedFreshPosition() {
     maximumAge: 0,
   })
 
-  await wait(MOCK_CHECK_DELAY_MS)
+  // Only add delay in development mode for testing
+  if (import.meta.env.DEV) {
+    await wait(MOCK_CHECK_DELAY_MS)
+  }
 
   try {
     return await getCurrentPositionAsync({
@@ -169,6 +362,11 @@ const options = ref<OptionReason[]>([
   //   value: 'ประสบภัย เช่น น้ำท่วม มีพายุ ประสบอุบัติเหตุ',
   //   text: 'ประสบภัย เช่น น้ำท่วม มีพายุ ประสบอุบัติเหตุ',
   // },
+  {
+    value: 'ปฏิบัติงานในจุดบริการด่วนมหานคร',
+    text: 'ปฏิบัติงานในจุดบริการด่วนมหานคร',
+  },
+
   { value: 'อื่นๆ', text: 'อื่นๆ' },
 ])
 
@@ -187,11 +385,227 @@ const cameraIsOn = ref<boolean>(false)
 const img = ref<any>(undefined)
 const photoWidth = ref<number>(350)
 const photoHeight = ref<number>(350)
+const cameraMountKey = ref<number>(0)
 const availableCameras = ref<any[]>([])
 const currentCameraIndex = ref<number>(0)
 const currentCameraType = ref<'front' | 'back' | 'unknown'>('unknown')
 
-const intervalId = ref<number | undefined>(undefined) // ต้องใช้ตัวแปรเก็บค่า interval
+/**
+ * Detect real iOS/iPadOS devices. Desktop mobile emulation can spoof the
+ * iPhone user-agent, so rely on platform + touch capability instead.
+ */
+const isIOSDevice: boolean = (() => {
+  const platform = navigator.platform || ''
+  const hasTouchPoints = navigator.maxTouchPoints > 1
+
+  return (
+    /iPhone|iPad|iPod/.test(platform) ||
+    (platform === 'MacIntel' && hasTouchPoints)
+  )
+})()
+
+const isAndroidDevice: boolean = /Android/i.test(navigator.userAgent)
+/**
+ * `preferNativePhotoCapture` starts false on every device — inline camera is
+ * always attempted first.  It is set to true only by
+ * `switchToNativePhotoCapture()` / `enableNativePhotoCaptureFallback()` when
+ * inline capture is proven to be unsupported or has failed.  This covers iOS
+ * Safari too: getUserMedia is supported there since iOS 14.3, so we try
+ * inline first and fall back gracefully on first failure.
+ */
+const preferNativePhotoCapture = ref<boolean>(false)
+const useNativePhotoCapture = computed(() => preferNativePhotoCapture.value)
+const centeredPreviewImageStyle = Object.freeze({
+  objectFit: 'cover',
+  objectPosition: 'center center',
+})
+const INLINE_CAMERA_PREVIEW_TIMEOUT_MS = isIOSDevice ? 2500 : 1800
+const INLINE_CAMERA_PREVIEW_POLL_MS = 120
+const INLINE_CAMERA_REMOUNT_DELAY_MS = 120
+const MAX_INLINE_CAMERA_RECOVERY_ATTEMPTS = 1
+
+/** Ref for the hidden file input used as native camera fallback */
+const nativePhotoInput = ref<HTMLInputElement | null>(null)
+const DEFAULT_NORMALIZED_IMAGE_QUALITY = 0.92
+
+interface NormalizePhotoOptions {
+  fileName?: string
+  mirrorHorizontally?: boolean
+  quality?: number
+}
+
+function clearSelectedPhoto() {
+  if (img.value) {
+    URL.revokeObjectURL(img.value)
+    img.value = undefined
+  }
+  fileImg.value = undefined
+}
+
+async function canDecodeImageBlob(blob: Blob) {
+  if (!blob.type.startsWith('image/')) {
+    return false
+  }
+
+  const imageUrl = URL.createObjectURL(blob)
+
+  try {
+    const image = await new Promise<HTMLImageElement>((resolve, reject) => {
+      const element = new Image()
+      element.onload = () => {
+        if (element.naturalWidth > 0 && element.naturalHeight > 0) {
+          resolve(element)
+        } else {
+          reject(new Error('Image has invalid dimensions'))
+        }
+      }
+      element.onerror = () => reject(new Error('Image decode failed'))
+      element.src = imageUrl
+    })
+
+    return image.naturalWidth > 0 && image.naturalHeight > 0
+  } catch (error) {
+    console.error('Error decoding captured image:', error)
+    return false
+  } finally {
+    URL.revokeObjectURL(imageUrl)
+  }
+}
+
+async function isValidCapturedImage(blob: Blob) {
+  if (blob.size < MIN_CAPTURE_FILE_SIZE_BYTES) {
+    return false
+  }
+
+  return canDecodeImageBlob(blob)
+}
+
+async function loadImageFromBlob(blob: Blob) {
+  const imageUrl = URL.createObjectURL(blob)
+
+  try {
+    return await new Promise<HTMLImageElement>((resolve, reject) => {
+      const image = new Image()
+      image.onload = () => resolve(image)
+      image.onerror = () => reject(new Error('Image load failed'))
+      image.src = imageUrl
+    })
+  } finally {
+    URL.revokeObjectURL(imageUrl)
+  }
+}
+
+async function normalizePhotoFile(
+  source: Blob,
+  options: NormalizePhotoOptions = {}
+) {
+  const fileName =
+    options.fileName ??
+    (source instanceof File && source.name
+      ? source.name
+      : `photo_${Date.now()}.jpg`)
+  const imageType =
+    source.type && source.type.startsWith('image/') ? source.type : 'image/jpeg'
+
+  if (!options.mirrorHorizontally) {
+    if (source instanceof File && source.name === fileName) {
+      return source
+    }
+
+    return new File([source], fileName, { type: imageType })
+  }
+
+  const image = await loadImageFromBlob(source)
+  const canvas = document.createElement('canvas')
+  canvas.width = image.naturalWidth
+  canvas.height = image.naturalHeight
+
+  const context = canvas.getContext('2d')
+  if (!context) {
+    throw new Error('Canvas context unavailable')
+  }
+
+  context.translate(canvas.width, 0)
+  context.scale(-1, 1)
+  context.drawImage(image, 0, 0, canvas.width, canvas.height)
+
+  const normalizedBlob = await new Promise<Blob | null>((resolve) => {
+    canvas.toBlob(
+      resolve,
+      imageType,
+      options.quality ?? DEFAULT_NORMALIZED_IMAGE_QUALITY
+    )
+  })
+
+  if (!normalizedBlob) {
+    throw new Error('Failed to normalize image')
+  }
+
+  return new File([normalizedBlob], fileName, { type: imageType })
+}
+
+async function assignSelectedPhoto(file: File) {
+  clearSelectedPhoto()
+  fileImg.value = file
+  img.value = URL.createObjectURL(file)
+}
+
+function openNativePhotoCapture() {
+  void stopInlineCamera()
+
+  if (nativePhotoInput.value) {
+    nativePhotoInput.value.value = ''
+    nativePhotoInput.value.click()
+  }
+}
+
+function enableNativePhotoCaptureFallback() {
+  preferNativePhotoCapture.value = true
+  void stopInlineCamera()
+  clearSelectedPhoto()
+}
+
+function switchToNativePhotoCapture() {
+  enableNativePhotoCaptureFallback()
+  openNativePhotoCapture()
+}
+
+/**
+ * Called when the user selects / captures a photo via the native file-input
+ * fallback. Keeps the same `img` + `fileImg` state that capturePhoto()
+ * sets so the upload flow is identical.
+ */
+async function onNativePhotoSelected(event: Event) {
+  const input = event.target as HTMLInputElement
+  const file = input.files?.[0]
+  input.value = ''
+  if (!file) return
+
+  if (!(await isValidCapturedImage(file))) {
+    clearSelectedPhoto()
+    messageError($q, '', 'ไม่สามารถอ่านไฟล์รูปภาพได้ กรุณาถ่ายรูปใหม่อีกครั้ง')
+    return
+  }
+
+  try {
+    const normalizedFile = await normalizePhotoFile(file, {
+      fileName: file.name,
+      mirrorHorizontally: !isIOSDevice,
+    })
+
+    if (!(await isValidCapturedImage(normalizedFile))) {
+      throw new Error('Normalized image is invalid')
+    }
+
+    await assignSelectedPhoto(normalizedFile)
+  } catch (error) {
+    console.error('Error normalizing native photo:', error)
+    clearSelectedPhoto()
+    messageError($q, error, 'ไม่สามารถเตรียมรูปภาพได้ กรุณาถ่ายรูปใหม่อีกครั้ง')
+  }
+}
+
+const intervalId = ref<ReturnType<typeof setInterval> | undefined>(undefined)
 
 /**
  * เริ่มจาก onMounted #1 เช็ค status คิว
@@ -246,18 +660,6 @@ async function fetchCheckStatus() {
   }
 }
 
-/** ตัวเก่าก่อนเปลี่ยน */
-
-// async function stopChecking() {
-//   if (intervalId.value !== undefined) {
-//     clearInterval(intervalId.value) // หยุด interval
-//     setTimeout(() => {
-//       fetchCheckTime()
-//     }, 1000)
-//     intervalId.value = undefined // รีเซ็ตค่า
-//   }
-// }
-
 /** ตัวใหม่ที่เปลี่ยนก่อนเปลี่ยน
  * เริ่มจาก onMounted #3 เช็ค status คิว
  *
@@ -307,14 +709,30 @@ async function stopChecking() {
 
 function identifyCameraType(label: string): 'front' | 'back' | 'unknown' {
   const lowerLabel = label.toLowerCase()
-  if (lowerLabel.includes('front') || lowerLabel.includes('user') || lowerLabel.includes('face')) {
+  if (
+    lowerLabel.includes('front') ||
+    lowerLabel.includes('user') ||
+    lowerLabel.includes('face')
+  ) {
     return 'front'
-  } else if (lowerLabel.includes('back') || lowerLabel.includes('environment') || lowerLabel.includes('rear')) {
+  } else if (
+    lowerLabel.includes('back') ||
+    lowerLabel.includes('environment') ||
+    lowerLabel.includes('rear')
+  ) {
     return 'back'
   }
   return 'unknown'
 }
 
+function resolveCameraType(
+  label: string,
+  fallbackType: 'front' | 'back'
+): 'front' | 'back' {
+  const detectedType = identifyCameraType(label)
+  return detectedType === 'unknown' ? fallbackType : detectedType
+}
+
 /** function เปิดกล้อง*/
 async function openCamera() {
   // เช็คสิทธิ์ privacy ก่อนเปิดกล้อง
@@ -322,20 +740,35 @@ async function openCamera() {
     return
   }
 
-  if (!isPermissionCameraDenied.value) {
-    // change camera device
-    if (cameraIsOn.value) {
-      await camera.value?.stop()
-    } else {
-      await camera.value?.start()
-      const devices: any = await camera.value?.devices(['videoinput'])
-      if (devices) {
-        availableCameras.value = devices
-        await changeCamera()
-      }
+  // If inline capture previously failed on this device, fall back to the
+  // native still-photo picker instead of reopening the live camera.
+  if (useNativePhotoCapture.value) {
+    openNativePhotoCapture()
+    return
+  }
+
+  if (cameraIsOn.value) {
+    await stopInlineCamera()
+    return
+  }
+
+  if (
+    (isIOSDevice || isAndroidDevice) &&
+    !useNativePhotoCapture.value &&
+    (cameraPermissionState.value === 'denied' ||
+      cameraPermissionState.value === 'unsupported')
+  ) {
+    switchToNativePhotoCapture()
+    return
+  }
+
+  const hasCameraPermission = await requestCameraPermission()
+  if (!hasCameraPermission) {
+    if ((isIOSDevice || isAndroidDevice) && !useNativePhotoCapture.value) {
+      switchToNativePhotoCapture()
+      return
     }
-    cameraIsOn.value = !cameraIsOn.value
-  } else {
+
     messageError(
       $q,
       '',
@@ -343,6 +776,19 @@ async function openCamera() {
     )
     return
   }
+
+  try {
+    await startInlineCamera()
+  } catch (error) {
+    console.error('Error opening camera:', error)
+
+    if ((isIOSDevice || isAndroidDevice) && !useNativePhotoCapture.value) {
+      switchToNativePhotoCapture()
+      return
+    }
+
+    messageError($q, error, 'ไม่สามารถเปิดกล้องได้ กรุณาลองใหม่อีกครั้ง')
+  }
 }
 
 /** change camera device*/
@@ -359,27 +805,43 @@ async function changeCamera(targetCameraType?: 'front' | 'back') {
 
     if (devices.length === 1 || !targetCameraType) {
       const device = devices[0]
+      const fallbackType =
+        targetCameraType ??
+        (currentCameraType.value === 'back' ? 'back' : 'front')
       await camera.value?.changeCamera(device.deviceId)
+      await ensureInlineCameraPreviewReady()
       currentCameraIndex.value = 0
-      currentCameraType.value = identifyCameraType(device.label || '')
+      currentCameraType.value = resolveCameraType(
+        device.label || '',
+        fallbackType
+      )
       return
     }
 
-    const matchingCameras = devices.filter((device: any) =>
-      identifyCameraType(device.label || '') === targetCameraType
+    const matchingCameras = devices.filter(
+      (device: any) =>
+        identifyCameraType(device.label || '') === targetCameraType
     )
 
     if (matchingCameras.length > 0) {
       const targetDevice = matchingCameras[0]
       await camera.value?.changeCamera(targetDevice.deviceId)
+      await ensureInlineCameraPreviewReady()
       currentCameraIndex.value = devices.indexOf(targetDevice)
-      currentCameraType.value = targetCameraType
+      currentCameraType.value = resolveCameraType(
+        targetDevice.label || '',
+        targetCameraType
+      )
     } else {
       const nextIndex = (currentCameraIndex.value + 1) % devices.length
       const nextDevice = devices[nextIndex]
       await camera.value?.changeCamera(nextDevice.deviceId)
+      await ensureInlineCameraPreviewReady()
       currentCameraIndex.value = nextIndex
-      currentCameraType.value = identifyCameraType(nextDevice.label || '')
+      currentCameraType.value = resolveCameraType(
+        nextDevice.label || '',
+        targetCameraType
+      )
     }
   } catch (error) {
     console.error('Error switching camera:', error)
@@ -392,32 +854,78 @@ async function switchCamera() {
     return
   }
 
-  const targetType: 'front' | 'back' = currentCameraType.value === 'front' ? 'back' : 'front'
-  await changeCamera(targetType)
+  // สลับแค่ระหว่างกล้อง 2 ตัวแรก (กล้องหน้าและหลังหลัก)
+  const targetIndex = currentCameraIndex.value === 0 ? 1 : 0
+  const targetDevice = availableCameras.value[targetIndex]
+  const fallbackType = currentCameraType.value === 'back' ? 'front' : 'back'
+
+  await camera.value?.changeCamera(targetDevice.deviceId)
+  await ensureInlineCameraPreviewReady()
+  currentCameraIndex.value = targetIndex
+  currentCameraType.value = resolveCameraType(
+    targetDevice.label || '',
+    fallbackType
+  )
 }
 
 /** function ถ่ายรูป*/
 async function capturePhoto() {
-  const imageBlob: any = await camera.value?.snapshot(
-    { width: photoWidth.value, height: photoHeight.value },
-    'image/png',
-    0.5
-  )
-  if (!imageBlob) return
-  const fileName = 'photo.jpg'
-  //ไฟล์รูป
-  const file = new File([imageBlob], fileName, { type: 'image/png' })
-  fileImg.value = file
-  //แสดงรูป
-  await camera.value?.stop()
-  const url = URL.createObjectURL(imageBlob)
-  img.value = url
+  try {
+    const imageBlob: any = await camera.value?.snapshot(
+      { width: photoWidth.value, height: photoHeight.value },
+      'image/jpeg',
+      0.8
+    )
+    if (!imageBlob || !(await isValidCapturedImage(imageBlob))) {
+      if (isIOSDevice || isAndroidDevice) {
+        switchToNativePhotoCapture()
+        return
+      }
+
+      messageError($q, '', 'ไม่สามารถถ่ายรูปได้ กรุณาลองใหม่อีกครั้ง')
+      return
+    }
+    const fileName = `photo_${Date.now()}.jpg`
+    const normalizedFile = await normalizePhotoFile(imageBlob, {
+      fileName,
+      mirrorHorizontally: false,
+      quality: 0.8,
+    })
+
+    if (!(await isValidCapturedImage(normalizedFile))) {
+      throw new Error('Normalized image is invalid')
+    }
+
+    await assignSelectedPhoto(normalizedFile)
+
+    //แสดงรูป
+    await stopInlineCamera()
+  } catch (error) {
+    console.error('Error capturing photo:', error)
+
+    if ((isIOSDevice || isAndroidDevice) && !useNativePhotoCapture.value) {
+      switchToNativePhotoCapture()
+      return
+    }
+
+    messageError($q, error, 'ไม่สามารถถ่ายรูปได้ กรุณาลองใหม่อีกครั้ง')
+  }
 }
 
 /** function เปลี่ยนรูปภาพ*/
-function refreshPhoto() {
-  img.value = undefined
-  camera.value?.start()
+async function refreshPhoto() {
+  try {
+    clearSelectedPhoto()
+
+    if (useNativePhotoCapture.value) {
+      openNativePhotoCapture()
+      return
+    }
+    await startInlineCamera()
+  } catch (error) {
+    console.error('Error refreshing photo:', error)
+    messageError($q, error, 'ไม่สามารถเปิดกล้องได้ กรุณาลองใหม่อีกครั้ง')
+  }
 }
 
 /** ref validate*/
@@ -470,8 +978,16 @@ async function validateForm() {
   }
 }
 
-const mapRef = ref<InstanceType<typeof MapCheck> | null>(null)
+const mapRefDesktop = ref<InstanceType<typeof MapCheck> | null>(null)
+const mapRefMobile = ref<InstanceType<typeof MapCheck> | null>(null)
+
+// Computed ref that returns the correct map ref based on screen size
+const mapRef = computed(() =>
+  $q.screen.gt.xs ? mapRefDesktop.value : mapRefMobile.value
+)
+
 const timeChickin = ref<string>('') //เวลาเข้างาน,เวลาออกงาน
+const displayedCheckDate = ref<Date>(new Date())
 
 /** function ยืนยันการลงเวลาเข้า - ออก*/
 async function confirm() {
@@ -487,6 +1003,16 @@ async function confirm() {
     return
   }
 
+  if (!fileImg.value || !(await isValidCapturedImage(fileImg.value))) {
+    if ((isIOSDevice || isAndroidDevice) && !useNativePhotoCapture.value) {
+      enableNativePhotoCaptureFallback()
+    }
+    clearSelectedPhoto()
+    disabledBtn.value = false
+    messageError($q, '', 'รูปภาพไม่สมบูรณ์ กรุณาถ่ายรูปใหม่อีกครั้งก่อนลงเวลา')
+    return
+  }
+
   showLoader()
   const isLocation = workplace.value === 'in-place' //*true คือ ณ สถานที่ตั้ง, false คือ นอกสถานที่ตั้ง
   const locationName = workplace.value === 'in-place' ? '' : useLocation.value
@@ -504,6 +1030,7 @@ async function confirm() {
     .then(async (res) => {
       const data = await res.data.result
       const dateObject = new Date(data.date)
+      displayedCheckDate.value = dateObject
       checkDate.value = data.date ? true : false
       const options: Intl.DateTimeFormatOptions = {
         hour12: false,
@@ -535,7 +1062,12 @@ async function getCheck() {
   }
 
   showLoader()
-  const isSeminar = model.value === 'ไปประชุม / อบรม / สัมมนา' ? 'Y' : 'N'
+  const isSeminar =
+    model.value === 'ไปประชุม / อบรม / สัมมนา'
+      ? 'S'
+      : model.value === 'ปฏิบัติงานในจุดบริการด่วนมหานคร'
+      ? 'O'
+      : 'N'
 
   await http
     .get(config.API.checkoutCheck + `/${isSeminar}`)
@@ -585,7 +1117,7 @@ async function onClickConfirm() {
   try {
     showLoader()
     cameraIsOn.value = false
-    img.value = undefined
+    clearSelectedPhoto()
     modalTime.value = false
     if (!statusCheckin.value) {
       statusCheckin.value = true
@@ -623,13 +1155,8 @@ const inQueue = ref<boolean>(false)
 
 // ฟังก์ชันสำหรับรีเซ็ตรูปและหยุดกล้อง
 function resetCameraAndImage() {
-  if (img.value) {
-    img.value = undefined
-  }
-  if (cameraIsOn.value && camera.value) {
-    camera.value.stop()
-    cameraIsOn.value = false
-  }
+  clearSelectedPhoto()
+  void stopInlineCamera()
 }
 
 // เพิ่มฟังก์ชันสำหรับจัดการการปิดแอพในมือถือ
@@ -655,36 +1182,52 @@ function handleVisibilityChange() {
   }
 }
 
-const isPermissionCameraDenied = ref<boolean>(false) // ตัวแปรสำหรับตรวจสอบการปฏิเสธสิทธิ์กล้อง
-
-async function requestCamera() {
-  try {
-    await navigator.mediaDevices.getUserMedia({ video: true })
-  } catch (err) {
-    isPermissionCameraDenied.value = true
-  }
-}
-
 /** Hook*/
 onMounted(async () => {
-  isLoadingCheckTime.value = true
+  // เริ่มต้น clock เสมอ
   updateClock()
-  startChecking() //เช็ค status จาก คิว #1
-
-  // เรียกแผนที่เฉพาะเมื่อยอมรับ privacy แล้ว
-  if (privacyStore.isAccepted) {
-    mapRef.value?.requestLocationPermission()
-    requestCamera()
-  }
+  clockInterval.value = setInterval(updateClock, 1000)
 
   // เพิ่ม event listeners สำหรับมือถือ
   document.addEventListener('visibilitychange', handleVisibilityChange)
   window.addEventListener('pagehide', handleAppClose)
+
+  // ถ้ามีข้อมูลสังกัดแล้ว เริ่ม checking ได้เลย
+  if (hasOrganization.value) {
+    isLoadingCheckTime.value = true
+    startChecking()
+  }
+
+  await syncPermissionStates()
+
+  // เรียกแผนที่เฉพาะเมื่อยอมรับ privacy แล้ว
+  if (privacyStore.isAccepted) {
+    mapRef.value?.requestLocationPermission()
+  }
 })
 
+// เฝ้าดูการเปลี่ยนแปลงของ hasOrganization
+// เพื่อเริ่ม startChecking เมื่อมีข้อมูลสังกัด
+watch(
+  hasOrganization,
+  (newValue) => {
+    if (newValue && !isLoadingCheckTime.value) {
+      isLoadingCheckTime.value = true
+      startChecking()
+    }
+  },
+  { immediate: false }
+)
+
 onBeforeUnmount(() => {
   resetCameraAndImage()
 
+  // หยุด clock interval
+  if (clockInterval.value !== undefined) {
+    clearInterval(clockInterval.value)
+    clockInterval.value = undefined
+  }
+
   // หยุด interval ถ้ามี
   if (intervalId.value !== undefined) {
     clearInterval(intervalId.value)
@@ -698,10 +1241,10 @@ onBeforeUnmount(() => {
 
 watch(
   () => privacyStore.isAccepted,
-  (newVal) => {
+  async (newVal) => {
     if (newVal) {
+      await syncPermissionStates()
       mapRef.value?.requestLocationPermission()
-      requestCamera()
     }
   }
 )
@@ -724,6 +1267,7 @@ watch(
           >
             <q-skeleton width="100%" height="50px" />
           </div>
+
           <div v-else :class="getClass(statusCheckin)" class="gt-xs">
             <div class="col">
               <div class="row col-12 justify-center q-py-sm text-subtitle1">
@@ -768,19 +1312,44 @@ watch(
                   </div>
                 </div>
               </div>
+
+              <div v-if="isDisabledCheckTime && msgCheckTime">
+                <div class="col-12 column items-center justify-center q-pa-xl">
+                  <q-icon
+                    name="mdi-map-marker-radius"
+                    size="8em"
+                    class="text-primary q-mb-md"
+                  />
+                  <div class="text-h6 text-center text-red q-mt-sm">
+                    *{{ msgCheckTime }}
+                  </div>
+                </div>
+              </div>
+
               <div
                 class="col-xs-12 col-md-11 q-pa-md q-col-gutter-md row q-pt-lg"
+                v-if="!isDisabledCheckTime"
               >
+                <div v-if="crossDayCheckoutWarning" class="col-12">
+                  <q-banner
+                    rounded
+                    class="bg-white text-orange-10 warning-banner"
+                  >
+                    <q-icon name="warning" color="warning" size="20px" />
+
+                    {{ crossDayCheckoutWarning }}
+                  </q-banner>
+                </div>
                 <div class="col-xs-12 col-sm-8 gt-xs">
                   <div class="col-12">
                     <MapCheck
-                      v-if="$q.screen.gt.xs"
-                      ref="mapRef"
+                      ref="mapRefDesktop"
+                      :initialPOI="formLocation.POI"
                       @update:location="updateLocation"
                     />
                   </div>
                 </div>
-                <div class="col-xs-12 col-sm-4">
+                <div v-if="$q.screen.gt.xs" class="col-xs-12 col-sm-4">
                   <q-card
                     :class="
                       $q.screen.xs ? 'card-container-xs' : 'card-container'
@@ -802,17 +1371,38 @@ watch(
                     </div>
                     <div class="col-12 row items-center">
                       <!-- แสดงกล้องตอนกดถ่ายภาพ -->
-
                       <Camera
+                        :key="`desktop-${cameraMountKey}`"
                         :resolution="{ width: photoWidth, height: photoHeight }"
                         ref="camera"
+                        :class="['camera-preview']"
                         :autoplay="false"
-                        :style="!img ? 'display: block' : 'display: none'"
+                        :playsinline="true"
+                        :facingMode="'user'"
                       />
 
                       <!-- แสดงรูปเมื่อกด capture -->
                       <div v-if="img" class="image-container">
-                        <q-img :src="img" class="image-element"></q-img>
+                        <q-img
+                          :src="img"
+                          class="image-element"
+                          :img-style="centeredPreviewImageStyle"
+                        ></q-img>
+                        <!-- Native capture: cameraIsOn stays false so show retake here
+                             the refresh button here instead of inside v-if="cameraIsOn" -->
+                        <div
+                          v-if="useNativePhotoCapture"
+                          class="absolute-bottom-right q-ma-md"
+                        >
+                          <q-btn
+                            round
+                            push
+                            icon="refresh"
+                            size="md"
+                            color="negative"
+                            @click="refreshPhoto"
+                          />
+                        </div>
                       </div>
 
                       <div v-if="cameraIsOn">
@@ -890,6 +1480,106 @@ watch(
 
                 <!-- กรอกข้อมูล หน้ามือถือ -->
                 <div class="col-12 row q-col-gutter-y-md" v-if="$q.screen.xs">
+                  <!-- กล้อง หน้ามือถือ -->
+                  <div class="col-12">
+                    <q-card
+                      :class="
+                        $q.screen.xs ? 'card-container-xs' : 'card-container'
+                      "
+                    >
+                      <div
+                        v-if="!cameraIsOn && img == null"
+                        class="preview-placeholder"
+                        @click="() => !isDisabledCheckTime && openCamera()"
+                      >
+                        <div class="text-center">
+                          <q-icon
+                            name="mdi-camera"
+                            color="blue-grey-3"
+                            size="100px"
+                            class="center-icon"
+                          />
+                        </div>
+                      </div>
+                      <div class="col-12 row items-center">
+                        <!-- แสดงกล้องตอนกดถ่ายภาพ -->
+                        <Camera
+                          :key="`mobile-${cameraMountKey}`"
+                          :resolution="{
+                            width: photoWidth,
+                            height: photoHeight,
+                          }"
+                          ref="camera"
+                          :class="['camera-preview']"
+                          :autoplay="false"
+                          :playsinline="true"
+                          :facingMode="'user'"
+                        />
+
+                        <!-- แสดงรูปเมื่อกด capture -->
+                        <div v-if="img" class="image-container">
+                          <q-img
+                            :src="img"
+                            class="image-element"
+                            :img-style="centeredPreviewImageStyle"
+                          ></q-img>
+                          <!-- Native capture: cameraIsOn stays false so show retake here
+                               the refresh button here instead of inside v-if="cameraIsOn" -->
+                          <div
+                            v-if="useNativePhotoCapture"
+                            class="absolute-bottom text-subtitle2 text-center q-py-sm"
+                            style="background: #00000021"
+                          >
+                            <q-btn
+                              round
+                              icon="refresh"
+                              size="18px"
+                              style="background: #263238; color: white"
+                              @click="refreshPhoto"
+                              unelevated
+                            />
+                          </div>
+                        </div>
+
+                        <div v-if="cameraIsOn">
+                          <div
+                            class="absolute-bottom text-subtitle2 text-center q-py-sm"
+                            style="background: #00000021"
+                          >
+                            <q-btn
+                              v-if="availableCameras.length > 1 && img == null"
+                              round
+                              icon="flip_camera_ios"
+                              size="16px"
+                              style="background: #424242; color: white"
+                              @click="switchCamera"
+                              unelevated
+                              class="q-mr-xs"
+                            />
+                            <q-btn
+                              round
+                              v-if="img == null"
+                              icon="photo_camera"
+                              size="18px"
+                              style="background: #263238; color: white"
+                              @click="capturePhoto"
+                              unelevated
+                            />
+                            <q-btn
+                              v-else
+                              round
+                              icon="refresh"
+                              size="18px"
+                              style="background: #263238; color: white"
+                              @click="refreshPhoto"
+                              unelevated
+                            />
+                          </div>
+                        </div>
+                      </div>
+                    </q-card>
+                  </div>
+
                   <div class="col-12" v-if="!isDisabledCheckTime">
                     <q-card
                       flat
@@ -962,8 +1652,13 @@ watch(
                     </q-card>
                   </div>
 
-                  <div class="col-12" v-if="$q.screen.xs">
-                    <MapCheck ref="mapRef" @update:location="updateLocation" />
+                  <!-- Map หน้ามือถือ -->
+                  <div class="col-12">
+                    <MapCheck
+                      ref="mapRefMobile"
+                      :initialPOI="formLocation.POI"
+                      @update:location="updateLocation"
+                    />
                   </div>
                 </div>
                 <!-- กรอกข้อมูล หน้ามือถือ -->
@@ -1079,7 +1774,7 @@ watch(
             >
               <q-separator />
               <div class="col-12 q-pa-md">
-                <p
+                <!-- <p
                   :class="
                     $q.screen.gt.xs
                       ? 'text-red text-caption '
@@ -1087,7 +1782,7 @@ watch(
                   "
                 >
                   *หมายเหตุ คลิกลงเวลาเข้างานแล้วระบบจะลงเวลาทันที
-                </p>
+                </p> -->
                 <q-btn
                   :label="
                     !statusCheckin && inQueue
@@ -1119,10 +1814,10 @@ watch(
               </div>
             </div>
 
-            <div v-if="isDisabledCheckTime && $q.screen.gt.xs" class="col-12">
+            <!-- <div v-if="isDisabledCheckTime && $q.screen.gt.xs" class="col-12">
               <q-separator />
               <div class="text-red q-pa-md">*{{ msgCheckTime }}</div>
-            </div>
+            </div> -->
           </div>
         </q-card>
       </div>
@@ -1194,7 +1889,7 @@ watch(
   <q-footer reveal v-if="$q.screen.xs" class="bg-grey-2">
     <q-separator />
     <div v-if="!isDisabledCheckTime" class="col-12 q-pa-md">
-      <p
+      <!-- <p
         :class="
           $q.screen.gt.xs
             ? 'text-red text-caption '
@@ -1202,7 +1897,7 @@ watch(
         "
       >
         *หมายเหตุ คลิกลงเวลาเข้างานแล้วระบบจะลงเวลาทันที
-      </p>
+      </p> -->
       <q-btn
         :label="
           !statusCheckin && inQueue
@@ -1232,10 +1927,10 @@ watch(
         :loading="inQueue"
       />
     </div>
-    <div v-if="isDisabledCheckTime" class="col-12">
+    <!-- <div v-if="isDisabledCheckTime" class="col-12">
       <q-separator />
       <div class="text-red q-pa-md text-left">*{{ msgCheckTime }}</div>
-    </div>
+    </div> -->
   </q-footer>
 
   <!-- แสดงการลงเวลา -->
@@ -1263,7 +1958,7 @@ watch(
           <div
             class="col-12 text-subtitle1 text-center text-white text-weight-medium"
           >
-            {{ date2Thai(Thai) }}
+            {{ date2Thai(displayedCheckDate) }}
           </div>
           <div class="row col-12 justify-center q-pt-sm">
             <!-- <div class="text-h3 text-white text-weight-bold"></div> -->
@@ -1274,7 +1969,7 @@ watch(
         </div>
         <div class="col-12 text-center row q-pt-md">
           <div class="col-12 text-subtitle1 text-weight-medium text-secondary">
-            พื้นที่ใกล้เคียง {{ formLocation.POI ?? formLocation.POI }}
+            พื้นที่ใกล้เคียง {{ formLocation.POI }}
           </div>
           <div class="col-12 text-subtitle1 text-weight-medium text-secondary">
             {{ location }}
@@ -1297,6 +1992,20 @@ watch(
       </q-card-actions>
     </q-card>
   </q-dialog>
+
+  <!--
+    Native still-image fallback: hidden file input.
+    Activated only after inline camera is proven unsupported or fails — on any
+    platform including iOS.  Never used as the first-choice path.
+  -->
+  <input
+    ref="nativePhotoInput"
+    type="file"
+    accept="image/*"
+    capture="user"
+    style="display: none"
+    @change="onNativePhotoSelected"
+  />
 </template>
 
 <style scoped>
@@ -1313,7 +2022,7 @@ watch(
 .card-container {
   position: relative;
   overflow: hidden;
-  height: autu; /* Adjust as needed */
+  height: auto; /* Adjust as needed */
   background: #f5f5f5;
   height: 35vh !important;
   box-shadow: none !important;
@@ -1322,7 +2031,7 @@ watch(
 .card-container-xs {
   position: relative;
   overflow: hidden;
-  height: autu; /* Adjust as needed */
+  height: auto; /* Adjust as needed */
   background: #ffffff;
   height: 35vh !important;
   border-radius: 10px;
@@ -1333,6 +2042,8 @@ watch(
   left: 0;
   width: 100%;
   height: 100%;
+  overflow: hidden;
+  border-radius: 8px;
 }
 
 .image-element {
@@ -1347,6 +2058,14 @@ watch(
   height: 100%;
 }
 
+/* Keep the live camera preview visually aligned with the normalized saved photo. */
+.camera-preview :deep(video) {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+  -webkit-object-fit: cover;
+}
+
 .bg-topOut {
   background: rgb(39, 50, 56);
   background: linear-gradient(
@@ -1364,4 +2083,23 @@ watch(
     rgba(2, 169, 152, 1) 100%
   );
 }
-</style>
\ No newline at end of file
+
+.icon-bounce {
+  animation: bounce 2s infinite;
+}
+
+.warning-banner {
+  border: 1px solid #ffcc80;
+  border-left: 4px solid #fb8c00;
+}
+
+@keyframes bounce {
+  0%,
+  100% {
+    transform: translateY(0);
+  }
+  50% {
+    transform: translateY(-10px);
+  }
+}
+</style>
diff --git a/src/views/MainView.vue b/src/views/MainView.vue
index c8bc1d8..d83192e 100644
--- a/src/views/MainView.vue
+++ b/src/views/MainView.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, onMounted } from 'vue'
+import { ref, computed, onMounted } from 'vue'
 import { useQuasar } from 'quasar'
 import { useRouter } from 'vue-router'
 
@@ -10,6 +10,7 @@ import { logout, tokenParsed, getCookie, gotoLeavePage } from '@/plugins/auth'
 import { useCounterMixin } from '@/stores/mixin'
 import { usePrivacyStore } from '@/stores/privacy'
 import { usePositionKeycloakStore } from '@/stores/positionKeycloak'
+import type { KeycloakPosition } from '@/interface/keycloak-position'
 
 // import type { notiType } from '@/interface/index/Main'
 // import type { Noti } from '@/interface/response/Main'
@@ -144,6 +145,8 @@ function onClickLogout() {
     ok: 'ยืนยัน',
     persistent: true,
   }).onOk(async () => {
+    // ล้างข้อมูล positionKeycloak ก่อน logout
+    positionKeycloakStore.clearPositionKeycloak()
     await http.post(config.API.keycloakLogSSO, { text: 'ออกจากระบบ' })
     await logout()
   })
@@ -174,18 +177,80 @@ const landingPageUrl = ref<string>(configParam.landingPageUrl)
 
 /** ฟังก์ชันเรียกข้อมูลผู้ใช่งาน*/
 async function fetchKeycloakPosition() {
+  // เช็คว่ามีข้อมูลใน store อยู่แล้วหรือไม่ (จาก localStorage)
+  const existingData = positionKeycloakStore.dataPositionKeycloak
+
+  if (existingData) {
+    // มีข้อมูลอยู่แล้ว ใช้ข้อมูลเดิม
+
+    // เช็คว่ามีข้อมูลสังกัด (organization) หรือไม่
+    const hasOrganization =
+      existingData.organization &&
+      (existingData.organization.root ||
+        existingData.organization.child1 ||
+        existingData.organization.child2 ||
+        existingData.organization.child3 ||
+        existingData.organization.child4)
+
+    if (!hasOrganization) {
+      // ไม่มีข้อมูลสังกัด redirect ไปหน้า NoPosition
+      router.replace('/no-position')
+      return
+    }
+
+    privacyStore.modalPrivacy = !existingData.privacyCheckin
+    privacyStore.setAccepted(existingData.privacyCheckin)
+
+    return
+  }
+
+  // ไม่มีข้อมูล ให้ fetch จาก API
   await http
     .get(config.API.keycloakPosition())
     .then(async (res) => {
-      const data = await res.data.result
-      positionKeycloakStore.setPositionKeycloak(data)
-      privacyStore.modalPrivacy = !data.privacyCheckin ? true : false
-      privacyStore.setAccepted(data.privacyCheckin)
+      const apiData = await res.data.result
+
+      // Map API response to KeycloakPosition interface
+      const keycloakData: KeycloakPosition = {
+        privacyCheckin: apiData.privacyCheckin ?? false,
+        avatarName: apiData.avatarName,
+        profileId: apiData.profileId,
+        organization: {
+          root: apiData.root,
+          child1: apiData.child1,
+          child2: apiData.child2,
+          child3: apiData.child3,
+          child4: apiData.child4,
+        },
+      }
+
+      // เช็คว่ามีข้อมูลสังกัด (organization) หรือไม่
+      // ถ้าไม่มีข้อมูลสังกัด ให้ redirect ไปหน้า NoPosition
+      const hasOrganization =
+        keycloakData.organization &&
+        (keycloakData.organization.root ||
+          keycloakData.organization.child1 ||
+          keycloakData.organization.child2 ||
+          keycloakData.organization.child3 ||
+          keycloakData.organization.child4)
+
+      if (!hasOrganization) {
+        // บันทึกข้อมูลที่ได้รับไว้ก่อน (เผื่อใช้ในอนาคต)
+        positionKeycloakStore.setPositionKeycloak(keycloakData)
+        // Redirect ไปหน้า NoPosition
+        router.replace('/no-position')
+        return
+      }
+
+      positionKeycloakStore.setPositionKeycloak(keycloakData)
+      privacyStore.modalPrivacy = !keycloakData.privacyCheckin
+      privacyStore.setAccepted(keycloakData.privacyCheckin)
+
       //เช็คว่ามีรูปไหม ถ้ามีรูปเรียกข้อมูลรูป
-      if (data.avatarName) {
-        getImg(data.profileId, data.avatarName)
+      if (keycloakData.avatarName) {
+        getImg(keycloakData.profileId, keycloakData.avatarName)
       } else {
-        profileImg.value = avatar
+        positionKeycloakStore.setProfileImg(avatar)
       }
     })
     .catch((err) => {
@@ -193,12 +258,15 @@ async function fetchKeycloakPosition() {
     })
 }
 
-const profileImg = ref<string>('')
+const profileImg = computed({
+  get: () => positionKeycloakStore.profileImg,
+  set: (value) => positionKeycloakStore.setProfileImg(value),
+})
 function getImg(id: string, pathName: string) {
   http
     .get(config.API.fileByFile('ทะเบียนประวัติ', 'โปรไฟล์', id, pathName))
     .then((res) => {
-      profileImg.value = res.data.downloadUrl
+      positionKeycloakStore.setProfileImg(res.data.downloadUrl)
     })
 }
 
@@ -297,6 +365,7 @@ onMounted(async () => {
   const checkTokenParsed = await tokenParsed()
   const SSO_TOKEN = await getCookie('SSO')
   isSsoToken.value = SSO_TOKEN === 'y' ? true : false
+
   if (checkTokenParsed != null) {
     fullName.value = checkTokenParsed.name
   }
diff --git a/src/views/MapView.vue b/src/views/MapView.vue
index 33ebc58..5f7edc9 100644
--- a/src/views/MapView.vue
+++ b/src/views/MapView.vue
@@ -133,14 +133,19 @@ const photoHeight = ref<number>(350)
 
 /** function เปิดกล้อง */
 async function openCamera() {
-  // change camera device
-  if (cameraIsOn.value) {
-    camera.value?.stop()
-  } else {
-    await camera.value?.start()
-    changeCamera()
+  try {
+    // change camera device
+    if (cameraIsOn.value) {
+      camera.value?.stop()
+    } else {
+      await camera.value?.start()
+      changeCamera()
+    }
+    cameraIsOn.value = !cameraIsOn.value
+  } catch (error) {
+    console.error('Error opening camera:', error)
+    messageError($q, error, 'ไม่สามารถเปิดกล้องได้ กรุณาลองใหม่อีกครั้ง')
   }
-  cameraIsOn.value = !cameraIsOn.value
 }
 
 /** change camera device */
@@ -152,25 +157,49 @@ async function changeCamera() {
 
 /** function ถ่ายรูป*/
 async function capturePhoto() {
-  const imageBlob: any = await camera.value?.snapshot(
-    { width: photoWidth.value, height: photoHeight.value },
-    'image/png',
-    0.5
-  )
-  const fileName = 'photo.png'
-  //ไฟล์รูป
-  const file = new File([imageBlob], fileName, { type: 'image/png' })
-  fileImg.value = file
-  //แสดงรูป
-  camera.value?.stop()
-  const url = URL.createObjectURL(imageBlob)
-  img.value = url
+  try {
+    const imageBlob: any = await camera.value?.snapshot(
+      { width: photoWidth.value, height: photoHeight.value },
+      'image/jpeg',
+      0.8
+    )
+    if (!imageBlob) {
+      messageError($q, '', 'ไม่สามารถถ่ายรูปได้ กรุณาลองใหม่อีกครั้ง')
+      return
+    }
+    const fileName = `photo_${Date.now()}.jpg`
+    //ไฟล์รูป
+    const file = new File([imageBlob], fileName, { type: 'image/jpeg' })
+    fileImg.value = file
+
+    // ยกเลิก URL เก่าก่อนสร้างใหม่ (ป้องกัน memory leak)
+    if (img.value) {
+      URL.revokeObjectURL(img.value)
+    }
+
+    //แสดงรูป
+    camera.value?.stop()
+    const url = URL.createObjectURL(imageBlob)
+    img.value = url
+  } catch (error) {
+    console.error('Error capturing photo:', error)
+    messageError($q, error, 'ไม่สามารถถ่ายรูปได้ กรุณาลองใหม่อีกครั้ง')
+  }
 }
 
 /** function เปลี่ยนรูปภาพ*/
-function refreshPhoto() {
-  img.value = undefined
-  camera.value?.start()
+async function refreshPhoto() {
+  try {
+    // ยกเลิก URL เก่า (ป้องกัน memory leak)
+    if (img.value) {
+      URL.revokeObjectURL(img.value)
+      img.value = undefined
+    }
+    await camera.value?.start()
+  } catch (error) {
+    console.error('Error refreshing photo:', error)
+    messageError($q, error, 'ไม่สามารถเปิดกล้องได้ กรุณาลองใหม่อีกครั้ง')
+  }
 }
 
 /** ref validate*/
@@ -335,7 +364,8 @@ onMounted(async () => {
                       :resolution="{ width: photoWidth, height: photoHeight }"
                       ref="camera"
                       :autoplay="false"
-                      :style="!img ? 'display: block' : 'display: none'"
+                      :playsinline="true"
+                      :facingMode="'user'"
                     />
 
                     <!-- แสดงรูปเมื่อกด capture -->
@@ -460,7 +490,7 @@ onMounted(async () => {
                 <div class="col-12 text-right">
                   <q-separator />
                   <div class="col-12 q-pa-md">
-                    <p
+                    <!-- <p
                       :class="
                         $q.screen.gt.xs
                           ? 'text-red text-caption '
@@ -468,7 +498,7 @@ onMounted(async () => {
                       "
                     >
                       *หมายเหตุ คลิกลงเวลาเข้างานแล้วระบบจะลงเวลาทันที
-                    </p>
+                    </p> -->
                     <q-btn
                       :label="
                         stetusCheckin == true ? 'ลงเวลาเข้างาน' : 'ลงเวลาออกงาน'
@@ -569,4 +599,12 @@ onMounted(async () => {
   width: 100%;
   height: 100%;
 }
+
+/* iOS-specific video fixes */
+.card-container video {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+  -webkit-object-fit: cover;
+}
 </style>
diff --git a/src/views/NoPositionView.vue b/src/views/NoPositionView.vue
new file mode 100644
index 0000000..691d10a
--- /dev/null
+++ b/src/views/NoPositionView.vue
@@ -0,0 +1,106 @@
+<script setup lang="ts">
+import { useQuasar } from 'quasar'
+import { useRouter } from 'vue-router'
+import { useCounterMixin } from '@/stores/mixin'
+import { usePositionKeycloakStore } from '@/stores/positionKeycloak'
+import { logout } from '@/plugins/auth'
+import CustomComponent from '@/components/CustomDialog.vue'
+
+const $q = useQuasar()
+const router = useRouter()
+const mixin = useCounterMixin()
+const positionKeycloakStore = usePositionKeycloakStore()
+const { showLoader, hideLoader } = mixin
+
+/**
+ * ฟังก์ชันจัดการเมื่อผู้ใช้กดปุ่มตกลง
+ * ดำเนินการ logout โดยตรง
+ */
+function handleOkClick() {
+  performLogout()
+}
+
+/**
+ * ฟังก์ชันดำเนินการออกจากระบบ
+ */
+async function performLogout() {
+  showLoader()
+  try {
+    // ล้างข้อมูล positionKeycloak ก่อน logout
+    positionKeycloakStore.clearPositionKeycloak()
+    await logout()
+  } catch (error) {
+    console.error('Logout error:', error)
+  } finally {
+    setTimeout(() => {
+      hideLoader()
+    }, 1000)
+  }
+}
+</script>
+
+<template>
+  <div
+    class="fullscreen bg-secondary text-white text-center q-pa-sm flex flex-center"
+  >
+    <div class="no-position-container">
+      <!-- Icon แสดงความผิดปกติ -->
+      <div class="icon-container">
+        <q-icon name="mdi-account-off-outline" size="100px" color="white" />
+      </div>
+
+      <!-- หัวข้อหลัก -->
+      <div class="text-h4 q-mt-lg q-mb-md">ไม่พบข้อมูลสังกัด</div>
+
+      <!-- รายละเอียด -->
+      <div class="text-h6 q-mb-lg text-weight-regular">
+        ท่านยังไม่มีสังกัดในโครงสร้างองค์กร<br />
+        กรุณาติดต่อเจ้าหน้าที่ที่เบอร์ 1171
+        <br />เพื่อดำเนินการเพิ่มข้อมูล
+      </div>
+
+      <div class="text-weight-regular">
+        เมื่อเจ้าหน้าที่ได้เพิ่มท่านในโครงสร้างองค์กรเรียบร้อยแล้ว
+        กรุณาเข้าสู่ระบบใหม่อีกครั้ง
+      </div>
+      <!-- ปุ่มตกลง -->
+      <q-btn
+        class="q-mt-xl"
+        color="white"
+        text-color="secondary"
+        unelevated
+        label="ตกลง"
+        no-caps
+        size="lg"
+        padding="md xl"
+        @click="handleOkClick"
+      />
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.no-position-container {
+  max-width: 600px;
+  padding: 2rem;
+}
+
+.icon-container {
+  opacity: 0.9;
+}
+
+.text-h4 {
+  font-weight: 700;
+}
+
+.text-h6 {
+  line-height: 1.8;
+  opacity: 0.95;
+}
+
+.q-btn {
+  border-radius: 8px;
+  font-weight: 600;
+  min-width: 150px;
+}
+</style>
diff --git a/src/views/login.vue b/src/views/login.vue
index df02614..df0725d 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -20,7 +20,7 @@ const password = ref<string>('')
 async function onSubmit() {
   showLoader()
   const formdata = new URLSearchParams()
-  formdata.append('username', username.value)
+  formdata.append('username', username.value.trim())
   formdata.append('password', password.value)
 
   await axios
diff --git a/tests/utils.ts b/tests/utils.ts
new file mode 100644
index 0000000..92b5e37
--- /dev/null
+++ b/tests/utils.ts
@@ -0,0 +1,26 @@
+import { enableAutoUnmount, flushPromises, VueWrapper } from '@vue/test-utils'
+import { createPinia, setActivePinia } from 'pinia'
+
+/**
+ * Helper function to setup test environment with Pinia
+ */
+export function setupTest() {
+  const pinia = createPinia()
+  setActivePinia(pinia)
+  return pinia
+}
+
+/**
+ * Helper to flush all pending promises
+ */
+export async function flushAllPromises() {
+  await flushPromises()
+  await new Promise((resolve) => setTimeout(resolve, 0))
+}
+
+/**
+ * Helper to cleanup after each test
+ */
+export function teardownTest() {
+  vi.clearAllMocks()
+}
diff --git a/vite.config.js b/vite.config.js
index 6d575e0..8ed3c30 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -23,7 +23,7 @@ export default defineConfig({
         cleanupOutdatedCaches: true,
         globPatterns: ['**/*.*'],
       },
-      includeAssets: ['icons/safari-pinned-tab.svg'],
+      includeAssets: ['icons/safari-pinned-tab.svg', 'src/assets/markers/*.svg'],
       manifest: {
         name: 'HRMS-Checkin',
         short_name: 'HRMS Checkin',