From 70fde1ce9fd7e4ff0fa035c1d7e0a04c3bbcd357 Mon Sep 17 00:00:00 2001 From: Clement FERRERE Date: Tue, 28 Jun 2022 09:34:16 +0200 Subject: [PATCH] =?UTF-8?q?gestion=20des=20retours=20de=20l'api=20via=20le?= =?UTF-8?q?s=20toasts=20partie=202,=20pour=20les=20=C3=A9ditions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agence-edit/agence-edit.component.ts | 12 ++++++++--- src/app/components/agence/agence.component.ts | 12 +++++++---- .../businessunit-edit.component.ts | 12 ++++++++--- .../collaborateur-add.component.ts | 20 +++++++++++++------ .../collaborateur-edit.component.ts | 19 ++++++++++++------ .../periode-essai-edit.component.ts | 20 +++++++++++++++++-- .../periode-essai/periode-essai.component.ts | 12 ++++++++++- 7 files changed, 82 insertions(+), 25 deletions(-) diff --git a/src/app/components/agence/agence-edit/agence-edit.component.ts b/src/app/components/agence/agence-edit/agence-edit.component.ts index bd65bfa..171c00a 100644 --- a/src/app/components/agence/agence-edit/agence-edit.component.ts +++ b/src/app/components/agence/agence-edit/agence-edit.component.ts @@ -65,7 +65,13 @@ export class AgenceEditComponent implements OnInit { this.agence.name = this.registerForm.value.name this.agence.businessUnitId = this.registerForm.value.businessUnitId this.agenceService.updateAgence(this.agence) - .subscribe(()=>this.goBack()); + .subscribe(() => { + this.showSuccess(); + this.goBack(); + }, + () => { + this.showError() + }); } } @@ -77,11 +83,11 @@ export class AgenceEditComponent implements OnInit { } showSuccess() { - this.toastr.success('Création réussie', 'Business Unit'); + this.toastr.success('Modification réussie', 'Business Unit'); } showError() { - this.toastr.error('Création échouée', 'Business Unit'); + this.toastr.error('Modification échouée', 'Business Unit'); } } diff --git a/src/app/components/agence/agence.component.ts b/src/app/components/agence/agence.component.ts index 25c0a4a..fd60c8b 100644 --- a/src/app/components/agence/agence.component.ts +++ b/src/app/components/agence/agence.component.ts @@ -51,8 +51,12 @@ export class AgenceComponent implements OnInit { add(agence: Agence): void { this.agenceService.addAgence(agence) .subscribe(agence => { - this.agences.push(agence); - }); + this.agences.push(agence); + this.showSuccess(); + }, + () => { + this.showError() + }); } onSubmit() { @@ -74,11 +78,11 @@ export class AgenceComponent implements OnInit { } showSuccess() { - this.toastr.success('Création réussie', 'Business Unit'); + this.toastr.success('Création réussie', 'Agence'); } showError() { - this.toastr.error('Création échouée', 'Business Unit'); + this.toastr.error('Création échouée', 'Agence'); } } diff --git a/src/app/components/businessunit/businessunit-edit/businessunit-edit.component.ts b/src/app/components/businessunit/businessunit-edit/businessunit-edit.component.ts index c5596b2..cd64075 100644 --- a/src/app/components/businessunit/businessunit-edit/businessunit-edit.component.ts +++ b/src/app/components/businessunit/businessunit-edit/businessunit-edit.component.ts @@ -49,7 +49,13 @@ export class BusinessunitEditComponent implements OnInit { if (this.businessunit) { this.businessunitService.updateBusinessunit(this.bu, this.id) - .subscribe(() => this.goBack()); + .subscribe(() => { + this.showSuccess(); + this.goBack(); + }, + () => { + this.showError() + }); } } @@ -65,11 +71,11 @@ export class BusinessunitEditComponent implements OnInit { } showSuccess() { - this.toastr.success('Création réussie', 'Business Unit'); + this.toastr.success('Modification réussie', 'Business Unit'); } showError() { - this.toastr.error('Création échouée', 'Business Unit'); + this.toastr.error('Modification échouée', 'Business Unit'); } } diff --git a/src/app/components/collaborateur/collaborateur-add/collaborateur-add.component.ts b/src/app/components/collaborateur/collaborateur-add/collaborateur-add.component.ts index 2de5731..0693d7b 100644 --- a/src/app/components/collaborateur/collaborateur-add/collaborateur-add.component.ts +++ b/src/app/components/collaborateur/collaborateur-add/collaborateur-add.component.ts @@ -76,13 +76,13 @@ export class CollaborateurAddComponent implements OnInit { } this.collaborateur = this.registerForm.value if (this.collaborateur) { - this.collaborateurService.addCollaborateur(this.collaborateur).subscribe({ - next: () => { + this.collaborateurService.addCollaborateur(this.collaborateur).subscribe(collaborateur => { + this.collaborateurs.push(collaborateur); + this.showSuccess(); }, - error: () => { - this.errorValue = 1; - } - }) + () => { + this.showError() + }) } } @@ -104,4 +104,12 @@ export class CollaborateurAddComponent implements OnInit { this.collaborateur.birthDate = new Date($event.target.value); } + showSuccess() { + this.toastr.success('Création réussie', 'Collaborateur'); + } + + showError() { + this.toastr.error('Création échouée', 'Collaborateur'); + } + } diff --git a/src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.ts b/src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.ts index c31a813..2fd5e74 100644 --- a/src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.ts +++ b/src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.ts @@ -114,14 +114,13 @@ export class CollaborateurEditComponent implements OnInit { this.collaborateur.status = this.registerForm.value.status if (this.collaborateur) { - this.collaborateurService.updateCollaborateur(this.collaborateur).subscribe({ - next: () => { + this.collaborateurService.updateCollaborateur(this.collaborateur).subscribe(() => { + this.showSuccess(); this.goBack(); }, - error: () => { - this.errorValue = 1; - } - }) + () => { + this.showError() + }) } } @@ -141,4 +140,12 @@ export class CollaborateurEditComponent implements OnInit { onBirthDateChange($event: any):void { this.collaborateur.birthDate = new Date($event.target.value); } + + showSuccess() { + this.toastr.success('Modification réussie', 'Collaborateur'); + } + + showError() { + this.toastr.error('Modification échouée', 'Collaborateur'); + } } diff --git a/src/app/components/periode-essai/periode-essai-edit/periode-essai-edit.component.ts b/src/app/components/periode-essai/periode-essai-edit/periode-essai-edit.component.ts index 39ec86a..13368c8 100644 --- a/src/app/components/periode-essai/periode-essai-edit/periode-essai-edit.component.ts +++ b/src/app/components/periode-essai/periode-essai-edit/periode-essai-edit.component.ts @@ -8,6 +8,7 @@ import {Observable} from "rxjs"; import {ActivatedRoute} from "@angular/router"; import {take, tap} from "rxjs/operators"; import {Location} from "@angular/common"; +import {ToastrService} from "ngx-toastr"; @Component({ selector: 'app-periode-essai-edit', @@ -37,7 +38,8 @@ export class PeriodeEssaiEditComponent implements OnInit { private location: Location, private collaborateurService: CollaborateurService, private periodeEssaiService: PeriodeEssaiService, - private formBuilder: FormBuilder + private formBuilder: FormBuilder, + private toastr: ToastrService ) { this.id = Number(this.route.snapshot.paramMap.get('id')) } @@ -96,7 +98,13 @@ export class PeriodeEssaiEditComponent implements OnInit { if (this.periodeEssai){ this.periodeEssaiService.updatePeriodeEssai(this.periodeEssai) - .subscribe(()=>this.goBack()); + .subscribe(() => { + this.showSuccess(); + this.goBack(); + }, + () => { + this.showError() + }); } } @@ -119,6 +127,14 @@ export class PeriodeEssaiEditComponent implements OnInit { this.periodeEssai.realEndingDate = new Date($event.target.value); } + showSuccess() { + this.toastr.success('Modification réussie', 'Période d\'essai'); + } + + showError() { + this.toastr.error('Modification échouée', 'Collaborateur'); + } + } diff --git a/src/app/components/periode-essai/periode-essai.component.ts b/src/app/components/periode-essai/periode-essai.component.ts index 7a84d53..07449f5 100644 --- a/src/app/components/periode-essai/periode-essai.component.ts +++ b/src/app/components/periode-essai/periode-essai.component.ts @@ -5,6 +5,7 @@ import {PeriodeEssai} from "../../interfaces/periode-essai"; import {Collaborateur} from "../../interfaces/collaborateur"; import {CollaborateurService} from "../../services/collaborateur.service"; import {PeriodeEssaiService} from "../../services/periode-essai.service"; +import {ToastrService} from "ngx-toastr"; @Component({ selector: 'app-periode-essai', @@ -30,7 +31,8 @@ export class PeriodeEssaiComponent implements OnInit { private http : HttpClient, private collaborateurService: CollaborateurService, private periodeEssaiService: PeriodeEssaiService, - private formBuilder: FormBuilder + private formBuilder: FormBuilder, + private toastr: ToastrService ) { } ngOnInit(): void { @@ -104,4 +106,12 @@ export class PeriodeEssaiComponent implements OnInit { this.periodeEssaiService.getPeriodeEssais() .subscribe(periodeEssais => this.periodeEssais = periodeEssais); } + + showSuccess() { + this.toastr.success('Création réussie', 'Collaborateur'); + } + + showError() { + this.toastr.error('Création échouée', 'Collaborateur'); + } }