diff --git a/src/components/Activities/AttendLogs.jsx b/src/components/Activities/AttendLogs.jsx index b94c80c6..7c1e686d 100644 --- a/src/components/Activities/AttendLogs.jsx +++ b/src/components/Activities/AttendLogs.jsx @@ -1,6 +1,6 @@ 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"; @@ -128,7 +128,7 @@ const AttendLogs = ({ Id }) => {

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

)} @@ -156,7 +156,7 @@ const AttendLogs = ({ Id }) => { .sort((a, b) => b.id - a.id) .map((log, index) => ( - {log.activityTime.slice(0, 10)} + {formatUTCToLocalTime(log.activityTime)} {convertShortTime(log.activityTime)} {whichActivityPerform(log.activity, log.activityTime)} 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 }) => { <>
- Date : {todayDate.toLocaleDateString("en-GB")} + Date : {formatUTCToLocalTime(todayDate)}