Compare commits

..

No commits in common. "bca43633ae189fa3fba6282483c75e485218f107" and "85dbd419f3003ec09c85a73dcbb2aa88212c4d4d" have entirely different histories.

3 changed files with 12 additions and 19 deletions

View File

@ -84,14 +84,13 @@ const AttendLogs = ({ Id }) => {
document.querySelectorAll('[data-bs-toggle="tooltip"]') document.querySelectorAll('[data-bs-toggle="tooltip"]')
); );
tooltipTriggerList.forEach((el) => new bootstrap.Tooltip(el)); tooltipTriggerList.forEach((el) => new bootstrap.Tooltip(el));
}, [] ); }, []);
console.log(logs[0]?.updatedByEmployee?.firstName)
return ( return (
<div className="table-responsive"> <div className="table-responsive">
<div className="text-start"> <div className="text-start">
{logs && !loading && ( {logs && !loading && (
<p> <p>
Attendance logs for{" "} Attendance for{" "}
{logs[0]?.employee?.firstName + " " + logs[0]?.employee?.lastName}{" "} {logs[0]?.employee?.firstName + " " + logs[0]?.employee?.lastName}{" "}
on {logs[0]?.activityTime.slice(0, 10)}{" "} on {logs[0]?.activityTime.slice(0, 10)}{" "}
</p> </p>
@ -107,13 +106,11 @@ const AttendLogs = ({ Id }) => {
<table className="table table-sm mb-0"> <table className="table table-sm mb-0">
<thead> <thead>
<tr> <tr>
<th >Date</th> <th style={{ width: "20%" }}>Date</th>
<th >Time</th> <th style={{ width: "15%" }}>Time</th>
<th >Activity</th> <th style={{ width: "20%" }}>Activity</th>
<th >Location</th> <th style={{ width: "20%" }}>Location</th>
<th >Recored By</th> <th style={{ width: "45%" }}>Description</th>
<th >Description</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -128,7 +125,7 @@ const AttendLogs = ({ Id }) => {
<td> <td>
{log?.latitude != 0 ? ( {log?.latitude != 0 ? (
<i <i
class="bx bx-location-plus text-danger cursor-pointer" class="bx bx-location-plus text-warning cursor-pointer"
data-bs-toggle="tooltip" data-bs-toggle="tooltip"
data-bs-offset="0,8" data-bs-offset="0,8"
data-bs-placement="top" data-bs-placement="top"
@ -142,13 +139,9 @@ const AttendLogs = ({ Id }) => {
"--" "--"
)} )}
</td> </td>
<td className="text-wrap" > <td className="text-wrap" colSpan={3}>
{`${logs[0]?.updatedByEmployee?.firstName ?? ''} ${logs[0]?.updatedByEmployee?.lastName ?? ''}`} mahajan {log?.comment}
</td> </td>
<td className="text-wrap" colSpan={3} >
{log?.comment || "--"}
</td>
</tr> </tr>
))} ))}
</tbody> </tbody>

View File

@ -6,7 +6,7 @@ import Confirmation from './Confirmation'
const AttendanceModel = ({modelConfig,closeModal,handleSubmitForm}) => { const AttendanceModel = ({modelConfig,closeModal,handleSubmitForm}) => {
return ( return (
<div className={`modal-dialog modal-lg modal-simple ${modelConfig.type === "view" ? "modal-lg":"modal-md"}`} > <div className={`modal-dialog modal-md modal-simple ${modelConfig.type === "view" ? "modal-lg":"modal-md"}`} >
<div className="modal-content"> <div className="modal-content">
<div className="modal-body"> <div className="modal-body">
<button <button

View File

@ -103,7 +103,7 @@ const AttendancesEmployeeRecords = ({ employee }) => {
> >
{" "} {" "}
<div <div
className="modal-dialog modal-lg modal-simple attendance-log-modal mx-sm-auto mx-1" className="modal-dialog modal-md modal-simple attendance-log-modal mx-sm-auto mx-1"
role="document" role="document"
> >
<div className="modal-content"> <div className="modal-content">