diff --git a/src/pages/Activities/DailyTask.jsx b/src/pages/Activities/DailyTask.jsx
index 60b5ed6a..0edddf62 100644
--- a/src/pages/Activities/DailyTask.jsx
+++ b/src/pages/Activities/DailyTask.jsx
@@ -55,7 +55,7 @@ const DailyTask = () => {
});
}, [selectedProject]);
- // Memoized filtering
+ // Memoized filtering
const filteredTasks = useMemo(() => {
if (!TaskList) return [];
return TaskList.filter((task) => {
@@ -69,7 +69,7 @@ const DailyTask = () => {
});
}, [TaskList, filters]);
- // Memoized dates
+ // Memoized dates
const groupedTasks = useMemo(() => {
const groups = {};
filteredTasks.forEach((task) => {
@@ -101,8 +101,8 @@ const DailyTask = () => {
data-bs-content={`
${task.teamMembers
- .map(
- (m) => `
+ .map(
+ (m) => `
@@ -111,8 +111,8 @@ const DailyTask = () => {
${m.firstName} ${m.lastName}
`
- )
- .join("")}
+ )
+ .join("")}
`}
>
@@ -182,7 +182,7 @@ const DailyTask = () => {
currentSelectedFloors={filters.selectedFloors}
currentSelectedActivities={filters.selectedActivities}
selectedProject={selectedProject}
- disabled={!TaskList || TaskList.length === 0} // 🔹 Disable when no data
+ disabled={!TaskList || TaskList.length === 0}
/>
@@ -200,19 +200,17 @@ const DailyTask = () => {
- {taskLoading && (
+ {taskLoading ? (
|
- )}
- {!taskLoading && groupedTasks.length === 0 && (
+ ) : filteredTasks.length === 0 ? (
- No Reports Found |
+ No reports available for the selected date range. |
- )}
- {!taskLoading &&
+ ) : (
groupedTasks.map(({ date, tasks }) => (
@@ -244,7 +242,8 @@ const DailyTask = () => {
))}
- ))}
+ ))
+ )}
@@ -254,4 +253,4 @@ const DailyTask = () => {
>
);
};
-export default DailyTask;
+export default DailyTask;
\ No newline at end of file