Skip to content
Snippets Groups Projects
Unverified Commit 94ee8bba authored by Arthur Guédon's avatar Arthur Guédon Committed by GitHub
Browse files

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
parent f578fad9
No related branches found
No related tags found
7 merge requests!76Authorize valid profile,!70Test new form,!71Add context sheet for visits, frontend,!69update dev branch,!66Testbranch,!65Merge master into dev,!68Branchetest
......@@ -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>
......
......@@ -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"},
]
......
......@@ -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"
}
......
......@@ -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>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment