Skip to content
Snippets Groups Projects
Unverified Commit 2d79e5a2 authored by Secteur Geek's avatar Secteur Geek Committed by GitHub
Browse files

Merge master into dev (#65)


* 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: default avatarAurianeStrasser2 <32937502+AurianeStrasser2@users.noreply.github.com>
Co-authored-by: default avatarchiahetcho <44137047+chiahetcho@users.noreply.github.com>
Co-authored-by: default avatarFlorimond Manca <florimond.manca@gmail.com>
Co-authored-by: default avatarDylan 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: default avatarAurianeStrasser2 <32937502+AurianeStrasser2@users.noreply.github.com>
Co-authored-by: default avatarchiahetcho <44137047+chiahetcho@users.noreply.github.com>
Co-authored-by: default avatarFlorimond Manca <florimond.manca@gmail.com>
Co-authored-by: default avatarDylan 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: default avatarArthur Guédon <60623551+arthurgdn@users.noreply.github.com>
Co-authored-by: default avatarAurianeStrasser2 <32937502+AurianeStrasser2@users.noreply.github.com>
Co-authored-by: default avatarchiahetcho <44137047+chiahetcho@users.noreply.github.com>
Co-authored-by: default avatarFlorimond Manca <florimond.manca@gmail.com>
Co-authored-by: default avatarDylan Sechet <dylan.sechet82@gmail.com>
parent 00570cdc
Branches
No related tags found
No related merge requests found
......@@ -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
},
);
......
......@@ -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
......
......@@ -33,6 +33,7 @@
</mat-hint>
</mat-form-field>
<p>
Il ne te reste plus qu'à choisir un mot de passe. :-)
</p>
......@@ -57,6 +58,7 @@
<app-load-spinner *ngIf="loading" [block]="false"></app-load-spinner>
</button>
</div>
<p class="text-center">{{error}}</p>
<p class="text-center">
......
......@@ -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),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment