From 1b1bfb83fc3940a4e2a67645c4b27c53b4ae6c74 Mon Sep 17 00:00:00 2001 From: Quy_FE Date: Tue, 27 May 2025 15:16:47 +0700 Subject: [PATCH] =?UTF-8?q?Feat=20:=20disable=20c=C3=A1c=20button?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/_components/boxChart/BoxDoughnutChar.js | 6 ++--- .../home/detail-room-education/index.js | 25 ++++++++++++++----- .../home/education-department/index.js | 2 +- 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/src/_components/boxChart/BoxDoughnutChar.js b/src/_components/boxChart/BoxDoughnutChar.js index 464e2ee..a20cc9d 100644 --- a/src/_components/boxChart/BoxDoughnutChar.js +++ b/src/_components/boxChart/BoxDoughnutChar.js @@ -19,11 +19,11 @@ export default function BoxDoughnutChart({data = [], title, propsContainer}) { return (

{title}

-
-
+
+
-
+
{renderStats()}
diff --git a/src/_screens/home/detail-room-education/index.js b/src/_screens/home/detail-room-education/index.js index 0798d7a..46a9829 100644 --- a/src/_screens/home/detail-room-education/index.js +++ b/src/_screens/home/detail-room-education/index.js @@ -38,6 +38,7 @@ export default function DetailRoomEducation() { const [isLoadingStatisticCircle, setIsLoadingStatisticCircle] = useState(false); const [isLoadingStudentChart, setIsLoadingStudentChart] = useState(false); const [isLoadingTeacherChart, setIsLoadingTeacherChart] = useState(false); + const [isFilterChanged, setIsFilterChanged] = useState(false); const [isLoadMoreOnline, setLoadMoreOnline] = useState(true); const [limitOnline] = useState(10); const [offsetOnline, setOffsetOnline] = useState(0); @@ -431,12 +432,12 @@ export default function DetailRoomEducation() { }} /> {"Tìm kiếm"} - + Xuất excel
@@ -445,22 +446,34 @@ export default function DetailRoomEducation() { { + setSchoolYear(value); + setIsFilterChanged(true); + }} style={{flex: 1, minWidth: '200px', padding:'0 10px'}} /> { + changeSemester(value); + setIsFilterChanged(true); + }} style={{flex: 0.5, minWidth: '151px', padding:'0 10px'}} /> { + setMonth(value); + setIsFilterChanged(true); + }} style={{flex: 0.5, minWidth: '150px', padding:'0 10px'}} /> - + { + handleFilter(); + setIsFilterChanged(false); + }}> Áp dụng
diff --git a/src/_screens/home/education-department/index.js b/src/_screens/home/education-department/index.js index e20b27c..f259374 100644 --- a/src/_screens/home/education-department/index.js +++ b/src/_screens/home/education-department/index.js @@ -273,7 +273,7 @@ export default function EducationDepartmentHome() { />
{"Tìm kiếm"}