dan/Portfolio
1
0
Fork 0
mirror of https://github.com/danbulant/Portfolio synced 2026-07-05 11:00:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: personalId birthdate validation

Browse source
This commit is contained in:
Sebastian Pravda 2023-02-05 15:57:28 +01:00
parent e3b01ab53a
commit 6780762bf7
No known key found for this signature in database
GPG key ID: F3BC84F08EFA3F57
2 changed files with 33 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/lib/utils/personalIdFormat.ts
View file

@ -14,7 +14,7 @@ export const isPersonalIdNumberValid = (personalIdNumber: string): boolean => {
} }
}; };
export const isPersonalIdNumberWithBirthdateValid = ( export const isPersonalIdMatchingBirthdate = (
personalIdNumber: string, personalIdNumber: string,
birthdate: string birthdate: string
): boolean => { ): boolean => {

36
frontend/src/routes/(candidate)/(authenticated)/register/+page.svelte
View file

@ -25,7 +25,7 @@
import PersonalIdConfirmCheckBox from '$lib/components/checkbox/PersonalIdConfirmCheckBox.svelte'; import PersonalIdConfirmCheckBox from '$lib/components/checkbox/PersonalIdConfirmCheckBox.svelte';
import { import {
parseBirthdateSexFromPersonalId, parseBirthdateSexFromPersonalId,
isPersonalIdNumberWithBirthdateValid isPersonalIdMatchingBirthdate
} from '$lib/utils/personalIdFormat'; } from '$lib/utils/personalIdFormat';
import PersonalIdErrorModal from '$lib/components/modal/PersonalIdErrorModal.svelte'; import PersonalIdErrorModal from '$lib/components/modal/PersonalIdErrorModal.svelte';
import LinkErrorModal from '$lib/components/modal/LinkErrorModal.svelte'; import LinkErrorModal from '$lib/components/modal/LinkErrorModal.svelte';
@ -127,7 +127,20 @@
birthdate: yup birthdate: yup
.string() .string()
.required() .required()
.matches(/^([0-3]?[0-9])\.(0?[1-9]|1[0-2])\.[0-9]{4}$/), .matches(/^([0-3]?[0-9])\.(0?[1-9]|1[0-2])\.[0-9]{4}$/)
.test((_val) => {
if ($form.candidate.citizenship !== 'Česká republika') return true;
if (!_val) return false;
if (isPersonalIdMatchingBirthdate(
$form.candidate.personalIdNumber,
_val
)) {
return true;
} else {
pushErrorText("Datum narození a rodné číslo se neshodují.")
return false;
}
}),
birthSurname: yup.string(), birthSurname: yup.string(),
sex: yup.string(), sex: yup.string(),
address: yup.string(), address: yup.string(),
@ -397,7 +410,22 @@
return '+' + telephone.match(/[0-9]{1,3}/g)!.join(' '); return '+' + telephone.match(/[0-9]{1,3}/g)!.join(' ');
}; };
$: if ($form.candidate.citizenship === 'Česká republika') { let lastCitizenshipSelected = $form.candidate.citizenship;
$: if ($form.candidate.citizenship !== lastCitizenshipSelected) {
lastCitizenshipSelected = $form.candidate.citizenship;
$form.candidate.birthdate = '';
$form.candidate.sex = '';
if ($form.candidate.citizenship === 'Česká republika') {
let [birthdate, sex] = parseBirthdateSexFromPersonalId(data.whoami.personalIdNumber);
$form.candidate.birthdate = birthdate;
$form.candidate.sex = sex;
pushSuccessText(
`Datum narození a pohlaví bylo vyplněno automaticky podle Vašeho rodného čísla (${data.whoami.personalIdNumber}).`
);
}
}
/* $: if ($form.candidate.citizenship === 'Česká republika') {
if ($form.candidate.birthdate === '' && $form.candidate.sex === '') { if ($form.candidate.birthdate === '' && $form.candidate.sex === '') {
let [birthdate, sex] = parseBirthdateSexFromPersonalId(data.whoami.personalIdNumber); let [birthdate, sex] = parseBirthdateSexFromPersonalId(data.whoami.personalIdNumber);
$form.candidate.birthdate = birthdate; $form.candidate.birthdate = birthdate;
@ -409,7 +437,7 @@
} else { } else {
$form.candidate.birthdate = ''; $form.candidate.birthdate = '';
$form.candidate.sex = ''; $form.candidate.sex = '';
} } */
if (details !== undefined) { if (details !== undefined) {
details.candidate.birthdate = details.candidate.birthdate.split('-').reverse().join('.'); details.candidate.birthdate = details.candidate.birthdate.split('-').reverse().join('.');