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

Merge pull request 'Filter icon should not be displayed when no records are found in Daily Progress Report' (#373) from Kartik_Bug#1042 into Issues_Sep_1W

Browse Source 
Reviewed-on: #373
This commit is contained in:
Vikas Nale 2025-09-08 09:09:36 +00:00
commit c6f16249fd
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/common/FilterIcon.jsx
View File

@ -30,7 +30,7 @@ const FilterIcon = ({
}, [currentSelectedBuilding, currentSelectedFloors, currentSelectedActivities, selectedProject]); }, [currentSelectedBuilding, currentSelectedFloors, currentSelectedActivities, selectedProject]);
const getUniqueFilterValues = (key, overrideBuilding, overrideFloors) => { const getUniqueFilterValues = (key, overrideBuilding, overrideFloors) => {
if (!taskListData) return []; if (!taskListData || taskListData.length === 0) return [];
let filteredTasks = [...taskListData]; let filteredTasks = [...taskListData];
@ -125,6 +125,11 @@ const FilterIcon = ({
const appliedFilterCount = const appliedFilterCount =
(appliedBuilding ? 1 : 0) + appliedFloors.length + appliedActivities.length; (appliedBuilding ? 1 : 0) + appliedFloors.length + appliedActivities.length;
// ✅ Hide filter if no task data
if (!taskListData || taskListData.length === 0) {
return null;
}
return ( return (
<div className="dropdown" style={{ marginLeft: "-14px", position: "relative" }}> <div className="dropdown" style={{ marginLeft: "-14px", position: "relative" }}>
<a <a

15
src/pages/Activities/DailyTask.jsx
View File

@ -167,13 +167,22 @@ const DailyTask = () => {
{/* --- Filters --- */} {/* --- Filters --- */}
<div className="d-flex align-items-center mb-2"> <div className="d-flex align-items-center mb-2">
<DateRangePicker onRangeChange={setDateRange} endDateMode="today" DateDifference="6" dateFormat="DD-MM-YYYY" /> <DateRangePicker onRangeChange={setDateRange} endDateMode="today" DateDifference="6" dateFormat="DD-MM-YYYY" />
<FilterIcon {/* <FilterIcon
taskListData={TaskList} taskListData={TaskList}
onApplyFilters={setFilters} onApplyFilters={setFilters}
currentSelectedBuilding={filters.selectedBuilding} currentSelectedBuilding={filters.selectedBuilding}
currentSelectedFloors={filters.selectedFloors} currentSelectedFloors={filters.selectedFloors}
currentSelectedActivities={filters.selectedActivities} currentSelectedActivities={filters.selectedActivities}
selectedProject={selectedProject} selectedProject={selectedProject}
/> */}
<FilterIcon
taskListData={TaskList}
onApplyFilters={setFilters}
currentSelectedBuilding={filters.selectedBuilding}
currentSelectedFloors={filters.selectedFloors}
currentSelectedActivities={filters.selectedActivities}
selectedProject={selectedProject}
disabled={!TaskList || TaskList.length === 0} // 🔹 Disable when no data
/> />
</div> </div>
@ -194,7 +203,7 @@ const DailyTask = () => {
{taskLoading && ( {taskLoading && (
<tr> <tr>
<td colSpan={6} className="text-center"> <td colSpan={6} className="text-center">
<Loader/> <Loader />
</td> </td>
</tr> </tr>
)} )}
@ -211,7 +220,7 @@ const DailyTask = () => {
</tr> </tr>
{tasks.map((task, idx) => ( {tasks.map((task, idx) => (
<tr key={task.id || 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>{task.workItem.activityMaster?.activityName || "No Activity Name"}</div>
<div className="text-sm"> <div className="text-sm">
{task.workItem.workArea?.floor?.building?.name} › {task.workItem.workArea?.floor?.floorName} › {task.workItem.workArea?.areaName} {task.workItem.workArea?.floor?.building?.name} › {task.workItem.workArea?.floor?.floorName} › {task.workItem.workArea?.areaName}