Compare commits

..

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

3 changed files with 12 additions and 19 deletions

View File

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

View File

@ -6,7 +6,7 @@ import Confirmation from './Confirmation'
const AttendanceModel = ({modelConfig,closeModal,handleSubmitForm}) => {
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-body">
<button

View File

@ -103,7 +103,7 @@ const AttendancesEmployeeRecords = ({ employee }) => {
>
{" "}
<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"
>
<div className="modal-content">