Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issue_May_2W

src/components/Activities/AttendLogs.jsx

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

src/components/Activities/AttendanceModel.jsx

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

src/pages/employee/AttendancesEmployeeRecords.jsx

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