diff --git a/src/components/Activities/Regularization.jsx b/src/components/Activities/Regularization.jsx index 32481c81..0aab7474 100644 --- a/src/components/Activities/Regularization.jsx +++ b/src/components/Activities/Regularization.jsx @@ -1,6 +1,6 @@ import React, { useCallback, useEffect, useState, useMemo } from "react"; import Avatar from "../common/Avatar"; -import { convertShortTime } from "../../utils/dateUtils"; +import { convertShortTime, formatUTCToLocalTime } from "../../utils/dateUtils"; import RegularizationActions from "./RegularizationActions"; import { useSelector } from "react-redux"; import { useRegularizationRequests } from "../../hooks/useAttendance"; @@ -126,13 +126,19 @@ const Regularization = ({ Check-Out + + Requested By + + + Requested At + Action {currentItems?.map((att, index) => ( - +
@@ -150,7 +156,23 @@ const Regularization = ({ {convertShortTime(att.checkInTime)} - {att.checkOutTime ? convertShortTime(att.checkOutTime) : "--"} + {att.requestedAt ? convertShortTime(att.checkOutTime) : "--"} + + + + {att.requestedBy ? (
+ + +
):(--)} + + + {att?.requestedAt ? formatUTCToLocalTime(att.requestedAt,true) : "--"}