From 7d41412821b87e4a784579ccb890df5ced8764c0 Mon Sep 17 00:00:00 2001
From: Kartik Sharma <kartik.sharma@marcoaiot.com>
Date: Fri, 29 Aug 2025 12:49:33 +0530
Subject: [PATCH 1/2] Attendance Record Popup Shows Wrong Date Format

---
 src/components/Activities/AttendLogs.jsx | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

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 }) => {
           <p>
             Attendance logs for{" "}
             {logs[0]?.employee?.firstName + " " + logs[0]?.employee?.lastName}{" "}
-            on {logs[0]?.activityTime.slice(0, 10)}{" "}
+            on {formatDate(logs[0]?.activityTime)}
           </p>
         )}
       </div>
@@ -156,13 +166,13 @@ const AttendLogs = ({ Id }) => {
                 .sort((a, b) => b.id - a.id)
                 .map((log, index) => (
                   <tr key={index}>
-                    <td>{log.activityTime.slice(0, 10)}</td>
+                    <td>{formatDate(log.activityTime)}</td>
                     <td>{convertShortTime(log.activityTime)}</td>
                     <td>
                       {whichActivityPerform(log.activity, log.activityTime)}
                     </td>
                     <td>
-                      {log?.latitude != 0 ? (
+                      {log?.latitude !== 0 ? (
                         <i
                           className="bx bx-map text-danger  cursor-pointer"
                           data-bs-toggle="tooltip"
-- 
2.43.0


From 1626335fbe96aaeb1da3d2c877e2be7611593929 Mon Sep 17 00:00:00 2001
From: Kartik Sharma <kartik.sharma@marcoaiot.com>
Date: Mon, 1 Sep 2025 14:48:33 +0530
Subject: [PATCH 2/2] Changes in date format in Attendance logs and attendance.

---
 src/components/Activities/AttendLogs.jsx | 20 +++++---------------
 src/components/Activities/Attendance.jsx |  4 ++--
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/components/Activities/AttendLogs.jsx b/src/components/Activities/AttendLogs.jsx
index fee0649e..7c1e686d 100644
--- a/src/components/Activities/AttendLogs.jsx
+++ b/src/components/Activities/AttendLogs.jsx
@@ -1,6 +1,6 @@
-import React, { useEffect } from "react";
+import React, { useEffect, useState } from "react";
 import { useEmployeeAttendacesLog } from "../../hooks/useAttendance";
-import { convertShortTime } from "../../utils/dateUtils";
+import { convertShortTime, formatUTCToLocalTime } from "../../utils/dateUtils";
 import { useNavigate } from "react-router-dom";
 import { THRESH_HOLD } from "../../utils/constants";
 
@@ -8,16 +8,6 @@ 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,
@@ -138,7 +128,7 @@ const AttendLogs = ({ Id }) => {
           <p>
             Attendance logs for{" "}
             {logs[0]?.employee?.firstName + " " + logs[0]?.employee?.lastName}{" "}
-            on {formatDate(logs[0]?.activityTime)}
+            on {formatUTCToLocalTime(logs[0]?.activityTime)}
           </p>
         )}
       </div>
@@ -166,13 +156,13 @@ const AttendLogs = ({ Id }) => {
                 .sort((a, b) => b.id - a.id)
                 .map((log, index) => (
                   <tr key={index}>
-                    <td>{formatDate(log.activityTime)}</td>
+                    <td>{formatUTCToLocalTime(log.activityTime)}</td>
                     <td>{convertShortTime(log.activityTime)}</td>
                     <td>
                       {whichActivityPerform(log.activity, log.activityTime)}
                     </td>
                     <td>
-                      {log?.latitude !== 0 ? (
+                      {log?.latitude != 0 ? (
                         <i
                           className="bx bx-map text-danger  cursor-pointer"
                           data-bs-toggle="tooltip"
diff --git a/src/components/Activities/Attendance.jsx b/src/components/Activities/Attendance.jsx
index 2dde2938..62d5c70f 100644
--- a/src/components/Activities/Attendance.jsx
+++ b/src/components/Activities/Attendance.jsx
@@ -1,7 +1,7 @@
 import React, { useState, useEffect, useCallback, useMemo } from "react";
 import moment from "moment";
 import Avatar from "../common/Avatar";
-import { convertShortTime } from "../../utils/dateUtils";
+import { convertShortTime, formatUTCToLocalTime } from "../../utils/dateUtils";
 import RenderAttendanceStatus from "./RenderAttendanceStatus";
 import usePagination from "../../hooks/usePagination";
 import { useNavigate } from "react-router-dom";
@@ -116,7 +116,7 @@ const Attendance = ({ getRole, handleModalData, searchTerm }) => {
     <>
       <div className="table-responsive text-nowrap h-100" >
         <div className="d-flex text-start align-items-center py-2">
-          <strong>Date : {todayDate.toLocaleDateString("en-GB")}</strong>
+          <strong>Date : {formatUTCToLocalTime(todayDate)}</strong>
           <div className="form-check form-switch text-start m-0 ms-5">
             <input
               type="checkbox"
-- 
2.43.0