Compare commits
No commits in common. "c6f16249fdba438f589a606984681d8e36e9e033" and "42b68024193d2ba109f735f878a95bb6792245c2" have entirely different histories.
c6f16249fd
...
42b6802419
@ -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 || taskListData.length === 0) return [];
|
if (!taskListData) return [];
|
||||||
|
|
||||||
let filteredTasks = [...taskListData];
|
let filteredTasks = [...taskListData];
|
||||||
|
|
||||||
@ -125,11 +125,6 @@ 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
|
||||||
|
@ -167,22 +167,13 @@ 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
|
|
||||||
taskListData={TaskList}
|
|
||||||
onApplyFilters={setFilters}
|
|
||||||
currentSelectedBuilding={filters.selectedBuilding}
|
|
||||||
currentSelectedFloors={filters.selectedFloors}
|
|
||||||
currentSelectedActivities={filters.selectedActivities}
|
|
||||||
selectedProject={selectedProject}
|
|
||||||
/> */}
|
|
||||||
<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}
|
||||||
disabled={!TaskList || TaskList.length === 0} // 🔹 Disable when no data
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -203,7 +194,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>
|
||||||
)}
|
)}
|
||||||
@ -220,7 +211,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}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user