Compare commits

..

No commits in common. "c0e9c1e2b9ad9170f6d0f822394371c4ebf4dbd6" and "367290a3fb2ff9b85a3ae5c9daba067195cec149" have entirely different histories.

2 changed files with 21 additions and 6 deletions

View File

@ -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}
/> />

View File

@ -81,9 +81,22 @@ const ProjectDetails = () => {
switch (activePill) { switch (activePill) {
case "profile": { case "profile": {
return ( return (
<>
<div className="row "> <div className="row ">
<div className="col-xl-4 col-lg-5 col-md-5 mt-5"> <div className="col-lg-4 col-md-5 mt-5">
<AboutProject ></AboutProject> {/* 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> </div>
<div className="col-xl-4 col-lg-5 col-md-5 mt-5"> <div className="col-xl-4 col-lg-5 col-md-5 mt-5">
<ProjectOverview project={projectId} /> <ProjectOverview project={projectId} />
@ -123,8 +136,8 @@ const ProjectDetails = () => {
} }
case "directory": { case "directory": {
return ( return (
<div className="row"> <div className="row mt-2">
<Directory IsPage={false} prefernceContacts={projects_Details.id} /> <Directory IsPage={false} prefernceContacts={projectDetails.id} />
</div> </div>
); );
} }