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

Merge pull request 'Meaningful Message Required When No Reports Found in Selected Date Range' (#379) from Kartik_Bug#1045 into Issues_Sep_1W

Browse Source 
Reviewed-on: #379
Merged
This commit is contained in:
pramod.mahajan 2025-09-10 04:45:29 +00:00
commit b02893fd98
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,7 +55,7 @@ const DailyTask = () => {
}); });
}, [selectedProject]); }, [selectedProject]);
// Memoized filtering //  Memoized filtering
const filteredTasks = useMemo(() => { const filteredTasks = useMemo(() => {
if (!TaskList) return []; if (!TaskList) return [];
return TaskList.filter((task) => { return TaskList.filter((task) => {
@ -69,7 +69,7 @@ const DailyTask = () => {
}); });
}, [TaskList, filters]); }, [TaskList, filters]);
// Memoized dates //  Memoized dates
const groupedTasks = useMemo(() => { const groupedTasks = useMemo(() => {
const groups = {}; const groups = {};
filteredTasks.forEach((task) => { filteredTasks.forEach((task) => {
@ -182,7 +182,7 @@ const DailyTask = () => {
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 disabled={!TaskList || TaskList.length === 0}
/> />
</div> </div>
@ -200,19 +200,17 @@ const DailyTask = () => {
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{taskLoading && ( {taskLoading ? (
<tr> <tr>
<td colSpan={6} className="text-center"> <td colSpan={6} className="text-center">
<Loader /> <Loader />
</td> </td>
</tr> </tr>
)} ) : filteredTasks.length === 0 ? (
{!taskLoading && groupedTasks.length === 0 && (
<tr> <tr>
<td colSpan={6} className="text-center">No Reports Found</td> <td colSpan={6} className="text-center">No reports available for the selected date range.</td>
</tr> </tr>
)} ) : (
{!taskLoading &&
groupedTasks.map(({ date, tasks }) => ( groupedTasks.map(({ date, tasks }) => (
<React.Fragment key={date}> <React.Fragment key={date}>
<tr className="table-row-header text-start"> <tr className="table-row-header text-start">
@ -244,7 +242,8 @@ const DailyTask = () => {
</tr> </tr>
))} ))}
</React.Fragment> </React.Fragment>
))} ))
)}
</tbody> </tbody>
</table> </table>
</div> </div>