diff --git a/src/_components/Header/index.js b/src/_components/Header/index.js index 2ff97c0..cd2a912 100644 --- a/src/_components/Header/index.js +++ b/src/_components/Header/index.js @@ -14,7 +14,7 @@ export default function Header({ icon, title, subtitles = [] }) { {!!subtitles?.length && subtitles?.map((item, index) => ( - {" > "} + {" - "} {item} ))} diff --git a/src/_constants/common.js b/src/_constants/common.js index f2b9115..307d743 100644 --- a/src/_constants/common.js +++ b/src/_constants/common.js @@ -96,7 +96,7 @@ export const getListMonthBySemester = (semester) => { { label: "Tháng 10", value: 10 }, { label: "Tháng 11", value: 11 }, { label: "Tháng 12", value: 12 }, - { label: `Tháng 1 (${currentYear + 1})`, value: 1 }, + { label: `Tháng 1 (${currentYear})`, value: 1 }, ]; case 2: return [ diff --git a/src/_screens/home/detail-grade/detailGrade.style.scss b/src/_screens/home/detail-grade/detailGrade.style.scss index 016af00..278370f 100644 --- a/src/_screens/home/detail-grade/detailGrade.style.scss +++ b/src/_screens/home/detail-grade/detailGrade.style.scss @@ -29,7 +29,13 @@ } .detail-grade-list-action { - align-self: flex-end; + display: flex; + justify-content: space-between; + } + .arrow-button{ + display: flex; + justify-content: space-between; + width: 70%; } .detail-grade-list-class { diff --git a/src/_screens/home/detail-grade/index.js b/src/_screens/home/detail-grade/index.js index e72ccbb..e1922f5 100644 --- a/src/_screens/home/detail-grade/index.js +++ b/src/_screens/home/detail-grade/index.js @@ -153,7 +153,13 @@ export default function DetailGrade() {
- {!!listClass?.length && Xuất excel} +
+ {}}>{'<'} + {}}>{'>'} +
+
+ {!!listClass?.length && Xuất excel} +
{!isLoading && !listClass?.length && ( diff --git a/src/_screens/home/headmaster/index.js b/src/_screens/home/headmaster/index.js index 523d383..5a9fe70 100644 --- a/src/_screens/home/headmaster/index.js +++ b/src/_screens/home/headmaster/index.js @@ -45,7 +45,7 @@ export default function HeadmasterHome() { const schoolName = !!schoolId ? !!school_name ? decodeURIComponent(school_name) : '' - : authentication?.user?.organization_name; + : `Hiệu trưởng ${authentication?.user?.fullname||''} ${authentication?.user?.organization_name}`; const id = !!schoolId ? schoolId : authentication?.user?.organization_id; const changeSemester = (item) => { @@ -197,13 +197,15 @@ export default function HeadmasterHome() {
-
- { - history.goBack() - }}> - Quay lại - -
+ {authentication.user.role ==='supper_admin' &&( +
+ { + history.goBack() + }}> + Quay lại + +
+ )}

Mức độ hoàn thành của trường