From 53ca639f1bf0624dec5be487694bd67b873785d1 Mon Sep 17 00:00:00 2001
From: Quy_FE <ngocquywork99@gmail.com>
Date: Tue, 15 Apr 2025 17:09:36 +0700
Subject: [PATCH] =?UTF-8?q?Feat=20:=20th=C3=AAm=20tr=C6=B0=E1=BB=9Dng=20m?=
 =?UTF-8?q?=E1=BB=9Bi=20execl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../criteria/criteria-manage/index.js         |  6 +--
 .../home/detail-grade/detailGrade.style.scss  |  3 +-
 src/_screens/home/detail-grade/index.js       | 14 +++--
 src/_screens/home/headmaster/index.js         | 51 ++++++++++---------
 4 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/src/_screens/criteria/criteria-manage/index.js b/src/_screens/criteria/criteria-manage/index.js
index 93b577f..8244f88 100644
--- a/src/_screens/criteria/criteria-manage/index.js
+++ b/src/_screens/criteria/criteria-manage/index.js
@@ -120,10 +120,8 @@ export default function CriteriaManage() {
           }),
         );
         setListIdSelected([]);
-        // await setSearchText("");
-        // await changeProvince(listProvince[0]);
-        // await setStatusCriteriaSelected(listStatusCriteria[0]);
-        // getDataCriteria();
+        setIsEndOnlineClasses(false)
+        await getDataCriteria(true);
       }
     } catch (err) {
       dispatch(
diff --git a/src/_screens/home/detail-grade/detailGrade.style.scss b/src/_screens/home/detail-grade/detailGrade.style.scss
index 278370f..428fac2 100644
--- a/src/_screens/home/detail-grade/detailGrade.style.scss
+++ b/src/_screens/home/detail-grade/detailGrade.style.scss
@@ -29,8 +29,7 @@
     }
 
     .detail-grade-list-action {
-      display: flex;
-      justify-content: space-between;
+      align-self: flex-end;
     }
     .arrow-button{
       display: flex;
diff --git a/src/_screens/home/detail-grade/index.js b/src/_screens/home/detail-grade/index.js
index e1922f5..113a535 100644
--- a/src/_screens/home/detail-grade/index.js
+++ b/src/_screens/home/detail-grade/index.js
@@ -51,10 +51,9 @@ export default function DetailGrade() {
       "Tiêu chí giao bài",
       "Tỷ lệ học sinh làm bài",
       "Tiêu chí tỷ lệ học sinh làm bài",
-      "Khối",
       "Trường",
-      // "Huyện",
-      // "Tỉnh",
+      "Huyện",
+      "Tỉnh",
       "Tháng",
       "học kỳ",
       "Niên khóa",
@@ -67,10 +66,9 @@ export default function DetailGrade() {
       item?.assign_number_level || 0,
       `${item?.student_done_per || 0}%`,
       item?.student_done_per_level || 0,
-      gradeName || '',
       schoolName || '',
-      // "Huyện",
-      // "Tỉnh",
+      "",
+      "",
       !!month?.value
         ? month.value
         : getListMonthBySemester(semester.value)
@@ -153,10 +151,10 @@ export default function DetailGrade() {
           </div>
           <div className="detail-grade-right-side">
             <div className="detail-grade-list-action detail-grade-right-p-h">
-              <div className="arrow-button">
+              {/* <div className="arrow-button">
                 <PrimaryButton onClick={()=>{}}>{'<'}</PrimaryButton>
                 <PrimaryButton onClick={()=>{}}>{'>'}</PrimaryButton>
-              </div>
+              </div> */}
               <div>
                   {!!listClass?.length && <PrimaryButton onClick={handleExport}>Xuất excel</PrimaryButton>}
               </div>
diff --git a/src/_screens/home/headmaster/index.js b/src/_screens/home/headmaster/index.js
index 118e41e..058f321 100644
--- a/src/_screens/home/headmaster/index.js
+++ b/src/_screens/home/headmaster/index.js
@@ -57,39 +57,40 @@ export default function HeadmasterHome() {
     const listHeader = [
       "STT",
       "Tên giáo viên",
-      "Email",
-      "Số điện thoại",
       "Tiêu chí giao bài",
       "Tiêu chí tỷ lệ học sinh làm bài",
-      // "Trường",
-      // "Huyện",
-      // "Tỉnh",
-      // "Tháng",
-      // "học kỳ",
-      // "Niên khóa",
+      "Mức độ hoàn thiện tiêu chí",
+      "Tên Trường",
+      "Huyện",
+      "Tỉnh",
+      "Tháng",
+      "học kỳ",
+      "Niên khóa",
     ];
     const listData = listTeacher.map((item, index) => [
       index + 1,
       item?.teacher_name,
-      item?.email || "",
-      item?.phone || "",
       item?.criteria_teacher?.assign_number_level || 0,
       item?.criteria_teacher?.student_done_per_level || 0,
-      // "Trường",
-      // "Huyện",
-      // "Tỉnh",
-      // !!month?.value
-      //   ? month.value
-      //   : getListMonthBySemester(semester.value)
-      //       ?.filter((item) => !!item?.value)
-      //       ?.map((item) => item?.value)
-      //       ?.join(", "),
-      // !!semester?.value
-      //   ? semester.value
-      //   : LIST_SEMESTER?.filter((item) => !!item?.value)
-      //       ?.map((item) => item?.value)
-      //       ?.join(", "),
-      // schoolYear?.value,
+      item?.criteria_teacher?.criteria_level || 0,
+      //trường
+      "",
+      // Huyện
+      "",
+      // Tỉnh
+      "",
+      !!month?.value
+        ? month.value
+        : getListMonthBySemester(semester.value)
+            ?.filter((item) => !!item?.value)
+            ?.map((item) => item?.value)
+            ?.join(", "),
+      !!semester?.value
+        ? semester.value
+        : LIST_SEMESTER?.filter((item) => !!item?.value)
+            ?.map((item) => item?.value)
+            ?.join(", "),
+      schoolYear?.value,
     ]);
     exportExcel(
       listHeader,