From 2d79e5a2aa18a911fd57f198ade40e2b4233e485 Mon Sep 17 00:00:00 2001
From: Secteur Geek <oser.geek@gmail.com>
Date: Sat, 16 Jan 2021 19:05:43 +0100
Subject: [PATCH] Merge master into dev (#65)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Fix Oser to OSER (#55)
* adds support for personnal data
* modifie le form pour inclure la nationalité
* supprime le gg form
* supprime le champ section et ajoute la liste des etablissements
* adapts for user
* adds validation and connects to students api for personnal data
* adds classType field and rgpd info
* corrects scholarships
* removes signup file tab
* minor presentation changes
* deletes random console.log
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* filters if the whole list is sent back
* adds message after personnal data modifications
* fix Oser to OSER
* Validated signup file display (#57)
* Modify inscription page (#32)
* modify the order of blocks
* Update dependencies and TravisCI build (#33)
* Update dependencies via a clean npm install
* Use Node.js 10 in Travis CI
* Specify node==10.x for Heroku
* adds support for personnal data
* modifie le form pour inclure la nationalité
* supprime le gg form
* supprime le champ section et ajoute la liste des etablissements
* adapts for user
* adds validation and connects to students api for personnal data
* adds classType field and rgpd info
* corrects scholarships
* removes signup file tab
* minor presentation changes
* deletes random console.log
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* filters if the whole list is sent back
* adds message after personnal data modifications
* adds untested frontend support for showing validated status of signup file
* adds phone number validation for personnal data
* checks for year field in registration to display correct status
Co-authored-by: AurianeStrasser2 <32937502+AurianeStrasser2@users.noreply.github.com>
Co-authored-by: chiahetcho <44137047+chiahetcho@users.noreply.github.com>
Co-authored-by: Florimond Manca <florimond.manca@gmail.com>
Co-authored-by: Dylan Sechet <dylan.sechet82@gmail.com>
* Personnal data fix (#58)
* adds support for personnal data
* modifie le form pour inclure la nationalité
* supprime le gg form
* supprime le champ section et ajoute la liste des etablissements
* adapts for user
* adds validation and connects to students api for personnal data
* adds classType field and rgpd info
* corrects scholarships
* removes signup file tab
* minor presentation changes
* deletes random console.log
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* filters if the whole list is sent back
* adds message after personnal data modifications
* adds some options and fixes wrong scholarship in the personnal data form
* adds info on phone number format (#61)
* Modify inscription page (#32)
* modify the order of blocks
* Update dependencies and TravisCI build (#33)
* Update dependencies via a clean npm install
* Use Node.js 10 in Travis CI
* Specify node==10.x for Heroku
* adds support for personnal data
* modifie le form pour inclure la nationalité
* supprime le gg form
* supprime le champ section et ajoute la liste des etablissements
* adapts for user
* adds validation and connects to students api for personnal data
* adds classType field and rgpd info
* corrects scholarships
* removes signup file tab
* minor presentation changes
* deletes random console.log
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* filters if the whole list is sent back
* adds message after personnal data modifications
* Validated signup file display (#54)
* adds support for personnal data
* modifie le form pour inclure la nationalité
* supprime le gg form
* supprime le champ section et ajoute la liste des etablissements
* adapts for user
* adds validation and connects to students api for personnal data
* adds classType field and rgpd info
* corrects scholarships
* removes signup file tab
* minor presentation changes
* deletes random console.log
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* filters if the whole list is sent back
* adds message after personnal data modifications
* adds untested frontend support for showing validated status of signup file
* adds phone number validation for personnal data
* checks for year field in registration to display correct status
* adds some options and fixes wrong scholarship in the personnal data form
* adds info on phone number format
Co-authored-by: AurianeStrasser2 <32937502+AurianeStrasser2@users.noreply.github.com>
Co-authored-by: chiahetcho <44137047+chiahetcho@users.noreply.github.com>
Co-authored-by: Florimond Manca <florimond.manca@gmail.com>
Co-authored-by: Dylan Sechet <dylan.sechet82@gmail.com>
* Update student-signup.component.html (#62)
* Improve error message (#63)
* adds support for personnal data
* modifie le form pour inclure la nationalité
* supprime le gg form
* supprime le champ section et ajoute la liste des etablissements
* adapts for user
* adds validation and connects to students api for personnal data
* adds classType field and rgpd info
* corrects scholarships
* removes signup file tab
* minor presentation changes
* deletes random console.log
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* filters if the whole list is sent back
* adds message after personnal data modifications
* improves phone number validation format
* adds error message when email is already used and redirects after signup (#64)
* adds support for personnal data
* modifie le form pour inclure la nationalité
* supprime le gg form
* supprime le champ section et ajoute la liste des etablissements
* adapts for user
* adds validation and connects to students api for personnal data
* adds classType field and rgpd info
* corrects scholarships
* removes signup file tab
* minor presentation changes
* deletes random console.log
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* changes upload component declarations
* filters if the whole list is sent back
* adds message after personnal data modifications
* improves phone number validation format
* adds message when email already used and redirects after signup
Co-authored-by: Arthur Guédon <60623551+arthurgdn@users.noreply.github.com>
Co-authored-by: AurianeStrasser2 <32937502+AurianeStrasser2@users.noreply.github.com>
Co-authored-by: chiahetcho <44137047+chiahetcho@users.noreply.github.com>
Co-authored-by: Florimond Manca <florimond.manca@gmail.com>
Co-authored-by: Dylan Sechet <dylan.sechet82@gmail.com>
---
.../account/edit-data/edit-data.component.ts | 8 +++++---
.../account-overview.component.html | 3 +++
.../student-signup.component.html | 4 +++-
.../student-signup/student-signup.component.ts | 18 +++++++++++++++++-
4 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/src/app/members/account/edit-data/edit-data.component.ts b/src/app/members/account/edit-data/edit-data.component.ts
index 34a1fb6..1a6260d 100644
--- a/src/app/members/account/edit-data/edit-data.component.ts
+++ b/src/app/members/account/edit-data/edit-data.component.ts
@@ -95,8 +95,10 @@ export class EditDataComponent implements OnInit {
street:this.personalData.street,
zipCode:this.personalData.zipCode,
city:this.personalData.city,
- personalPhone:[this.personalData.personalPhone,Validators.pattern("^([0-9]{2}[. ]?){5}$")],
- parentsPhone:[this.personalData.parentsPhone,Validators.pattern("^([0-9]{2}[. ]?){5}$")],
+ personalPhone:[this.personalData.personalPhone,Validators.pattern("^([0-9]{2}[]?){5}$")],
+ parentsPhone:[this.personalData.parentsPhone,Validators.pattern("^([0-9]{2}[]?){5}$")],
+
+
parentsEmail:[this.personalData.parentsEmail,Validators.email],
school:this.personalData.school,
grade:this.personalData.grade,
@@ -131,7 +133,7 @@ export class EditDataComponent implements OnInit {
).subscribe(
() => {},
(error) => {
- this.error = "Erreur lors de la modification des données"
+ this.error = "Erreur lors de la modification des données, vérifie que tes données rentrées sont sous le bon format"
this.loading = false
},
);
diff --git a/src/app/members/student-home/account-overview/account-overview.component.html b/src/app/members/student-home/account-overview/account-overview.component.html
index 3870316..1619aac 100644
--- a/src/app/members/student-home/account-overview/account-overview.component.html
+++ b/src/app/members/student-home/account-overview/account-overview.component.html
@@ -4,9 +4,12 @@
<p>
+
Remplie ou modifie tes données personnelles qui te serviront pour valider ton inscription à OSER.
+
+
</p>
<a mat-raised-button color="accent" routerLink="compte/donnees">
Voir mon compte
diff --git a/src/app/signup/student-signup/student-signup.component.html b/src/app/signup/student-signup/student-signup.component.html
index 64ba46d..31e460d 100644
--- a/src/app/signup/student-signup/student-signup.component.html
+++ b/src/app/signup/student-signup/student-signup.component.html
@@ -33,6 +33,7 @@
</mat-hint>
</mat-form-field>
+
<p>
Il ne te reste plus qu'à choisir un mot de passe. :-)
</p>
@@ -57,10 +58,11 @@
<app-load-spinner *ngIf="loading" [block]="false"></app-load-spinner>
</button>
</div>
+ <p class="text-center">{{error}}</p>
<p class="text-center">
J'ai déjà un compte ! <a routerLink="/connexion">Me connecter</a>
</p>
</form>
-</app-form-page>
\ No newline at end of file
+</app-form-page>
diff --git a/src/app/signup/student-signup/student-signup.component.ts b/src/app/signup/student-signup/student-signup.component.ts
index a07350b..398a968 100644
--- a/src/app/signup/student-signup/student-signup.component.ts
+++ b/src/app/signup/student-signup/student-signup.component.ts
@@ -18,6 +18,7 @@ export class StudentSignupComponent implements OnInit {
registration: Registration;
personnalData: PersonnalData
formGroup: FormGroup;
+ error: String;
loading = false;
public showPersonnalDataForm = false;
public zipPattern = new RegExp(/^\d{5}(?:\d{2})?$/)
@@ -123,10 +124,25 @@ export class StudentSignupComponent implements OnInit {
'OK',
{ duration: 3000 },
)),
+ tap(()=> this.error = ""),
tap(() => this.loading = false),
+ tap(() => {
+ setTimeout(()=>{
+ this.router.navigate(['./membres'])
+
+ },3000)})
+
).subscribe(
() => {},
- (error) => this.loading = false,
+ (error) => {
+
+
+ this.loading=false
+
+ if(error.error.email){
+ this.error = "Erreur, cet email est déjà utilisé !"
+ }
+ }
);
// this.personnalDataService.create(personnalData).pipe(
// tap(() => this.loading = false),
--
GitLab