From 11b090ebe67b504ac805ee65b0a76bb53e7423b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arthur=20Gu=C3=A9don?=
<60623551+arthurgdn@users.noreply.github.com>
Date: Mon, 5 Oct 2020 17:30:52 +0200
Subject: [PATCH] Donnees personnelles (#49)
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 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
---
.../members/account/core/personal-data.service.ts | 14 ++++++++++++--
.../members/account/my-data/my-data.component.ts | 1 +
.../student-signup/student-signup.component.html | 1 +
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/app/members/account/core/personal-data.service.ts b/src/app/members/account/core/personal-data.service.ts
index 46be693..8c928e9 100644
--- a/src/app/members/account/core/personal-data.service.ts
+++ b/src/app/members/account/core/personal-data.service.ts
@@ -31,10 +31,20 @@ export class PersonalDataService extends ApiService {
);
}
retrieve(id: number | string): Observable<PersonalData> {
- let url = this.baseUrl ;
+
+ let url = this.baseUrl;
return this.http.get<PersonalData>(url).pipe(
map(v =>{
- return this.adapter.adapt(v[0])}),
+ console.log('get',v)
+ if(v instanceof Array){
+ if (v.length>1){
+ return this.adapter.adapt(v.find((user)=>user.user_id===id))
+ }
+ return this.adapter.adapt(v[0])
+ }
+
+ }),
+
);
}
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 06aa58f..b19ef19 100644
--- a/src/app/members/account/my-data/my-data.component.ts
+++ b/src/app/members/account/my-data/my-data.component.ts
@@ -34,6 +34,7 @@ export class MyDataComponent implements OnInit {
}
+
public editData = ()=> {
this.router.navigate(['./membres/compte/modifier_donnees'])
diff --git a/src/app/signup/student-signup/student-signup.component.html b/src/app/signup/student-signup/student-signup.component.html
index 64ba46d..23e73c8 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>
--
GitLab