From 049fb882209f9e6f13450feed63d709758fb6397 Mon Sep 17 00:00:00 2001 From: Sebastian Pravda Date: Thu, 2 Feb 2023 19:45:28 +0100 Subject: [PATCH 1/3] feat: personalIdError Modal with tech support contact --- .../modal/PersonalIdErrorModal.svelte | 43 +++++++++++++++++++ .../(authenticated)/register/+page.svelte | 23 +++++++--- 2 files changed, 61 insertions(+), 5 deletions(-) create mode 100644 frontend/src/lib/components/modal/PersonalIdErrorModal.svelte diff --git a/frontend/src/lib/components/modal/PersonalIdErrorModal.svelte b/frontend/src/lib/components/modal/PersonalIdErrorModal.svelte new file mode 100644 index 0000000..f1a991e --- /dev/null +++ b/frontend/src/lib/components/modal/PersonalIdErrorModal.svelte @@ -0,0 +1,43 @@ + + +{#if isOpened} + + +
+
+

+ Vaše rodné číslo není + '{personalIdNumber}'? +

+

Znamená to, že jsme udělali chybu v přepisu přihlášky. +

+

+ Kontaktujte nás na telefonu +420 123 456 789, +

+

+ nebo nám napište na email na + portfolio@ssps.cz +

+

Omlouváme se za komplikace s přijímacím řízením SSPŠaG

+
+
+ +{/if} + + diff --git a/frontend/src/routes/(candidate)/(authenticated)/register/+page.svelte b/frontend/src/routes/(candidate)/(authenticated)/register/+page.svelte index 2f88152..4f4bcd9 100644 --- a/frontend/src/routes/(candidate)/(authenticated)/register/+page.svelte +++ b/frontend/src/routes/(candidate)/(authenticated)/register/+page.svelte @@ -26,6 +26,7 @@ import SchoolSelect from '$lib/components/select/SchoolSelect/SchoolSelect.svelte'; import PersonalIdConfirmCheckBox from '$lib/components/checkbox/PersonalIdConfirmCheckBox.svelte'; import { isPersonalIdNumberWithBirthdateValid } from '$lib/utils/personalIdFormat'; + import PersonalIdErrorModal from '$lib/components/modal/PersonalIdErrorModal.svelte'; let pageIndex = 0; let pagesFilled = [false, false, false, false, false, false, false, false]; @@ -203,7 +204,11 @@ // TODO: https://github.com/tjinauyeung/svelte-forms-lib/issues/171!! (Zatím tenhle mega typ) $: typedErrors = errors as unknown as Writable; - $: console.log($typedErrors); + let visibleModals = { + personalIdModal: false, + linkErrorModal: false + }; + const onSubmit = async (values: CandidateData) => { if (pageIndex === 3) { if (values.candidate.citizenship === 'Česká republika') { @@ -285,11 +290,13 @@ switch (index) { case 0: if ($typedErrors['personalIdOk'] || $typedErrors['personalIdErr']) { + visibleModals.personalIdModal = true; return true; } break; case 1: if ($typedErrors['linkOk'] || $typedErrors['linkError']) { + visibleModals.linkErrorModal = true; return true; } break; @@ -351,10 +358,10 @@ case 7: // @ts-ignore if ( - $typedErrors['candidate']['firstSchool']['name'] || - $typedErrors['candidate']['firstSchool']['field'] || - $typedErrors['candidate']['secondSchool']['name'] || - $typedErrors['candidate']['secondSchool']['field'] + $typedErrors['candidate']['firstSchool']['name'] || + $typedErrors['candidate']['firstSchool']['field'] || + $typedErrors['candidate']['secondSchool']['name'] || + $typedErrors['candidate']['secondSchool']['field'] ) { return true; } @@ -422,6 +429,12 @@ + {#if visibleModals.personalIdModal} + (visibleModals.personalIdModal = false)} + personalIdNumber={baseCandidateDetails.personalIdNumber} + /> + {/if}
From 747c261db84a197e969d7fd2df3e499ef6d2ca77 Mon Sep 17 00:00:00 2001 From: Sebastian Pravda Date: Thu, 2 Feb 2023 22:49:05 +0100 Subject: [PATCH 2/3] feat: personalIdErrorModal bigger on -
+

Vaše rodné číslo není From 19c193b520865e0789298941abb9bbabb1525b61 Mon Sep 17 00:00:00 2001 From: Sebastian Pravda Date: Thu, 2 Feb 2023 22:49:27 +0100 Subject: [PATCH 3/3] feat: LinkErrorModal --- .../components/modal/LinkErrorModal.svelte | 58 +++++++++++++++++++ .../(authenticated)/register/+page.svelte | 3 + 2 files changed, 61 insertions(+) create mode 100644 frontend/src/lib/components/modal/LinkErrorModal.svelte diff --git a/frontend/src/lib/components/modal/LinkErrorModal.svelte b/frontend/src/lib/components/modal/LinkErrorModal.svelte new file mode 100644 index 0000000..31a463c --- /dev/null +++ b/frontend/src/lib/components/modal/LinkErrorModal.svelte @@ -0,0 +1,58 @@ + + +{#if isOpened} + + +
+
+ {#if applications.length === 1} +

+ Přihláška {applications[0]} není + Vaše? +

+

+ Nebo jste podávali dvě + přihlášky? +

+ {:else} +

+ Přihlášky {applications[0]} a {applications[1]} nejsou + Vaše? +

+

+ Nebo jste podávali jen jednu + přihlášku? +

+ {/if} +

Znamená to, že jsme udělali chybu v přepisu přihlášky. +

+

+ Kontaktujte nás na telefonu +420 123 456 789, +

+

+ nebo nám napište na email na + portfolio@ssps.cz +

+

Omlouváme se za komplikace s přijímacím řízením SSPŠaG

+
+
+ +{/if} + + diff --git a/frontend/src/routes/(candidate)/(authenticated)/register/+page.svelte b/frontend/src/routes/(candidate)/(authenticated)/register/+page.svelte index 4f4bcd9..7e0382d 100644 --- a/frontend/src/routes/(candidate)/(authenticated)/register/+page.svelte +++ b/frontend/src/routes/(candidate)/(authenticated)/register/+page.svelte @@ -27,6 +27,7 @@ import PersonalIdConfirmCheckBox from '$lib/components/checkbox/PersonalIdConfirmCheckBox.svelte'; import { isPersonalIdNumberWithBirthdateValid } from '$lib/utils/personalIdFormat'; import PersonalIdErrorModal from '$lib/components/modal/PersonalIdErrorModal.svelte'; + import LinkErrorModal from '$lib/components/modal/LinkErrorModal.svelte'; let pageIndex = 0; let pagesFilled = [false, false, false, false, false, false, false, false]; @@ -434,6 +435,8 @@ on:close={(_) => (visibleModals.personalIdModal = false)} personalIdNumber={baseCandidateDetails.personalIdNumber} /> + {:else if visibleModals.linkErrorModal} + (visibleModals.linkErrorModal = false)} /> {/if}