Compare commits

...

13 Commits

Author SHA1 Message Date
c0566f8281 Merge branch 'Issues_July_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_2W 2025-07-14 12:58:48 +05:30
7343e733ea Creating a custom hook for ImageGallery to call an API. 2025-07-14 12:58:41 +05:30
4201326e27 Changes in Date picker . 2025-07-14 12:58:41 +05:30
08d8f0b651 In the Image Gallery, the filter drawer's date picker should default to the last 7 days (today minus 7 days). 2025-07-14 12:58:24 +05:30
ae46350c51 In filter DatePicker should not display dates in Image Gallery. 2025-07-14 12:58:24 +05:30
1d32632be7 In ProjectNav.jsx and AttendancePage.jsx, remove inline CSS font-size styles and replace them with Bootstrap classes. 2025-07-14 12:58:00 +05:30
3f245bf62b Nevigate to "Projects" Page Should Display Only Message When No Projects Are Assigned. 2025-07-14 12:58:00 +05:30
f7e66ce28f Navigate to "Projects" Page Should Display Only Message When No Projects Are Assigned. 2025-07-14 12:57:39 +05:30
b1c0773c33 Ensure all pages maintain a consistent size, even when there's less data to display. 2025-07-14 12:57:12 +05:30
770c8e3e91 Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report. 2025-07-14 12:56:59 +05:30
ec79e93cf2 Increase the size of table in Projects Directory and show text in center and add 200 px height. 2025-07-14 12:56:35 +05:30
d539bd67f1 UI Misaligned on Toggling 'Show Inactive Contact' When No Inactive Contacts Exist in Directory at projects. 2025-07-14 12:56:35 +05:30
a1f232d65b Increase the size of Tabs text in Attendance and Projects. 2025-07-14 12:56:16 +05:30
4 changed files with 0 additions and 49 deletions

View File

@ -333,7 +333,6 @@ 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>

View File

@ -39,7 +39,6 @@ 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
@ -355,7 +354,6 @@ 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}
@ -461,7 +459,6 @@ const Directory = ({ IsPage = true, prefernceContacts }) => {
searchText={searchText} searchText={searchText}
setIsOpenModalNote={setIsOpenModalNote} setIsOpenModalNote={setIsOpenModalNote}
filterAppliedNotes={filterAppliedNotes} filterAppliedNotes={filterAppliedNotes}
filterAppliedNotes={filterAppliedNotes}
/> />
</div> </div>
)} )}
@ -497,10 +494,6 @@ 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" : ""
}`} }`}
@ -517,7 +510,6 @@ const Directory = ({ IsPage = true, prefernceContacts }) => {
)} )}
</div> </div>
</div> </div>
); );
}; };

View File

@ -175,7 +175,6 @@ 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");
@ -322,7 +321,6 @@ 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}
/> />

View File

@ -374,44 +374,6 @@ 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))}
>
&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 && ( {!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">