Merge pull request 'after refresh attednace page, now it able get employee default selectedproject.' (#63) from pramod_Bug#178 into Issue_May_2W

Reviewed-on: #63
This commit is contained in:
Vikas Nale 2025-05-06 12:45:19 +00:00
commit ff9818fb3c

View File

@ -93,13 +93,14 @@ const AttendancePage = () => {
}, [modelConfig, isCreateModalOpen]); }, [modelConfig, isCreateModalOpen]);
useEffect(() => { useEffect(() => {
setAttendances(attendance); setAttendances(attendance);
}, [attendance]); }, [ attendance ] );
useEffect(()=>{
if(selectedProject == 1){
dispatch(setProjectId(loginUser?.projects[0])) useEffect(() => {
console.log(loginUser?.projects); if (selectedProject === 1 || selectedProject === undefined ) {
} dispatch(setProjectId(loginUser?.projects[0]));
},[selectedProject,loginUser?.projects]) }
}, [selectedProject, loginUser?.projects]);
return ( return (
<> <>
{isCreateModalOpen && modelConfig && ( {isCreateModalOpen && modelConfig && (
@ -159,7 +160,6 @@ useEffect(()=>{
</select> </select>
</label> </label>
)} )}
</div> </div>
</ul> </ul>
<ul className="nav nav-tabs" role="tablist"> <ul className="nav nav-tabs" role="tablist">
@ -204,13 +204,18 @@ useEffect(()=>{
{!projectLoading && !attendances && <span>Not Found</span>} {!projectLoading && !attendances && <span>Not Found</span>}
{activeTab === "all" && ( {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" && ( {activeTab === "logs" && (