From 62fac2ec8a40e0480f8f7693ab59fb45adabb0d9 Mon Sep 17 00:00:00 2001 From: Quy_FE Date: Wed, 23 Apr 2025 08:45:17 +0700 Subject: [PATCH] =?UTF-8?q?Feat=20:=20t=E1=BB=91i=20=C6=B0u=20handleScroll?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/_screens/criteria/criteria-manage/index.js | 4 +++- src/_screens/home/admin/index.js | 5 +++-- src/_screens/home/detail-grade/index.js | 4 ++-- src/_screens/home/headmaster/index.js | 4 +++- src/_screens/home/teacher/index.js | 4 +++- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/_screens/criteria/criteria-manage/index.js b/src/_screens/criteria/criteria-manage/index.js index fe2c19c..fc1c69c 100644 --- a/src/_screens/criteria/criteria-manage/index.js +++ b/src/_screens/criteria/criteria-manage/index.js @@ -339,7 +339,9 @@ export default function CriteriaManage() { }`; const res = await apiCaller(endPoint, "GET"); - if (res?.status) { + if (!res){ + setIsEndOnlineClasses(true); + } else { listNext = res?.data; setOffsetOnline(offsetOnline + limitOnline); if (res?.data?.length < limitOnline) { diff --git a/src/_screens/home/admin/index.js b/src/_screens/home/admin/index.js index 78f16c1..bf5c74e 100644 --- a/src/_screens/home/admin/index.js +++ b/src/_screens/home/admin/index.js @@ -288,8 +288,9 @@ export default function AdminHome() { queryParams.length ? `&${queryParams.join("&")}` : "" }`; const res = await apiCaller(endPoint, "GET"); - - if (res?.status) { + if(!res){ + setIsEndOnlineClasses(true); + } else { concatListSide = res?.data; setOffsetOnline(offsetOnline + limitOnline); if (res?.data?.length < limitOnline) { diff --git a/src/_screens/home/detail-grade/index.js b/src/_screens/home/detail-grade/index.js index aac1753..fbe0a0d 100644 --- a/src/_screens/home/detail-grade/index.js +++ b/src/_screens/home/detail-grade/index.js @@ -167,9 +167,9 @@ export default function DetailGrade() { }&limit=${limitOnline}&offset=${offsetOnlineMore}`; const res = await apiCaller(endPoint, "GET"); console.log('res',res); - if(res){ + if(!res){ setIsEndOnlineClasses(true); - }else if (res?.status) { + } else { 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 7204803..5188c80 100644 --- a/src/_screens/home/headmaster/index.js +++ b/src/_screens/home/headmaster/index.js @@ -184,7 +184,9 @@ export default function HeadmasterHome() { const endPoint = `/report/api_report/teacherByOrganizationId?organization_id=${id}&limit=${limitOnline}&offset=${offsetOnlineMore}`; const res = await apiCaller(endPoint, "GET"); - if (res?.status) { + if (!res){ + setIsEndOnlineClasses(true); + } else { listNext = res?.data; setOffsetOnline(offsetOnline + limitOnline); if (res?.data?.length < limitOnline) { diff --git a/src/_screens/home/teacher/index.js b/src/_screens/home/teacher/index.js index 8853394..1306247 100644 --- a/src/_screens/home/teacher/index.js +++ b/src/_screens/home/teacher/index.js @@ -184,7 +184,9 @@ export default function TeacherHome() { `/api_exercise_report/teacher_report_summary?teacher_id=${id}&year=${schoolYear?.value.trim()}&limit=${limitOnline}&offset=${offsetOnlineMore}` + (queryParams.length > 0 ? `&${queryParams.join("&")}` : ""); const res = await apiCaller(endPoint, "GET"); - if (res?.status) { + if (!res){ + setIsEndOnlineClasses(true); + } else { concatListSide = res?.data; setOffsetOnline(offsetOnline + limitOnline); if (res?.data?.length < limitOnline) {