diff --git a/src/app/members/account/account.component.ts b/src/app/members/account/account.component.ts
index 29bb5b9e1ec787eb21dfaee1ac4ad6b3fcf05096..b16b9250c03c4ac5ac5d15fb0026945dc5ca0cd4 100644
--- a/src/app/members/account/account.component.ts
+++ b/src/app/members/account/account.component.ts
@@ -1,6 +1,4 @@
-
import { Component, OnInit,Input } from '@angular/core';
-
import { Router } from '@angular/router';
import { Link } from 'app/shared';
@@ -11,7 +9,6 @@ import { Link } from 'app/shared';
})
export class AccountComponent implements OnInit {
@Input() theme: string;
-
constructor( private router: Router ) { }
navLinks: Link[] = [
diff --git a/src/app/members/account/core/personal-data.service.ts b/src/app/members/account/core/personal-data.service.ts
index 8c928e93e83ebc4d211860958bfb006be0581130..c5bf690deafbd8fca4db32385c14387391b0a667 100644
--- a/src/app/members/account/core/personal-data.service.ts
+++ b/src/app/members/account/core/personal-data.service.ts
@@ -31,11 +31,9 @@ export class PersonalDataService extends ApiService {
);
}
retrieve(id: number | string): Observable<PersonalData> {
-
let url = this.baseUrl;
return this.http.get<PersonalData>(url).pipe(
map(v =>{
- console.log('get',v)
if(v instanceof Array){
if (v.length>1){
return this.adapter.adapt(v.find((user)=>user.user_id===id))
@@ -44,7 +42,6 @@ export class PersonalDataService extends ApiService {
}
}),
-
);
}
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 5d8fd82312691ae9ec025da96e504e3eed821fe7..faf76ca44b3114ffa8696554d857b62676649659 100644
--- a/src/app/members/account/edit-data/edit-data.component.html
+++ b/src/app/members/account/edit-data/edit-data.component.html
@@ -152,6 +152,7 @@
</button>
</div>
<p class="text-center">{{error}}</p>
+ <p class="text-center post-edit-text">{{postEditMessage}}</p>
</form>
</app-form-page>
<messages></messages>
diff --git a/src/app/members/account/edit-data/edit-data.component.scss b/src/app/members/account/edit-data/edit-data.component.scss
index 94479bb41b43b5561a20755df745b9c043b80aab..f99e2b9c3baabbf455adbd54bdc198f78604ff07 100644
--- a/src/app/members/account/edit-data/edit-data.component.scss
+++ b/src/app/members/account/edit-data/edit-data.component.scss
@@ -25,4 +25,8 @@
.checkbox-field {
display: block;
margin: .5em 0;
+ }
+
+ .post-edit-text{
+ color:green;
}
\ No newline at end of file
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 465c5527a971462cfa8cc7870a88a6daa93a0e1f..9bd2489410fc184120f94b0917d3def99865de16 100644
--- a/src/app/members/account/edit-data/edit-data.component.ts
+++ b/src/app/members/account/edit-data/edit-data.component.ts
@@ -20,6 +20,7 @@ export class EditDataComponent implements OnInit {
formGroup : FormGroup;
loading = false;
public error : String = "";
+ public postEditMessage : String = "" ;
public possibleParentsStatus = [
{id:"Mariés",name:"Mariés"},
{id:"Divorcés",name:"Divorcés"},
@@ -118,7 +119,14 @@ export class EditDataComponent implements OnInit {
this.personalDataService.edit(personalData).pipe(
tap(() => this.loading = false),
tap(()=> this.error = ""),
- tap(() => this.router.navigate(['./membres/compte/donnees'])),
+ tap(() => {
+ this.postEditMessage = "Merci d'avoir completé tes données personnelles ! Nous allons t'envoyer un email contenant le lien vers le dossier d'inscription, si tu ne le reçois pas, pense à vérifier tes spams."
+ setTimeout(()=>{
+ this.router.navigate(['./membres/compte/donnees'])
+ this.postEditMessage = ""
+ },7000)
+
+ }),
).subscribe(
() => {},
(error) => {
diff --git a/src/app/members/account/my-data/my-data.component.html b/src/app/members/account/my-data/my-data.component.html
index 85fe1a5e0c6fe43ed36abad11d98d15be21d2981..d17a78139d79381b6ed2138e4ea12dfa2e78e330 100644
--- a/src/app/members/account/my-data/my-data.component.html
+++ b/src/app/members/account/my-data/my-data.component.html
@@ -24,7 +24,6 @@
<p><span class='label'>Nombre de personnes à charge : </span>{{personalData.dependantsNumber}}</p>
<div class="text-center">
<button mat-raised-button color="primary" (click)="editData()" ><mat-icon aria-hidden="false" aria-label="Example home icon">edit</mat-icon>Modifier mes données</button>
-
</div>
</app-form-page>
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 b19ef19cfdd9e4d55c64bcc254ce31270a814451..cf04c137f8fb73ee21894fa5afbf2b03dcaee093 100644
--- a/src/app/members/account/my-data/my-data.component.ts
+++ b/src/app/members/account/my-data/my-data.component.ts
@@ -33,10 +33,9 @@ export class MyDataComponent implements OnInit {
}
-
+
public editData = ()=> {
-
this.router.navigate(['./membres/compte/modifier_donnees'])
}
diff --git a/src/app/members/account/upload/upload.module.ts b/src/app/members/account/upload/upload.module.ts
index 16be158e0002b6a444c2170ab778a7421e34aa4c..51c0b61584ea97c68adb353475715ee04f93c13b 100644
--- a/src/app/members/account/upload/upload.module.ts
+++ b/src/app/members/account/upload/upload.module.ts
@@ -13,7 +13,6 @@ import {
} from '@angular/material'
import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
-
import { UploadService } from './upload.service'
import { HttpClientModule } from '@angular/common/http'
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 d940ef584cbd8fd836d06f5cdc2580375ac9d112..674262d2106745afa80e308992dc2f956b4a1ebd 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
@@ -2,7 +2,7 @@
<h2 id="title">Mon Compte</h2>
<p>
- Retrouve et modifie tes données personnelles que tu as saisies lors de ton inscription.
+ 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/members/student-home/student-home.component.html b/src/app/members/student-home/student-home.component.html
index a2c967ef1430c2de4514eaa4cdeb89b87824d183..f5adf0206aec4fde495d0d9569b8557edfeb2bf7 100644
--- a/src/app/members/student-home/student-home.component.html
+++ b/src/app/members/student-home/student-home.component.html
@@ -2,7 +2,7 @@
Mon espace
</h1>
-<app-two-panes>
+<app-three-panes>
<app-pane id="visits">
<visits-overview class="pane-content"></visits-overview>
</app-pane>
@@ -12,7 +12,11 @@
<app-pane id="account">
<account-overview class="pane-content"></account-overview>
</app-pane>
+<<<<<<< HEAD
</app-two-panes>
+=======
+</app-three-panes>
+>>>>>>> donnees_personnelles
<div class="container">
<h2>
diff --git a/src/app/panes/panes.module.ts b/src/app/panes/panes.module.ts
index 4318091c03ab19c926544f5c7fbdaf9512609b6b..b7b74763fb0c4f10e794858a8546faadb6470170 100644
--- a/src/app/panes/panes.module.ts
+++ b/src/app/panes/panes.module.ts
@@ -1,7 +1,7 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
-import { TwoPanesComponent } from './two-panes/two-panes.component';
+import { ThreePanesComponent } from './three-panes/three-panes.component';
import { PaneComponent } from './pane/pane.component';
@NgModule({
@@ -9,11 +9,11 @@ import { PaneComponent } from './pane/pane.component';
CommonModule
],
declarations: [
- TwoPanesComponent,
+ ThreePanesComponent,
PaneComponent,
],
exports: [
- TwoPanesComponent,
+ ThreePanesComponent,
PaneComponent,
]
})
diff --git a/src/app/panes/two-panes/two-panes.component.html b/src/app/panes/three-panes/three-panes.component.html
similarity index 100%
rename from src/app/panes/two-panes/two-panes.component.html
rename to src/app/panes/three-panes/three-panes.component.html
diff --git a/src/app/panes/two-panes/two-panes.component.scss b/src/app/panes/three-panes/three-panes.component.scss
similarity index 100%
rename from src/app/panes/two-panes/two-panes.component.scss
rename to src/app/panes/three-panes/three-panes.component.scss
diff --git a/src/app/panes/three-panes/three-panes.component.ts b/src/app/panes/three-panes/three-panes.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..4167f7532cfa6f8f02fdbe3f4735d75bf17631ee
--- /dev/null
+++ b/src/app/panes/three-panes/three-panes.component.ts
@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+
+@Component({
+ selector: 'app-three-panes',
+ templateUrl: './three-panes.component.html',
+ styleUrls: ['./three-panes.component.scss']
+})
+export class ThreePanesComponent {}
diff --git a/src/app/panes/two-panes/two-panes.component.ts b/src/app/panes/two-panes/two-panes.component.ts
deleted file mode 100644
index 5887f6d0b0ce78c2e5990183b847c09f7e421db5..0000000000000000000000000000000000000000
--- a/src/app/panes/two-panes/two-panes.component.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
- selector: 'app-two-panes',
- templateUrl: './two-panes.component.html',
- styleUrls: ['./two-panes.component.scss']
-})
-export class TwoPanesComponent {}
diff --git a/src/app/signup/student-signup/student-signup.component.html b/src/app/signup/student-signup/student-signup.component.html
index 23e73c807456173ed609c6f318ae754fa8640140..64ba46da0421255eb37e9b2ad0c7ebb5b2e64d8c 100644
--- a/src/app/signup/student-signup/student-signup.component.html
+++ b/src/app/signup/student-signup/student-signup.component.html
@@ -33,7 +33,6 @@
</mat-hint>
</mat-form-field>
-
<p>
Il ne te reste plus qu'à choisir un mot de passe. :-)
</p>