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

Reviewed-on: #379
Merged

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={`
         <div class="border border-secondary rounded custom-popover p-2 px-3">
           ${task.teamMembers
-          .map(
+        .map(
-            (m) => `
+          (m) => `
             <div class="d-flex align-items-center gap-2 mb-2">
               <div class="avatar avatar-xs">
                 <span class="avatar-initial rounded-circle bg-label-primary">
@@ -111,8 +111,8 @@ const DailyTask = () => {
               </div>
               <span>${m.firstName} ${m.lastName}</span>
             </div>`
-          )
+        )
-          .join("")}
+        .join("")}
         </div>
       `}
     >
@@ -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}
               />
             </div>
 
@@ -200,19 +200,17 @@ const DailyTask = () => {
                   </tr>
                 </thead>
                 <tbody>
-                  {taskLoading && (
+                  {taskLoading ? (
                     <tr>
                       <td colSpan={6} className="text-center">
                         <Loader />
                       </td>
                     </tr>
-                  )}
+                  ) : filteredTasks.length === 0 ? (
-                  {!taskLoading && groupedTasks.length === 0 && (
                     <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>
-                  )}
+                  ) : (
-                  {!taskLoading &&
                     groupedTasks.map(({ date, tasks }) => (
                       <React.Fragment key={date}>
                         <tr className="table-row-header text-start">
@@ -244,7 +242,8 @@ const DailyTask = () => {
                           </tr>
                         ))}
                       </React.Fragment>
-                    ))}
+                    ))
+                  )}
                 </tbody>
               </table>
             </div>
@@ -254,4 +253,4 @@ const DailyTask = () => {
     </>
   );
 };
-export default DailyTask;
+export default DailyTask;