diff --git a/client/dist.zip b/client/dist.zip index 3c991ea850adec2c924d16ba8a5e738844f7b59b..8575e24c493bce40b494d84bc61c2d68bdd3cebb 100644 Binary files a/client/dist.zip and b/client/dist.zip differ diff --git a/client/src/components/forms/AdditionnalInfoForm.tsx b/client/src/components/forms/AdditionnalInfoForm.tsx index fb04a0ab5459823d673db471d3a6ff84c5e3bfbc..85178bc5ddd7a158e2eedecb53b8c113df33f113 100644 --- a/client/src/components/forms/AdditionnalInfoForm.tsx +++ b/client/src/components/forms/AdditionnalInfoForm.tsx @@ -51,14 +51,20 @@ export function AdditionalInfoForm() { ) => { event.preventDefault() const payload: any = info - if (info.study_proof) { - payload.study_proof = await getBase64(info.study_proof) - } - if (info.photo) { - payload.photo = await getBase64(info.photo) - } - if (info.cv) { - payload.cv = await getBase64(info.cv) + console.log(info) + try { + if (info.study_proof) { + payload.study_proof = await getBase64(info.study_proof) + } + if (info.photo) { + payload.photo = await getBase64(info.photo) + } + if (info.cv) { + payload.cv = await getBase64(info.cv) + } + } catch (e) { + setError("Erreur lors de la conversion des fichiers") + return; } const response = await patchParticipantInfo(payload) if (!response) { diff --git a/server/src/model/preview_participant.rs b/server/src/model/preview_participant.rs index 79f7d2770d98ae0bf900a43b2b90d67f43069f80..ed5bbf1ce4010f44a1da5f5f0aa52bc4a3ef5345 100644 --- a/server/src/model/preview_participant.rs +++ b/server/src/model/preview_participant.rs @@ -21,7 +21,7 @@ pub struct ParticipantPreview { impl ParticipantPreview { pub async fn get_participants(db: &PgPool) -> Result<Vec<Self>, sqlx::Error> { sqlx::query_as::<_, Self>( - r#"SELECT id, first_name, last_name, email, role, competition, university, cv IS NOT NULL as contain_cv FROM participants"# + r#"SELECT id, first_name, last_name, email, role, competition, university, (study_proof IS NOT NULL AND LENGTH(study_proof) = 0) AND (photo IS NOT NULL AND LENGTH(photo) = 0) AND (cv IS NOT NULL AND LENGTH(cv) = 0) as contain_cv FROM participants"# ) .fetch_all(db) .await @@ -31,7 +31,7 @@ impl ParticipantPreview { db: &PgPool, university: University, ) -> Result<Vec<Self>, sqlx::Error> { - sqlx::query_as("SELECT id, first_name, last_name, email, role, competition, university, cv IS NOT NULL as contain_cv FROM participants WHERE university = $1 AND (role = 'participant' OR role = 'chef')") + sqlx::query_as("SELECT id, first_name, last_name, email, role, competition, university, (study_proof IS NOT NULL AND LENGTH(study_proof) = 0) AND (photo IS NOT NULL AND LENGTH(photo) = 0) AND (cv IS NOT NULL AND LENGTH(cv) = 0) as contain_cv FROM participants WHERE university = $1 AND (role = 'participant' OR role = 'chef')") .bind(university) .fetch_all(db) .await