diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/AuthenticatorService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/AuthenticatorService.java index 9e517b7..8da5536 100644 --- a/backend/src/main/java/ovh/herisson/Clyde/Services/AuthenticatorService.java +++ b/backend/src/main/java/ovh/herisson/Clyde/Services/AuthenticatorService.java @@ -24,7 +24,6 @@ public class AuthenticatorService { return tokenService.getUserFromToken(token); } - public String login(String identifier, String password, Date expirationDate){ User user = userService.getUser(identifier); if (user == null){return null;} diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/Inscription/InscriptionService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/Inscription/InscriptionService.java index aef2beb..d641df9 100644 --- a/backend/src/main/java/ovh/herisson/Clyde/Services/Inscription/InscriptionService.java +++ b/backend/src/main/java/ovh/herisson/Clyde/Services/Inscription/InscriptionService.java @@ -28,6 +28,7 @@ public class InscriptionService { private final MinervalRepository minervalRepository; private final ExternalCurriculumRepository externalCurriculumRepository; private final UserService userService; + public InscriptionService(InscriptionRepository inscriptionRepo, UserRepository userRepo, UserCurriculumRepository userCurriculumRepo, CurriculumRepository curriculumRepo, MinervalRepository minervalRepository, ExternalCurriculumRepository externalCurriculumRepository, UserService userService){ this.inscriptionRepo = inscriptionRepo; this.userRepo = userRepo; diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/ProtectionService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/ProtectionService.java index d08951e..74369b8 100644 --- a/backend/src/main/java/ovh/herisson/Clyde/Services/ProtectionService.java +++ b/backend/src/main/java/ovh/herisson/Clyde/Services/ProtectionService.java @@ -117,6 +117,7 @@ public class ProtectionService { toReturn.put("identityCard", inscriptionRequest.getIdentityCard()); toReturn.put("submissionDate", inscriptionRequest.getSubmissionDate()); toReturn.put("equivalenceState", inscriptionRequest.getEquivalenceState()); + toReturn.put("admissionDocUrl", inscriptionRequest.getAdmissionDocUrl()); return toReturn; } diff --git a/frontend/src/Apps/Inscription/AboutRequest.vue b/frontend/src/Apps/Inscription/AboutRequest.vue index da04a4a..0f27478 100644 --- a/frontend/src/Apps/Inscription/AboutRequest.vue +++ b/frontend/src/Apps/Inscription/AboutRequest.vue @@ -58,17 +58,17 @@ async function refreshCursus(){ {{ i18n("login.guest.country") }} : {{request.country}}
{{i18n("login.guest.birthday")}}
- +{{i18n("login.guest.password")}}
@@ -150,7 +163,7 @@{{i18n("Curriculum").toUpperCase()}}
{{i18n("login.guest.identityCard")}}
- +{{ i18n("login.guest.attestationdisclaimer") }}
Attestation:
- +@@ -320,9 +322,6 @@ input[type=submit],button,select{ } -input[type=file]{ - display:none; -} .browser{ display:inline-block;