From d0f81c0b946f47b399be76998dcceb16409f31dd Mon Sep 17 00:00:00 2001 From: HOANGLAOTA Date: Wed, 26 Jun 2024 16:08:03 +0700 Subject: [PATCH] fix bug 2606 --- .../Modal/ModalConfirmOTP/ModalConfirmOTP.jsx | 4 +- src/_containers/RegisterPage/RegisterPage.js | 3 + .../components/AddClassName/index.js | 87 ++++++++++--------- .../components/AddClassName/index.scss | 15 +++- .../components/UpdateInformation/index.scss | 4 +- src/_containers/RegisterPage/register.scss | 9 +- 6 files changed, 73 insertions(+), 49 deletions(-) diff --git a/src/_components/Modal/ModalConfirmOTP/ModalConfirmOTP.jsx b/src/_components/Modal/ModalConfirmOTP/ModalConfirmOTP.jsx index 6166060..0c727af 100644 --- a/src/_components/Modal/ModalConfirmOTP/ModalConfirmOTP.jsx +++ b/src/_components/Modal/ModalConfirmOTP/ModalConfirmOTP.jsx @@ -120,7 +120,7 @@ const ModalConfirmOTP = (props) => { XÁC NHẬN - {
ĐĂNG NHẬP
- + */} diff --git a/src/_containers/RegisterPage/RegisterPage.js b/src/_containers/RegisterPage/RegisterPage.js index 82cfa61..ff61453 100644 --- a/src/_containers/RegisterPage/RegisterPage.js +++ b/src/_containers/RegisterPage/RegisterPage.js @@ -88,6 +88,7 @@ function RegisterPage() { year_of_birth: dataUpdateInfo.birthday?.getFullYear(), school_id: dataAddressStudying?.school_id, organization_code: dataAddressStudying?.organization, + list_class: dataClassName?.list_class || [] }; data.birthday = moment(dataUpdateInfo.birthday).format("YYYY-MM-DD"); setPopupMessageRegisterTeacher(false); @@ -113,6 +114,7 @@ function RegisterPage() { year_of_birth: dataUpdateInfo.birthday?.getFullYear(), school_id: dataAddressStudying?.school_id, organization_code: dataAddressStudying?.organization, + list_class: dataClassName?.list_class || [] }; if (userConstants.ROLE_TEACHER == dataStepRole.role) { data.birthday = moment(dataUpdateInfo.birthday).format("YYYY-MM-DD"); @@ -255,6 +257,7 @@ function RegisterPage() { setData={setDataClassName} step={step} role={dataStepRole.role} + org={dataAddressStudying.organization} />
{ - const data = {} - if(role === 'student') { - data.class_nickname = className - } else { - data.list_class = listClass.map(item => item.name) + const data = { + list_class: listClass.map(item => item.name) } props.setData(data); props.setStep(stepAuthConstants.STEP_UPDATE_ACCOUNT); @@ -70,31 +62,40 @@ export default function AddClassName(props) { setIsChecked(false) } - const handleCheckClass = () => { + const handleCheckClass = async () => { setIsLoading(true) - setTimeout(() => { - let newList = listClass.map(className => { - const sameClass = fakeListClass.find(item => item.class_nickname === className.name) - if(sameClass) { - return { - ...className, - isAssign: sameClass.is_assign + try { + const url = '/api_register/check_teacher_class' + const data = { + organization_code: props?.org, + class_nickname: listClass.map(item => item.name).toString() + } + const res = await apiCaller(url,'POST', data, null, true) + if(res?.status) { + let newList = listClass.map(className => { + const sameClass = res?.data?.find(item => item.class_nickname === className.name) + if(sameClass) { + return { + ...className, + isAssign: sameClass.is_assign + } } - } - return {...className, isAssign: false} - }) - for (let i = 0; i < newList.length; i++) { - for (let j = i + 1; j < newList.length; j++) { - if(newList[i].name === newList[j].name) { - newList[j].isAssign = true + return {...className, isAssign: false} + }) + for (let i = 0; i < newList.length; i++) { + for (let j = i + 1; j < newList.length; j++) { + if(newList[i].name === newList[j].name) { + newList[j].isAssign = true + } } } + setListClass(newList) + setIsLoading(false) + setIsChecked(true) } - - setListClass(newList) + } catch (e) { setIsLoading(false) - setIsChecked(true) - }, 1000) + } } const renderClassIcon = () => { @@ -133,7 +134,7 @@ export default function AddClassName(props) {

ĐĂNG KÝ TÀI KHOẢN

- {`3. ${role === 'student' ? "Chọn lớp" : "Tạo lớp"}`} + {`4. Tạo lớp`}

: (
-

Dạy các lớp:

-
+ {/*

Dạy các lớp:

*/} +
{listClass?.map((item, index) => (
}
))} - {!!listClass[listClass.length - 1]?.name && +
- - {!isChecked && } + {!!listClass[listClass.length - 1]?.name && + <> + + {!isChecked && } + + }
- } -
)}
diff --git a/src/_containers/RegisterPage/components/AddClassName/index.scss b/src/_containers/RegisterPage/components/AddClassName/index.scss index b39c3e6..e5018b4 100644 --- a/src/_containers/RegisterPage/components/AddClassName/index.scss +++ b/src/_containers/RegisterPage/components/AddClassName/index.scss @@ -32,8 +32,8 @@ $normal-class: #979797; } .add-class-content { - margin-bottom: 24px; - padding-top: 24px; + // margin-bottom: 24px; + padding-bottom: 24px; &_list { display: flex; @@ -69,6 +69,15 @@ $normal-class: #979797; .add-class-content-list { display: flex; flex-direction: column; + max-height: 42vh; + padding: 16px 32px 0; + overflow-y: auto; + + @media screen and (max-width: 768px) { + overflow-y: unset; + padding: 0; + max-height: unset; + } } .add-class-content-item { @@ -112,6 +121,8 @@ $normal-class: #979797; .sub-action-container { display: flex; margin-top: 16px; + padding: 0 32px; + height: 40px; span { font-size: medium; diff --git a/src/_containers/RegisterPage/components/UpdateInformation/index.scss b/src/_containers/RegisterPage/components/UpdateInformation/index.scss index 9d1d2bd..59a583f 100644 --- a/src/_containers/RegisterPage/components/UpdateInformation/index.scss +++ b/src/_containers/RegisterPage/components/UpdateInformation/index.scss @@ -35,7 +35,7 @@ &_content { margin: 0 auto; - margin-top: 88px; + // margin-top: 88px; @media screen and (max-height: 800px) { margin-top: -130px; @@ -197,6 +197,8 @@ .login_text { width: fit-content; cursor: pointer; + padding: 0 8px; + margin-bottom: 32px; &:hover { diff --git a/src/_containers/RegisterPage/register.scss b/src/_containers/RegisterPage/register.scss index 6688362..7bec19c 100644 --- a/src/_containers/RegisterPage/register.scss +++ b/src/_containers/RegisterPage/register.scss @@ -36,13 +36,18 @@ $loading-color: #f8f8f8; &_content { margin: 0 auto; - margin-top: 50px; - max-width: 450px; + // margin-top: 50px; + max-width: 500px; @media screen and (max-height: 800px) { margin-top: -145px; } + + @media screen and (max-width: 768px) { + margin-top: 10px !important; + } + .title { font-size: 32px; text-transform: uppercase;