diff --git a/src/components/Activities/AttendLogs.jsx b/src/components/Activities/AttendLogs.jsx index b94c80c6..fee0649e 100644 --- a/src/components/Activities/AttendLogs.jsx +++ b/src/components/Activities/AttendLogs.jsx @@ -1,4 +1,4 @@ -import React, { useEffect, useState } from "react"; +import React, { useEffect } from "react"; import { useEmployeeAttendacesLog } from "../../hooks/useAttendance"; import { convertShortTime } from "../../utils/dateUtils"; import { useNavigate } from "react-router-dom"; @@ -8,6 +8,16 @@ const AttendLogs = ({ Id }) => { const { logs, loading } = useEmployeeAttendacesLog(Id); const navigate = useNavigate(); + // 🔹 Utility: format date as DD-MM-YYYY + const formatDate = (dateStr) => { + if (!dateStr) return ""; + const date = new Date(dateStr); + const day = String(date.getDate()).padStart(2, "0"); + const month = String(date.getMonth() + 1).padStart(2, "0"); + const year = date.getFullYear(); + return `${day}-${month}-${year}`; + }; + const isCheckoutRegularized = ( activityTimeStr, checkoutTimeStr, @@ -128,7 +138,7 @@ const AttendLogs = ({ Id }) => {

Attendance logs for{" "} {logs[0]?.employee?.firstName + " " + logs[0]?.employee?.lastName}{" "} - on {logs[0]?.activityTime.slice(0, 10)}{" "} + on {formatDate(logs[0]?.activityTime)}

)} @@ -156,13 +166,13 @@ const AttendLogs = ({ Id }) => { .sort((a, b) => b.id - a.id) .map((log, index) => ( - {log.activityTime.slice(0, 10)} + {formatDate(log.activityTime)} {convertShortTime(log.activityTime)} {whichActivityPerform(log.activity, log.activityTime)} - {log?.latitude != 0 ? ( + {log?.latitude !== 0 ? (