From daff2332c2d61ea5420a781eb1ea4c67e2b6f3f2 Mon Sep 17 00:00:00 2001 From: Quy_FE Date: Mon, 21 Apr 2025 11:32:49 +0700 Subject: [PATCH] feat : export execl --- src/_screens/home/detail-grade/index.js | 9 +++++---- src/_screens/home/headmaster/index.js | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/_screens/home/detail-grade/index.js b/src/_screens/home/detail-grade/index.js index f3e8a2d..aac1753 100644 --- a/src/_screens/home/detail-grade/index.js +++ b/src/_screens/home/detail-grade/index.js @@ -85,8 +85,8 @@ export default function DetailGrade() { `${item?.student_done_per || 0}%`, item?.student_done_per_level || 0, item?.organization_name || '', - item?.organization_district ||'', - item?.organization_province ||'', + item?.district ||'', + item?.province ||'', !!month?.value ? month.value : getListMonthBySemester(semester.value) @@ -167,8 +167,9 @@ export default function DetailGrade() { }&limit=${limitOnline}&offset=${offsetOnlineMore}`; const res = await apiCaller(endPoint, "GET"); console.log('res',res); - - if (res?.status) { + if(res){ + setIsEndOnlineClasses(true); + }else if (res?.status) { listNext = res?.data; setOffsetOnline(offsetOnline + limitOnline); if (res?.data?.length < limitOnline) { diff --git a/src/_screens/home/headmaster/index.js b/src/_screens/home/headmaster/index.js index cba9273..7204803 100644 --- a/src/_screens/home/headmaster/index.js +++ b/src/_screens/home/headmaster/index.js @@ -93,8 +93,8 @@ export default function HeadmasterHome() { item?.criteria_teacher?.student_done_per_level || 0, item?.criteria_teacher?.criteria_level || 0, item?.organization_name || '', - item?.organization_district ||'', - item?.organization_province ||'', + item?.district ||'', + item?.province ||'', !!month?.value ? month.value : getListMonthBySemester(semester.value)