From 94ee8bbad66b75b5b50310f0ff4771c434a3f872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arthur=20Gu=C3=A9don?= <60623551+arthurgdn@users.noreply.github.com> Date: Sun, 29 Nov 2020 00:16:43 +0100 Subject: [PATCH] Personnal data fix (#58) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 --- src/app/members/account/edit-data/edit-data.component.html | 2 ++ src/app/members/account/edit-data/edit-data.component.ts | 5 +++-- src/app/members/account/my-data/my-data.component.ts | 4 ++-- src/app/signup/student-signup/student-signup.component.html | 3 +++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/app/members/account/edit-data/edit-data.component.html b/src/app/members/account/edit-data/edit-data.component.html index faf76ca..819785b 100644 --- a/src/app/members/account/edit-data/edit-data.component.html +++ b/src/app/members/account/edit-data/edit-data.component.html @@ -76,6 +76,7 @@ <mat-option value="seconde">Seconde</mat-option> <mat-option value="premiere" >Première</mat-option> <mat-option value="terminale">Terminale</mat-option> + <mat-option value="classe passerelle">Classe Passerelle</mat-option> </mat-select> </mat-form-field> @@ -84,6 +85,7 @@ <mat-select formControlName="classType" required> <mat-option value="General">General</mat-option> <mat-option value="Technologique">Technologique</mat-option> + <mat-option value="Professionnelle">Professionnelle</mat-option> </mat-select> </mat-form-field> 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 01714e3..34a1fb6 100644 --- a/src/app/members/account/edit-data/edit-data.component.ts +++ b/src/app/members/account/edit-data/edit-data.component.ts @@ -24,8 +24,10 @@ export class EditDataComponent implements OnInit { public possibleParentsStatus = [ {id:"Mariés",name:"Mariés"}, {id:"Divorcés",name:"Divorcés"}, + {id:"Pacsés",name:"Pacsés"}, {id:"En concubinage",name:"En concubinage"}, - {id:"Famille Monoparentale",name:"Famille monoparentale"} + {id:"Famille Monoparentale",name:"Famille monoparentale"}, + {id:"Autre",name:"Autre"} ] public possibleParentsActivities = [ @@ -60,7 +62,6 @@ export class EditDataComponent implements OnInit { {id:"echelon4",name:"Oui, échelon 4"}, {id:"echelon5",name:"Oui, échelon 5"}, {id:"echelon6",name:"Oui, échelon 6"}, - {id:"echelon7",name:"Oui, échelon 7"}, {id:"no",name:"Non"}, ] diff --git a/src/app/members/account/my-data/my-data.component.ts b/src/app/members/account/my-data/my-data.component.ts index 5a7c5e3..08b27e4 100644 --- a/src/app/members/account/my-data/my-data.component.ts +++ b/src/app/members/account/my-data/my-data.component.ts @@ -20,7 +20,8 @@ export class MyDataComponent implements OnInit { "troisieme": "Troisième", "seconde":"Seconde", "premiere":"Première", - "terminale":"Terminale" + "terminale":"Terminale", + "classe passerelle":"Classe Passerelle" } @@ -42,7 +43,6 @@ export class MyDataComponent implements OnInit { "echelon4": "Oui, échelon 4", "echelon5": "Oui, échelon 5", "echelon6": "Oui, échelon 6", - "echelon7": "Oui, échelon 7", "no" : "Non" } diff --git a/src/app/signup/student-signup/student-signup.component.html b/src/app/signup/student-signup/student-signup.component.html index 23e73c8..bd096f8 100644 --- a/src/app/signup/student-signup/student-signup.component.html +++ b/src/app/signup/student-signup/student-signup.component.html @@ -33,7 +33,10 @@ </mat-hint> </mat-form-field> +<<<<<<< HEAD +======= +>>>>>>> donnees_personnelles <p> Il ne te reste plus qu'à choisir un mot de passe. :-) </p> -- GitLab