From d8cb4ae59bcacc38082029cda2723778ae97b60a Mon Sep 17 00:00:00 2001 From: Quy_FE Date: Fri, 25 Apr 2025 10:42:27 +0700 Subject: [PATCH] =?UTF-8?q?Feat=20:=20fix=20l=E1=BB=97i=20ch=E1=BB=8Dn=20h?= =?UTF-8?q?=E1=BB=8Dc=20k=E1=BB=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/_screens/criteria/criteria-manage/index.js | 8 ++++++++ src/_screens/home/admin/index.js | 5 +++-- src/_screens/home/detail-grade/index.js | 1 - src/_screens/home/headmaster/index.js | 1 - 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/_screens/criteria/criteria-manage/index.js b/src/_screens/criteria/criteria-manage/index.js index dc5a8b7..0890e14 100644 --- a/src/_screens/criteria/criteria-manage/index.js +++ b/src/_screens/criteria/criteria-manage/index.js @@ -40,6 +40,7 @@ export default function CriteriaManage() { const [limitOnline] = useState(10); const [offsetOnline, setOffsetOnline] = useState(0); const [isEndOnlineClasses, setIsEndOnlineClasses] = useState(false); + const [isCheckAll,setIsCheckAll] = useState(false) const listRef = useRef(null); const dispatch = useDispatch(); const changeProvince = (item) => { @@ -64,6 +65,12 @@ export default function CriteriaManage() { }); } }; + useEffect(() => { + if(isCheckAll){ + handleSelectAll() + } + }, [listData]) + const handleSelectAll = () => { if (listData?.every((item) => listIdSelected?.includes(item?.school_id))) { @@ -80,6 +87,7 @@ export default function CriteriaManage() { newListIdSelected.push(item?.school_id); }); setListIdSelected(newListIdSelected); + setIsCheckAll(true) }; const handleSelectItem = (item) => { diff --git a/src/_screens/home/admin/index.js b/src/_screens/home/admin/index.js index 92126f7..7cf5caf 100644 --- a/src/_screens/home/admin/index.js +++ b/src/_screens/home/admin/index.js @@ -232,7 +232,8 @@ export default function AdminHome() { if (savedState) { const state = JSON.parse(savedState); setSearchTextSchool(state.searchTextSchool); - setProvinceSelect(state.provinceSelect); + // setProvinceSelect(state.provinceSelect); + changeProvince(state.provinceSelect) setDistrictSelect(state.districtSelect); setendPointSave(state.endPointSave) if(state.endPointSave){ @@ -288,7 +289,7 @@ export default function AdminHome() { queryParams.length ? `&${queryParams.join("&")}` : "" }`; const res = await apiCaller(endPoint, "GET"); - if(!res.data){ + if(!res?.data){ setIsEndOnlineClasses(true); } else { concatListSide = res?.data; diff --git a/src/_screens/home/detail-grade/index.js b/src/_screens/home/detail-grade/index.js index 34a8587..1c669f8 100644 --- a/src/_screens/home/detail-grade/index.js +++ b/src/_screens/home/detail-grade/index.js @@ -55,7 +55,6 @@ export default function DetailGrade() { setOffsetOnline(0) setLoadMoreOnline(true) setIsEndOnlineClasses(false) - setIsFiltered(true); scrollToTop() getData(); }; diff --git a/src/_screens/home/headmaster/index.js b/src/_screens/home/headmaster/index.js index adb5ac0..66abfc8 100644 --- a/src/_screens/home/headmaster/index.js +++ b/src/_screens/home/headmaster/index.js @@ -66,7 +66,6 @@ export default function HeadmasterHome() { setOffsetOnline(0) setLoadMoreOnline(true) setIsEndOnlineClasses(false) - setIsFiltered(true); scrollToTop() setSemester(item); setMonth(getListMonthBySemester(item?.value)?.[0]);