Merge branch 'Issue_May_2W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#185

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();
         }
       })

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);

src/pages/Activities/AttendancePage.jsx

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

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) {
+     if (selectedProject === 1 || selectedProject === undefined) {
-        dispatch(setProjectId(projectId));
-      } else if (!selectedProject) {
         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 (