diff --git a/src/components/AttendanceComparison.tsx b/src/components/AttendanceComparison.tsx index 2d096f00..59abf4b6 100644 --- a/src/components/AttendanceComparison.tsx +++ b/src/components/AttendanceComparison.tsx @@ -74,7 +74,7 @@ const AttendanceComparison: React.FC = ({ useEffect(() => { const cohortIds = - store?.cohorts?.map((pair: Cohort) => pair?.cohortId) || []; + store?.cohorts?.filter((item: Cohort) => item?.cohortType === centerType).map((pair: Cohort) => pair?.cohortId) || []; const fetchData = async () => { const promises = cohortIds?.map((cohortId: string) => @@ -93,7 +93,7 @@ const AttendanceComparison: React.FC = ({ if (result?.statusCode === 200 && result?.data?.result?.contextId) { Object.keys(result?.data?.result?.contextId).forEach((id) => { dataMap[id] = - result?.data?.result?.contextId[id]?.present_percentage || '0'; + result?.data?.result?.contextId[id]?.present_percentage ?? '0'; }); } }); @@ -110,7 +110,7 @@ const AttendanceComparison: React.FC = ({ }; fetchData(); - }, [store?.cohorts, scope]); + }, [store?.cohorts, scope, centerType]); const data = store?.cohorts diff --git a/src/pages/dashboard.tsx b/src/pages/dashboard.tsx index db21a172..629c38f2 100644 --- a/src/pages/dashboard.tsx +++ b/src/pages/dashboard.tsx @@ -18,8 +18,8 @@ import { import { AttendancePercentageProps, CohortAttendancePercentParam, - CohortMemberList, ICohort, + CohortMemberList, } from '../utils/Interfaces'; import { accessControl, lowLearnerAttendanceLimit } from './../../app.config'; @@ -31,7 +31,6 @@ import OverviewCard from '@/components/OverviewCard'; import { showToastMessage } from '@/components/Toastify'; import WeekCalender from '@/components/WeekCalender'; import { getMyCohortMemberList } from '@/services/MyClassDetailsService'; -import { Role } from '@/utils/app.constant'; import { calculatePercentage } from '@/utils/attendanceStats'; import { logEvent } from '@/utils/googleAnalytics'; import withAccessControl from '@/utils/hoc/withAccessControl'; @@ -49,6 +48,7 @@ import calendar from '../assets/images/calendar.svg'; import Header from '../components/Header'; import Loader from '../components/Loader'; import useDeterminePathColor from '../hooks/useDeterminePathColor'; +import { Role } from '@/utils/app.constant'; interface DashboardProps { }