diff --git a/src/app/(user)/edit/_components/form.tsx b/src/app/(user)/edit/_components/form.tsx index 9e86560..b13e4ee 100644 --- a/src/app/(user)/edit/_components/form.tsx +++ b/src/app/(user)/edit/_components/form.tsx @@ -11,7 +11,7 @@ import { ErrorMsg, ErrorMsgFloat } from '../../register/_components/errorMsg'; import Image from 'next/image'; import { zodResolver } from '@hookform/resolvers/zod'; -import { sizeJersey } from '@/const/size'; +import { SizeJersey, sizeJersey } from '@/const/size'; import { faculties } from '@/const/faculties'; import { EditForm, EditSchema } from '@/schema/edit'; import { educationsMap, educationsMapReverse } from '@/const/educations'; @@ -149,10 +149,7 @@ export default function Form() { - setValue( - 'education', - educationsMapReverse[val as 'กำลังศึกษา' | 'จบการศึกษา'], - ) + val && setValue('education', educationsMapReverse[val]) } placeholder="กำลังศึกษาอยู่" choices={Object.keys(educationsMapReverse).map(key => key)} @@ -235,7 +232,9 @@ export default function Form() { + val && setValue('sizeJersey', val as SizeJersey) + } placeholder="กรุณาเลือก" choices={[...sizeJersey]} /> diff --git a/src/app/(user)/register/_components/subpages/two.tsx b/src/app/(user)/register/_components/subpages/two.tsx index c564f0d..9f04712 100644 --- a/src/app/(user)/register/_components/subpages/two.tsx +++ b/src/app/(user)/register/_components/subpages/two.tsx @@ -23,6 +23,7 @@ import { universities } from '@/const/universities'; import { faculties } from '@/const/faculties'; import { sizeJersey } from '@/const/size'; import { statusMap } from '@/const/status'; +// import Consent from '../policy/consent'; interface TwoProps { setStep: (value: number) => void; @@ -73,6 +74,15 @@ export default function Two({ setStep, form }: TwoProps) { useEffect(() => { let status: RegisterForm['status']; + // not specified + if (user.education == 'notSpecified') { + setValue('graduatedYear', '9999'); + setValue('faculty', 'ไม่ระบุ'); + setValue('status', 'general_public'); + setValue('university', 'ไม่ประสงค์เเจ้ง'); + return; + } + // set default value if ( !!user.education && @@ -152,7 +162,7 @@ export default function Two({ setStep, form }: TwoProps) { {/* university */} - {user.education && ( + {user.education && user.education != 'notSpecified' && (