diff --git a/src/apps/profiles/src/member-profile/education-and-certifications/EducationAndCertifications.tsx b/src/apps/profiles/src/member-profile/education-and-certifications/EducationAndCertifications.tsx index b2bbe2d01..3836048b6 100644 --- a/src/apps/profiles/src/member-profile/education-and-certifications/EducationAndCertifications.tsx +++ b/src/apps/profiles/src/member-profile/education-and-certifications/EducationAndCertifications.tsx @@ -90,7 +90,7 @@ const EducationAndCertifications: FC = (props: (memberEducation?.length as number) > 0 && ( memberEducation?.map((education: UserTrait) => ( )) diff --git a/src/apps/profiles/src/member-profile/education-and-certifications/EducationCard/EducationCard.tsx b/src/apps/profiles/src/member-profile/education-and-certifications/EducationCard/EducationCard.tsx index 7c262e7f4..fa1f6c3b6 100644 --- a/src/apps/profiles/src/member-profile/education-and-certifications/EducationCard/EducationCard.tsx +++ b/src/apps/profiles/src/member-profile/education-and-certifications/EducationCard/EducationCard.tsx @@ -1,6 +1,5 @@ import { FC } from 'react' import classNames from 'classnames' -import moment from 'moment' import { UserTrait } from '~/libs/core' @@ -16,18 +15,17 @@ const EducationCard: FC = (props: EducationCardProps) => (

- {props.education.major} + {props.education.degree}

- {props.education.schoolCollegeName} + {props.education.collegeName}

{ props.education.timePeriodFrom || props.education.timePeriodTo ? (

- {props.education.timePeriodTo ? moment(props.education.timePeriodTo) - .format('YYYY') : ''} + {props.education.endYear}

) : undefined diff --git a/src/apps/profiles/src/member-profile/education-and-certifications/ModifyEducationModal/ModifyEducationModal.tsx b/src/apps/profiles/src/member-profile/education-and-certifications/ModifyEducationModal/ModifyEducationModal.tsx index 50863cb1c..da8498e3a 100644 --- a/src/apps/profiles/src/member-profile/education-and-certifications/ModifyEducationModal/ModifyEducationModal.tsx +++ b/src/apps/profiles/src/member-profile/education-and-certifications/ModifyEducationModal/ModifyEducationModal.tsx @@ -77,6 +77,7 @@ const ModifyEducationModal: FC = (props: ModifyEducat traitId: UserTraitIds.education, traits: { data: memberEducation || [], + traitId: UserTraitIds.education, }, }, props.education) .then(() => { @@ -90,20 +91,9 @@ const ModifyEducationModal: FC = (props: ModifyEducat } function handleFormValueChange(key: string, event: React.ChangeEvent): void { - let value: string | boolean | Date | undefined - - switch (key) { - case 'endDate': - value = new Date(event.target.value) - break - default: - value = event.target.value - break - } - setFormValues({ ...formValues, - [key]: value, + [key]: event.target.value, }) } @@ -118,25 +108,24 @@ const ModifyEducationModal: FC = (props: ModifyEducat function handleFormAction(): void { setFormErrors({}) - if (!trim(formValues.schoolCollegeName as string)) { + if (!trim(formValues.collegeName as string)) { setFormErrors({ - schoolCollegeName: 'School is required', + collegeName: 'School is required', }) return } - if (!trim(formValues.major as string)) { + if (!trim(formValues.degree as string)) { setFormErrors({ - major: 'Degree is required', + degree: 'Degree is required', }) return } const updatedEducation: UserTrait = { - graduated: formValues.graduated, - major: formValues.major, - schoolCollegeName: formValues.schoolCollegeName, - timePeriodTo: formValues.endDate ? (formValues.endDate as Date).toISOString() : undefined, + collegeName: formValues.collegeName, + degree: formValues.degree, + endYear: formValues.endYear, } if (editedItemIndex !== undefined && memberEducation) { @@ -160,10 +149,9 @@ const ModifyEducationModal: FC = (props: ModifyEducat setEditedItemIndex(indx) setFormValues({ - endDate: education.timePeriodTo ? new Date(education.timePeriodTo) : undefined, - graduated: education.graduated, - major: education.major, - schoolCollegeName: education.schoolCollegeName, + collegeName: education.collegeName, + degree: education.degree, + endYear: education.endYear, }) } @@ -226,7 +214,7 @@ const ModifyEducationModal: FC = (props: ModifyEducat memberEducation?.map((education: UserTrait, indx: number) => (
@@ -257,24 +245,24 @@ const ModifyEducationModal: FC = (props: ModifyEducat = (props: Modi traitId: UserTraitIds.work, traits: { data: workExpirence || [], + traitId: UserTraitIds.work, }, }, props.workExpirence) .then(() => {