From fd9a02aa4f6dac4de8f9b9a0acdbb0827528d895 Mon Sep 17 00:00:00 2001
From: Pramod Mahajan <pramodmahajan1411200@gmail.com>
Date: Thu, 24 Apr 2025 10:26:31 +0530
Subject: [PATCH 1/3] joining date will no wrap

---
 src/pages/employee/EmployeeList.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/employee/EmployeeList.jsx b/src/pages/employee/EmployeeList.jsx
index d28a00c2..2cdaa15a 100644
--- a/src/pages/employee/EmployeeList.jsx
+++ b/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 "
+                  className="datatables-users table border-top dataTable no-footer dtr-column text-nowrap"
                   id="DataTables_Table_0"
                   aria-describedby="DataTables_Table_0_info"
                   style={{ width: "100%" }}
-- 
2.43.0


From e102abb117c5682a2f03661525825b4491209f59 Mon Sep 17 00:00:00 2001
From: Pramod Mahajan <pramodmahajan1411200@gmail.com>
Date: Thu, 24 Apr 2025 10:31:40 +0530
Subject: [PATCH 2/3] default project should not be set during the initial
 fetch. It will be set later based on specific conditions or user actions.

---
 src/hooks/useProjects.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/hooks/useProjects.js b/src/hooks/useProjects.js
index aa5fa3f6..16af5c78 100644
--- a/src/hooks/useProjects.js
+++ b/src/hooks/useProjects.js
@@ -49,19 +49,19 @@ export const useProjects = () =>
     fetchData();
   }, []);
 
-  useEffect( () =>
-  {
-    if (projects )
-    {
-      if ( profile?.projects && profile?.projects?.length > 0 )
-      {
-        dispatch(setProjectId(profile?.projects[0]))
-      } else
-      {
-        dispatch(setProjectId(1))
-      }
-    }
-  }, [profile]);
+  // useEffect( () =>
+  // {
+  //   if (projects )
+  //   {
+  //     if ( profile?.projects && profile?.projects?.length > 0 )
+  //     {
+  //       dispatch(setProjectId(profile?.projects[0]))
+  //     } else
+  //     {
+  //       dispatch(setProjectId(1))
+  //     }
+  //   }
+  // }, [profile]);
 
   return { projects, loading, error, refetch: fetchData };
 };
-- 
2.43.0


From dbfd536ba3692e5e4c2f9a262d41a5b6ffcc2fa1 Mon Sep 17 00:00:00 2001
From: Pramod Mahajan <pramodmahajan1411200@gmail.com>
Date: Thu, 24 Apr 2025 11:54:00 +0530
Subject: [PATCH 3/3] Prevent multiple API calls and display correct data for
 selected project

---
 src/pages/Activities/DailyTask.jsx | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/pages/Activities/DailyTask.jsx b/src/pages/Activities/DailyTask.jsx
index f4146ac6..d38211f3 100644
--- a/src/pages/Activities/DailyTask.jsx
+++ b/src/pages/Activities/DailyTask.jsx
@@ -34,20 +34,21 @@ const DailyTask = () => {
 
   // Sync projectId (either from URL or pick first accessible one)
   useEffect(() => {
-    if (!project_lodaing && projects.length > 0) {
+    if (!project_lodaing && projects.length > 0 && !initialized) {
       const userProjects = projects.filter((p) =>
         LoggedUser?.projects?.map(Number).includes(p.id)
       );
-
+  
       if (projectId) {
         dispatch(setProjectId(projectId));
       } else if (!selectedProject && userProjects.length > 0) {
         dispatch(setProjectId(userProjects[0].id));
       }
-
-      setInitialized(true);
+  
+      setInitialized(true); // <-- This blocks re-running this effect again
     }
-  }, [project_lodaing, projects, projectId, selectedProject]);
+  }, [project_lodaing, projects, projectId, selectedProject, initialized]);
+  
 
   
   const dispatch = useDispatch(selectedProject);
@@ -58,13 +59,15 @@ const DailyTask = () => {
     loading: task_loading,
     error: task_error,
     refetch,
-  } = useTaskList(selectedProject, dateRange.startDate, dateRange.endDate);
+  } = useTaskList( initialized ? selectedProject : null,
+    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);
-- 
2.43.0