From 164b82e1c79f0a3372e3a858dad71960bf785649 Mon Sep 17 00:00:00 2001
From: Kartik Sharma <kartik.sharma@marcoaiot.com>
Date: Fri, 19 Sep 2025 17:00:02 +0530
Subject: [PATCH 1/2] Add an Organization column in the Attendance grid across
 all tabs.

---
 src/components/Activities/Attendance.jsx     | 10 +++++++++-
 src/components/Activities/AttendcesLogs.jsx  |  5 +++--
 src/components/Activities/Regularization.jsx |  8 ++++++--
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/components/Activities/Attendance.jsx b/src/components/Activities/Attendance.jsx
index 6d751b12..3bd83f9b 100644
--- a/src/components/Activities/Attendance.jsx
+++ b/src/components/Activities/Attendance.jsx
@@ -142,6 +142,7 @@ const Attendance = ({ getRole, handleModalData, searchTerm }) => {
                 <tr className="border-top-1">
                   <th colSpan={2}>Name</th>
                   <th>Role</th>
+                  <th>Organization</th>  
                   <th>
                     <i className="bx bxs-down-arrow-alt text-success"></i>
                     Check-In
@@ -190,6 +191,8 @@ const Attendance = ({ getRole, handleModalData, searchTerm }) => {
                         </td>
 
                         <td>{item.jobRoleName}</td>
+                        <td>{item.organizationName || "--"}</td>
+
                         <td>
                           {item.checkInTime
                             ? convertShortTime(item.checkInTime)
@@ -213,7 +216,11 @@ const Attendance = ({ getRole, handleModalData, searchTerm }) => {
                     ))}
                 {!attendance && (
                   <tr>
-                    <td colSpan={6} className="text-center text-secondary" style={{ height: "200px" }}>
+                    <td
+                      colSpan={7} 
+                      className="text-center text-secondary"
+                      style={{ height: "200px" }}
+                    >
                       No employees assigned to the project!
                     </td>
                   </tr>
@@ -221,6 +228,7 @@ const Attendance = ({ getRole, handleModalData, searchTerm }) => {
               </tbody>
             </table>
 
+
             {!loading && finalFilteredData.length > ITEMS_PER_PAGE && (
               <nav aria-label="Page ">
                 <ul className="pagination pagination-sm justify-content-end py-1">
diff --git a/src/components/Activities/AttendcesLogs.jsx b/src/components/Activities/AttendcesLogs.jsx
index 9aced215..0c07f23d 100644
--- a/src/components/Activities/AttendcesLogs.jsx
+++ b/src/components/Activities/AttendcesLogs.jsx
@@ -264,9 +264,9 @@ const AttendanceLog = ({ handleModalData, searchTerm }) => {
                   Name
                 </th>
                 <th className="border-top-1">Date</th>
+                <th>Organization</th>
                 <th>
-                  <i className="bx bxs-down-arrow-alt text-success"></i>{" "}
-                  Check-In
+                  <i className="bx bxs-down-arrow-alt text-success"></i> Check-In
                 </th>
                 <th>
                   <i className="bx bxs-up-arrow-alt text-danger"></i> Check-Out
@@ -323,6 +323,7 @@ const AttendanceLog = ({ handleModalData, searchTerm }) => {
                         attendance.checkInTime || attendance.checkOutTime
                       ).format("DD-MMM-YYYY")}
                     </td>
+                    <td>{attendance.organizationName || "--"}</td> 
                     <td>{convertShortTime(attendance.checkInTime)}</td>
                     <td>
                       {attendance.checkOutTime
diff --git a/src/components/Activities/Regularization.jsx b/src/components/Activities/Regularization.jsx
index 82c906b5..5f216f50 100644
--- a/src/components/Activities/Regularization.jsx
+++ b/src/components/Activities/Regularization.jsx
@@ -98,6 +98,7 @@ const Regularization = ({ handleRequest, searchTerm }) => {
             <tr>
               <th colSpan={2}>Name</th>
               <th>Date</th>
+              <th>Organization</th>
               <th>
                 <i className="bx bxs-down-arrow-alt text-success"></i>Check-In
               </th>
@@ -115,7 +116,7 @@ const Regularization = ({ handleRequest, searchTerm }) => {
                     <Avatar
                       firstName={att.firstName}
                       lastName={att.lastName}
-                    ></Avatar>
+                    />
                     <div className="d-flex flex-column">
                       <a href="#" className="text-heading text-truncate">
                         <span className="fw-normal">
@@ -126,6 +127,9 @@ const Regularization = ({ handleRequest, searchTerm }) => {
                   </div>
                 </td>
                 <td>{moment(att.checkOutTime).format("DD-MMM-YYYY")}</td>
+
+                <td>{att.organizationName || "--"}</td>
+
                 <td>{convertShortTime(att.checkInTime)}</td>
                 <td>
                   {att.checkOutTime ? convertShortTime(att.checkOutTime) : "--"}
@@ -136,12 +140,12 @@ const Regularization = ({ handleRequest, searchTerm }) => {
                     handleRequest={handleRequest}
                     refresh={refetch}
                   />
-                  {/* </div> */}
                 </td>
               </tr>
             ))}
           </tbody>
         </table>
+
       ) : (
         <div
           className="d-flex justify-content-center align-items-center"
-- 
2.43.0


From 72dbdb0fe0e32ef59b0f1bf9114329f079490cf7 Mon Sep 17 00:00:00 2001
From: Kartik Sharma <kartik.sharma@marcoaiot.com>
Date: Sun, 21 Sep 2025 16:40:23 +0530
Subject: [PATCH 2/2] Changes in Attendance

---
 src/components/Activities/AttendcesLogs.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Activities/AttendcesLogs.jsx b/src/components/Activities/AttendcesLogs.jsx
index 0c07f23d..227fd26c 100644
--- a/src/components/Activities/AttendcesLogs.jsx
+++ b/src/components/Activities/AttendcesLogs.jsx
@@ -293,7 +293,7 @@ const AttendanceLog = ({ handleModalData, searchTerm }) => {
                       key={`header-${currentDate}`}
                       className="table-row-header"
                     >
-                      <td colSpan={6} className="text-start">
+                      <td colSpan={8} className="text-start">
                         <strong>
                           {moment(currentDate).format("DD-MM-YYYY")}
                         </strong>
-- 
2.43.0