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

Adds message after user changes his personal data (#51)

* 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 message after user modifies personal data
parent 11b090eb
No related branches found
No related tags found
No related merge requests found
Showing
with 32 additions and 25 deletions
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[] = [
......
......@@ -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 {
}
}),
);
}
......
......@@ -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>
......
......@@ -26,3 +26,7 @@
display: block;
margin: .5em 0;
}
.post-edit-text{
color:green;
}
\ No newline at end of file
......@@ -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) => {
......
......@@ -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>
......
......@@ -36,7 +36,6 @@ export class MyDataComponent implements OnInit {
public editData = ()=> {
this.router.navigate(['./membres/compte/modifier_donnees'])
}
......
......@@ -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'
......
......@@ -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
......
......@@ -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>
......
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,
]
})
......
import { Component } from '@angular/core';
@Component({
selector: 'app-three-panes',
templateUrl: './three-panes.component.html',
styleUrls: ['./three-panes.component.scss']
})
export class ThreePanesComponent {}
import { Component } from '@angular/core';
@Component({
selector: 'app-two-panes',
templateUrl: './two-panes.component.html',
styleUrls: ['./two-panes.component.scss']
})
export class TwoPanesComponent {}
......@@ -33,7 +33,6 @@
</mat-hint>
</mat-form-field>
<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