diff --git a/core/src/database/query/application.rs b/core/src/database/query/application.rs index 1f5334e..dde822f 100644 --- a/core/src/database/query/application.rs +++ b/core/src/database/query/application.rs @@ -12,6 +12,7 @@ pub struct ApplicationCandidateJoin { pub surname: Option, pub email: Option, pub telephone: Option, + pub field_of_study: Option, } use crate::{Query}; diff --git a/core/src/models/application.rs b/core/src/models/application.rs index aac9c2f..6cbb328 100644 --- a/core/src/models/application.rs +++ b/core/src/models/application.rs @@ -14,6 +14,7 @@ pub struct ApplicationResponse { pub surname: String, pub email: String, pub telephone: String, + pub field_of_study: Option, } impl ApplicationResponse { @@ -25,7 +26,6 @@ impl ApplicationResponse { let surname = EncryptedString::decrypt_option(&EncryptedString::try_from(&c.surname).ok(), private_key).await?; let email = EncryptedString::decrypt_option(&EncryptedString::try_from(&c.email).ok(), private_key).await?; let telephone = EncryptedString::decrypt_option(&EncryptedString::try_from(&c.telephone).ok(), private_key).await?; - Ok( Self { application_id: c.application_id, @@ -34,6 +34,7 @@ impl ApplicationResponse { email: email.unwrap_or_default(), telephone: telephone.unwrap_or_default(), candidate_id: c.candidate_id, + field_of_study: c.field_of_study, } ) } diff --git a/frontend/src/lib/@api/candidate.ts b/frontend/src/lib/@api/candidate.ts index 2b6f986..6ef2929 100644 --- a/frontend/src/lib/@api/candidate.ts +++ b/frontend/src/lib/@api/candidate.ts @@ -1,5 +1,10 @@ import axios, { type AxiosProgressEvent } from 'axios'; -import type { BaseCandidate, CandidateData, CandidateLogin, CreateCandidate } from '$lib/stores/candidate'; +import type { + BaseCandidate, + CandidateData, + CandidateLogin, + CreateCandidate +} from '$lib/stores/candidate'; import type { SubmissionProgress } from '$lib/stores/portfolio'; import { API_URL, errorHandler, type Fetch } from '.'; import DOMPurify from 'isomorphic-dompurify'; diff --git a/frontend/src/lib/components/admin/list/CandidateDetails.svelte b/frontend/src/lib/components/admin/list/CandidateDetails.svelte index e634f27..f837b52 100644 --- a/frontend/src/lib/components/admin/list/CandidateDetails.svelte +++ b/frontend/src/lib/components/admin/list/CandidateDetails.svelte @@ -62,10 +62,6 @@ E-mail {candidate.email} - - Obor - {candidate.study} - Rodné číslo {candidate.personalIdNumber} diff --git a/frontend/src/lib/components/admin/table/Table.svelte b/frontend/src/lib/components/admin/table/Table.svelte index f4d65ca..bdb4106 100644 --- a/frontend/src/lib/components/admin/table/Table.svelte +++ b/frontend/src/lib/components/admin/table/Table.svelte @@ -36,7 +36,7 @@ {candidate.surname} - {candidate.study} + {candidate.fieldOfStudy} diff --git a/frontend/src/lib/components/checkbox/AccountLinkCheckBox.svelte b/frontend/src/lib/components/checkbox/AccountLinkCheckBox.svelte index 6a96917..1276f57 100644 --- a/frontend/src/lib/components/checkbox/AccountLinkCheckBox.svelte +++ b/frontend/src/lib/components/checkbox/AccountLinkCheckBox.svelte @@ -1,9 +1,8 @@ - @@ -41,9 +39,9 @@