- */}
{
return { dashboard_data, loading: isLineChartLoading, error };
};
+
+export const useDashboard_AttendanceData = (date, projectId) => {
+ const [dashboard_Attendancedata, setDashboard_AttendanceData] = useState([]);
+ const [isLineChartLoading, setLoading] = useState(false);
+ const [error, setError] = useState("");
+
+ useEffect(() => {
+ const fetchData = async () => {
+ setLoading(true);
+ setError("");
+
+ try {
+ const response = await GlobalRepository.getDashboardAttendanceData(date,projectId); // date in 2nd param
+ setDashboard_AttendanceData(response.data);
+ } catch (err) {
+ setError("Failed to fetch dashboard data.");
+ console.error(err);
+ } finally {
+ setLoading(false);
+ }
+ };
+
+ if (date && projectId !== null) {
+ fetchData();
+ }
+ }, [date, projectId]);
+
+ return { dashboard_Attendancedata, isLineChartLoading: isLineChartLoading, error };
+};
+
+
// 🔹 Dashboard Projects Card Data Hook
export const useDashboardProjectsCardData = () => {
const [projectsCardData, setProjectsData] = useState([]);
diff --git a/src/hooks/useProfile.js b/src/hooks/useProfile.js
index 9c6a75a8..0674b7a4 100644
--- a/src/hooks/useProfile.js
+++ b/src/hooks/useProfile.js
@@ -3,46 +3,40 @@ import AuthRepository from "../repositories/AuthRepository";
import {cacheProfileData, getCachedProfileData} from "../slices/apiDataManager";
import {useSelector} from "react-redux";
-export const useProfile = () =>
-{
- const loggedUser = useSelector((store)=>store.globalVariables.loginUser)
-
- const [profile, setProfile] = useState(null);
- const [loading, setLoading] = useState(false);
- const [error, setError] = useState("");
-
-
- const fetchData = async () =>
- {
- try
- {
- setLoading( true )
+let hasFetched = false;
+
+export const useProfile = () => {
+ const loggedUser = useSelector( ( store ) => store.globalVariables.loginUser );
+ const [profile, setProfile] = useState(null);
+ const [loading, setLoading] = useState(false);
+ const [error, setError] = useState("");
+
+ const fetchData = async () => {
+ try {
+ setLoading(true);
let response = await AuthRepository.profile();
- setProfile( response.data )
- cacheProfileData( response.data )
- setLoading( false );
-
- } catch ( error )
- {
- setLoading( false )
- console.error( error );
- setError( "Failed to fetch data." );
- };
- }
-
-
- useEffect( () => {
-
- if (!loggedUser )
- {
- fetchData()
- } else
- {
- setProfile(loggedUser)
+ setProfile(response.data);
+ cacheProfileData(response.data);
+ } catch (error) {
+ setError("Failed to fetch data.");
+ } finally {
+ setLoading(false);
+ }
+ };
+
+ useEffect(() => {
+ if (!hasFetched) {
+ hasFetched = true;
+ if (!loggedUser) {
+ fetchData();
+ } else {
+ setProfile(loggedUser);
+ }
}
-
- },[])
- return { profile,loading,error}
-
- }
\ No newline at end of file
+ setProfile(loggedUser);
+
+ }, [loggedUser]);
+
+ return { profile, loading, error };
+};
diff --git a/src/hooks/useProjects.js b/src/hooks/useProjects.js
index 91590580..09582880 100644
--- a/src/hooks/useProjects.js
+++ b/src/hooks/useProjects.js
@@ -2,17 +2,18 @@ import { useEffect, useState } from "react";
import { cacheData, getCachedData } from "../slices/apiDataManager";
import ProjectRepository from "../repositories/ProjectRepository";
import { useProfile } from "./useProfile";
-import { useDispatch } from "react-redux";
+import { useDispatch, useSelector } from "react-redux";
import { setProjectId } from "../slices/localVariablesSlice";
export const useProjects = () => {
- const { profile } = useProfile();
+
+ const loggedUser = useSelector( ( store ) => store.globalVariables.loginUser )
const [projects, setProjects] = useState([]);
const [loading, setLoading] = useState(true);
const [error, setError] = useState("");
const fetchData = async () => {
- const projectIds = profile?.projects || [];
+ const projectIds = loggedUser?.projects || [];
const filterProjects = (projectsList) => {
return projectsList
@@ -43,12 +44,11 @@ export const useProjects = () => {
}
}
};
-
useEffect(() => {
- if (profile) {
+ if (loggedUser) {
fetchData();
}
- }, [profile]);
+ }, [loggedUser]);
return { projects, loading, error, refetch: fetchData };
};
diff --git a/src/repositories/GlobalRepository.jsx b/src/repositories/GlobalRepository.jsx
index 31468b66..eda5312e 100644
--- a/src/repositories/GlobalRepository.jsx
+++ b/src/repositories/GlobalRepository.jsx
@@ -18,6 +18,11 @@ const GlobalRepository = {
return api.get(`/api/Dashboard/Progression?${params.toString()}`);
},
+
+ getDashboardAttendanceData: ( date,projectId ) => {
+
+ return api.get(`/api/Dashboard/project-attendance/${projectId}?date=${date}`);
+},
getDashboardProjectsCardData: () => {
return api.get(`/api/Dashboard/projects`);
},