Filter icon should not be displayed when no records are found in Daily Progress Report
This commit is contained in:
parent
42b6802419
commit
dcb2f59f5b
@ -30,7 +30,7 @@ const FilterIcon = ({
|
||||
}, [currentSelectedBuilding, currentSelectedFloors, currentSelectedActivities, selectedProject]);
|
||||
|
||||
const getUniqueFilterValues = (key, overrideBuilding, overrideFloors) => {
|
||||
if (!taskListData) return [];
|
||||
if (!taskListData || taskListData.length === 0) return [];
|
||||
|
||||
let filteredTasks = [...taskListData];
|
||||
|
||||
@ -125,6 +125,11 @@ const FilterIcon = ({
|
||||
const appliedFilterCount =
|
||||
(appliedBuilding ? 1 : 0) + appliedFloors.length + appliedActivities.length;
|
||||
|
||||
// ✅ Hide filter if no task data
|
||||
if (!taskListData || taskListData.length === 0) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="dropdown" style={{ marginLeft: "-14px", position: "relative" }}>
|
||||
<a
|
||||
|
@ -167,6 +167,14 @@ const DailyTask = () => {
|
||||
{/* --- Filters --- */}
|
||||
<div className="d-flex align-items-center mb-2">
|
||||
<DateRangePicker onRangeChange={setDateRange} endDateMode="today" DateDifference="6" dateFormat="DD-MM-YYYY" />
|
||||
{/* <FilterIcon
|
||||
taskListData={TaskList}
|
||||
onApplyFilters={setFilters}
|
||||
currentSelectedBuilding={filters.selectedBuilding}
|
||||
currentSelectedFloors={filters.selectedFloors}
|
||||
currentSelectedActivities={filters.selectedActivities}
|
||||
selectedProject={selectedProject}
|
||||
/> */}
|
||||
<FilterIcon
|
||||
taskListData={TaskList}
|
||||
onApplyFilters={setFilters}
|
||||
@ -174,6 +182,7 @@ const DailyTask = () => {
|
||||
currentSelectedFloors={filters.selectedFloors}
|
||||
currentSelectedActivities={filters.selectedActivities}
|
||||
selectedProject={selectedProject}
|
||||
disabled={!TaskList || TaskList.length === 0} // 🔹 Disable when no data
|
||||
/>
|
||||
</div>
|
||||
|
||||
@ -194,7 +203,7 @@ const DailyTask = () => {
|
||||
{taskLoading && (
|
||||
<tr>
|
||||
<td colSpan={6} className="text-center">
|
||||
<Loader/>
|
||||
<Loader />
|
||||
</td>
|
||||
</tr>
|
||||
)}
|
||||
@ -211,7 +220,7 @@ const DailyTask = () => {
|
||||
</tr>
|
||||
{tasks.map((task, idx) => (
|
||||
<tr key={task.id || idx}>
|
||||
<td className="flex-wrap text-start">
|
||||
<td className="flex-wrap text-start">
|
||||
<div>{task.workItem.activityMaster?.activityName || "No Activity Name"}</div>
|
||||
<div className="text-sm">
|
||||
{task.workItem.workArea?.floor?.building?.name} › {task.workItem.workArea?.floor?.floorName} › {task.workItem.workArea?.areaName}
|
||||
|
Loading…
x
Reference in New Issue
Block a user