Compare commits
No commits in common. "c0566f828187aa7b4ed1b0d207d6260c0015a2e6" and "42bceef6541cd11b099dc81dd0bef5d3f6ce70f0" have entirely different histories.
c0566f8281
...
42bceef654
@ -333,6 +333,7 @@ const AttendanceLog = ({
|
|||||||
)}
|
)}
|
||||||
{!loading && !isRefreshing && data.length === 0 && (
|
{!loading && !isRefreshing && data.length === 0 && (
|
||||||
<span className="text-muted">No employee logs</span>
|
<span className="text-muted">No employee logs</span>
|
||||||
|
<span className="text-muted">No employee logs</span>
|
||||||
)}
|
)}
|
||||||
{/* {error && !loading && !isRefreshing && (
|
{/* {error && !loading && !isRefreshing && (
|
||||||
<tr>
|
<tr>
|
||||||
|
|||||||
@ -39,6 +39,7 @@ const Directory = ({ IsPage = true, prefernceContacts }) => {
|
|||||||
const [openBucketModal, setOpenBucketModal] = useState(false);
|
const [openBucketModal, setOpenBucketModal] = useState(false);
|
||||||
const [notes, setNotes] = useState([]);
|
const [notes, setNotes] = useState([]);
|
||||||
const [filterAppliedNotes, setFilterAppliedNotes] = useState([]);
|
const [filterAppliedNotes, setFilterAppliedNotes] = useState([]);
|
||||||
|
const [filterAppliedNotes, setFilterAppliedNotes] = useState([]);
|
||||||
// const [selectedOrgs, setSelectedOrgs] = useState([]);
|
// const [selectedOrgs, setSelectedOrgs] = useState([]);
|
||||||
|
|
||||||
// ✅ Changed to an array for multiple selections
|
// ✅ Changed to an array for multiple selections
|
||||||
@ -354,6 +355,7 @@ const Directory = ({ IsPage = true, prefernceContacts }) => {
|
|||||||
contactsToExport={contacts}
|
contactsToExport={contacts}
|
||||||
notesToExport={notes}
|
notesToExport={notes}
|
||||||
selectedNoteNames={selectedNoteNames}
|
selectedNoteNames={selectedNoteNames}
|
||||||
|
selectedNoteNames={selectedNoteNames}
|
||||||
setSelectedNoteNames={setSelectedNoteNames}
|
setSelectedNoteNames={setSelectedNoteNames}
|
||||||
notesForFilter={notes}
|
notesForFilter={notes}
|
||||||
setFilterAppliedNotes={setFilterAppliedNotes}
|
setFilterAppliedNotes={setFilterAppliedNotes}
|
||||||
@ -459,6 +461,7 @@ const Directory = ({ IsPage = true, prefernceContacts }) => {
|
|||||||
searchText={searchText}
|
searchText={searchText}
|
||||||
setIsOpenModalNote={setIsOpenModalNote}
|
setIsOpenModalNote={setIsOpenModalNote}
|
||||||
filterAppliedNotes={filterAppliedNotes}
|
filterAppliedNotes={filterAppliedNotes}
|
||||||
|
filterAppliedNotes={filterAppliedNotes}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
@ -494,6 +497,10 @@ const Directory = ({ IsPage = true, prefernceContacts }) => {
|
|||||||
</li>
|
</li>
|
||||||
))}
|
))}
|
||||||
|
|
||||||
|
<li
|
||||||
|
className={`page-item ${currentPage === totalPages ? "disabled" : ""
|
||||||
|
}`}
|
||||||
|
>
|
||||||
<li
|
<li
|
||||||
className={`page-item ${currentPage === totalPages ? "disabled" : ""
|
className={`page-item ${currentPage === totalPages ? "disabled" : ""
|
||||||
}`}
|
}`}
|
||||||
@ -510,6 +517,7 @@ const Directory = ({ IsPage = true, prefernceContacts }) => {
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@ -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]));
|
||||||
|
return Array.from(uniqueUsersMap.entries()).sort((a, b) => a[1].localeCompare(b[1]));
|
||||||
}, [allImagesData]);
|
}, [allImagesData]);
|
||||||
|
|
||||||
const buildings = getUniqueValuesWithIds("buildingId", "buildingName");
|
const buildings = getUniqueValuesWithIds("buildingId", "buildingName");
|
||||||
@ -321,6 +322,7 @@ const ImageGallery = () => {
|
|||||||
<DateRangePicker
|
<DateRangePicker
|
||||||
onRangeChange={setDateRange}
|
onRangeChange={setDateRange}
|
||||||
endDateMode="today"
|
endDateMode="today"
|
||||||
|
endDateMode="today"
|
||||||
startDate={selectedFilters.startDate}
|
startDate={selectedFilters.startDate}
|
||||||
endDate={selectedFilters.endDate}
|
endDate={selectedFilters.endDate}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@ -374,6 +374,44 @@ const ProjectList = () => {
|
|||||||
</div>
|
</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))}
|
||||||
|
>
|
||||||
|
«
|
||||||
|
</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))
|
||||||
|
}
|
||||||
|
>
|
||||||
|
»
|
||||||
|
</button>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</nav>
|
||||||
|
)}
|
||||||
|
|
||||||
{!loading && totalPages > 1 && (
|
{!loading && totalPages > 1 && (
|
||||||
<nav>
|
<nav>
|
||||||
<ul className="pagination pagination-sm justify-content-end py-2">
|
<ul className="pagination pagination-sm justify-content-end py-2">
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user