Adding 2 columns in Regularize column Request at and Requested by

This commit is contained in:
Kartik Sharma 2025-10-09 10:27:13 +05:30
parent ffd7f15488
commit 2fe297c6b6

View File

@ -120,7 +120,7 @@ const Regularization = ({ handleRequest, searchTerm, projectId, organizationId,
return () => eventBus.off("employee", employeeHandler); return () => eventBus.off("employee", employeeHandler);
}, [employeeHandler]); }, [employeeHandler]);
console.log("Kartik",currentItems) console.log("Kartik", currentItems)
return ( return (
<div className="table-responsive text-nowrap pb-4" style={{ minHeight: "200px" }}> <div className="table-responsive text-nowrap pb-4" style={{ minHeight: "200px" }}>
@ -142,6 +142,9 @@ const Regularization = ({ handleRequest, searchTerm, projectId, organizationId,
<th> <th>
<i className="bx bxs-up-arrow-alt text-danger"></i>Check-Out <i className="bx bxs-up-arrow-alt text-danger"></i>Check-Out
</th> </th>
<th>Request By</th>
<th>Requested At</th>
<th>Action</th> <th>Action</th>
</tr> </tr>
</thead> </thead>
@ -174,6 +177,7 @@ const Regularization = ({ handleRequest, searchTerm, projectId, organizationId,
</div> </div>
</td> </td>
<td>{att.projectName || "--"}</td> <td>{att.projectName || "--"}</td>
<td>{moment(att.checkOutTime).format("DD-MMM-YYYY")}</td> <td>{moment(att.checkOutTime).format("DD-MMM-YYYY")}</td>
{/* <td>{att.organizationName || "--"}</td> */} {/* <td>{att.organizationName || "--"}</td> */}
@ -182,6 +186,16 @@ const Regularization = ({ handleRequest, searchTerm, projectId, organizationId,
<td> <td>
{att.checkOutTime ? convertShortTime(att.checkOutTime) : "--"} {att.checkOutTime ? convertShortTime(att.checkOutTime) : "--"}
</td> </td>
<td>
{att.requestedBy
? `${att.requestedBy?.firstName} ${att.requestedBy?.lastName}`
: "--"}
</td>
<td>
{att.requestedAt
? moment(att.requestedAt).format("DD-MMM-YYYY")
: "--"}
</td>
<td className="text-center "> <td className="text-center ">
<RegularizationActions <RegularizationActions
attendanceData={att} attendanceData={att}