src/hooks/useProjects.js

@@ -49,19 +49,19 @@ export const useProjects = () =>
     fetchData();
   }, []);
 
-  // useEffect( () =>
+  useEffect( () =>
-  // {
+  {
-  //   if (projects )
+    if (projects )
-  //   {
+    {
-  //     if ( profile?.projects && profile?.projects?.length > 0 )
+      if ( profile?.projects && profile?.projects?.length > 0 )
-  //     {
+      {
-  //       dispatch(setProjectId(profile?.projects[0]))
+        dispatch(setProjectId(profile?.projects[0]))
-  //     } else
+      } else
-  //     {
+      {
-  //       dispatch(setProjectId(1))
+        dispatch(setProjectId(1))
-  //     }
+      }
-  //   }
+    }
-  // }, [profile]);
+  }, [profile]);
 
   return { projects, loading, error, refetch: fetchData };
 };

src/pages/Activities/DailyTask.jsx

@@ -34,7 +34,7 @@ const DailyTask = () => {
 
   // Sync projectId (either from URL or pick first accessible one)
   useEffect(() => {
-    if (!project_lodaing && projects.length > 0 && !initialized) {
+    if (!project_lodaing && projects.length > 0) {
       const userProjects = projects.filter((p) =>
         LoggedUser?.projects?.map(Number).includes(p.id)
       );
@@ -45,10 +45,9 @@ const DailyTask = () => {
         dispatch(setProjectId(userProjects[0].id));
       }
 
-      setInitialized(true); // <-- This blocks re-running this effect again
+      setInitialized(true);
     }
-  }, [project_lodaing, projects, projectId, selectedProject, initialized]);
+  }, [project_lodaing, projects, projectId, selectedProject]);
-  
 
   
   const dispatch = useDispatch(selectedProject);
@@ -59,15 +58,13 @@ const DailyTask = () => {
     loading: task_loading,
     error: task_error,
     refetch,
-  } = useTaskList( initialized ? selectedProject : null,
+  } = useTaskList(selectedProject, dateRange.startDate, dateRange.endDate);
-    initialized ? dateRange.startDate : null,
-    initialized ? dateRange.endDate : null);
 
   const [TaskLists, setTaskLists] = useState([]);
 
   useEffect(() => {
     setTaskLists(TaskList);
-  }, [TaskList,selectedProject]);
+  }, [TaskList, selectedProject]);
 
   const [selectedTask, selectTask] = useState(null);
   const [comments, setComment] = useState(null);

src/pages/employee/EmployeeList.jsx

@@ -293,7 +293,7 @@ const EmployeeList = () => {
                   </div>
                 </div>
                 <table
-                  className="datatables-users table border-top dataTable no-footer dtr-column text-nowrap"
+                  className="datatables-users table border-top dataTable no-footer dtr-column "
                   id="DataTables_Table_0"
                   aria-describedby="DataTables_Table_0_info"
                   style={{ width: "100%" }}