From 2598c29d259bd9c7498a973f5a27ae46ea32ddab Mon Sep 17 00:00:00 2001 From: Clement FERRERE Date: Mon, 25 Jul 2022 14:18:21 +0200 Subject: [PATCH] fix code mort et optimisation --- .../agence/agence-add/agence-add.component.ts | 28 +++++-------------- .../agence-edit/agence-edit.component.html | 2 +- .../agence-edit/agence-edit.component.ts | 1 - src/app/components/agence/agence.component.ts | 2 -- .../businessunit/businessunit.component.ts | 1 - .../collaborateur-add.component.ts | 9 ------ .../periode-essai-add.component.html | 2 -- 7 files changed, 8 insertions(+), 37 deletions(-) diff --git a/src/app/components/agence/agence-add/agence-add.component.ts b/src/app/components/agence/agence-add/agence-add.component.ts index 26cc129..953a49a 100644 --- a/src/app/components/agence/agence-add/agence-add.component.ts +++ b/src/app/components/agence/agence-add/agence-add.component.ts @@ -14,11 +14,8 @@ import {ToastrService} from "ngx-toastr"; }) export class AgenceAddComponent implements OnInit { - agences: Agence[] = []; agence = {} as Agence; businessUnits: Businessunit[] = []; - businessUnit = {} as Businessunit; - registerForm!: FormGroup; submitted = false; @@ -36,7 +33,6 @@ export class AgenceAddComponent implements OnInit { } ngOnInit(): void { - this.getAgences(); this.getBusinessUnits(); this.registerForm = this.formBuilder.group({ name: ['', Validators.required], @@ -44,27 +40,11 @@ export class AgenceAddComponent implements OnInit { }); } - getAgences(): void { - this.agenceService.getAgences() - .subscribe(agences => this.agences = agences); - } - getBusinessUnits() { this.businessUnitService.getBusinessunits() .subscribe(businessunits => this.businessUnits = businessunits); } - add(agence: Agence): void { - this.agenceService.addAgence(agence) - .subscribe(agence => { - this.agences.push(agence); - this.showSuccess(); - }, - () => { - this.showError() - }); - } - onSubmit() { this.submitted = true; @@ -73,7 +53,13 @@ export class AgenceAddComponent implements OnInit { } this.agence.name = this.registerForm.value.name this.agence.businessUnitId = this.registerForm.value.businessUnitId - this.add(this.agence) + this.agenceService.addAgence(this.agence) + .subscribe(() => { + this.showSuccess(); + }, + () => { + this.showError() + }); } onReset() { diff --git a/src/app/components/agence/agence-edit/agence-edit.component.html b/src/app/components/agence/agence-edit/agence-edit.component.html index 0c83cbb..2c97cf2 100644 --- a/src/app/components/agence/agence-edit/agence-edit.component.html +++ b/src/app/components/agence/agence-edit/agence-edit.component.html @@ -33,7 +33,7 @@
- +
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 c050298..a1f7fa6 100644 --- a/src/app/components/agence/agence-edit/agence-edit.component.ts +++ b/src/app/components/agence/agence-edit/agence-edit.component.ts @@ -17,7 +17,6 @@ import {ToastrService} from "ngx-toastr"; }) export class AgenceEditComponent implements OnInit { businessUnits: Businessunit[] = []; - businessUnit = {} as Businessunit; agence = {} as Agence; agenceObservable!: Observable; diff --git a/src/app/components/agence/agence.component.ts b/src/app/components/agence/agence.component.ts index 2f2fe72..93e2f6e 100644 --- a/src/app/components/agence/agence.component.ts +++ b/src/app/components/agence/agence.component.ts @@ -12,9 +12,7 @@ import {BusinessunitService} from "../../services/businessunit.service"; }) export class AgenceComponent implements OnInit { agences: Agence[] = []; - agence = {} as Agence; businessUnits: Businessunit[] = []; - businessUnit = {} as Businessunit; constructor( diff --git a/src/app/components/businessunit/businessunit.component.ts b/src/app/components/businessunit/businessunit.component.ts index a3f08ad..9486219 100644 --- a/src/app/components/businessunit/businessunit.component.ts +++ b/src/app/components/businessunit/businessunit.component.ts @@ -13,7 +13,6 @@ import {FormGroup} from "@angular/forms"; export class BusinessunitComponent implements OnInit { businessunits: Businessunit[] = []; - businessunit = {} as Businessunit; registerForm!: FormGroup; submitted = false; 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 83ba157..40c618c 100644 --- a/src/app/components/collaborateur/collaborateur-add/collaborateur-add.component.ts +++ b/src/app/components/collaborateur/collaborateur-add/collaborateur-add.component.ts @@ -18,11 +18,8 @@ export class CollaborateurAddComponent implements OnInit { collaborateurs: Collaborateur[] = []; collaborateur = {} as Collaborateur; businessUnits: Businessunit[] = []; - businessUnit = {} as Businessunit; errorValue: number = 0; - rDate: String = ""; - bDate: String = ""; registerForm!: FormGroup; submitted = false; @@ -56,12 +53,6 @@ export class CollaborateurAddComponent implements OnInit { resignationDate: [], businessUnitId: ['', Validators.required], }); - if (this.collaborateur.resignationDate) { - this.rDate = new Date(this.collaborateur.resignationDate).toISOString().split('T')[0]; - } - if (this.collaborateur.birthDate) { - this.bDate = new Date(this.collaborateur.birthDate).toISOString().split('T')[0]; - } } getCollaborateurs(): void { diff --git a/src/app/components/periode-essai/periode-essai-add/periode-essai-add.component.html b/src/app/components/periode-essai/periode-essai-add/periode-essai-add.component.html index 3f91d1f..5bbaaf6 100644 --- a/src/app/components/periode-essai/periode-essai-add/periode-essai-add.component.html +++ b/src/app/components/periode-essai/periode-essai-add/periode-essai-add.component.html @@ -7,8 +7,6 @@