diff --git a/frontend/src/api/schedule.ts b/frontend/src/api/schedule.ts index 1b7428a..e376d8d 100644 --- a/frontend/src/api/schedule.ts +++ b/frontend/src/api/schedule.ts @@ -60,7 +60,7 @@ export const getAvailabilityForCoordinator = (scheduleId: number) => { }>(`coordinator/enrollments/${scheduleId}/temporary-availabilities`) } -export const getSchedules = (year_group_id: number = 1) => { +export const getSchedules = (year_group_id: number) => { return axiosInstance.get<{ examination_schedules: { id: number diff --git a/frontend/src/views/coordinator/Schedules.tsx b/frontend/src/views/coordinator/Schedules.tsx index 5bb5b66..16cb8d4 100644 --- a/frontend/src/views/coordinator/Schedules.tsx +++ b/frontend/src/views/coordinator/Schedules.tsx @@ -18,7 +18,7 @@ const Schedules = () => { const [endDate, setEndDate] = useState(new Date()) const { data: schedules, refetch } = useQuery(['getSchedules'], () => - getSchedules(), + getSchedules(Number(yearGroupId)), ) const { mutate: mutateCreateSchedule } = useMutation( diff --git a/frontend/src/views/coordinator/SupervisorAvailabilities.tsx b/frontend/src/views/coordinator/SupervisorAvailabilities.tsx index dbfe14c..f7fca07 100644 --- a/frontend/src/views/coordinator/SupervisorAvailabilities.tsx +++ b/frontend/src/views/coordinator/SupervisorAvailabilities.tsx @@ -1,9 +1,14 @@ import { useQuery } from 'react-query' import { getSchedules } from '../../api/schedule' import { Link } from 'react-router-dom' +import useLocalStorageState from 'use-local-storage-state' const SupervisorAvailabilities = () => { - const { data: schedules } = useQuery(['getSchedules'], () => getSchedules()) + const [yearGroupId] = useLocalStorageState('yearGroupId') + + const { data: schedules } = useQuery(['getSchedules'], () => + getSchedules(Number(yearGroupId)), + ) return (
diff --git a/frontend/src/views/student/StudentSchedules.tsx b/frontend/src/views/student/StudentSchedules.tsx index 3c5f262..c53481f 100644 --- a/frontend/src/views/student/StudentSchedules.tsx +++ b/frontend/src/views/student/StudentSchedules.tsx @@ -1,9 +1,14 @@ import { useQuery } from 'react-query' import { getSchedules } from '../../api/schedule' import { Link } from 'react-router-dom' +import useLocalStorageState from 'use-local-storage-state' const StudentSchedules = () => { - const { data: schedules } = useQuery(['getSchedules'], () => getSchedules()) + const [yearGroupId] = useLocalStorageState('yearGroupId') + + const { data: schedules } = useQuery(['getSchedules'], () => + getSchedules(Number(yearGroupId)), + ) return (
diff --git a/frontend/src/views/supervisor/SupervisorSchedules.tsx b/frontend/src/views/supervisor/SupervisorSchedules.tsx index 2c1c80c..589762d 100644 --- a/frontend/src/views/supervisor/SupervisorSchedules.tsx +++ b/frontend/src/views/supervisor/SupervisorSchedules.tsx @@ -1,9 +1,14 @@ import { useQuery } from 'react-query' import { getSchedules } from '../../api/schedule' import { Link } from 'react-router-dom' +import useLocalStorageState from 'use-local-storage-state' const SupervisorSchedules = () => { - const { data: schedules } = useQuery(['getSchedules'], () => getSchedules()) + const [yearGroupId] = useLocalStorageState('yearGroupId') + + const { data: schedules } = useQuery(['getSchedules'], () => + getSchedules(Number(yearGroupId)), + ) return (