From 8483114f4d4f4c0ab7cd974496cb69546e817d5e Mon Sep 17 00:00:00 2001
From: Pramod Mahajan <pramodmahajan1411200@gmail.com>
Date: Tue, 6 May 2025 11:00:13 +0530
Subject: [PATCH 1/5] set selectedProject on page refresh in DailyTask.jsx -
 added fallback logic to select first project if selectedProject is undefined
 or 1 - used initialized flag to prevent multiple dispatches

---
 src/pages/Activities/DailyTask.jsx | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/pages/Activities/DailyTask.jsx b/src/pages/Activities/DailyTask.jsx
index 318dae54..e220a6d0 100644
--- a/src/pages/Activities/DailyTask.jsx
+++ b/src/pages/Activities/DailyTask.jsx
@@ -32,9 +32,7 @@ const DailyTask = () => {
   // Sync projectId (either from URL or pick first accessible one)
   useEffect(() => {
     if (!project_lodaing && projects.length > 0 && !initialized) {
-      if (projectId) {
-        dispatch(setProjectId(projectId));
-      } else if (!selectedProject) {
+     if (selectedProject === 1 || selectedProject === undefined) {
         dispatch(setProjectId(projects[0].id));
       }
 
@@ -77,7 +75,6 @@ const DailyTask = () => {
     selectTask(task);
     openModal();
   };
-
   return (
     <>
       <div
@@ -160,21 +157,26 @@ const DailyTask = () => {
                   </tr>
                 </thead>
                 <tbody className="table-border-bottom-0">
-                  {TaskLists?.length === 0 && !task_loading && (
-                    <tr>
-                      <td colSpan={7} className="text-center">
-                        No Task Found
-                      </td>
-                    </tr>
-                  )}
 
-                  {task_loading && (
+                {task_loading && (
                     <tr>
                       <td colSpan={7} className="text-center">
                         <p>Loading..</p>
                       </td>
                     </tr>
                   )}
+                  {project_lodaing &&  <tr>
+                      <td colSpan={7} className="text-center">
+                        Loading...
+                      </td>
+                    </tr>}
+                  {TaskLists?.length === 0 && !task_loading && !project_lodaing &&(
+                    <tr>
+                      <td colSpan={7} className="text-center">
+                        No Task Found
+                      </td>
+                    </tr>
+                  )}
 
                   {TaskLists.map((task, index) => {
                     return (

From 1a651ac5bcd84e845d4585e42dc5577671ace092 Mon Sep 17 00:00:00 2001
From: Pramod Mahajan <pramodmahajan1411200@gmail.com>
Date: Tue, 6 May 2025 10:29:58 +0530
Subject: [PATCH 2/5] after refresh attednace page, now it able get employee
 default selectedproject.

---
 src/pages/Activities/AttendancePage.jsx | 35 ++++++++++++++-----------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/pages/Activities/AttendancePage.jsx b/src/pages/Activities/AttendancePage.jsx
index 2f6d3812..b0484492 100644
--- a/src/pages/Activities/AttendancePage.jsx
+++ b/src/pages/Activities/AttendancePage.jsx
@@ -93,13 +93,14 @@ const AttendancePage = () => {
   }, [modelConfig, isCreateModalOpen]);
   useEffect(() => {
     setAttendances(attendance);
-  }, [attendance]);
-useEffect(()=>{
-  if(selectedProject == 1){
-    dispatch(setProjectId(loginUser?.projects[0]))
-    console.log(loginUser?.projects);
-  }
-},[selectedProject,loginUser?.projects])
+  }, [ attendance ] );
+  
+  console.log(selectedProject)
+  useEffect(() => {
+    if (selectedProject === 1 || selectedProject === undefined ) {
+      dispatch(setProjectId(loginUser?.projects[0]));
+    }
+  }, [selectedProject, loginUser?.projects]);
   return (
     <>
       {isCreateModalOpen && modelConfig && (
@@ -159,7 +160,6 @@ useEffect(()=>{
                   </select>
                 </label>
               )}
-            
             </div>
           </ul>
           <ul className="nav nav-tabs" role="tablist">
@@ -204,13 +204,18 @@ useEffect(()=>{
             {!projectLoading && !attendances && <span>Not Found</span>}
 
             {activeTab === "all" && (
-              <div className="tab-pane fade show active py-0">
-                <Attendance
-                  attendance={attendances}
-                  handleModalData={handleModalData}
-                  getRole={getRole}
-                />
-              </div>
+              <>
+                {!projectLoading && attendances.length === 0 && (
+                  <p>No Employee assigned yet.</p>
+                )}
+                <div className="tab-pane fade show active py-0">
+                  <Attendance
+                    attendance={attendances}
+                    handleModalData={handleModalData}
+                    getRole={getRole}
+                  />
+                </div>
+              </>
             )}
 
             {activeTab === "logs" && (

From 174b3f3bee22ffd4d41108f461a1fa819186d1aa Mon Sep 17 00:00:00 2001
From: Pramod Mahajan <pramodmahajan1411200@gmail.com>
Date: Tue, 6 May 2025 10:32:40 +0530
Subject: [PATCH 3/5] removed console

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

diff --git a/src/pages/Activities/AttendancePage.jsx b/src/pages/Activities/AttendancePage.jsx
index b0484492..6aaee98c 100644
--- a/src/pages/Activities/AttendancePage.jsx
+++ b/src/pages/Activities/AttendancePage.jsx
@@ -95,7 +95,7 @@ const AttendancePage = () => {
     setAttendances(attendance);
   }, [ attendance ] );
   
-  console.log(selectedProject)
+
   useEffect(() => {
     if (selectedProject === 1 || selectedProject === undefined ) {
       dispatch(setProjectId(loginUser?.projects[0]));

From f45febb82c8dd32e83a405897f629fed0c0abcdb Mon Sep 17 00:00:00 2001
From: Pramod Mahajan <pramodmahajan1411200@gmail.com>
Date: Tue, 6 May 2025 11:35:02 +0530
Subject: [PATCH 4/5]  show correct message after all employees are assigned to
 a project - fixed issue where loader spinner stayed active after API call -
 added setLoading(false) in useAllEmployee hook after API call - now message
 All employee assigned to Project." shows properly

---
 src/hooks/useEmployees.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hooks/useEmployees.js b/src/hooks/useEmployees.js
index 4a127fef..31e4220b 100644
--- a/src/hooks/useEmployees.js
+++ b/src/hooks/useEmployees.js
@@ -16,7 +16,8 @@ export const useAllEmployees = () => {
         setLoading(true);
         const response = await EmployeeRepository.getAllEmployeeList();
         cacheData("AllEmployees", response.data);
-        setEmployeeList(response.data);
+        setEmployeeList( response.data );
+        setLoading(false);
       } else {
         setEmployeeList(EmployeeList_cached);
         setLoading(false);

From 1bcc5343081ec123f08b58d0e97675f8f9a83b33 Mon Sep 17 00:00:00 2001
From: Pramod Mahajan <pramodmahajan1411200@gmail.com>
Date: Tue, 6 May 2025 16:06:00 +0530
Subject: [PATCH 5/5] added toast for success msg

---
 src/components/Project/Infrastructure/EditActivityModal.jsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/Project/Infrastructure/EditActivityModal.jsx b/src/components/Project/Infrastructure/EditActivityModal.jsx
index ef72a35a..884e7aba 100644
--- a/src/components/Project/Infrastructure/EditActivityModal.jsx
+++ b/src/components/Project/Infrastructure/EditActivityModal.jsx
@@ -141,7 +141,9 @@ const EditActivityModal = ({
             data: newProject,
           });
           resetForm();
-          dispatch(refreshData(true));
+          dispatch( refreshData( true ) );
+          showToast("Activity Updated Successfully","success")
+
           onClose();
         }
       })