Compare commits

...

16 Commits

Author SHA1 Message Date
c0e9c1e2b9 Merge branch 'Issues_July_2W' of https://git.marcoaiot.com/admin/marco.pms.web into Issues_July_2W 2025-07-14 14:21:44 +05:30
39f0908fc0 fixed error during rebase 2025-07-14 14:21:36 +05:30
50585e1fbd rebase from main 2025-07-14 14:21:35 +05:30
85d10e3b17 Creating a custom hook for ImageGallery to call an API. 2025-07-14 14:21:05 +05:30
94358c7aa2 Changes in Date picker . 2025-07-14 14:21:04 +05:30
6f6e688249 In the Image Gallery, the filter drawer's date picker should default to the last 7 days (today minus 7 days). 2025-07-14 14:20:28 +05:30
b8949b3b71 In filter DatePicker should not display dates in Image Gallery. 2025-07-14 14:20:28 +05:30
f8abcc8aa8 In ProjectNav.jsx and AttendancePage.jsx, remove inline CSS font-size styles and replace them with Bootstrap classes. 2025-07-14 14:19:56 +05:30
e3d7d6005b Nevigate to "Projects" Page Should Display Only Message When No Projects Are Assigned. 2025-07-14 14:19:56 +05:30
a6f55f31f3 Navigate to "Projects" Page Should Display Only Message When No Projects Are Assigned. 2025-07-14 14:19:55 +05:30
41f9d4d39a Ensure all pages maintain a consistent size, even when there's less data to display. 2025-07-14 14:17:59 +05:30
0793dc28fb Page Height Should Be Minimized with "No Reports Found" Message in Daily Progress Report. 2025-07-14 14:17:41 +05:30
98767fc6af Increase the size of table in Projects Directory and show text in center and add 200 px height. 2025-07-14 14:17:05 +05:30
2dc37e04c6 Sizing for the projects directory has been corrected. 2025-07-14 14:17:04 +05:30
718fb73c5d UI Misaligned on Toggling 'Show Inactive Contact' When No Inactive Contacts Exist in Directory at projects. 2025-07-14 14:16:08 +05:30
a381b58851 Increase the size of Tabs text in Attendance and Projects. 2025-07-14 14:14:13 +05:30
2 changed files with 6 additions and 21 deletions

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]));
}, [allImagesData]);
const buildings = getUniqueValuesWithIds("buildingId", "buildingName");
@ -322,7 +321,6 @@ const ImageGallery = () => {
<DateRangePicker
onRangeChange={setDateRange}
endDateMode="today"
endDateMode="today"
startDate={selectedFilters.startDate}
endDate={selectedFilters.endDate}
/>

View File

@ -81,22 +81,9 @@ const ProjectDetails = () => {
switch (activePill) {
case "profile": {
return (
<>
<div className="row">
<div className="col-lg-4 col-md-5 mt-5">
{/* About User */}
<AboutProject data={projectDetails}></AboutProject>
<ProjectOverview project={projectId} />
{/* About User */}
</div>
<div className="col-lg-8 col-md-5 mt-5">
{/* Profile Overview */}
<ProjectProgressChart
ShowAllProject="false"
DefaultRange="1M"
/>
{/* Profile Overview */}
</div>
<div className="col-xl-4 col-lg-5 col-md-5 mt-5">
<AboutProject ></AboutProject>
</div>
<div className="col-xl-4 col-lg-5 col-md-5 mt-5">
<ProjectOverview project={projectId} />
@ -136,8 +123,8 @@ const ProjectDetails = () => {
}
case "directory": {
return (
<div className="row mt-2">
<Directory IsPage={false} prefernceContacts={projectDetails.id} />
<div className="row">
<Directory IsPage={false} prefernceContacts={projects_Details.id} />
</div>
);
}