From 97e7a979586e5c7266939851b9c0a2f9247c15bf Mon Sep 17 00:00:00 2001
From: Sebastian Pravda
Date: Tue, 17 Jan 2023 17:32:09 +0100
Subject: [PATCH] feat: frontend testLanguage field
---
frontend/src/lib/stores/candidate.ts | 4 ++-
.../[code=application]/+page.server.ts | 3 +-
.../(authenticated)/register/+page.svelte | 32 +++++++++++++------
3 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/frontend/src/lib/stores/candidate.ts b/frontend/src/lib/stores/candidate.ts
index 0deb860..9b94cf8 100644
--- a/frontend/src/lib/stores/candidate.ts
+++ b/frontend/src/lib/stores/candidate.ts
@@ -16,6 +16,7 @@ export interface CandidateData {
schoolName: string;
healthInsurance: string;
grades: Array;
+ testLanguage: string;
};
parents: Array<{
name: string;
@@ -75,7 +76,8 @@ export const candidateData = writable({
personalIdNumber: '',
schoolName: '',
healthInsurance: '',
- grades: []
+ grades: [],
+ testLanguage: ''
},
parents: []
});
diff --git a/frontend/src/routes/(admin)/admin/(authenticated)/candidate/[code=application]/+page.server.ts b/frontend/src/routes/(admin)/admin/(authenticated)/candidate/[code=application]/+page.server.ts
index 0e0a9db..5088c69 100644
--- a/frontend/src/routes/(admin)/admin/(authenticated)/candidate/[code=application]/+page.server.ts
+++ b/frontend/src/routes/(admin)/admin/(authenticated)/candidate/[code=application]/+page.server.ts
@@ -20,7 +20,8 @@ export const load: PageServerLoad = async ({ fetch, params }) => {
personalIdNumber: '',
schoolName: '',
healthInsurance: '',
- grades: []
+ grades: [],
+ testLanguage: ''
},
parents: []
};
diff --git a/frontend/src/routes/(candidate)/(authenticated)/register/+page.svelte b/frontend/src/routes/(candidate)/(authenticated)/register/+page.svelte
index 061e750..f57d9b6 100644
--- a/frontend/src/routes/(candidate)/(authenticated)/register/+page.svelte
+++ b/frontend/src/routes/(candidate)/(authenticated)/register/+page.svelte
@@ -60,7 +60,8 @@
personalIdNumber: '',
schoolName: '',
healthInsurance: '',
- grades: []
+ grades: [],
+ testLanguage: '',
},
parents: [
{
@@ -120,7 +121,8 @@
semester: yup.string().required()
})
.required()
- ).required()
+ ).required(),
+ testLanguage: yup.string().required(),
}),
parents: yup.array().of(
yup.object().shape({
@@ -623,14 +625,24 @@
se hlásíte.
-
-
-
+
+
+
+
+
+
+
+
{#if $form.candidate.citizenship === 'Česká republika' || !$form.candidate.citizenship}