fix: increase DB pool size and fix connection leak in permissions route

- connectionLimit 10 -> 50, queueLimit 0 -> 100 to prevent pool exhaustion
- Add missing db.release() in GET /permissions/:id finally block

backend/config/db.js

@@ -0,0 +1,8 @@
+// backend/config/db.js
+import 'dotenv/config';
+
+export const APP_TIMEZONE =
+  process.env.APP_TIMEZONE || '+07:00'; // default for Nilai
+  //process.env.APP_TIMEZONE || 'Asia/Jakarta'; // default for Indonesia
+
+  // All dates from DB are treated as if they are in this timezone

backend/pool.js

@@ -0,0 +1,34 @@
+import mysql from 'mysql2/promise'
+import { APP_TIMEZONE } from './config/db.js'
+import dotenv from 'dotenv'
+import path from 'path'
+import { fileURLToPath } from 'url'
+
+dotenv.config({ path: path.join(path.dirname(fileURLToPath(import.meta.url)), '.env') });
+
+const db = mysql.createPool({
+  host: process.env.DB_HOST,
+  user: process.env.DB_USER,
+  password: process.env.DB_PASSWORD,
+  database: process.env.DB_NAME,
+  port: process.env.DB_PORT,
+  waitForConnections: true,
+  connectionLimit: 50,
+  queueLimit: 100,
+  // timezone: '+08:00',
+  dateStrings: true,
+});
+
+
+const originalGetConnection = db.getConnection.bind(db);
+
+db.getConnection = async () => {
+  const connection = await originalGetConnection();
+  // 设置时区
+  await connection.execute(`SET time_zone = '${APP_TIMEZONE}'`);
+  return connection;
+};
+
+export const getConnection = async () => {
+  return await db.getConnection()
+}

backend/server.js

@@ -7,28 +7,17 @@ import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
 import dotenv from 'dotenv';
-import mysql from 'mysql2/promise';
 import managerRoutes from './managerRoutes.js';
 import workerRoutes from './workerRoutes.js';
+import { getConnection } from './pool.js'
 
 async function startServer() {
   dotenv.config({ path: path.join(path.dirname(fileURLToPath(import.meta.url)), '.env') });
 
   const app = express();
 
-  const db = mysql.createPool({
-    host: process.env.DB_HOST,
-    user: process.env.DB_USER,
-    password: process.env.DB_PASSWORD,
-    database: process.env.DB_NAME,
-    port: process.env.DB_PORT,
-    waitForConnections: true,
-    connectionLimit: 10,
-    queueLimit: 0,
-  });
-
   try {
-    const connection = await db.getConnection();
+    const connection = await getConnection();
     console.log('Database connected successfully!');
     connection.release();
   } catch (error) {
@@ -53,7 +42,7 @@ async function startServer() {
     },
     credentials: true,
     methods: ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS'],
-    allowedHeaders: ['Content-Type', 'Authorization', 'ngrok-skip-browser-warning'],
+    allowedHeaders: ['Content-Type', 'Authorization', 'ngrok-skip-browser-warning', 'X-User-Timezone'], //added X-User-Timezone for my development (Edison)
     exposedHeaders: ['Content-Range', 'X-Content-Range'],
   };
 
@@ -76,8 +65,8 @@ async function startServer() {
     app.get('/time', timeHandler);       // public path
     app.get('/api/time', timeHandler);   // also under /api
 
-  app.use('/api/managers', managerRoutes(db));
-  app.use('/api', workerRoutes(db));
+  app.use('/api/managers', managerRoutes());
+  app.use('/api', workerRoutes());
 
   const httpPort = process.env.HTTP_PORT || 3000;
   const httpsPort = process.env.HTTPS_PORT || 3443;

backend/test.js

@@ -0,0 +1,22 @@
+import { getConnection } from './pool.js'
+// import mysql from 'mysql2/promise'
+//
+//
+//
+// export const db = mysql.createPool({
+//   host: '47.254.195.2',
+//   user: 'nilai_clock_indo',
+//   password: '5jHy8ZsfeEjPAhYS',
+//   database: 'nilai_clock_indo',
+//   port: 3306,
+//   waitForConnections: true,
+//   connectionLimit: 10,
+//   queueLimit: 0,
+//   dateStrings: true,
+//   // 不在这里设置timezone，因为我们用查询设置
+// });
+
+const conn = await getConnection()
+
+const [rows] = await conn.execute('select * from clock_records where id= 6654');
+console.log(rows);

backend/workerRoutes.js

@@ -2,7 +2,7 @@ import express from 'express';
 import { point, polygon, booleanPointInPolygon, pointToLineDistance } from '@turf/turf';
 import bcrypt from 'bcrypt';
 import jwt from 'jsonwebtoken';
-// Removed unused import
+import { getConnection } from './pool.js';
 
 async function validateDeviceForUser(userId, deviceUuid, db) {
   const [userRows] = await db.execute('SELECT device_uuid FROM workers WHERE id = ?', [userId]);
@@ -15,13 +15,14 @@ async function validateDeviceForUser(userId, deviceUuid, db) {
   return { valid: device_uuid === deviceUuid, message: 'Device validation failed' };
 }
 
-async function isClockingEnabled(db) {
-  const today = new Date().toISOString().slice(0, 10); // YYYY-MM-DD format
-  const [rows] = await db.execute('SELECT 1 FROM enabled_dates WHERE enabled_date = ? LIMIT 1', [today]);
+async function isClockingEnabled(conn) {
+  const [rows] = await conn.execute(
+    'SELECT 1 FROM enabled_dates WHERE enabled_date = CURDATE() LIMIT 1'
+  );
   return rows.length > 0;
 }
 
-export default function(db) {
+export default function() {
   const router = express.Router();
 
   // Set DEVICE_UUID_ENABLED to false to completely disable device UUID checking
@@ -30,51 +31,58 @@ export default function(db) {
   const AUTO_REGISTER_NEW_DEVICES = true;
 
   router.post('/auth/login', async (req, res) => {
-    const { username, password, deviceUuid } = req.body;
-    const [rows] = await db.execute('SELECT id, role, password_hash, status FROM workers WHERE username = ?', [username]);
-    if (rows.length === 0) {
-      return res.status(401).json({ message: 'Invalid credentials' });
-    }
-    const user = rows[0];
+    const db = await getConnection();
+    try {
+      const { username, password, deviceUuid } = req.body;
+      const [rows] = await db.execute('SELECT id, role, password_hash, status FROM workers WHERE username = ?', [username]);
+      if (rows.length === 0) {
+        return res.status(401).json({ message: 'Invalid credentials' });
+      }
+      const user = rows[0];
 
-    // Check if the user's status is 'active'
-    if (user.status !== 'active') {
-      return res.status(401).json({ message: 'Invalid credentials' });
-    }
+      // Check if the user's status is 'active'
+      if (user.status !== 'active') {
+        return res.status(401).json({ message: 'Invalid credentials' });
+      }
 
-    const passwordMatch = await bcrypt.compare(password, user.password_hash);
-    if (!passwordMatch) {
-      return res.status(401).json({ message: 'Invalid credentials' });
-    }
+      const passwordMatch = await bcrypt.compare(password, user.password_hash);
+      if (!passwordMatch) {
+        return res.status(401).json({ message: 'Invalid credentials' });
+      }
 
-    // Device UUID handling - controlled by configuration flags above
-    if (DEVICE_UUID_ENABLED && user.role === 'worker') {
-      const [deviceRows] = await db.execute('SELECT device_uuid FROM workers WHERE id = ?', [user.id]);
-      const existingDeviceUuid = deviceRows[0].device_uuid;
+      // Device UUID handling - controlled by configuration flags above
+      if (DEVICE_UUID_ENABLED && user.role === 'worker') {
+        const [deviceRows] = await db.execute('SELECT device_uuid FROM workers WHERE id = ?', [user.id]);
+        const existingDeviceUuid = deviceRows[0].device_uuid;
 
-      if (existingDeviceUuid) {
-        if (deviceUuid && deviceUuid !== existingDeviceUuid) {
-          return res.status(403).json({ message: 'deviceMismatch' });
-        } else if (!deviceUuid) {
-          return res.status(403).json({ message: 'useMobileApp' });
-        }
-      } else {
-        // User has no registered device
-        if (deviceUuid && AUTO_REGISTER_NEW_DEVICES) {
-          const deviceResult = await validateDeviceForUser(user.id, deviceUuid, db);
-          if (!deviceResult.valid) {
-            return res.status(500).json({ message: 'deviceRegistrationFailed' });
+        if (existingDeviceUuid) {
+          if (deviceUuid && deviceUuid !== existingDeviceUuid) {
+            return res.status(403).json({ message: 'deviceMismatch' });
+          } else if (!deviceUuid) {
+            return res.status(403).json({ message: 'useMobileApp' });
+          }
+        } else {
+          // User has no registered device
+          if (deviceUuid && AUTO_REGISTER_NEW_DEVICES) {
+            const deviceResult = await validateDeviceForUser(user.id, deviceUuid, db);
+            if (!deviceResult.valid) {
+              return res.status(500).json({ message: 'deviceRegistrationFailed' });
+            }
+          } else if (!deviceUuid && REQUIRE_DEVICE_FOR_WORKERS) {
+            return res.status(403).json({ message: 'deviceRequired' });
           }
-          // console.log(`Device UUID registered for worker ${user.id}: ${deviceUuid}`);
-        } else if (!deviceUuid && REQUIRE_DEVICE_FOR_WORKERS) {
-          return res.status(403).json({ message: 'deviceRequired' });
         }
       }
-    }
 
-    // Managers can always login, workers without device_uuid can login
-    const token = jwt.sign({ userId: user.id, role: user.role }, process.env.JWT_SECRET, { expiresIn: '1h' });
-    res.json({ token });
+      // Managers can always login, workers without device_uuid can login
+      const token = jwt.sign({ userId: user.id, role: user.role }, process.env.JWT_SECRET, { expiresIn: '1h' });
+      res.json({ token });
+    } catch (error) {
+      console.error('Login error:', error);
+      res.status(500).json({ message: 'Server error during login' });
+    } finally {
+      db.release();
+    }
   });
 
   const authenticateJWT = (req, res, next) => {
@@ -85,7 +93,7 @@ export default function(db) {
         if (err) {
           return res.status(403).json({ message: 'Invalid or expired token' });
         }
-        req.user = { ...user, id: user.userId }; // Correctly map userId to id
+        req.user = { ...user, id: user.userId };
         next();
       });
     } else {
@@ -94,32 +102,37 @@ export default function(db) {
   };
 
   router.use(authenticateJWT);
-// Definitive version with distance calculation and specific error messages
 
-// Definitive version with distance calculation and specific error messages
   router.post('/clock', async (req, res) => {
+    const db = await getConnection();
     try {
       const { userId, eventType, qrCodeValue, latitude, longitude } = req.body;
-      const currentTimestamp = new Date().toISOString().slice(0, 19).replace('T', ' ');
 
-      // 1. Kill Switch Enforcement
+      // 1) Kill Switch — now evaluated in the session's local day
       const clockingAllowed = await isClockingEnabled(db);
       if (!clockingAllowed) {
         const note = 'Clock-in/out function is not enabled for today.';
         await db.execute(
-          'INSERT INTO clock_records (worker_id, event_type, qr_code_id, latitude, longitude, notes, timestamp) VALUES (?, "failed", ?, ?, ?, ?, ?)',
-          [userId, qrCodeValue, latitude, longitude, note, currentTimestamp]
+          `INSERT INTO clock_records
+           (worker_id, event_type, qr_code_id, latitude, longitude, notes, timestamp)
+           VALUES (?, "failed", ?, ?, ?, ?, CURRENT_TIME())`,
+          [userId, qrCodeValue, latitude, longitude, note]
         );
         return res.status(403).json({ message: 'error.clockingDisabled' });
       }
 
-      // 2. Geofence Validation with Distance Calculation
+      // 2) Geofence Validation
       if (latitude != null && longitude != null) {
         const [activeFences] = await db.execute('SELECT coordinates FROM geofences WHERE is_active = 1');
 
         if (activeFences.length === 0) {
           const note = 'Cannot clock in: No active work area is defined.';
-          await db.execute('INSERT INTO clock_records (worker_id, event_type, qr_code_id, latitude, longitude, notes, timestamp) VALUES (?, "failed", ?, ?, ?, ?, ?)', [userId, qrCodeValue, latitude, longitude, note, currentTimestamp]);
+          await db.execute(
+            `INSERT INTO clock_records
+             (worker_id, event_type, qr_code_id, latitude, longitude, notes, timestamp)
+             VALUES (?, "failed", ?, ?, ?, ?, CURRENT_TIME())`,
+            [userId, qrCodeValue, latitude, longitude, note]
+          );
           return res.status(403).json({ message: 'error.noActiveGeofence' });
         }
 
@@ -132,7 +145,7 @@ export default function(db) {
             if (!fence.coordinates) continue;
             const coordinates = JSON.parse(fence.coordinates);
             const fencePolygon = polygon([coordinates]);
-            parsedPolygons.push(fencePolygon); // Save for distance calculation
+            parsedPolygons.push(fencePolygon);
             if (booleanPointInPolygon(userLocation, fencePolygon)) {
               isInside = true;
               break;
@@ -146,18 +159,21 @@ export default function(db) {
           let minDistance = Infinity;
           for (const p of parsedPolygons) {
             const distance = pointToLineDistance(userLocation, p.geometry.coordinates[0], { units: 'meters' });
-            if (distance < minDistance) {
-              minDistance = distance;
-            }
+            if (distance < minDistance) minDistance = distance;
           }
           const distanceString = minDistance.toFixed(2);
           const note = `Outside geofence by ${distanceString}m`;
-          await db.execute('INSERT INTO clock_records (worker_id, event_type, qr_code_id, latitude, longitude, notes, timestamp) VALUES (?, "failed", ?, ?, ?, ?, ?)', [userId, qrCodeValue, latitude, longitude, note, currentTimestamp]);
+          await db.execute(
+            `INSERT INTO clock_records
+             (worker_id, event_type, qr_code_id, latitude, longitude, notes, timestamp)
+             VALUES (?, "failed", ?, ?, ?, ?, CURRENT_TIME())`,
+            [userId, qrCodeValue, latitude, longitude, note]
+          );
           return res.status(403).json({ message: `error.outsideGeofence|${distanceString}` });
         }
       }
 
-      // 3. QR Code and Status Validation
+      // 3) QR Code and Status Validation
       if (qrCodeValue !== 'FORCE_CLOCK_OUT') {
         const [qrRows] = await db.execute('SELECT is_active FROM qr_codes WHERE id = ?', [qrCodeValue]);
         if (qrRows.length === 0 || !qrRows[0].is_active) {
@@ -165,65 +181,104 @@ export default function(db) {
         }
       }
 
-      const [lastEvent] = await db.execute('SELECT event_type FROM clock_records WHERE worker_id = ? ORDER BY timestamp DESC LIMIT 1', [userId]);
+      const [lastEvent] = await db.execute(
+        'SELECT event_type FROM clock_records WHERE worker_id = ? ORDER BY timestamp DESC LIMIT 1',
+        [userId]
+      );
       if (lastEvent.length > 0 && lastEvent[0].event_type === eventType) {
         const errorKey = eventType === 'clock_in' ? 'error.alreadyClockedIn' : 'error.alreadyClockedOut';
         return res.status(400).json({ message: errorKey });
       }
 
-      // 4. Record Successful Event
+      // 4) Record Successful Event
       await db.execute(
-        'INSERT INTO clock_records (worker_id, event_type, qr_code_id, latitude, longitude, timestamp) VALUES (?, ?, ?, ?, ?, ?)',
-        [userId, eventType, qrCodeValue, latitude, longitude, currentTimestamp]
+        `INSERT INTO clock_records
+           (worker_id, event_type, qr_code_id, latitude, longitude, timestamp)
+         VALUES (?, ?, ?, ?, ?, CURRENT_TIME())`,
+        [userId, eventType, qrCodeValue, latitude, longitude]
       );
-      res.status(201).json({ message: 'Clock event recorded.' });
 
+      res.status(201).json({ message: 'Clock event recorded.' });
     } catch (error) {
       console.error('!!! CRITICAL ERROR in /clock route !!!:', error);
       res.status(500).json({ message: 'error.criticalServer' });
+    } finally {
+      db.release();
     }
   });
 
   router.get('/workers/:id', async (req, res) => {
-    const { id } = req.params;
-    const [rows] = await db.execute("SELECT full_name FROM workers WHERE id = ? AND role = 'worker'", [id]);
-    if (rows.length === 0) {
-      return res.status(404).json({ message: 'Worker not found.' });
+    const db = await getConnection();
+    try {
+      const { id } = req.params;
+      const [rows] = await db.execute("SELECT full_name FROM workers WHERE id = ? AND role = 'worker'", [id]);
+      if (rows.length === 0) {
+        return res.status(404).json({ message: 'Worker not found.' });
+      }
+      res.json(rows[0]);
+    } catch (error) {
+      console.error('Get worker error:', error);
+      res.status(500).json({ message: 'Server error fetching worker' });
+    } finally {
+      db.release();
     }
-    res.json(rows[0]);
   });
 
   router.get('/worker/status/:userId', async (req, res) => {
-    const { userId } = req.params;
-    const [rows] = await db.execute('SELECT event_type FROM clock_records WHERE worker_id = ? ORDER BY timestamp DESC LIMIT 1', [userId]);
-    res.json({ eventType: rows.length > 0 ? rows[0].event_type : 'clock_out' });
+    const db = await getConnection();
+    try {
+      const { userId } = req.params;
+      const [rows] = await db.execute('SELECT event_type FROM clock_records WHERE worker_id = ? ORDER BY timestamp DESC LIMIT 1', [userId]);
+      res.json({ eventType: rows.length > 0 ? rows[0].event_type : 'clock_out' });
+    } catch (error) {
+      console.error('Get worker status error:', error);
+      res.status(500).json({ message: 'Server error fetching worker status' });
+    } finally {
+      db.release();
+    }
   });
 
   router.get('/worker/clock-history/:userId', async (req, res) => {
-    const { userId } = req.params;
-    const [rows] = await db.execute(`
-      SELECT cr.id, cr.event_type, cr.timestamp, COALESCE(qc.name, 'Manual Entry') as qrCodeUsedName
-      FROM clock_records cr
-      LEFT JOIN qr_codes qc ON cr.qr_code_id = qc.id
-      WHERE cr.worker_id = ? ORDER BY cr.timestamp DESC
-    `, [userId]);
-    res.json(rows);
+    const db = await getConnection();
+    try {
+      const { userId } = req.params;
+      const [rows] = await db.execute(`
+        SELECT cr.id, cr.event_type, cr.timestamp, COALESCE(qc.name, 'Manual Entry') as qrCodeUsedName
+        FROM clock_records cr
+               LEFT JOIN qr_codes qc ON cr.qr_code_id = qc.id
+        WHERE cr.worker_id = ? ORDER BY cr.timestamp DESC
+      `, [userId]);
+      res.json(rows);
+    } catch (error) {
+      console.error('Get clock history error:', error);
+      res.status(500).json({ message: 'Server error fetching clock history' });
+    } finally {
+      db.release();
+    }
   });
 
   router.put('/worker/change-password', async (req, res) => {
-    const { userId } = req.user;
-    const { currentPassword, newPassword } = req.body;
-    if (!currentPassword || !newPassword || newPassword.length < 6) {
-      return res.status(400).json({ message: 'Invalid input.' });
+    const db = await getConnection();
+    try {
+      const { userId } = req.user;
+      const { currentPassword, newPassword } = req.body;
+      if (!currentPassword || !newPassword || newPassword.length < 6) {
+        return res.status(400).json({ message: 'Invalid input.' });
+      }
+      const [rows] = await db.execute('SELECT password_hash FROM workers WHERE id = ?', [userId]);
+      const passwordMatch = await bcrypt.compare(currentPassword, rows[0].password_hash);
+      if (!passwordMatch) {
+        return res.status(401).json({ message: 'Incorrect current password.' });
+      }
+      const newHashedPassword = await bcrypt.hash(newPassword, 10);
+      await db.execute('UPDATE workers SET password_hash = ? WHERE id = ?', [newHashedPassword, userId]);
+      res.json({ message: 'Password updated successfully.' });
+    } catch (error) {
+      console.error('Change password error:', error);
+      res.status(500).json({ message: 'Server error changing password' });
+    } finally {
+      db.release();
     }
-    const [rows] = await db.execute('SELECT password_hash FROM workers WHERE id = ?', [userId]);
-    const passwordMatch = await bcrypt.compare(currentPassword, rows[0].password_hash);
-    if (!passwordMatch) {
-      return res.status(401).json({ message: 'Incorrect current password.' });
-    }
-    const newHashedPassword = await bcrypt.hash(newPassword, 10);
-    await db.execute('UPDATE workers SET password_hash = ? WHERE id = ?', [newHashedPassword, userId]);
-    res.json({ message: 'Password updated successfully.' });
   });
 
   router.post('/location/update', async (req, res) => {
@@ -232,30 +287,62 @@ export default function(db) {
   });
 
   router.post('/device/register', async (req, res) => {
-    const { userId, deviceUuid } = req.body;
-    const result = await validateDeviceForUser(userId, deviceUuid, db);
-    res.status(result.valid ? 200 : 409).json(result);
+    const db = await getConnection();
+    try {
+      const { userId, deviceUuid } = req.body;
+      const result = await validateDeviceForUser(userId, deviceUuid, db);
+      res.status(result.valid ? 200 : 409).json(result);
+    } catch (error) {
+      console.error('Device register error:', error);
+      res.status(500).json({ message: 'Server error registering device' });
+    } finally {
+      db.release();
+    }
   });
 
   router.post('/device/validate', async (req, res) => {
-    const { userId, deviceUuid } = req.body;
-    const result = await validateDeviceForUser(userId, deviceUuid, db);
-    res.json(result);
+    const db = await getConnection();
+    try {
+      const { userId, deviceUuid } = req.body;
+      const result = await validateDeviceForUser(userId, deviceUuid, db);
+      res.json(result);
+    } catch (error) {
+      console.error('Device validate error:', error);
+      res.status(500).json({ message: 'Server error validating device' });
+    } finally {
+      db.release();
+    }
   });
 
   router.get('/security/status/:userId', async (req, res) => {
-    const { userId } = req.params;
-    const [securityRows] = await db.execute('SELECT * FROM security_checks WHERE user_id = ? ORDER BY created_at DESC LIMIT 1', [userId]);
-    const [alertRows] = await db.execute('SELECT * FROM security_alerts WHERE user_id = ? AND created_at > DATE_SUB(NOW(), INTERVAL 7 DAY)', [userId]);
-    res.json({
-      latestSecurityCheck: securityRows[0] || null,
-      recentAlerts: alertRows,
-    });
+    const db = await getConnection();
+    try {
+      const { userId } = req.params;
+      const [securityRows] = await db.execute('SELECT * FROM security_checks WHERE user_id = ? ORDER BY created_at DESC LIMIT 1', [userId]);
+      const [alertRows] = await db.execute('SELECT * FROM security_alerts WHERE user_id = ? AND created_at > DATE_SUB(NOW(), INTERVAL 7 DAY)', [userId]);
+      res.json({
+        latestSecurityCheck: securityRows[0] || null,
+        recentAlerts: alertRows,
+      });
+    } catch (error) {
+      console.error('Security status error:', error);
+      res.status(500).json({ message: 'Server error fetching security status' });
+    } finally {
+      db.release();
+    }
   });
 
   router.get('/security/app-blacklist', async (req, res) => {
-    const [rows] = await db.execute('SELECT package_name FROM app_blacklist');
-    res.json(rows.map(row => row.package_name));
+    const db = await getConnection();
+    try {
+      const [rows] = await db.execute('SELECT package_name FROM app_blacklist');
+      res.json(rows.map(row => row.package_name));
+    } catch (error) {
+      console.error('App blacklist error:', error);
+      res.status(500).json({ message: 'Server error fetching app blacklist' });
+    } finally {
+      db.release();
+    }
   });
 
   return router;

package.json

@@ -19,6 +19,7 @@
     "body-parser": "^2.2.0",
     "cors": "^2.8.5",
     "dotenv": "^16.6.1",
+    "exceljs": "^4.4.0",
     "express": "^5.1.0",
     "html5-qrcode": "^2.3.8",
     "json2csv": "^6.0.0-alpha.2",

src/api.js

@@ -1,11 +1,21 @@
 const API_BASE_URL = import.meta.env.VITE_API_BASE_URL;
 
+function getUserTimezone() {
+  try {
+    return Intl.DateTimeFormat().resolvedOptions().timeZone || 'Asia/Kuala_Lumpur';
+  } catch {
+    return 'Asia/Kuala_Lumpur';
+  }
+}
+
 export async function apiFetch(endpoint, options = {}) {
   const token = sessionStorage.getItem('token');
 
   const defaultHeaders = {
     'ngrok-skip-browser-warning': 'true',
     'Content-Type': 'application/json',
+    // Timezone header used by the backend to set session time_zone
+    'X-User-Timezone': getUserTimezone(),
     ...options.headers,
   };
 
@@ -42,12 +52,18 @@ export async function apiFetch(endpoint, options = {}) {
         document.dispatchEvent(event);
       }
       // Use the 'details' from our backend error structure, or the message, or a default
-      throw new Error(errorData.details || errorData.message || `API call failed with status: ${response.status}`);
+      throw new Error(
+        errorData.details ||
+          errorData.message ||
+          `API call failed with status: ${response.status}`
+      );
     } else {
       // If the server sends back HTML or plain text, use that as the error message.
       // This prevents the "Unexpected token '<'" error.
       const textError = await response.text();
-      throw new Error(textError || `Server returned an unhandled error with status: ${response.status}`);
+      throw new Error(
+        textError || `Server returned an unhandled error with status: ${response.status}`
+      );
     }
   }
 
@@ -59,7 +75,7 @@ export async function apiFetch(endpoint, options = {}) {
   // Handle file downloads like CSV
   const disposition = response.headers.get('content-disposition');
   if (disposition && disposition.includes('attachment')) {
-      return response.blob();
+    return response.blob();
   }
 
   return response.json();

src/components/KillSwitchManagement.vue

@@ -6,11 +6,17 @@
           {{ monthYear }}
         </h2>
         <div class="flex items-center gap-2">
-          <button @click="prevMonth" class="p-2 rounded-full hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors">
-            <svg class="w-5 h-5 text-gray-600 dark:text-gray-300" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7"></path></svg>
+          <button @click="prevMonth"
+            class="p-2 rounded-full hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors">
+            <svg class="w-5 h-5 text-gray-600 dark:text-gray-300" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7"></path>
+            </svg>
           </button>
-          <button @click="nextMonth" class="p-2 rounded-full hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors">
-            <svg class="w-5 h-5 text-gray-600 dark:text-gray-300" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7"></path></svg>
+          <button @click="nextMonth"
+            class="p-2 rounded-full hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors">
+            <svg class="w-5 h-5 text-gray-600 dark:text-gray-300" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7"></path>
+            </svg>
           </button>
         </div>
       </div>
@@ -20,16 +26,51 @@
       </div>
 
       <div class="grid grid-cols-7 gap-1">
-        <div v-for="day in calendarGrid" :key="day.id"
-             @click="day.isCurrentMonth && onDayClick(day)"
-             :class="getDayClasses(day)">
+        <div v-for="day in calendarGrid" :key="day.id" @click="day.isCurrentMonth && onDayClick(day)"
+          :class="getDayClasses(day)">
           {{ day.date }}
         </div>
       </div>
     </div>
 
     <div class="bg-white dark:bg-gray-800 rounded-lg shadow p-6 sticky top-4">
-      <h3 class="text-lg font-semibold mb-4 text-gray-800 dark:text-white">{{ $t('pendingChanges') }}</h3>
+      <h3 class="text-lg font-semibold mb-4 text-gray-800 dark:text-white">
+        {{ $t('pendingChanges') }}
+      </h3>
+
+      <div class="mb-6">
+      <p class="text-sm text-gray-600 dark:text-gray-400 mb-3">
+        This will enable all dates on the current month you are on
+      </p>
+      <div class="grid grid-cols-2 gap-2">
+        <button
+          type="button"
+          @click="enableAllCurrentMonth"
+          class="flex items-center justify-center gap-1.5 px-3 py-2.5 rounded-lg text-sm font-medium
+                text-green-700 bg-green-50 hover:bg-green-100 border border-green-200
+                dark:text-green-200 dark:bg-green-900/20 dark:hover:bg-green-900/40 dark:border-green-800
+                transition-colors"
+        >
+          <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7"></path>
+          </svg>
+          Enable ({{ viewDate.toLocaleString('default', { month: 'long' }) }})
+        </button>
+        <button
+          type="button"
+          @click="disableAllCurrentMonth"
+          class="flex items-center justify-center gap-1.5 px-3 py-2.5 rounded-lg text-sm font-medium
+                text-red-700 bg-red-50 hover:bg-red-100 border border-red-200
+                dark:text-red-200 dark:bg-red-900/20 dark:hover:bg-red-900/40 dark:border-red-800
+                transition-colors"
+        >
+          <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"></path>
+          </svg>
+          Disable ({{ viewDate.toLocaleString('default', { month: 'long' }) }})
+        </button>
+      </div>
+    </div>
       <div v-if="!hasPendingChanges" class="text-center py-8 text-gray-500 dark:text-gray-400">
         {{ $t('noPendingChanges') }}
       </div>
@@ -52,10 +93,12 @@
         </div>
       </div>
       <div class="mt-6 flex flex-col sm:flex-row gap-3">
-        <button @click="applyChanges" :disabled="!hasPendingChanges" class="w-full bg-blue-600 hover:bg-blue-700 text-white font-semibold px-4 py-2 rounded-md disabled:opacity-50 disabled:cursor-not-allowed">
+        <button @click="applyChanges" :disabled="!hasPendingChanges"
+          class="w-full bg-blue-600 hover:bg-blue-700 text-white font-semibold px-4 py-2 rounded-md disabled:opacity-50 disabled:cursor-not-allowed">
           {{ $t('applyChanges') }}
         </button>
-        <button @click="discardChanges" :disabled="!hasPendingChanges" class="w-full bg-gray-500 hover:bg-gray-600 text-white font-semibold px-4 py-2 rounded-md disabled:opacity-50 disabled:cursor-not-allowed">
+        <button @click="discardChanges" :disabled="!hasPendingChanges"
+          class="w-full bg-gray-500 hover:bg-gray-600 text-white font-semibold px-4 py-2 rounded-md disabled:opacity-50 disabled:cursor-not-allowed">
           {{ $t('discardChanges') }}
         </button>
       </div>
@@ -73,18 +116,30 @@ const { t: $t } = useI18n();
 const toast = useToast();
 
 const viewDate = ref(new Date());
-// Server-driven KL date for the yellow ring (updates every 60s)
+// Server-driven "today" string (YYYY-MM-DD) for the yellow ring
 const todayStr = ref(null);
 
-const TZ = 'Asia/Kuala_Lumpur';
+// --- timezone handling
+const getUserTimezone = () => {
+  try {
+    return Intl.DateTimeFormat().resolvedOptions().timeZone || 'Asia/Kuala_Lumpur';
+  } catch {
+    return 'Asia/Kuala_Lumpur';
+  }
+};
+
+const TZ = getUserTimezone();
 
 // Helper: format YYYY-MM-DD in a given TZ
 const ymdInTZ = (tz, d = new Date()) =>
   new Intl.DateTimeFormat('en-CA', {
-    timeZone: tz, year: 'numeric', month: '2-digit', day: '2-digit'
+    timeZone: tz,
+    year: 'numeric',
+    month: '2-digit',
+    day: '2-digit',
   }).format(d);
 
-// Pull today from server; try /api/time then /time; fallback to client KL
+// Pull today from server; try /api/time then /time; fallback to client TZ
 async function getServerDate() {
   const parse = (data) => {
     if (typeof data?.ymdKL === 'string') return data.ymdKL;
@@ -93,36 +148,49 @@ async function getServerDate() {
   };
 
   for (const path of ['/api/time', '/time']) {
-  try {
-    const d = await apiFetch(`${path}?_t=${Date.now()}`);
-    const y = parse(d);
-    if (y) return y;
-  } catch (_err) {
-    continue; // try next endpoint
+    try {
+      const d = await apiFetch(`${path}?_t=${Date.now()}`);
+      const y = parse(d);
+      if (y) return y;
+    } catch (_err) {
+      continue;
+    }
   }
-}
 
-  console.warn('Server time unavailable; using client KL time.');
+  console.warn('Server time unavailable; using client time.');
   return ymdInTZ(TZ, new Date());
 }
 
 let _intervalId;
 onMounted(async () => {
-  const update = async () => { todayStr.value = await getServerDate(); };
+  const update = async () => {
+    todayStr.value = await getServerDate();
+  };
   await update();
   _intervalId = setInterval(update, 60_000);
 });
-onUnmounted(() => { if (_intervalId) clearInterval(_intervalId); });
+onUnmounted(() => {
+  if (_intervalId) clearInterval(_intervalId);
+});
 
 const originalEnabledDates = ref(new Set());
 const datesToEnable = ref(new Set());
 const datesToDisable = ref(new Set());
 
-const hasPendingChanges = computed(() => datesToEnable.value.size > 0 || datesToDisable.value.size > 0);
+const hasPendingChanges = computed(
+  () => datesToEnable.value.size > 0 || datesToDisable.value.size > 0
+);
 const sortedEnableList = computed(() => Array.from(datesToEnable.value).sort());
 const sortedDisableList = computed(() => Array.from(datesToDisable.value).sort());
 
-const monthYear = computed(() => viewDate.value.toLocaleString('default', { month: 'long', year: 'numeric' }));
+const monthYear = computed(() =>
+  viewDate.value.toLocaleString('default', {
+    month: 'long',
+    year: 'numeric',
+    timeZone: TZ,
+  })
+);
+
 const weekDays = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
 
 const calendarGrid = computed(() => {
@@ -143,12 +211,35 @@ const calendarGrid = computed(() => {
 
   return grid;
 });
+const getCurrentMonthDateStrings = () => {
+  const year = viewDate.value.getFullYear();
+  const month = viewDate.value.getMonth();
+  const daysInMonth = new Date(year, month + 1, 0).getDate();
+  const list = [];
+
+  for (let i = 1; i <= daysInMonth; i++) {
+    const dateStr = `${year}-${String(month + 1).padStart(2, '0')}-${String(i).padStart(2, '0')}`;
+    list.push(dateStr);
+  }
+
+  return list;
+};
 
 const getDayClasses = (day) => {
   if (!day.isCurrentMonth) return 'h-20';
 
   const dateStr = day.id;
-  const classes = ['h-20', 'flex', 'items-center', 'justify-center', 'text-lg', 'rounded-lg', 'cursor-pointer', 'transition-colors', 'relative'];
+  const classes = [
+    'h-20',
+    'flex',
+    'items-center',
+    'justify-center',
+    'text-lg',
+    'rounded-lg',
+    'cursor-pointer',
+    'transition-colors',
+    'relative',
+  ];
 
   let isEnabled = originalEnabledDates.value.has(dateStr);
   if (datesToEnable.value.has(dateStr)) isEnabled = true;
@@ -161,7 +252,18 @@ const getDayClasses = (day) => {
     classes.push('bg-blue-500', 'text-white', 'font-bold');
   } else if (isPendingDisable) {
     classes.push('bg-red-200', 'dark:bg-red-800', 'text-red-700', 'dark:text-red-200');
-    classes.push('after:content-[\'\']', 'after:absolute', 'after:w-3/4', 'after:h-0.5', 'after:bg-red-500', 'after:left-1/2', 'after:top-1/2', 'after:-translate-x-1/2', 'after:-translate-y-1/2', 'after:rotate-[-10deg]');
+    classes.push(
+      'after:content-[\'\']',
+      'after:absolute',
+      'after:w-3/4',
+      'after:h-0.5',
+      'after:bg-red-500',
+      'after:left-1/2',
+      'after:top-1/2',
+      'after:-translate-x-1/2',
+      'after:-translate-y-1/2',
+      'after:rotate-[-10deg]'
+    );
   } else if (isEnabled) {
     classes.push('bg-green-100', 'dark:bg-green-800', 'text-green-800', 'dark:text-green-200');
   } else {
@@ -169,8 +271,8 @@ const getDayClasses = (day) => {
   }
 
   if (todayStr.value && dateStr === todayStr.value) {
-  classes.push('ring-2', 'ring-yellow-400', 'dark:ring-yellow-500');
-}
+    classes.push('ring-2', 'ring-yellow-400', 'dark:ring-yellow-500');
+  }
 
   return classes;
 };
@@ -189,9 +291,36 @@ function onDayClick(day) {
       : datesToEnable.value.add(dateStr);
   }
 }
+function enableAllCurrentMonth() {
+  const dates = getCurrentMonthDateStrings();
+
+  dates.forEach((dateStr) => {
+    datesToDisable.value.delete(dateStr);
+
+    if (originalEnabledDates.value.has(dateStr)) {
+      datesToEnable.value.delete(dateStr);
+    } else {
+      datesToEnable.value.add(dateStr);
+    }
+  });
+}
+
+function disableAllCurrentMonth() {
+  const dates = getCurrentMonthDateStrings();
+
+  dates.forEach((dateStr) => {
+    datesToEnable.value.delete(dateStr);
+
+    if (originalEnabledDates.value.has(dateStr)) {
+      datesToDisable.value.add(dateStr);
+    } else {
+      datesToDisable.value.delete(dateStr);
+    }
+  });
+}
 
 async function applyChanges() {
-  const confirmed = await toast.showConfirm($t('confirmApplyChanges'))
+  const confirmed = await toast.showConfirm($t('confirmApplyChanges'));
   if (!confirmed) return;
 
   try {
@@ -216,12 +345,19 @@ function discardChanges() {
   datesToDisable.value.clear();
 }
 
-const prevMonth = () => viewDate.value = new Date(viewDate.value.setMonth(viewDate.value.getMonth() - 1));
-const nextMonth = () => viewDate.value = new Date(viewDate.value.setMonth(viewDate.value.getMonth() + 1));
+const prevMonth = () =>
+  (viewDate.value = new Date(viewDate.value.setMonth(viewDate.value.getMonth() - 1)));
+const nextMonth = () =>
+  (viewDate.value = new Date(viewDate.value.setMonth(viewDate.value.getMonth() + 1)));
 
-const formatDate = (dateStr) => new Date(dateStr + 'T00:00:00').toLocaleDateString(undefined, {
-  weekday: 'long', year: 'numeric', month: 'long', day: 'numeric',
-});
+const formatDate = (dateStr) =>
+  new Date(dateStr + 'T00:00:00').toLocaleDateString(undefined, {
+    weekday: 'long',
+    year: 'numeric',
+    month: 'long',
+    day: 'numeric',
+    timeZone: TZ,
+  });
 
 async function fetchEnabledDates() {
   try {

src/components/PersonnelManagement.vue

@@ -4,28 +4,44 @@
       <h2 class="text-xl font-semibold mb-6 text-gray-800 dark:text-white">{{ $t('addNewUser') }}</h2>
       <div class="grid grid-cols-1 md:grid-cols-3 lg:grid-cols-6 gap-4 items-end">
         <div class="flex flex-col gap-2">
-          <label for="fullName" class="text-sm font-medium text-gray-700 dark:text-gray-300">{{ $t('fullName') }}</label>
-          <input type="text" id="fullName" v-model="newWorker.fullName" class="border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-700 text-gray-900 dark:text-white" :placeholder="$t('egJohnSmith')" />
+          <label for="fullName" class="text-sm font-medium text-gray-700 dark:text-gray-300">{{ $t('fullName')
+            }}</label>
+          <input type="text" id="fullName" v-model="newWorker.fullName"
+            class="border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-700 text-gray-900 dark:text-white"
+            :placeholder="$t('egJohnSmith')" />
         </div>
         <div class="flex flex-col gap-2">
-          <label for="username" class="text-sm font-medium text-gray-700 dark:text-gray-300">{{ $t('username') }}</label>
-          <input type="text" id="username" v-model="newWorker.username" class="border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-700 text-gray-900 dark:text-white" :placeholder="$t('egJsmith')" />
+          <label for="username" class="text-sm font-medium text-gray-700 dark:text-gray-300">{{ $t('username')
+            }}</label>
+          <input type="text" id="username" v-model="newWorker.username"
+            class="border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-700 text-gray-900 dark:text-white"
+            :placeholder="$t('egJsmith')" />
         </div>
         <div class="flex flex-col gap-2">
-          <label for="password" class="text-sm font-medium text-gray-700 dark:text-gray-300">{{ $t('password') }}</label>
-          <input type="password" id="password" v-model="newWorker.password" class="border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-700 text-gray-900 dark:text-white" :placeholder="$t('eg123456')" />
+          <label for="password" class="text-sm font-medium text-gray-700 dark:text-gray-300">{{ $t('password')
+            }}</label>
+          <input type="password" id="password" v-model="newWorker.password"
+            class="border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-700 text-gray-900 dark:text-white"
+            :placeholder="$t('eg123456')" />
         </div>
         <div class="flex flex-col gap-2">
-          <label for="department" class="text-sm font-medium text-gray-700 dark:text-gray-300">{{ $t('department') }}</label>
-          <input type="text" id="department" v-model="newWorker.department" class="border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-700 text-gray-900 dark:text-white" :placeholder="$t('egSales')" />
+          <label for="department" class="text-sm font-medium text-gray-700 dark:text-gray-300">{{ $t('department')
+            }}</label>
+          <input type="text" id="department" v-model="newWorker.department"
+            class="border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-700 text-gray-900 dark:text-white"
+            :placeholder="$t('egSales')" />
         </div>
         <div class="flex flex-col gap-2">
-          <label for="position" class="text-sm font-medium text-gray-700 dark:text-gray-300">{{ $t('position') }}</label>
-          <input type="text" id="position" v-model="newWorker.position" class="border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-700 text-gray-900 dark:text-white" :placeholder="$t('egManager')" />
+          <label for="position" class="text-sm font-medium text-gray-700 dark:text-gray-300">{{ $t('position')
+            }}</label>
+          <input type="text" id="position" v-model="newWorker.position"
+            class="border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-700 text-gray-900 dark:text-white"
+            :placeholder="$t('egManager')" />
         </div>
         <div class="flex flex-col gap-2">
           <label class="text-sm font-medium text-gray-700 dark:text-gray-300 invisible">{{ $t('addUser') }}</label>
-          <button @click="addWorker" :disabled="!isFormValid || loading" class="bg-blue-600 hover:bg-blue-700 text-white font-semibold px-4 py-2 rounded-md disabled:opacity-50 disabled:cursor-not-allowed">
+          <button @click="addWorker" :disabled="!isFormValid || loading"
+            class="bg-blue-600 hover:bg-blue-700 text-white font-semibold px-4 py-2 rounded-md disabled:opacity-50 disabled:cursor-not-allowed">
             {{ loading ? $t('adding') : $t('addUser') }}
           </button>
         </div>
@@ -35,44 +51,98 @@
 
     <section class="bg-white dark:bg-gray-800 rounded-lg shadow p-6">
       <h2 class="text-xl font-semibold mb-6 text-gray-800 dark:text-white">{{ $t('workerRoster') }}</h2>
-      <div class="mb-6 flex flex-col sm:flex-row gap-4 sm:items-end justify-between">
-        <div class="flex-grow">
-          <input type="text" id="search-roster" v-model="searchQuery" :placeholder="$t('searchByNameOrDepartment')" class="border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 w-full shadow-sm focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-700 text-gray-900 dark:text-white" />
-        </div>
       
-        <div class="flex items-end gap-4">
-            <div class="flex flex-col gap-2">
-              <label for="export-start-date" class="text-sm font-medium text-gray-700 dark:text-gray-300">{{ $t('startDate') }}</label>
-              <input type="date" id="export-start-date" v-model="exportFilters.startDate" class="border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-700 text-gray-900 dark:text-white" />
-            </div>
-            <div class="flex flex-col gap-2">
-              <label for="export-end-date" class="text-sm font-medium text-gray-700 dark:text-gray-300">{{ $t('endDate') }}</label>
-              <input type="date" id="export-end-date" v-model="exportFilters.endDate" class="border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-700 text-gray-900 dark:text-white" />
-            </div>
-            <button @click="exportWorkHours" :disabled="!exportFilters.startDate || !exportFilters.endDate || exportLoading" class="bg-green-600 hover:bg-green-700 text-white font-semibold px-4 py-2 rounded-md transition-colors duration-200 disabled:opacity-50">
-              {{ exportLoading ? $t('exporting') : $t('exportAll') }}
-            </button>
+     <div class="mb-6 flex items-end gap-4">
+        <div class="flex-1 min-w-0">
+          <input type="text" id="search-roster" v-model="searchQuery" :placeholder="$t('searchByName')"
+            class="border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 w-full shadow-sm focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-700 text-gray-900 dark:text-white" />
+        </div>
+        <div class="shrink-0 flex flex-col gap-2">
+        <label for="department-filter" class="text-sm font-medium text-gray-700 dark:text-gray-300">{{
+          $t('departmentFilter') }}</label>
+        <div class="relative">
+          <select
+            id="department-filter"
+            v-model="selectedDepartment"
+            class="appearance-none border border-gray-300 dark:border-gray-600 rounded-md pl-3 pr-10 py-2 focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-700 text-gray-900 dark:text-white min-w-[180px] w-full"
+          >
+            <option value="">{{ $t('allDepartments') }}</option>
+            <option v-for="dept in departments" :key="dept" :value="dept">
+              {{ dept }}
+            </option>
+          </select>
+          <svg xmlns="http://www.w3.org/2000/svg" class="absolute right-3 top-1/2 -translate-y-1/2 h-4 w-4 text-gray-500 dark:text-gray-400 pointer-events-none" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7" />
+          </svg>
         </div>
       </div>
+        <div class="shrink-0 flex flex-col gap-2">
+          <label for="export-start-date" class="text-sm font-medium text-gray-700 dark:text-gray-300">{{
+            $t('startDate') }}</label>
+          <input type="date" id="export-start-date" v-model="exportFilters.startDate"
+            class="border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-700 text-gray-900 dark:text-white" />
+        </div>
+        <div class="shrink-0 flex flex-col gap-2">
+          <label for="export-end-date" class="text-sm font-medium text-gray-700 dark:text-gray-300">{{ $t('endDate')
+            }}</label>
+          <input type="date" id="export-end-date" v-model="exportFilters.endDate"
+            class="border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-700 text-gray-900 dark:text-white" />
+        </div>
+        <div class="shrink-0">
+          <button @click="exportWorkHours"
+            :disabled="!exportFilters.startDate || !exportFilters.endDate || exportLoading"
+            class="bg-green-600 hover:bg-green-700 text-white font-semibold px-4 py-2 rounded-md transition-colors duration-200 disabled:opacity-50">
+            {{ exportLoading ? $t('exporting') : $t('exportAll') }}
+          </button>
+        </div>
+        <div class="shrink-0">
+          <button @click="exportTxt"
+            :disabled="!exportFilters.startDate || !exportFilters.endDate || txtExportLoading"
+            class="bg-blue-600 hover:bg-blue-700 text-white font-semibold px-4 py-2 rounded-md transition-colors duration-200 disabled:opacity-50">
+            {{ txtExportLoading ? $t('exporting') : 'Export TXT' }}
+          </button>
+        </div>
+      </div>
+
       <div class="overflow-x-auto">
         <table class="min-w-[700px] w-full text-left">
           <thead class="bg-gray-50 dark:bg-gray-700">
             <tr class="border-b border-gray-200 dark:border-gray-600">
               <th class="w-12 px-2 py-3 text-center">
-                <input type="checkbox" @change="toggleSelectAll" :checked="isAllSelected" class="form-checkbox h-4 w-4 text-blue-600 rounded" />
+                <input type="checkbox" @change="toggleSelectAll" :checked="isAllSelected"
+                  class="form-checkbox h-4 w-4 text-blue-600 rounded" />
+              </th>
+              <th class="px-4 py-3 text-sm font-semibold text-gray-600 dark:text-gray-300 uppercase tracking-wider">
+                {{ $t('fullName') }}
+              </th>
+              <th class="px-4 py-3 text-sm font-semibold text-gray-600 dark:text-gray-300 uppercase tracking-wider">
+                {{ $t('username') }}
+              </th>
+              <th class="px-4 py-3 text-sm font-semibold text-gray-600 dark:text-gray-300 uppercase tracking-wider">
+                {{ $t('department') }}
+              </th>
+              <th class="px-4 py-3 text-sm font-semibold text-gray-600 dark:text-gray-300 uppercase tracking-wider">
+                {{ $t('position') }}
+              </th>
+              <th class="px-4 py-3 text-sm font-semibold text-gray-600 dark:text-gray-300 uppercase tracking-wider">
+                {{ $t('status') }}
+              </th>
+              <th class="px-4 py-3 text-sm font-semibold text-gray-600 dark:text-gray-300 uppercase tracking-wider">
+                {{ $t('dateJoined') }}
+              </th>
+              <th
+                class="px-4 py-3 text-sm font-semibold text-gray-600 dark:text-gray-300 uppercase tracking-wider text-right">
+                {{ $t('actions') }}
               </th>
-              <th class="px-4 py-3 text-sm font-semibold text-gray-600 dark:text-gray-300 uppercase tracking-wider">{{ $t('fullName') }}</th>
-              <th class="px-4 py-3 text-sm font-semibold text-gray-600 dark:text-gray-300 uppercase tracking-wider">{{ $t('username') }}</th>
-              <th class="px-4 py-3 text-sm font-semibold text-gray-600 dark:text-gray-300 uppercase tracking-wider">{{ $t('department') }}</th>
-              <th class="px-4 py-3 text-sm font-semibold text-gray-600 dark:text-gray-300 uppercase tracking-wider">{{ $t('position') }}</th>
-              <th class="px-4 py-3 text-sm font-semibold text-gray-600 dark:text-gray-300 uppercase tracking-wider">{{ $t('status') }}</th> <th class="px-4 py-3 text-sm font-semibold text-gray-600 dark:text-gray-300 uppercase tracking-wider">{{ $t('dateJoined') }}</th>
-              <th class="px-4 py-3 text-sm font-semibold text-gray-600 dark:text-gray-300 uppercase tracking-wider text-right">{{ $t('actions') }}</th>
             </tr>
           </thead>
           <tbody class="divide-y divide-gray-200 dark:divide-gray-700">
-            <tr v-for="worker in workers" :key="worker.id" :class="{ 'bg-blue-50 dark:bg-blue-950': isWorkerSelected(worker.id) }" class="hover:bg-gray-50 dark:hover:bg-gray-700 transition-colors duration-150">
+            <tr v-for="worker in workers" :key="worker.id"
+              :class="{ 'bg-blue-50 dark:bg-blue-950': isWorkerSelected(worker.id) }"
+              class="hover:bg-gray-50 dark:hover:bg-gray-700 transition-colors duration-150">
               <td class="px-2 py-3 text-center">
-                <input type="checkbox" :checked="isWorkerSelected(worker.id)" @change="toggleWorkerSelection(worker.id)" class="form-checkbox h-4 w-4 text-blue-600 rounded" />
+                <input type="checkbox" :checked="isWorkerSelected(worker.id)" @change="toggleWorkerSelection(worker.id)"
+                  class="form-checkbox h-4 w-4 text-blue-600 rounded" />
               </td>
               <td class="px-4 py-3 text-gray-800 dark:text-white">{{ worker.full_name }}</td>
               <td class="px-4 py-3 text-gray-800 dark:text-white">{{ worker.username }}</td>
@@ -87,41 +157,61 @@
                   {{ worker.status }}
                 </span>
               </td>
-              <td class="px-4 py-3 text-gray-800 dark:text-white">{{ new Date(worker.created_at).toLocaleDateString() }}</td>
-                <td class="px-4 py-3 flex justify-end gap-2 sm:gap-3 flex-wrap">
-                <button @click="viewRecords(worker.id)" class="bg-green-500 hover:bg-green-600 text-white px-3 py-1 rounded-md text-sm font-medium transition-colors duration-200">{{ $t('viewRecords') }}</button>
-                <button @click="openSettingsModal(worker)" class="bg-gray-500 hover:bg-gray-600 text-white px-3 py-1 rounded-md text-sm font-medium transition-colors duration-200 flex items-center gap-1">
-                  <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z" />
-                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
+              <td class="px-4 py-3 text-gray-800 dark:text-white">
+                {{ formatLocalDate(worker.created_at) }}
+              </td>
+              <td class="px-4 py-3 flex justify-end gap-2 sm:gap-3 flex-wrap">
+                <button @click="viewRecords(worker.id)"
+                  class="bg-green-500 hover:bg-green-600 text-white px-3 py-1 rounded-md text-sm font-medium transition-colors duration-200">
+                  {{ $t('viewRecords') }}
+                </button>
+                <button @click="openSettingsModal(worker)"
+                  class="bg-gray-500 hover:bg-gray-600 text-white px-3 py-1 rounded-md text-sm font-medium transition-colors duration-200 flex items-center gap-1">
+                  <svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24"
+                    stroke="currentColor">
+                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                      d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z" />
+                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                      d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
                   </svg>
                   {{ $t('settings') }}
                 </button>
               </td>
             </tr>
             <tr v-if="workers.length === 0">
-              <td colspan="8" class="text-center py-8 text-gray-500 dark:text-gray-400"> {{ loading ? $t('loadingWorkers') : $t('noWorkersFound') }}
+              <td colspan="8" class="text-center py-8 text-gray-500 dark:text-gray-400">
+                {{ loading ? $t('loadingWorkers') : $t('noWorkersFound') }}
               </td>
             </tr>
           </tbody>
         </table>
       </div>
-      <div v-if="totalPages > 1" class="flex justify-end items-center gap-4 mt-6 pt-6 border-t border-gray-200 dark:border-gray-700">
-        <button @click="changePage(currentPage - 1)" :disabled="currentPage <= 1" class="px-4 py-2 border border-gray-300 dark:border-gray-600 rounded-md hover:bg-gray-50 dark:hover:bg-gray-700 disabled:opacity-50 disabled:cursor-not-allowed text-gray-800 dark:text-white">{{ $t('previous') }}</button>
+      <div v-if="totalPages > 1"
+        class="flex justify-end items-center gap-4 mt-6 pt-6 border-t border-gray-200 dark:border-gray-700">
+        <button @click="changePage(currentPage - 1)" :disabled="currentPage <= 1"
+          class="px-4 py-2 border border-gray-300 dark:border-gray-600 rounded-md hover:bg-gray-50 dark:hover:bg-gray-700 disabled:opacity-50 disabled:cursor-not-allowed text-gray-800 dark:text-white">
+          {{ $t('previous') }}
+        </button>
         <div class="flex items-center gap-2">
-          <input type="number" v-model.number="jumpToPageInput" @keyup.enter="jumpToPage" class="w-20 text-center border border-gray-300 dark:border-gray-600 rounded-md px-2 py-1.5 focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-700 text-gray-900 dark:text-white" />
+          <input type="number" v-model.number="jumpToPageInput" @keyup.enter="jumpToPage"
+            class="w-20 text-center border border-gray-300 dark:border-gray-600 rounded-md px-2 py-1.5 focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-700 text-gray-900 dark:text-white" />
           <span class="text-gray-700 dark:text-gray-200">/ {{ totalPages }}</span>
         </div>
-        <button @click="changePage(currentPage + 1)" :disabled="currentPage >= totalPages" class="px-4 py-2 border border-gray-300 dark:border-gray-600 rounded-md hover:bg-gray-50 dark:hover:bg-gray-700 disabled:opacity-50 disabled:cursor-not-allowed text-gray-800 dark:text-white">{{ $t('next') }}</button>
+        <button @click="changePage(currentPage + 1)" :disabled="currentPage >= totalPages"
+          class="px-4 py-2 border border-gray-300 dark:border-gray-600 rounded-md hover:bg-gray-50 dark:hover:bg-gray-700 disabled:opacity-50 disabled:cursor-not-allowed text-gray-800 dark:text-white">
+          {{ $t('next') }}
+        </button>
       </div>
     </section>
 
-    <div v-if="isSettingsModalVisible" class="fixed inset-0 bg-gray-900 bg-opacity-60 flex justify-center items-center z-50 p-4">
+    <div v-if="isSettingsModalVisible"
+      class="fixed inset-0 bg-gray-900 bg-opacity-60 flex justify-center items-center z-50 p-4">
       <div class="bg-white dark:bg-gray-800 rounded-lg shadow-xl p-6 w-full max-w-md">
         <div class="flex justify-between items-center mb-6">
           <h3 class="text-xl font-bold text-gray-800 dark:text-white">{{ $t('employeeSettings') }}</h3>
           <button @click="closeSettingsModal" class="text-gray-500 hover:text-gray-700 dark:hover:text-gray-300">
-            <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+            <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24"
+              stroke="currentColor">
               <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
             </svg>
           </button>
@@ -133,31 +223,65 @@
 
             <div class="mb-4 space-y-4">
               <div>
-                <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">{{ $t('department') }}</label>
-                <input type="text" v-model="editingWorker.department" class="w-full border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-800 text-gray-900 dark:text-white" />
+                <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+                  {{ $t('fullName') }}
+                </label>
+                <input
+                  type="text"
+                  v-model="editingWorker.fullName"
+                  class="w-full border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-800 text-gray-900 dark:text-white"
+                />
               </div>
+
               <div>
-                <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">{{ $t('position') }}</label>
-                <input type="text" v-model="editingWorker.position" class="w-full border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-800 text-gray-900 dark:text-white" />
+                <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+                  {{ $t('department') }}
+                </label>
+                <input
+                  type="text"
+                  v-model="editingWorker.department"
+                  class="w-full border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-800 text-gray-900 dark:text-white"
+                />
+              </div>
+
+              <div>
+                <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+                  {{ $t('position') }}
+                </label>
+                <input
+                  type="text"
+                  v-model="editingWorker.position"
+                  class="w-full border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-800 text-gray-900 dark:text-white"
+                />
               </div>
             </div>
 
             <div class="mb-4">
-              <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">{{ $t('changePassword') }}</label>
+              <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+                {{ $t('changePassword') }}
+              </label>
               <div class="space-y-3">
-                <input type="password" v-model="newPassword" :placeholder="$t('newPassword')" class="w-full border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-800 text-gray-900 dark:text-white" />
-                <input type="password" v-model="confirmNewPassword" :placeholder="$t('confirmNewPassword')" class="w-full border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-800 text-gray-900 dark:text-white" />
+                <input type="password" v-model="newPassword" :placeholder="$t('newPassword')"
+                  class="w-full border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-800 text-gray-900 dark:text-white" />
+                <input type="password" v-model="confirmNewPassword" :placeholder="$t('confirmNewPassword')"
+                  class="w-full border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-800 text-gray-900 dark:text-white" />
               </div>
             </div>
 
             <div class="flex items-center justify-between">
               <div>
-                <h4 class="font-semibold text-lg mb-4 text-gray-800 dark:text-white">{{ $t('workerStatus') }}</h4>
-                <p class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">{{ $t('activeAccount') }}</p>
+                <h4 class="font-semibold text-lg mb-4 text-gray-800 dark:text-white">
+                  {{ $t('workerStatus') }}
+                </h4>
+                <p class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+                  {{ $t('activeAccount') }}
+                </p>
               </div>
               <label class="relative inline-flex items-center cursor-pointer">
-                <input type="checkbox" v-model="editingWorker.isActive" class="sr-only peer">
-                <div class="w-11 h-6 bg-gray-200 peer-focus:outline-none peer-focus:ring-4 peer-focus:ring-blue-300 dark:peer-focus:ring-blue-800 rounded-full peer dark:bg-gray-600 peer-checked:after:translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-[2px] after:left-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all dark:border-gray-600 peer-checked:bg-blue-600"></div>
+                <input type="checkbox" v-model="editingWorker.isActive" class="sr-only peer" />
+                <div
+                  class="w-11 h-6 bg-gray-200 peer-focus:outline-none peer-focus:ring-4 peer-focus:ring-blue-300 dark:peer-focus:ring-blue-800 rounded-full peer dark:bg-gray-600 peer-checked:after:translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-[2px] after:left-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all dark:border-gray-600 peer-checked:bg-blue-600">
+                </div>
               </label>
             </div>
           </div>
@@ -167,19 +291,26 @@
               <div class="flex justify-between items-center">
                 <div>
                   <h5 class="font-medium text-red-700 dark:text-red-300">{{ $t('clearDevice') }}</h5>
-                  <p class="text-xs text-red-600 dark:text-red-400/80">{{ $t('clearDeviceDescription') }}</p>
+                  <p class="text-xs text-red-600 dark:text-red-400/80">
+                    {{ $t('clearDeviceDescription') }}
+                  </p>
                 </div>
-                <button @click="showClearDeviceConfirm = true" class="text-red-700 dark:text-red-300 hover:text-white hover:bg-red-600 dark:hover:bg-red-700 px-3 py-1 rounded-md text-sm font-medium border border-red-300 dark:border-red-700 transition-colors w-32">
+                <button @click="showClearDeviceConfirm = true"
+                  class="text-red-700 dark:text-red-300 hover:text-white hover:bg-red-600 dark:hover:bg-red-700 px-3 py-1 rounded-md text-sm font-medium border border-red-300 dark:border-red-700 transition-colors w-32">
                   {{ $t('clearDevice') }}
                 </button>
               </div>
               <div v-if="showClearDeviceConfirm" class="mt-3 p-3 bg-white dark:bg-gray-800 rounded-md">
-                <p class="text-sm text-gray-700 dark:text-gray-300 mb-3">{{ $t('confirmClearDevice') }}</p>
+                <p class="text-sm text-gray-700 dark:text-gray-300 mb-3">
+                  {{ $t('confirmClearDevice') }}
+                </p>
                 <div class="flex justify-end gap-2">
-                  <button @click="showClearDeviceConfirm = false" class="px-3 py-1 rounded-md text-sm font-medium text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors">
+                  <button @click="showClearDeviceConfirm = false"
+                    class="px-3 py-1 rounded-md text-sm font-medium text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors">
                     {{ $t('cancel') }}
                   </button>
-                  <button @click="clearDevice(editingWorker.id)" class="px-3 py-1 rounded-md text-sm font-medium text-white bg-red-600 hover:bg-red-700 transition-colors">
+                  <button @click="clearDevice(editingWorker.id)"
+                    class="px-3 py-1 rounded-md text-sm font-medium text-white bg-red-600 hover:bg-red-700 transition-colors">
                     {{ $t('confirm') }}
                   </button>
                 </div>
@@ -190,19 +321,26 @@
               <div class="flex justify-between items-center">
                 <div>
                   <h5 class="font-medium text-red-700 dark:text-red-300">{{ $t('delete') }}</h5>
-                  <p class="text-xs text-red-600 dark:text-red-400/80">{{ $t('deleteDescription') }}</p>
+                  <p class="text-xs text-red-600 dark:text-red-400/80">
+                    {{ $t('deleteDescription') }}
+                  </p>
                 </div>
-                <button @click="showDeleteConfirm = true" class="text-red-700 dark:text-red-300 hover:text-white hover:bg-red-600 dark:hover:bg-red-700 px-3 py-1 rounded-md text-sm font-medium border border-red-300 dark:border-red-700 transition-colors w-32">
+                <button @click="showDeleteConfirm = true"
+                  class="text-red-700 dark:text-red-300 hover:text-white hover:bg-red-600 dark:hover:bg-red-700 px-3 py-1 rounded-md text-sm font-medium border border-red-300 dark:border-red-700 transition-colors w-32">
                   {{ $t('delete') }}
                 </button>
               </div>
               <div v-if="showDeleteConfirm" class="mt-3 p-3 bg-white dark:bg-gray-800 rounded-md">
-                <p class="text-sm text-gray-700 dark:text-gray-300 mb-3">{{ $t('confirmDelete') }}</p>
+                <p class="text-sm text-gray-700 dark:text-gray-300 mb-3">
+                  {{ $t('confirmDelete') }}
+                </p>
                 <div class="flex justify-end gap-2">
-                  <button @click="showDeleteConfirm = false" class="px-3 py-1 rounded-md text-sm font-medium text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors">
+                  <button @click="showDeleteConfirm = false"
+                    class="px-3 py-1 rounded-md text-sm font-medium text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors">
                     {{ $t('cancel') }}
                   </button>
-                  <button @click="deleteWorker(editingWorker.id)" class="px-3 py-1 rounded-md text-sm font-medium text-white bg-red-600 hover:bg-red-700 transition-colors">
+                  <button @click="deleteWorker(editingWorker.id)"
+                    class="px-3 py-1 rounded-md text-sm font-medium text-white bg-red-600 hover:bg-red-700 transition-colors">
                     {{ $t('confirm') }}
                   </button>
                 </div>
@@ -211,25 +349,33 @@
           </div>
 
           <div v-if="passwordErrorMessage || passwordSuccessMessage" class="text-center">
-            <p v-if="passwordErrorMessage" class="text-red-500 text-sm">{{ passwordErrorMessage }}</p>
-            <p v-if="passwordSuccessMessage" class="text-green-500 text-sm">{{ passwordSuccessMessage }}</p>
+            <p v-if="passwordErrorMessage" class="text-red-500 text-sm">
+              {{ passwordErrorMessage }}
+            </p>
+            <p v-if="passwordSuccessMessage" class="text-green-500 text-sm">
+              {{ passwordSuccessMessage }}
+            </p>
           </div>
 
-          <button @click="saveWorkerSettings" :disabled="passwordLoading" class="w-full bg-blue-600 hover:bg-blue-700 text-white font-medium py-2 px-4 rounded-md transition-colors disabled:opacity-50">
+          <button @click="saveWorkerSettings" :disabled="passwordLoading"
+            class="w-full bg-blue-600 hover:bg-blue-700 text-white font-medium py-2 px-4 rounded-md transition-colors disabled:opacity-50">
             {{ passwordLoading ? $t('saving') : $t('saveChanges') }}
           </button>
         </div>
       </div>
     </div>
 
-    <div v-if="isConfirmModalVisible" class="fixed inset-0 bg-gray-900 bg-opacity-60 flex justify-center items-center z-50 p-4">
+    <div v-if="isConfirmModalVisible"
+      class="fixed inset-0 bg-gray-900 bg-opacity-60 flex justify-center items-center z-50 p-4">
       <div class="bg-white dark:bg-gray-800 rounded-lg shadow-xl p-6 w-full max-w-sm">
         <h3 class="text-xl font-bold mb-4 text-gray-800 dark:text-white">{{ confirmMessage }}</h3>
         <div class="flex justify-end gap-3 mt-6">
-          <button @click="closeConfirmModal" class="bg-gray-200 dark:bg-gray-700 hover:bg-gray-300 dark:hover:bg-gray-600 text-gray-800 dark:text-white font-medium px-4 py-2 rounded-md transition-colors">
+          <button @click="closeConfirmModal"
+            class="bg-gray-200 dark:bg-gray-700 hover:bg-gray-300 dark:hover:bg-gray-600 text-gray-800 dark:text-white font-medium px-4 py-2 rounded-md transition-colors">
             {{ $t('cancel') }}
           </button>
-          <button @click="executeConfirmedAction" class="bg-red-500 hover:bg-red-600 text-white font-medium px-4 py-2 rounded-md transition-colors">
+          <button @click="executeConfirmedAction"
+            class="bg-red-500 hover:bg-red-600 text-white font-medium px-4 py-2 rounded-md transition-colors">
             {{ $t('confirm') }}
           </button>
         </div>
@@ -248,11 +394,46 @@ import { useI18n } from 'vue-i18n';
 import { workerCache } from '@/utils/workerCache.js';
 
 const { t: $t } = useI18n();
-
 const router = useRouter();
 
+// --- timezone helpers (for consistent local display + export header) ---
+const getUserTimezone = () => {
+  try {
+    return Intl.DateTimeFormat().resolvedOptions().timeZone || 'Asia/Kuala_Lumpur';
+  } catch {
+    return 'Asia/Kuala_Lumpur';
+  }
+};
+
+const formatLocalDate = (utcValue) => {
+  if (!utcValue) return '';
+  const tz = getUserTimezone();
+
+  let iso = utcValue;
+
+  if (utcValue instanceof Date) {
+    iso = utcValue.toISOString();
+  } else if (typeof utcValue === 'string') {
+    if (!iso.endsWith('Z')) {
+      if (iso.includes('T')) {
+        iso = iso + 'Z';
+      } else {
+        iso = iso.replace(' ', 'T') + 'Z';
+      }
+    }
+  }
+
+  const d = new Date(iso);
+
+  return d.toLocaleDateString(undefined, {
+    timeZone: tz,
+    year: 'numeric',
+    month: '2-digit',
+    day: '2-digit',
+  });
+};
+
 const viewRecords = (workerId) => {
-  // Save current search state before navigating away
   const searchState = {
     searchQuery: searchQuery.value,
     currentPage: currentPage.value,
@@ -260,7 +441,8 @@ const viewRecords = (workerId) => {
     totalWorkers: totalWorkers.value,
     workers: workers.value,
     selectedWorkerIds: selectedWorkerIds.value,
-    exportFilters: exportFilters.value
+    exportFilters: exportFilters.value,
+    selectedDepartment: selectedDepartment.value,
   };
   sessionStorage.setItem('personnelSearchState', JSON.stringify(searchState));
 
@@ -271,7 +453,13 @@ const viewRecords = (workerId) => {
 const workers = ref([]);
 const loading = ref(false);
 const errorMessage = ref('');
-const newWorker = ref({ fullName: '', username: '', password: '', department: '', position: '' });
+const newWorker = ref({
+  fullName: '',
+  username: '',
+  password: '',
+  department: '',
+  position: '',
+});
 const searchQuery = ref('');
 const currentPage = ref(1);
 const pageSize = ref(20);
@@ -290,18 +478,30 @@ const confirmMessage = ref('');
 const isConfirmModalVisible = ref(false);
 const exportFilters = ref({ startDate: '', endDate: '' });
 const exportLoading = ref(false);
-// Removed workerStatusLoading as it's no longer needed with integrated save
+const txtExportLoading = ref(false);
+const showClearDeviceConfirm = ref(false);
+const showDeleteConfirm = ref(false);
+const departments = ref([]);
+const selectedDepartment = ref('');
 
 // --- COMPUTED ---
-const isFormValid = computed(() => newWorker.value.fullName && newWorker.value.username && newWorker.value.password);
+const isFormValid = computed(
+  () => newWorker.value.fullName && newWorker.value.username && newWorker.value.password
+);
 const totalPages = computed(() => {
   const pages = Math.ceil(totalWorkers.value / pageSize.value);
-  return pages < 1 ? 1 : pages; // Ensure at least 1 page
+  return pages < 1 ? 1 : pages;
 });
-const isAllSelected = computed(() => workers.value.length > 0 && selectedWorkerIds.value.length === workers.value.length);
+const isAllSelected = computed(
+  () => workers.value.length > 0 && selectedWorkerIds.value.length === workers.value.length
+);
 
 // --- WATCHERS ---
 watch(searchQuery, () => fetchWorkers(1));
+watch(selectedDepartment, () => {
+  currentPage.value = 1;
+  fetchWorkers(1);
+});
 watch(currentPage, (newPage) => {
   selectedWorkerIds.value = [];
   jumpToPageInput.value = newPage;
@@ -311,18 +511,19 @@ watch(currentPage, (newPage) => {
 const fetchWorkers = async (page = currentPage.value) => {
   loading.value = true;
   try {
-    const data = await apiFetch(`/api/managers/workers?search=${searchQuery.value}&page=${page}&limit=${pageSize.value}`);
+    let url = `/api/managers/workers?search=${encodeURIComponent(searchQuery.value)}&page=${page}&limit=${pageSize.value}`;
+    if (selectedDepartment.value) {
+      url += `&department=${encodeURIComponent(selectedDepartment.value)}`;
+    }
+    const data = await apiFetch(url);
     workers.value = data.workers;
     totalWorkers.value = data.totalCount;
 
-    // Cache worker data
     if (data.workers && Array.isArray(data.workers)) {
-      data.workers.forEach(worker => {
+      data.workers.forEach((worker) => {
         workerCache.storeWorkerData(worker.id, worker);
       });
     }
-
-    // currentPage is already set to the requested page before fetch
   } catch (_err) {
     errorMessage.value = 'Failed to fetch workers.';
     workers.value = [];
@@ -332,6 +533,14 @@ const fetchWorkers = async (page = currentPage.value) => {
     loading.value = false;
   }
 };
+const fetchDepartments = async () => {
+  try {
+    const data = await apiFetch('/api/managers/departments');
+    departments.value = data;
+  } catch (_err) {
+    console.error('Failed to fetch departments');
+  }
+};
 
 const changePage = (page) => {
   if (page > 0 && page <= totalPages.value) {
@@ -355,12 +564,18 @@ const addWorker = async () => {
   loading.value = true;
   errorMessage.value = '';
   try {
-      await apiFetch('/api/managers/workers', {
-        method: 'POST',
-        body: JSON.stringify({ ...newWorker.value, role: 'worker' }),
-      });
+    await apiFetch('/api/managers/workers', {
+      method: 'POST',
+      body: JSON.stringify({ ...newWorker.value, role: 'worker' }),
+    });
     await fetchWorkers(1);
-    newWorker.value = { fullName: '', username: '', password: '', department: '', position: '' };
+    newWorker.value = {
+      fullName: '',
+      username: '',
+      password: '',
+      department: '',
+      position: '',
+    };
     toast.showToast($t('workerAdded'), 'success');
   } catch (_err) {
     toast.showToast(_err.message || $t('addUserError'), 'error');
@@ -376,7 +591,9 @@ const deleteWorker = async (id) => {
   try {
     await apiFetch(`/api/managers/workers/${id}`, { method: 'DELETE' });
     toast.showToast($t('workerSoftDeleted'), 'success');
-    fetchWorkers(workers.value.length === 1 && currentPage.value > 1 ? currentPage.value - 1 : currentPage.value);
+    fetchWorkers(
+      workers.value.length === 1 && currentPage.value > 1 ? currentPage.value - 1 : currentPage.value
+    );
   } catch (_err) {
     errorMessage.value = 'Failed to soft-delete worker.';
   }
@@ -392,16 +609,15 @@ const clearDevice = async (workerId) => {
   }
 };
 
-// Renamed and refactored updateWorkerPassword to saveWorkerSettings
 const saveWorkerSettings = async () => {
   const toast = useToast();
   passwordErrorMessage.value = '';
   passwordSuccessMessage.value = '';
   let passwordUpdated = false;
   let detailsUpdated = false;
-    toast.showToast($t('savingSettings'), 'info');
 
-  // Handle password change
+  toast.showToast($t('savingSettings'), 'info');
+
   if (newPassword.value || confirmNewPassword.value) {
     if (newPassword.value !== confirmNewPassword.value) {
       passwordErrorMessage.value = 'Passwords do not match.';
@@ -414,16 +630,17 @@ const saveWorkerSettings = async () => {
     passwordUpdated = true;
   }
 
-  // Handle details change (status, department, position)
-  const originalWorker = workers.value.find(w => w.id === editingWorker.value.id);
-  const newStatus = editingWorker.value.isActive ? 'active' : 'inactive';
-  if (
-    originalWorker.status !== newStatus ||
-    originalWorker.department !== editingWorker.value.department ||
-    originalWorker.position !== editingWorker.value.position
-  ) {
-    detailsUpdated = true;
-  }
+  const originalWorker = workers.value.find((w) => w.id === editingWorker.value.id);
+const newStatus = editingWorker.value.isActive ? 'active' : 'inactive';
+
+if (
+  originalWorker.status !== newStatus ||
+  originalWorker.department !== editingWorker.value.department ||
+  originalWorker.position !== editingWorker.value.position ||
+  originalWorker.full_name !== editingWorker.value.fullName
+) {
+  detailsUpdated = true;
+}
 
   if (!passwordUpdated && !detailsUpdated) {
     passwordErrorMessage.value = 'No changes to save.';
@@ -447,6 +664,7 @@ const saveWorkerSettings = async () => {
           status: newStatus,
           department: editingWorker.value.department,
           position: editingWorker.value.position,
+          fullName: editingWorker.value.fullName,
         }),
       });
       if (passwordUpdated) {
@@ -455,7 +673,6 @@ const saveWorkerSettings = async () => {
         passwordSuccessMessage.value = 'Worker details updated successfully!';
       }
     }
-
     await fetchWorkers(currentPage.value);
     setTimeout(() => {
       closeSettingsModal();
@@ -468,7 +685,11 @@ const saveWorkerSettings = async () => {
 };
 
 const openSettingsModal = (worker) => {
-  editingWorker.value = { ...worker, isActive: worker.status === 'active' }; // Initialize isActive for checkbox
+  editingWorker.value = {
+    ...worker,
+    fullName: worker.full_name,
+    isActive: worker.status === 'active',
+  };
   isSettingsModalVisible.value = true;
 };
 
@@ -483,9 +704,6 @@ const closeSettingsModal = () => {
   showDeleteConfirm.value = false;
 };
 
-const showClearDeviceConfirm = ref(false);
-const showDeleteConfirm = ref(false);
-
 const closeConfirmModal = () => {
   isConfirmModalVisible.value = false;
   confirmAction.value = '';
@@ -510,28 +728,37 @@ const toggleWorkerSelection = (workerId) => {
 };
 
 const toggleSelectAll = (event) => {
-  selectedWorkerIds.value = event.target.checked ? workers.value.map(w => w.id) : [];
+  selectedWorkerIds.value = event.target.checked ? workers.value.map((w) => w.id) : [];
 };
 
 const exportWorkHours = async () => {
   const toast = useToast();
   exportLoading.value = true;
-    toast.showToast($t('exportingRecords'), 'info');
+  toast.showToast($t('exportingRecords'), 'info');
   const { startDate, endDate } = exportFilters.value;
-  let workerIds = selectedWorkerIds.value.join(',');
+  const workerIds = selectedWorkerIds.value.join(',');
+
+  let exportUrl = `${import.meta.env.VITE_API_BASE_URL}/api/managers/attendance-records/export?format=xlsx&startDate=${startDate}&endDate=${endDate}&workerIds=${workerIds}`;
+  if (selectedDepartment.value) {
+    exportUrl += `&department=${encodeURIComponent(selectedDepartment.value)}`;
+  }
 
   try {
-    const response = await fetch(`${import.meta.env.VITE_API_BASE_URL}/api/managers/attendance-records/export?startDate=${startDate}&endDate=${endDate}&workerIds=${workerIds}`, {
+    const response = await fetch(
+      exportUrl,
+      {
         headers: {
-            'Authorization': `Bearer ${sessionStorage.getItem('token')}`
-        }
-    });
+          Authorization: `Bearer ${sessionStorage.getItem('token')}`,
+          'X-User-Timezone': getUserTimezone(),
+        },
+      }
+    );
     if (!response.ok) throw new Error('Network response was not ok.');
     const blob = await response.blob();
     const url = window.URL.createObjectURL(blob);
     const a = document.createElement('a');
     a.href = url;
-    a.download = `work_hours_${startDate}_to_${endDate}.csv`;
+    a.download = `work_hours_${startDate}_to_${endDate}.xlsx`;
     document.body.appendChild(a);
     a.click();
     a.remove();
@@ -539,12 +766,45 @@ const exportWorkHours = async () => {
   } catch (_err) {
     toast.showToast($t('exportRecordsFailed'), 'error');
   } finally {
-      exportLoading.value = false;
+    exportLoading.value = false;
+  }
+};
+
+const exportTxt = async () => {
+  const toast = useToast();
+  txtExportLoading.value = true;
+  const { startDate, endDate } = exportFilters.value;
+  const workerIds = selectedWorkerIds.value.join(',');
+  let exportUrl = `${import.meta.env.VITE_API_BASE_URL}/api/managers/attendance-records/export?format=txt&startDate=${startDate}&endDate=${endDate}&workerIds=${workerIds}`;
+  if (selectedDepartment.value) {
+    exportUrl += `&department=${encodeURIComponent(selectedDepartment.value)}`;
+  }
+  try {
+    const response = await fetch(exportUrl, {
+      headers: {
+        Authorization: `Bearer ${sessionStorage.getItem('token')}`,
+        'X-User-Timezone': getUserTimezone(),
+      },
+    });
+    if (!response.ok) throw new Error('Network response was not ok.');
+    const blob = await response.blob();
+    const url = window.URL.createObjectURL(blob);
+    const a = document.createElement('a');
+    a.href = url;
+    a.download = `attendance_${startDate}_to_${endDate}.txt`;
+    document.body.appendChild(a);
+    a.click();
+    a.remove();
+    window.URL.revokeObjectURL(url);
+  } catch (_err) {
+    toast.showToast('Export TXT failed.', 'error');
+  } finally {
+    txtExportLoading.value = false;
   }
 };
 
 onMounted(() => {
-  // Check if there's saved search state
+  fetchDepartments();
   const savedSearchState = sessionStorage.getItem('personnelSearchState');
   if (savedSearchState) {
     try {
@@ -556,11 +816,9 @@ onMounted(() => {
       workers.value = searchState.workers || [];
       selectedWorkerIds.value = searchState.selectedWorkerIds || [];
       exportFilters.value = searchState.exportFilters || { startDate: '', endDate: '' };
-
-      // Clear the saved search state after restoring it
+      selectedDepartment.value = searchState.selectedDepartment || '';
       sessionStorage.removeItem('personnelSearchState');
     } catch (_e) {
-      // If there's an error parsing the saved state, fetch workers normally
       fetchWorkers();
     }
   } else {

src/components/WarningReporting.vue

@@ -4,18 +4,24 @@
       <h2 class="text-xl font-semibold mb-6 text-gray-800 dark:text-white">{{ $t('failedClockSummary') }}</h2>
       <div class="mb-6 flex flex-col sm:flex-row sm:items-end gap-4 p-4 bg-gray-50 dark:bg-gray-700 rounded-lg">
         <div class="flex-grow">
-          <input type="text" id="search-worker" v-model="searchQuery" :placeholder="$t('searchByNameOrDepartment')" class="border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 w-full focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-800 text-gray-900 dark:text-white" />
+          <input type="text" id="search-worker" v-model="searchQuery" :placeholder="$t('searchByNameOrDepartment')"
+            class="border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 w-full focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-800 text-gray-900 dark:text-white" />
         </div>
         <div class="flex items-end gap-4 flex-wrap">
           <div class="flex flex-col">
-            <label for="start-date" class="text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">{{ $t('startDate') }}</label>
-            <input type="date" id="start-date" v-model="filters.startDate" class="border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-800 text-gray-900 dark:text-white" />
+            <label for="start-date" class="text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">{{ $t('startDate')
+              }}</label>
+            <input type="date" id="start-date" v-model="filters.startDate"
+              class="border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-800 text-gray-900 dark:text-white" />
           </div>
           <div class="flex flex-col">
-            <label for="end-date" class="text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">{{ $t('endDate') }}</label>
-            <input type="date" id="end-date" v-model="filters.endDate" class="border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-800 text-gray-900 dark:text-white" />
+            <label for="end-date" class="text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">{{ $t('endDate')
+              }}</label>
+            <input type="date" id="end-date" v-model="filters.endDate"
+              class="border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-800 text-gray-900 dark:text-white" />
           </div>
-          <button @click="fetchFailedRecords" :disabled="loadingReport" class="bg-blue-600 hover:bg-blue-700 text-white font-semibold px-4 py-2 rounded-md transition-colors duration-200 disabled:opacity-50">
+          <button @click="fetchFailedRecords" :disabled="loadingReport"
+            class="bg-blue-600 hover:bg-blue-700 text-white font-semibold px-4 py-2 rounded-md transition-colors duration-200 disabled:opacity-50">
             {{ loadingReport ? $t('loading') : $t('fetchRecords') }}
           </button>
         </div>
@@ -24,23 +30,40 @@
         <table class="min-w-[700px] w-full text-left">
           <thead class="bg-gray-100 dark:bg-gray-700">
             <tr class="border-b-2 border-gray-200 dark:border-gray-600">
-              <th class="px-4 py-3 text-sm font-semibold text-gray-600 dark:text-gray-300 uppercase tracking-wider cursor-pointer" @click="sortBy('full_name')">
+              <th
+                class="px-4 py-3 text-sm font-semibold text-gray-600 dark:text-gray-300 uppercase tracking-wider cursor-pointer"
+                @click="sortBy('full_name')">
                 {{ $t('worker') }}
-                <span v-if="sortField === 'full_name'" class="ml-1">{{ sortDirection === 'asc' ? '↑' : '↓' }}</span>
+                <span v-if="sortField === 'full_name'" class="ml-1">
+                  {{ sortDirection === 'asc' ? '↑' : '↓' }}
+                </span>
               </th>
-              <th class="px-4 py-3 text-sm font-semibold text-gray-600 dark:text-gray-300 uppercase tracking-wider cursor-pointer text-center" @click="sortBy('count')">
+              <th
+                class="px-4 py-3 text-sm font-semibold text-gray-600 dark:text-gray-300 uppercase tracking-wider cursor-pointer text-center"
+                @click="sortBy('count')">
                 {{ $t('failedCount') }}
-                <span v-if="sortField === 'count'" class="ml-1">{{ sortDirection === 'asc' ? '↑' : '↓' }}</span>
+                <span v-if="sortField === 'count'" class="ml-1">
+                  {{ sortDirection === 'asc' ? '↑' : '↓' }}
+                </span>
+              </th>
+              <th
+                class="px-4 py-3 text-sm font-semibold text-gray-600 dark:text-gray-300 uppercase tracking-wider text-center">
+                {{ $t('actions') }}
               </th>
-              <th class="px-4 py-3 text-sm font-semibold text-gray-600 dark:text-gray-300 uppercase tracking-wider text-center">{{ $t('actions') }}</th>
             </tr>
           </thead>
           <tbody class="divide-y divide-gray-200 dark:divide-gray-700">
-            <tr v-for="record in sortedFailedRecords" :key="record.worker_id" class="hover:bg-gray-50 dark:hover:bg-gray-800 transition-colors duration-150">
-              <td class="px-4 py-3 text-gray-800 dark:text-white font-medium">{{ record.full_name }}</td>
-              <td class="px-4 py-3 text-gray-800 dark:text-white text-center">{{ record.count }}</td>
+            <tr v-for="record in sortedFailedRecords" :key="record.worker_id"
+              class="hover:bg-gray-50 dark:hover:bg-gray-800 transition-colors duration-150">
+              <td class="px-4 py-3 text-gray-800 dark:text-white font-medium">
+                {{ record.full_name }}
+              </td>
+              <td class="px-4 py-3 text-gray-800 dark:text-white text-center">
+                {{ record.count }}
+              </td>
               <td class="px-4 py-3 text-center">
-                <button @click="showDetails(record.worker_id, record.full_name)" class="text-blue-600 dark:text-blue-400 hover:underline">
+                <button @click="showDetails(record.worker_id, record.full_name)"
+                  class="text-blue-600 dark:text-blue-400 hover:underline">
                   {{ $t('viewDetails') }}
                 </button>
               </td>
@@ -53,9 +76,12 @@
             <tr v-if="loadingReport">
               <td colspan="3" class="text-center py-8 text-gray-500 dark:text-gray-400">
                 <div class="flex justify-center items-center">
-                  <svg class="animate-spin -ml-1 mr-3 h-5 w-5 text-blue-500" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
+                  <svg class="animate-spin -ml-1 mr-3 h-5 w-5 text-blue-500" xmlns="http://www.w3.org/2000/svg"
+                    fill="none" viewBox="0 0 24 24">
                     <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
-                    <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
+                    <path class="opacity-75" fill="currentColor"
+                      d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z">
+                    </path>
                   </svg>
                   <span>{{ $t('loadingReport') }}</span>
                 </div>
@@ -69,8 +95,11 @@
     <div v-if="showDetailModal" class="fixed inset-0 bg-black bg-opacity-60 flex items-center justify-center z-50 p-4">
       <div class="bg-white dark:bg-gray-800 rounded-lg shadow-xl p-6 w-full max-w-4xl max-h-[90vh] flex flex-col">
         <div class="flex justify-between items-center mb-4 border-b pb-3">
-          <h3 class="text-xl font-semibold text-gray-800 dark:text-white">{{ detailModalTitle }}</h3>
-          <button @click="showDetailModal = false" class="text-gray-500 dark:text-gray-400 hover:text-gray-700 dark:hover:text-gray-300 text-2xl leading-none">
+          <h3 class="text-xl font-semibold text-gray-800 dark:text-white">
+            {{ detailModalTitle }}
+          </h3>
+          <button @click="showDetailModal = false"
+            class="text-gray-500 dark:text-gray-400 hover:text-gray-700 dark:hover:text-gray-300 text-2xl leading-none">
             &times;
           </button>
         </div>
@@ -78,22 +107,37 @@
           <table class="min-w-full divide-y divide-gray-200 dark:divide-gray-700">
             <thead class="bg-gray-50 dark:bg-gray-700">
               <tr>
-                <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-300 uppercase tracking-wider">{{ $t('timestamp') }}</th>
-                <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-300 uppercase tracking-wider">{{ $t('eventType') }}</th>
-                <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-300 uppercase tracking-wider">{{ $t('location') }}</th>
-                <th class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-300 uppercase tracking-wider">{{ $t('notes') }}</th>
+                <th
+                  class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-300 uppercase tracking-wider">
+                  {{ $t('timestamp') }}</th>
+                <th
+                  class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-300 uppercase tracking-wider">
+                  {{ $t('eventType') }}</th>
+                <th
+                  class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-300 uppercase tracking-wider">
+                  {{ $t('location') }}</th>
+                <th
+                  class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-300 uppercase tracking-wider">
+                  {{ $t('notes') }}</th>
               </tr>
             </thead>
             <tbody class="bg-white dark:bg-gray-800 divide-y divide-gray-200 dark:divide-gray-700">
               <tr v-for="detail in detailRecords" :key="detail.id">
-                <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-800 dark:text-gray-200">{{ new Date(detail.timestamp).toLocaleString() }}</td>
                 <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-800 dark:text-gray-200">
-                  <span class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-red-100 text-red-800 dark:bg-red-900 dark:text-red-200">
+                  {{ detail.timestamp }}
+                </td>
+                <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-800 dark:text-gray-200">
+                  <span
+                    class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-red-100 text-red-800 dark:bg-red-900 dark:text-red-200">
                     {{ $t(detail.event_type) }}
                   </span>
                 </td>
-                <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-800 dark:text-gray-200">{{ detail.qrCodeUsedName || $t('nA') }}</td>
-                <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-800 dark:text-gray-200">{{ detail.notes || $t('nA') }}</td>
+                <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-800 dark:text-gray-200">
+                  {{ detail.qrCodeUsedName || $t('nA') }}
+                </td>
+                <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-800 dark:text-gray-200">
+                  {{ detail.notes || $t('nA') }}
+                </td>
               </tr>
             </tbody>
           </table>
@@ -112,6 +156,47 @@ import { useToast } from '@/composables/useToast';
 const { t: $t } = useI18n();
 const toast = useToast();
 
+// --- timezone-aware formatter (local helper) ---
+const getUserTimezone = () => {
+  try {
+    return Intl.DateTimeFormat().resolvedOptions().timeZone || 'Asia/Kuala_Lumpur';
+  } catch {
+    return 'Asia_Kuala_Lumpur';
+  }
+};
+
+const formatLocalTimestamp = (utcValue) => {
+  if (!utcValue) return '';
+  const tz = getUserTimezone();
+
+  let iso = utcValue;
+
+  if (utcValue instanceof Date) {
+    iso = utcValue.toISOString();
+  } else if (typeof utcValue === 'string') {
+    if (!iso.endsWith('Z')) {
+      if (iso.includes('T')) {
+        iso = iso + 'Z';
+      } else {
+        iso = iso.replace(' ', 'T') + 'Z';
+      }
+    }
+  }
+
+  const d = new Date(iso);
+
+  return d.toLocaleString(undefined, {
+    timeZone: tz,
+    year: 'numeric',
+    month: '2-digit',
+    day: '2-digit',
+    hour: '2-digit',
+    minute: '2-digit',
+    second: '2-digit',
+    hour12: false,
+  });
+};
+
 // --- STATE ---
 const searchQuery = ref('');
 const filters = ref({ startDate: '', endDate: '' });
@@ -151,7 +236,7 @@ const fetchFailedRecords = async () => {
     const url = `/api/managers/failed-records?search=${searchQuery.value}&startDate=${filters.value.startDate}&endDate=${filters.value.endDate}`;
     failedRecords.value = await apiFetch(url);
   } catch (_err) {
-    console.error('Failed to fetch failed records',_err);
+    console.error('Failed to fetch failed records', _err);
     toast.showToast('Failed to fetch records.', 'error');
   } finally {
     loadingReport.value = false;
@@ -174,7 +259,7 @@ const showDetails = async (workerId, workerName) => {
     detailRecords.value = await apiFetch(url);
     showDetailModal.value = true;
   } catch (_err) {
-    console.error('Failed to fetch details',_err);
+    console.error('Failed to fetch details', _err);
     toast.showToast('Failed to load details.', 'error');
   }
 };

src/locales/en.json

@@ -115,6 +115,7 @@
   "chooseTag": "-- Choose a tag --",
   "addByTag": "Add by Tag",
   "selectedForReport": "Selected for Report ({count})",
+  "all": "All",
   "allWorkersSelected": "All Workers ({count}) Selected",
   "noWorkersSelected": "No workers selected.",
   "reportSettings": "2. Report Settings",
@@ -139,6 +140,9 @@
   "exportAll": "Export All",
   "export": "Export",
 
+  "filterByDepartment": "Filter by Department",
+  "departmentFilter": "Departments",
+  "allDepartments": "All Departments",
   "addNewUser": "Add New User",
   "fullName": "Full Name",
   "department": "Department",
@@ -159,6 +163,7 @@
   "tags": "Tags",
   "workerRoster": "Employee List",
   "searchByNameOrUsername": "Search by name/username",
+  "searchByName": "Search by Name",
   "searchByNameOrDepartment": "Search by name/department",
   "filterByTag": "Filter by tag",
   "clearFilter": "Clear filter",

src/locales/ms.json

@@ -116,6 +116,7 @@
   "chooseTag": "-- Pilih tag --",
   "addByTag": "Tambah melalui Tag",
   "selectedForReport": "Dipilih untuk Laporan ({count})",
+  "all": "Semua",
   "allWorkersSelected": "Semua Pekerja ({count}) Dipilih",
   "noWorkersSelected": "Tiada pekerja dipilih.",
   "reportSettings": "2. Tetapan Laporan",
@@ -139,6 +140,9 @@
   "reportGenerationError": "Ralat semasa menjana laporan.",
   "exportAll": "Eksport Semua",
   "export": "Eksport",
+  "filterByDepartment": "Tapis mengikut Jabatan",
+  "departmentFilter": "Jabatan:",
+  "allDepartments": "Semua Jabatan",
   "addNewUser": "Tambah Pengguna Baru",
   "fullName": "Nama Penuh",
   "department": "Jabatan",
@@ -158,6 +162,7 @@
   "createTag": "Cipta Tag",
   "tags": "Tag",
   "workerRoster": "Deftar Pekerja",
+  "searchByName": "Cari mengikut Nama",
   "searchByNameOrUsername": "Cari mengikut nama atau nama pengguna",
   "searchByNameOrDepartment": " Cari nama atau jabatan",
   "filterByTag": "Tapis mengikut tag",

src/locales/tm.json

@@ -97,7 +97,8 @@
     "chooseTag": "-- ஒரு டேக்கைத் தேர்ந்தெடுக்கவும் --",
     "addByTag": "டேக் மூலம் சேர்க்கவும்",
     "selectedForReport": "அறிக்கைக்காக தேர்ந்தெடுக்கப்பட்டவை ({count})",
-    "allWorkersSelected": "அனைத்து பணியாளர்கள் ({count}) தேர்ந்தெடுக்கப்பட்டனர்",
+    "all": "அனைத்தும்",
+  "allWorkersSelected": "அனைத்து பணியாளர்கள் ({count}) தேர்ந்தெடுக்கப்பட்டனர்",
     "noWorkersSelected": "பணியாளர்கள் எதுவும் தேர்ந்தெடுக்கப்படவில்லை.",
     "reportSettings": "2. அறிக்கை அமைப்புகள்",
     "setting": "அமைப்பு",
@@ -133,7 +134,8 @@
     "createTag": "டேக் உருவாக்கவும்",
     "tags": "டேக்குகள்",
     "workerRoster": "பணியாளர் பட்டியல்",
-    "searchByNameOrUsername": "பெயர் அல்லது பயனர் பெயர் மூலம் தேடவும்",
+    "searchByName": "பெயரால் தேடு",
+    "searchByNameOrUsername": "பெயர் அல்லது பயனர்பெயரால் தேடு",
     "filterByTag": "டேக் மூலம் வடிகட்டவும்",
     "clearFilter": "வடிகட்டியைத் துடைக்கவும்",
     "dateJoined": "சேர்ந்த தேதி",

src/utils/time.js

@@ -0,0 +1,50 @@
+// src/utils/time.js
+
+// Same logic as apiFetch and KillSwitchManagement
+export function getUserTimezone() {
+  try {
+    return Intl.DateTimeFormat().resolvedOptions().timeZone || 'Asia/Kuala_Lumpur';
+  } catch {
+    return 'Asia_Kuala_Lumpur';
+  }
+}
+
+// utcValue can be: "2025-11-03 16:30:00", ISO string, or Date
+export function formatUtcToLocal(utcValue, options = {}) {
+  if (!utcValue) return '';
+
+  const tz = options.timeZone || getUserTimezone();
+  const locale = options.locale || 'en-MY';
+
+  let d;
+
+  if (utcValue instanceof Date) {
+    d = utcValue;
+  } else if (typeof utcValue === 'string') {
+    // Normalize: DB gives "YYYY-MM-DD HH:mm:ss" (UTC) – turn into ISO UTC
+    let iso = utcValue;
+    if (!iso.endsWith('Z')) {
+      if (iso.includes('T')) {
+        iso = iso + 'Z';
+      } else {
+        iso = iso.replace(' ', 'T') + 'Z';
+      }
+    }
+    d = new Date(iso);
+  } else if (typeof utcValue === 'number') {
+    d = new Date(utcValue);
+  } else {
+    return '';
+  }
+
+  return d.toLocaleString(locale, {
+    timeZone: tz,
+    year: options.year ?? 'numeric',
+    month: options.month ?? '2-digit',
+    day: options.day ?? '2-digit',
+    hour: options.hour ?? '2-digit',
+    minute: options.minute ?? '2-digit',
+    second: options.second ?? '2-digit',
+    hour12: options.hour12 ?? false,
+  });
+}

src/views/ManagerAttendanceRecord.vue

@@ -19,20 +19,38 @@
         </p>
         <div class="flex flex-col sm:flex-row gap-4 items-end">
           <div class="flex flex-col gap-2 flex-grow w-full">
-            <label for="manual-timestamp" class="text-sm font-medium text-gray-700 dark:text-gray-300">{{
-              $t('clockOutTime') }}</label>
-            <input type="datetime-local" id="manual-timestamp" v-model="manualClockOut.timestamp"
-              class="border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 w-full focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-700 text-gray-900 dark:text-white" />
+            <label
+              for="manual-timestamp"
+              class="text-sm font-medium text-gray-700 dark:text-gray-300"
+            >
+              {{ $t('clockOutTime') }}
+            </label>
+            <input
+              type="datetime-local"
+              id="manual-timestamp"
+              v-model="manualClockOut.timestamp"
+              class="border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 w-full focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-700 text-gray-900 dark:text-white"
+            />
           </div>
           <div class="flex flex-col gap-2 flex-grow w-full">
-            <label for="manual-notes" class="text-sm font-medium text-gray-700 dark:text-gray-300">{{ $t('reason')
-              }}</label>
-            <input type="text" id="manual-notes" v-model="manualClockOut.notes"
+            <label
+              for="manual-notes"
+              class="text-sm font-medium text-gray-700 dark:text-gray-300"
+            >
+              {{ $t('reason') }}
+            </label>
+            <input
+              type="text"
+              id="manual-notes"
+              v-model="manualClockOut.notes"
               class="border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 w-full focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-700 text-gray-900 dark:text-white"
-              :placeholder="$t('enterBriefNote')" />
+              :placeholder="$t('enterBriefNote')"
+            />
           </div>
-          <button @click="addManualClockOut"
-            class="bg-blue-600 hover:bg-blue-700 text-white font-semibold px-4 py-2 rounded-md w-full sm:w-auto flex-shrink-0">
+          <button
+            @click="addManualClockOut"
+            class="bg-blue-600 hover:bg-blue-700 text-white font-semibold px-4 py-2 rounded-md w-full sm:w-auto flex-shrink-0"
+          >
             {{ $t('addRecord') }}
           </button>
         </div>
@@ -40,23 +58,45 @@
 
       <div class="flex flex-col sm:flex-row gap-4 items-end mb-6 pt-4 border-t border-gray-200 dark:border-gray-700">
         <div class="flex flex-col gap-2 w-full sm:w-auto">
-          <label for="start-date" class="text-sm font-medium text-gray-700 dark:text-gray-300">{{ $t('startDate')
-            }}</label>
-          <input type="date" id="start-date" v-model="filters.startDate"
-            class="border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 w-full focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-700 text-gray-900 dark:text-white" />
+          <label
+            for="start-date"
+            class="text-sm font-medium text-gray-700 dark:text-gray-300"
+          >
+            {{ $t('startDate') }}
+          </label>
+          <input
+            type="date"
+            id="start-date"
+            v-model="filters.startDate"
+            class="border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 w-full focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-700 text-gray-900 dark:text-white"
+          />
         </div>
         <div class="flex flex-col gap-2 w-full sm:w-auto">
-          <label for="end-date" class="text-sm font-medium text-gray-700 dark:text-gray-300">{{ $t('endDate') }}</label>
-          <input type="date" id="end-date" v-model="filters.endDate"
-            class="border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 w-full focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-700 text-gray-900 dark:text-white" />
+          <label
+            for="end-date"
+            class="text-sm font-medium text-gray-700 dark:text-gray-300"
+          >
+            {{ $t('endDate') }}
+          </label>
+          <input
+            type="date"
+            id="end-date"
+            v-model="filters.endDate"
+            class="border border-gray-300 dark:border-gray-600 rounded-md px-3 py-2 w-full focus:ring-blue-500 focus:border-blue-500 bg-white dark:bg-gray-700 text-gray-900 dark:text-white"
+          />
         </div>
-        <button @click="fetchRecords"
-          class="bg-blue-600 hover:bg-blue-700 text-white font-semibold px-4 py-2 rounded-md w-full sm:w-auto flex-shrink-0">
+        <button
+          @click="fetchRecords"
+          class="bg-blue-600 hover:bg-blue-700 text-white font-semibold px-4 py-2 rounded-md w-full sm:w-auto flex-shrink-0"
+        >
           {{ $t('filterRecords') }}
         </button>
-        <button @click="exportRawRecords" :disabled="exportLoading"
-            class="bg-green-600 hover:bg-green-700 text-white font-semibold px-4 py-2 rounded-md w-full sm:w-auto flex-shrink-0 disabled:opacity-50">
-            {{ exportLoading ? $t('exporting') : $t('export') }}
+        <button
+          @click="exportRawRecords"
+          :disabled="exportLoading"
+          class="bg-green-600 hover:bg-green-700 text-white font-semibold px-4 py-2 rounded-md w-full sm:w-auto flex-shrink-0 disabled:opacity-50"
+        >
+          {{ exportLoading ? $t('exporting') : $t('export') }}
         </button>
       </div>
 
@@ -87,8 +127,11 @@
                 {{ $t('noRecordsFound') }}
               </td>
             </tr>
-            <tr v-for="record in records" :key="record.id"
-              class="hover:bg-gray-50 dark:hover:bg-gray-700 transition-colors duration-150">
+            <tr
+              v-for="record in records"
+              :key="record.id"
+              class="hover:bg-gray-50 dark:hover:bg-gray-700 transition-colors duration-150"
+            >
               <td class="px-4 py-3">
                 <span
                   class="inline-block px-2 py-1 rounded-md text-xs font-semibold uppercase whitespace-nowrap text-white"
@@ -96,23 +139,34 @@
                     'bg-green-500': record.event_type === 'clock_in',
                     'bg-red-500': record.event_type === 'clock_out',
                     'bg-yellow-500': record.event_type === 'failed',
-                  }">
+                  }"
+                >
                   {{ record.event_type.replace('_', ' ') }}
                 </span>
               </td>
               <td class="px-4 py-3 text-gray-800 dark:text-white">
-                {{ new Date(record.timestamp).toLocaleString() }}
+                {{ record.timestamp }}
+              </td>
+              <td class="px-4 py-3 text-gray-800 dark:text-white">
+                {{ record.qrCodeUsedName }}
               </td>
-              <td class="px-4 py-3 text-gray-800 dark:text-white">{{ record.qrCodeUsedName }}</td>
               <td class="px-4 py-3">
-                <a v-if="record.latitude && record.longitude"
-                  :href="`https://maps.google.com/?q=${record.latitude},${record.longitude}`" target="_blank"
-                  rel="noopener noreferrer" class="text-blue-600 hover:text-blue-800 underline font-medium">
+                <a
+                  v-if="record.latitude && record.longitude"
+                  :href="`https://maps.google.com/?q=${record.latitude},${record.longitude}`"
+                  target="_blank"
+                  rel="noopener noreferrer"
+                  class="text-blue-600 hover:text-blue-800 underline font-medium"
+                >
                   {{ $t('showOnMap') }}
                 </a>
-                <span v-else class="text-gray-500 dark:text-gray-400">{{ $t('nA') }}</span>
+                <span v-else class="text-gray-500 dark:text-gray-400">
+                  {{ $t('nA') }}
+                </span>
+              </td>
+              <td class="px-4 py-3 text-gray-800 dark:text-white">
+                {{ record.notes || $t('nA') }}
               </td>
-              <td class="px-4 py-3 text-gray-800 dark:text-white">{{ record.notes || $t('nA') }}</td>
             </tr>
           </tbody>
         </table>
@@ -135,15 +189,59 @@ const records = ref([])
 const workerName = ref('')
 const workerId = route.params.workerId
 
+const getUserTimezone = () => {
+  try {
+    return Intl.DateTimeFormat().resolvedOptions().timeZone || 'Asia/Kuala_Lumpur'
+  } catch {
+    return 'Asia/Kuala_Lumpur'
+  }
+}
+
+const normalizeUtcToIso = (utcValue) => {
+  if (!utcValue) return null
+
+  if (utcValue instanceof Date) {
+    return utcValue.toISOString()
+  }
+
+  let iso = utcValue
+  if (typeof iso === 'string') {
+    if (!iso.endsWith('Z')) {
+      if (iso.includes('T')) {
+        iso = iso + 'Z'
+      } else {
+        iso = iso.replace(' ', 'T') + 'Z'
+      }
+    }
+  }
+  return iso
+}
+
+const formatLocalTimestamp = (utcValue) => {
+  const iso = normalizeUtcToIso(utcValue)
+  if (!iso) return ''
+  const tz = getUserTimezone()
+  const d = new Date(iso)
+  return d.toLocaleString(undefined, {
+    timeZone: tz,
+    year: 'numeric',
+    month: '2-digit',
+    day: '2-digit',
+    hour: '2-digit',
+    minute: '2-digit',
+    second: '2-digit',
+    hour12: false
+  })
+}
+
 const toLocalISOString = (date) => {
-  const tzoffset = new Date().getTimezoneOffset() * 60000 //offset in milliseconds
-  const localISOTime = new Date(date - tzoffset).toISOString().slice(0, 16)
+  const localISOTime = new Date(date).toISOString().slice(0, 16)
   return localISOTime
 }
 
 const manualClockOut = ref({
   timestamp: toLocalISOString(new Date()),
-  notes: '',
+  notes: ''
 })
 
 const today = new Date()
@@ -152,15 +250,14 @@ setStartDay.setDate(today.getDate() - 60)
 
 const filters = ref({
   startDate: setStartDay.toISOString().split('T')[0],
-  endDate: today.toISOString().split('T')[0],
+  endDate: today.toISOString().split('T')[0]
 })
 
-const exportLoading = ref(false);
+const exportLoading = ref(false)
 
 const goBack = () => {
-  // Navigate back to the manager dashboard (PersonnelManagement component)
-  window.history.back();
-};
+  window.history.back()
+}
 
 const fetchRecords = async () => {
   let url = `/api/managers/attendance-records?workerIds=${workerId}`
@@ -174,21 +271,19 @@ const fetchRecords = async () => {
     if (data && Array.isArray(data)) {
       records.value = data
       if (!workerName.value && data.length > 0) {
-        // Check if worker data is cached
-        const cachedWorkerData = workerCache.getWorkerData(workerId);
+        const cachedWorkerData = workerCache.getWorkerData(workerId)
         if (cachedWorkerData) {
-          workerName.value = cachedWorkerData.full_name;
+          workerName.value = cachedWorkerData.full_name
         } else {
-          workerName.value = data[0].full_name;
-          // Cache the worker data for future use
-          workerCache.storeWorkerData(workerId, { full_name: data[0].full_name });
+          workerName.value = data[0].full_name
+          workerCache.storeWorkerData(workerId, { full_name: data[0].full_name })
         }
       }
     } else {
       records.value = []
     }
   } catch (_err) {
-    console.error('Failed to fetch attendance records:',_err)
+    console.error('Failed to fetch attendance records:', _err)
     alert(_err.message)
     records.value = []
   }
@@ -208,14 +303,14 @@ const addManualClockOut = async () => {
     await apiFetch('/api/managers/add-record', {
       method: 'POST',
       headers: {
-        'Content-Type': 'application/json',
+        'Content-Type': 'application/json'
       },
       body: JSON.stringify({
         workerId: workerId,
         eventType: 'clock_out',
         timestamp: manualClockOut.value.timestamp,
-        notes: manualClockOut.value.notes,
-      }),
+        notes: manualClockOut.value.notes
+      })
     })
 
     alert(t('manualClockOutSuccess'))
@@ -223,37 +318,45 @@ const addManualClockOut = async () => {
     manualClockOut.value.timestamp = toLocalISOString(new Date())
     fetchRecords()
   } catch (_err) {
-    console.error('Failed to submit manual clock-out:',_err)
+    console.error('Failed to submit manual clock-out:', _err)
     alert(t('manualClockOutError', { msg: _err.message }))
   }
 }
 
 const exportRawRecords = async () => {
-  exportLoading.value = true;
-  const { startDate, endDate } = filters.value;
+  exportLoading.value = true
+  const { startDate, endDate } = filters.value
+
+  const tz = localStorage.getItem('tz') || getUserTimezone()
 
   try {
-    const response = await fetch(`${import.meta.env.VITE_API_BASE_URL}/api/managers/attendance-records/export-raw?startDate=${startDate}&endDate=${endDate}&workerIds=${workerId}`, {
+    const response = await fetch(
+      `${import.meta.env.VITE_API_BASE_URL}/api/managers/attendance-records/export-raw?startDate=${startDate}&endDate=${endDate}&workerIds=${workerId}&tz=${encodeURIComponent(
+        tz
+      )}`,
+      {
         headers: {
-            'Authorization': `Bearer ${sessionStorage.getItem('token')}`
+          Authorization: `Bearer ${sessionStorage.getItem('token')}`,
+          'X-User-Timezone': tz
         }
-    });
-    if (!response.ok) throw new Error('Network response was not ok.');
-    const blob = await response.blob();
-    const url = window.URL.createObjectURL(blob);
-    const a = document.createElement('a');
-    a.href = url;
-    a.download = `raw_attendance_${workerName.value}_${startDate}_to_${endDate}.csv`;
-    document.body.appendChild(a);
-    a.click();
-    a.remove();
-    window.URL.revokeObjectURL(url);
+      }
+    )
+    if (!response.ok) throw new Error('Network response was not ok.')
+    const blob = await response.blob()
+    const url = window.URL.createObjectURL(blob)
+    const a = document.createElement('a')
+    a.href = url
+    a.download = `raw_attendance_${workerName.value}_${startDate}_to_${endDate}.csv`
+    document.body.appendChild(a)
+    a.click()
+    a.remove()
+    window.URL.revokeObjectURL(url)
   } catch (_err) {
-    alert('Failed to export records.');
+    alert('Failed to export records.')
   } finally {
-      exportLoading.value = false;
+    exportLoading.value = false
   }
-};
+}
 
 onMounted(() => {
   fetchRecords()

src/views/WorkerDashboard.vue

@@ -186,13 +186,29 @@ const fetchCurrentStatus = async () => {
   }
 }
 
+const getTimeContext = () => {
+  const tzName = Intl.DateTimeFormat().resolvedOptions().timeZone || 'UTC'
+  const offsetMin = -new Date().getTimezoneOffset() // east of UTC => positive
+  return { device_epoch_ms: Date.now(), tz_name: tzName, offset_min: offsetMin }
+}
+
 const sendClockEvent = async (qrCodeValue, latitude, longitude) => {
   const eventType = isClockedIn.value ? 'clock_out' : 'clock_in'
   try {
+    const payload = {
+      userId,
+      eventType,
+      qrCodeValue,
+      latitude,
+      longitude,
+      ...getTimeContext() // new: device_epoch_ms, tz_name, offset_min
+    }
+
     await apiFetch('/api/clock', {
       method: 'POST',
-      body: JSON.stringify({ userId, eventType, qrCodeValue, latitude, longitude }),
+      body: JSON.stringify(payload),
     });
+
     const newClockStatus = !isClockedIn.value
     isClockedIn.value = newClockStatus
     triggerOverlay(t(newClockStatus ? 'successClockIn' : 'successClockOut'), 'success');

src/views/WorkerHistory.vue

@@ -2,11 +2,9 @@
   <div class="mobile-viewport bg-gray-100 dark:bg-gray-900 min-h-screen">
     <!-- Back Button -->
     <div class="fixed bottom-4 right-4 z-50">
-      <button
-        @click="goBack"
+      <button @click="goBack"
         class="bg-white dark:bg-gray-800 shadow-lg rounded-full p-3 hover:shadow-xl transition-all duration-200 focus:outline-none focus:ring-2 focus:ring-blue-500"
-        aria-label="Return to Dashboard"
-      >
+        aria-label="Return to Dashboard">
         <svg class="w-6 h-6 text-gray-700 dark:text-gray-300" fill="none" stroke="currentColor" viewBox="0 0 24 24">
           <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 19l-7-7m0 0l7-7m-7 7h18" />
         </svg>
@@ -17,26 +15,43 @@
       <!-- Empty State -->
       <div v-if="!clockHistory.length" class="text-center py-16 mt-8">
         <ChartBarIcon class="w-16 h-16 text-gray-400 dark:text-gray-500 mx-auto mb-4" />
-        <h2 class="text-2xl font-semibold text-gray-700 dark:text-gray-300">{{ $t('noClockHistory') }}</h2>
-        <p class="text-gray-500 dark:text-gray-400 mt-2">{{ $t('clockHistoryEmptyState') }}</p>
+        <h2 class="text-2xl font-semibold text-gray-700 dark:text-gray-300">
+          {{ $t('noClockHistory') }}
+        </h2>
+        <p class="text-gray-500 dark:text-gray-400 mt-2">
+          {{ $t('clockHistoryEmptyState') }}
+        </p>
       </div>
 
       <!-- History List -->
       <div v-else class="space-y-4 mt-8 mb-10">
         <div v-for="event in clockHistory" :key="event.id"
-             class="bg-white dark:bg-gray-800 rounded-2xl shadow-lg p-5 flex items-center space-x-4">
-          <div class="w-12 h-12 rounded-full flex items-center justify-center"
-               :class="event.event_type === 'clock_in' ? 'bg-green-100 dark:bg-green-900/50' : 'bg-red-100 dark:bg-red-900/50'">
-            <component :is="event.event_type === 'clock_in' ? ArrowDownCircleIcon : ArrowUpCircleIcon"
-                       :class="['w-8 h-8', event.event_type === 'clock_in' ? 'text-green-600 dark:text-green-400' : 'text-red-600 dark:text-red-400']" />
+          class="bg-white dark:bg-gray-800 rounded-2xl shadow-lg p-5 flex items-center space-x-4">
+          <div class="w-12 h-12 rounded-full flex items-center justify-center" :class="event.event_type === 'clock_in'
+            ? 'bg-green-100 dark:bg-green-900/50'
+            : 'bg-red-100 dark:bg-red-900/50'">
+            <component :is="event.event_type === 'clock_in' ? ArrowDownCircleIcon : ArrowUpCircleIcon" :class="[
+              'w-8 h-8',
+              event.event_type === 'clock_in'
+                ? 'text-green-600 dark:text-green-400'
+                : 'text-red-600 dark:text-red-400'
+            ]" />
           </div>
           <div class="flex-grow">
-            <div class="font-bold text-lg text-gray-900 dark:text-gray-100">{{ $t(event.event_type) }}</div>
-            <div class="text-sm text-gray-600 dark:text-gray-400">{{ event.qrCodeUsedName }}</div>
+            <div class="font-bold text-lg text-gray-900 dark:text-gray-100">
+              {{ $t(event.event_type) }}
+            </div>
+            <div class="text-sm text-gray-600 dark:text-gray-400">
+              {{ event.qrCodeUsedName }}
+            </div>
           </div>
           <div class="text-right">
-            <div class="font-medium text-gray-800 dark:text-gray-200">{{ new Date(event.timestamp).toLocaleDateString() }}</div>
-            <div class="text-sm text-gray-500 dark:text-gray-400">{{ new Date(event.timestamp).toLocaleTimeString() }}</div>
+            <div class="font-medium text-gray-800 dark:text-gray-200">
+              {{ event.timestamp }}
+            </div>
+            <div class="text-sm text-gray-500 dark:text-gray-400">
+              {{ event.timestamp }}
+            </div>
           </div>
         </div>
       </div>
@@ -56,6 +71,61 @@ const router = useRouter()
 const clockHistory = ref([])
 const userId = sessionStorage.getItem('userId')
 
+const getUserTimezone = () => {
+  try {
+    return Intl.DateTimeFormat().resolvedOptions().timeZone || 'Asia/Kuala_Lumpur'
+  } catch {
+    return 'Asia/Kuala_Lumpur'
+  }
+}
+
+const normalizeUtcToIso = (utcValue) => {
+  if (!utcValue) return null
+
+  if (utcValue instanceof Date) {
+    return utcValue.toISOString()
+  }
+
+  let iso = utcValue
+  if (typeof iso === 'string') {
+    if (!iso.endsWith('Z')) {
+      if (iso.includes('T')) {
+        iso = iso + 'Z'
+      } else {
+        iso = iso.replace(' ', 'T') + 'Z'
+      }
+    }
+  }
+  return iso
+}
+
+const formatLocalDate = (utcValue) => {
+  const iso = normalizeUtcToIso(utcValue)
+  if (!iso) return ''
+  const tz = getUserTimezone()
+  const d = new Date(iso)
+  return d.toLocaleDateString(undefined, {
+    timeZone: tz,
+    year: 'numeric',
+    month: '2-digit',
+    day: '2-digit'
+  })
+}
+
+const formatLocalTime = (utcValue) => {
+  const iso = normalizeUtcToIso(utcValue)
+  if (!iso) return ''
+  const tz = getUserTimezone()
+  const d = new Date(iso)
+  return d.toLocaleTimeString(undefined, {
+    timeZone: tz,
+    hour: '2-digit',
+    minute: '2-digit',
+    second: '2-digit',
+    hour12: false
+  })
+}
+
 onMounted(async () => {
   if (!userId) {
     router.push('/')
@@ -64,7 +134,7 @@ onMounted(async () => {
   try {
     const data = await apiFetch(`/api/worker/clock-history/${userId}`)
     if (data) {
-      clockHistory.value = data.filter(event => event.event_type !== 'failed');
+      clockHistory.value = data.filter(event => event.event_type !== 'failed')
     }
   } catch (error) {
     console.error(t('clockHistoryFetchFail'), error)