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

src/components/Activities/AttendcesLogs.jsx

@@ -333,6 +333,7 @@ const AttendanceLog = ({
         )}
         {!loading && !isRefreshing && data.length === 0 && (
          <span className="text-muted">No employee logs</span>
+         <span className="text-muted">No employee logs</span>
         )}
         {/* {error && !loading && !isRefreshing && (
           <tr>

src/pages/Directory/Directory.jsx

@@ -39,6 +39,7 @@ const Directory = ({ IsPage = true, prefernceContacts }) => {
   const [openBucketModal, setOpenBucketModal] = useState(false);
   const [notes, setNotes] = useState([]);
   const [filterAppliedNotes, setFilterAppliedNotes] = useState([]);
+  const [filterAppliedNotes, setFilterAppliedNotes] = useState([]);
   // const [selectedOrgs, setSelectedOrgs] = useState([]);
 
   // ✅ Changed to an array for multiple selections
@@ -354,6 +355,7 @@ const Directory = ({ IsPage = true, prefernceContacts }) => {
             contactsToExport={contacts}
             notesToExport={notes}
             selectedNoteNames={selectedNoteNames}
+            selectedNoteNames={selectedNoteNames}
             setSelectedNoteNames={setSelectedNoteNames}
             notesForFilter={notes}
             setFilterAppliedNotes={setFilterAppliedNotes}
@@ -459,6 +461,7 @@ const Directory = ({ IsPage = true, prefernceContacts }) => {
               searchText={searchText}
               setIsOpenModalNote={setIsOpenModalNote}
               filterAppliedNotes={filterAppliedNotes}
+              filterAppliedNotes={filterAppliedNotes}
             />
           </div>
         )}
@@ -494,6 +497,10 @@ const Directory = ({ IsPage = true, prefernceContacts }) => {
                   </li>
                 ))}
 
+                <li
+                  className={`page-item ${currentPage === totalPages ? "disabled" : ""
+                    }`}
+                >
                 <li
                   className={`page-item ${currentPage === totalPages ? "disabled" : ""
                     }`}
@@ -510,6 +517,7 @@ const Directory = ({ IsPage = true, prefernceContacts }) => {
           )}
       </div>
 
+
     </div>
   );
 };

src/pages/Gallary/ImageGallary.jsx

@@ -175,6 +175,7 @@ const ImageGallery = () => {
       });
     });
     return Array.from(uniqueUsersMap.entries()).sort((a, b) => a[1].localeCompare(b[1]));
+    return Array.from(uniqueUsersMap.entries()).sort((a, b) => a[1].localeCompare(b[1]));
   }, [allImagesData]);
 
   const buildings = getUniqueValuesWithIds("buildingId", "buildingName");
@@ -321,6 +322,7 @@ const ImageGallery = () => {
               <DateRangePicker
                 onRangeChange={setDateRange}
                 endDateMode="today"
+                endDateMode="today"
                 startDate={selectedFilters.startDate}
                 endDate={selectedFilters.endDate}
               />

src/pages/project/ProjectList.jsx

@@ -374,6 +374,44 @@ const ProjectList = () => {
   </div>
 )}
 
+{!loading && totalPages > 1 && (
+  <nav>
+    <ul className="pagination pagination-sm justify-content-end py-2">
+      <li className={`page-item ${currentPage === 1 && "disabled"}`}>
+        <button
+          className="page-link"
+          onClick={() => setCurrentPage((p) => Math.max(1, p - 1))}
+        >
+          &laquo;
+        </button>
+      </li>
+      {[...Array(totalPages)].map((_, i) => (
+        <li
+          key={i}
+          className={`page-item ${currentPage === i + 1 && "active"}`}
+        >
+          <button
+            className="page-link"
+            onClick={() => setCurrentPage(i + 1)}
+          >
+            {i + 1}
+          </button>
+        </li>
+      ))}
+      <li className={`page-item ${currentPage === totalPages && "disabled"}`}>
+        <button
+          className="page-link"
+          onClick={() =>
+            setCurrentPage((p) => Math.min(totalPages, p + 1))
+          }
+        >
+          &raquo;
+        </button>
+      </li>
+    </ul>
+  </nav>
+)}
+
 {!loading && totalPages > 1 && (
   <nav>
     <ul className="pagination pagination-sm justify-content-end py-2">