From 05c01d1d3403ea8bfdcb593782bd5c9a2b1e4464 Mon Sep 17 00:00:00 2001
From: Kartik Sharma <kartik.sharma@marcoaiot.com>
Date: Tue, 14 Oct 2025 14:32:45 +0530
Subject: [PATCH] Changes in Attendance page.

---
 src/components/Activities/Attendance.jsx     | 86 ++++++++++----------
 src/components/Activities/AttendcesLogs.jsx  | 47 +++++------
 src/components/Activities/Regularization.jsx | 40 ---------
 3 files changed, 66 insertions(+), 107 deletions(-)

diff --git a/src/components/Activities/Attendance.jsx b/src/components/Activities/Attendance.jsx
index c46feac3..b7ddfaff 100644
--- a/src/components/Activities/Attendance.jsx
+++ b/src/components/Activities/Attendance.jsx
@@ -223,50 +223,6 @@ const Attendance = ({ getRole, handleModalData, searchTerm, projectId, organizat
                 )}
               </tbody>
             </table>
-
-
-            {!loading && finalFilteredData.length > ITEMS_PER_PAGE && (
-              <nav aria-label="Page ">
-                <ul className="pagination pagination-sm justify-content-end py-1">
-                  <li
-                    className={`page-item  ${currentPage === 1 ? "disabled" : ""
-                      }`}
-                  >
-                    <button
-                      className="page-link btn-xs"
-                      onClick={() => paginate(currentPage - 1)}
-                    >
-                      &laquo;
-                    </button>
-                  </li>
-                  {[...Array(totalPages)].map((_, index) => (
-                    <li
-                      key={index}
-                      className={`page-item ${currentPage === index + 1 ? "active" : ""
-                        }`}
-                    >
-                      <button
-                        className="page-link "
-                        onClick={() => paginate(index + 1)}
-                      >
-                        {index + 1}
-                      </button>
-                    </li>
-                  ))}
-                  <li
-                    className={`page-item ${currentPage === totalPages ? "disabled" : ""
-                      }`}
-                  >
-                    <button
-                      className="page-link "
-                      onClick={() => paginate(currentPage + 1)}
-                    >
-                      &raquo;
-                    </button>
-                  </li>
-                </ul>
-              </nav>
-            )}
           </>
         ) : (
           <div
@@ -281,6 +237,48 @@ const Attendance = ({ getRole, handleModalData, searchTerm, projectId, organizat
           </div>
         )}
       </div>
+      {!loading && finalFilteredData.length > ITEMS_PER_PAGE && (
+        <nav aria-label="Page ">
+          <ul className="pagination pagination-sm justify-content-end py-1">
+            <li
+              className={`page-item  ${currentPage === 1 ? "disabled" : ""
+                }`}
+            >
+              <button
+                className="page-link btn-xs"
+                onClick={() => paginate(currentPage - 1)}
+              >
+                &laquo;
+              </button>
+            </li>
+            {[...Array(totalPages)].map((_, index) => (
+              <li
+                key={index}
+                className={`page-item ${currentPage === index + 1 ? "active" : ""
+                  }`}
+              >
+                <button
+                  className="page-link "
+                  onClick={() => paginate(index + 1)}
+                >
+                  {index + 1}
+                </button>
+              </li>
+            ))}
+            <li
+              className={`page-item ${currentPage === totalPages ? "disabled" : ""
+                }`}
+            >
+              <button
+                className="page-link "
+                onClick={() => paginate(currentPage + 1)}
+              >
+                &raquo;
+              </button>
+            </li>
+          </ul>
+        </nav>
+      )}
     </>
   );
 };
diff --git a/src/components/Activities/AttendcesLogs.jsx b/src/components/Activities/AttendcesLogs.jsx
index 7a346f67..dea24b4e 100644
--- a/src/components/Activities/AttendcesLogs.jsx
+++ b/src/components/Activities/AttendcesLogs.jsx
@@ -171,29 +171,30 @@ const AttendanceLog = ({ handleModalData, searchTerm, organizationId }) => {
 
   return (
     <>
-      <div
-        className="dataTables_length text-start py-2 d-flex justify-content-between "
-        id="DataTables_Table_0_length"
-      >
-        <div className="d-flex align-items-center my-0 ">
-          <DateRangePicker
-            onRangeChange={setDateRange}
-            defaultStartDate={yesterday}
-          />
-          <div className="form-check form-switch text-start ms-1 ms-md-2 align-items-center mb-0">
-            <input
-              type="checkbox"
-              className="form-check-input"
-              role="switch"
-              disabled={isFetching}
-              id="inactiveEmployeesCheckbox"
-              checked={showPending}
-              onChange={(e) => setShowPending(e.target.checked)}
-            />
-            <label className="form-check-label ms-0">Pending Attendance</label>
-          </div>
-        </div>
-      </div>
+     <div
+  className="dataTables_length text-start py-2 d-flex flex-wrap justify-content-between"
+  id="DataTables_Table_0_length"
+>
+  <div className="d-flex flex-wrap align-items-center my-0 gap-2">
+    <DateRangePicker
+      onRangeChange={setDateRange}
+      defaultStartDate={yesterday}
+    />
+    <div className="form-check form-switch text-start d-flex align-items-center mb-0">
+      <input
+        type="checkbox"
+        className="form-check-input"
+        role="switch"
+        disabled={isFetching}
+        id="inactiveEmployeesCheckbox"
+        checked={showPending}
+        onChange={(e) => setShowPending(e.target.checked)}
+      />
+      <label className="form-check-label ms-2 mb-0">Pending Attendance</label>
+    </div>
+  </div>
+</div>
+
       <div
         className="table-responsive text-nowrap"
         style={{ minHeight: "200px" }}
diff --git a/src/components/Activities/Regularization.jsx b/src/components/Activities/Regularization.jsx
index 0aab7474..22eff749 100644
--- a/src/components/Activities/Regularization.jsx
+++ b/src/components/Activities/Regularization.jsx
@@ -197,46 +197,6 @@ const Regularization = ({
           </span>
         </div>
       )}
-      {/* {!loading && totalPages > 1 && (
-        <nav aria-label="Page ">
-          <ul className="pagination pagination-sm justify-content-end py-1 mt-3">
-            <li className={`page-item  ${currentPage === 1 ? "disabled" : ""}`}>
-              <button
-                className="page-link btn-xs"
-                onClick={() => paginate(currentPage - 1)}
-              >
-                &laquo;
-              </button>
-            </li>
-            {[...Array(totalPages)].map((_, index) => (
-              <li
-                key={index}
-                className={`page-item ${currentPage === index + 1 ? "active" : ""
-                  }`}
-              >
-                <button
-                  className="page-link "
-                  onClick={() => paginate(index + 1)}
-                >
-                  {index + 1}
-                </button>
-              </li>
-            ))}
-            <li
-              className={`page-item ${currentPage === totalPages ? "disabled" : ""
-                }`}
-            >
-              <button
-                className="page-link "
-                onClick={() => paginate(currentPage + 1)}
-              >
-                &raquo;
-              </button>
-            </li>
-          </ul>
-        </nav>
-      )} */}
-
       {totalPages > 0 && (
         <Pagination
           currentPage={currentPage}