admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge pull request 'In filter DatePicker should not display dates in Image Gallery.' (#238) from Kartik_Bug#679 into Issues_July_2W

Browse Source 
Reviewed-on: #238
Merged
This commit is contained in:
pramod.mahajan 2025-07-11 07:13:52 +00:00
commit 9a9ff4460f
1 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/pages/Gallary/ImageGallary.jsx
View File

@ -6,10 +6,10 @@ import { useSelector } from "react-redux";
import { useModal } from "./ModalContext"; import { useModal } from "./ModalContext";
import ImagePop from "./ImagePop"; import ImagePop from "./ImagePop";
import Avatar from "../../components/common/Avatar"; import Avatar from "../../components/common/Avatar";
import DateRangePicker from "../../components/common/DateRangePicker";
import eventBus from "../../services/eventBus"; import eventBus from "../../services/eventBus";
import Breadcrumb from "../../components/common/Breadcrumb"; import Breadcrumb from "../../components/common/Breadcrumb";
import {formatUTCToLocalTime} from "../../utils/dateUtils"; import { formatUTCToLocalTime } from "../../utils/dateUtils";
import DateRangePicker from "../../components/common/DateRangePicker";
const PAGE_SIZE = 10; const PAGE_SIZE = 10;
const SCROLL_THRESHOLD = 5; const SCROLL_THRESHOLD = 5;
@ -207,9 +207,9 @@ const ImageGallery = () => {
} else { } else {
id = batch[idKey]; id = batch[idKey];
} }
const name = batch[nameKey]; const name = batch[nameKey];
if (id && name && !map.has(id)) { if (id && name && !map.has(id)) {
map.set(id, name); map.set(id, name);
} }
@ -229,7 +229,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]); }, [allImagesData]);
const buildings = getUniqueValuesWithIds("buildingId", "buildingName"); const buildings = getUniqueValuesWithIds("buildingId", "buildingName");
@ -315,7 +315,7 @@ const ImageGallery = () => {
return false; return false;
} }
if ((oldVal === null && newVal === "") || (oldVal === "" && newVal === null)) { if ((oldVal === null && newVal === "") || (oldVal === "" && newVal === null)) {
return false; return false;
} }
return oldVal !== newVal; return oldVal !== newVal;
}); });
@ -406,8 +406,7 @@ const ImageGallery = () => {
<div className="date-range-inputs"> <div className="date-range-inputs">
<DateRangePicker <DateRangePicker
onRangeChange={setDateRange} onRangeChange={setDateRange}
defaultStartDate={selectedFilters.startDate || yesterday} endDateMode="today"
defaultEndDate={selectedFilters.endDate || moment().format('YYYY-MM-DD')}
startDate={selectedFilters.startDate} startDate={selectedFilters.startDate}
endDate={selectedFilters.endDate} endDate={selectedFilters.endDate}
/> />
@ -438,12 +437,12 @@ const ImageGallery = () => {
); );
return ( return (
<div className={`gallery-container container-fluid ${ isFilterPanelOpen ? "filter-panel-open-end" : "" }`}> <div className={`gallery-container container-fluid ${isFilterPanelOpen ? "filter-panel-open-end" : ""}`}>
<Breadcrumb <Breadcrumb
data={[ data={[
{ label: "Home", link: "/" }, { label: "Home", link: "/" },
{ label: "Gallary", link: null }, { label: "Gallary", link: null },
]} ]}
></Breadcrumb> ></Breadcrumb>
<div className="main-content"> <div className="main-content">
<button <button
@ -469,8 +468,8 @@ const ImageGallery = () => {
const userName = `${firstDoc?.uploadedBy?.firstName || ""} ${firstDoc?.uploadedBy?.lastName || "" const userName = `${firstDoc?.uploadedBy?.firstName || ""} ${firstDoc?.uploadedBy?.lastName || ""
}`.trim(); }`.trim();
const date = formatUTCToLocalTime(firstDoc?.uploadedAt) const date = formatUTCToLocalTime(firstDoc?.uploadedAt)
const showScrollButtons = batch.documents.length > SCROLL_THRESHOLD; const showScrollButtons = batch.documents.length > SCROLL_THRESHOLD;
@ -490,7 +489,7 @@ const ImageGallery = () => {
{userName} {userName}
</strong> </strong>
<span className="me-2"> <span className="me-2">
{date} {date}
</span> </span>
</div> </div>
</div> </div>
@ -605,13 +604,13 @@ const ImageGallery = () => {
></button> ></button>
</div> </div>
<div className="filter-actions mt-auto mx-2"> <div className="filter-actions mt-auto mx-2">
<button className="btn btn-secondary btn-xs" onClick={handleClearAllFilters}> <button className="btn btn-secondary btn-xs" onClick={handleClearAllFilters}>
Clear All Clear All
</button> </button>
<button className="btn btn-primary btn-xs" onClick={handleApplyFilters}> <button className="btn btn-primary btn-xs" onClick={handleApplyFilters}>
Apply Filters Apply Filters
</button> </button>
</div> </div>
<div className="offcanvas-body d-flex flex-column"> <div className="offcanvas-body d-flex flex-column">
{renderFilterCategory("Date Range", [], "dateRange")} {renderFilterCategory("Date Range", [], "dateRange")}
{renderFilterCategory("Building", buildings, "building")} {renderFilterCategory("Building", buildings, "building")}
@ -621,7 +620,7 @@ const ImageGallery = () => {
{renderFilterCategory("Uploaded By (User)", uploadedByUsers, "uploadedBy")} {renderFilterCategory("Uploaded By (User)", uploadedByUsers, "uploadedBy")}
{renderFilterCategory("Work Category", workCategories, "workCategory")} {renderFilterCategory("Work Category", workCategories, "workCategory")}
</div> </div>
</div> </div>
</div> </div>