Fix des champs non modifies non reconnus pour les collaborateur + clear de code mort

src/app/components/agence/agence-edit/agence-edit.component.ts

@@ -15,11 +15,11 @@ import {take, tap} from "rxjs/operators";
   styleUrls: ['./agence-edit.component.scss']
 })
 export class AgenceEditComponent implements OnInit {
-  agence = {} as Agence;
-  agenceObservable!:Observable<Agence>;
   businessUnits : Businessunit[] = [];
   businessUnit = {} as Businessunit ;
+  agence = {} as Agence;
 
+  agenceObservable!:Observable<Agence>;
   id: number;
 
   registerForm!: FormGroup;

src/app/components/businessunit/businessunit-edit/businessunit-edit.component.ts

@@ -15,10 +15,9 @@ import {take, tap} from "rxjs/operators";
 export class BusinessunitEditComponent implements OnInit {
 
   businessunit! : Observable<Businessunit> ;
-  bu! : Businessunit ;
+  bu = {} as Businessunit ;
   id: number;
 
-
   registerForm!: FormGroup;
   submitted = false;
 
@@ -31,7 +30,7 @@ export class BusinessunitEditComponent implements OnInit {
     this.id = Number(this.route.snapshot.paramMap.get('id'))
   }
 
-  async ngOnInit(): Promise<void> {
+  async ngOnInit() {
     this.registerForm = this.formBuilder.group({
       name: ['', Validators.required]
     });
@@ -39,20 +38,17 @@ export class BusinessunitEditComponent implements OnInit {
     this.bu = await this.businessunit.pipe(take(1)).toPromise()
   }
 
-  async save() {
-    if (this.businessunit) {
-      this.businessunitService.updateBusinessunit(this.bu, this.id)
-        .subscribe(() => this.goBack());
-    }
-  }
-
-  async onSubmit() {
+  onSubmit() {
     this.submitted = true;
     if (this.registerForm.invalid) {
       return;
     }
     this.bu.name = this.registerForm.value.name
-    await this.save()
+
+    if (this.businessunit) {
+      this.businessunitService.updateBusinessunit(this.bu, this.id)
+        .subscribe(() => this.goBack());
+    }
   }
 
   get f() { return this.registerForm.controls; }

src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.html

@@ -5,7 +5,9 @@
 
   <div><label class="form-label">ID : </label>{{collaborateur.id}}</div>
 
-  <form [formGroup]="registerForm" (ngSubmit)="onSubmit()" >
+  <form *ngIf="collaborateurObservable | async;"
+        [formGroup]="registerForm"
+        (ngSubmit)="onSubmit()" >
 
     <div class="row mb-2">
 

src/app/components/collaborateur/collaborateur-edit/collaborateur-edit.component.ts

@@ -6,6 +6,8 @@ import { CollaborateurService} from "../../../services/collaborateur.service";
 import {BusinessunitService} from "../../../services/businessunit.service";
 import {FormBuilder, FormGroup, Validators} from "@angular/forms";
 import {Businessunit} from "../../../interfaces/businessunit";
+import {Observable} from "rxjs";
+import {take, tap} from "rxjs/operators";
 
 @Component({
   selector: 'app-collaborateur-edit',
@@ -13,10 +15,14 @@ import {Businessunit} from "../../../interfaces/businessunit";
   styleUrls: ['./collaborateur-edit.component.scss']
 })
 export class CollaborateurEditComponent implements OnInit {
+
+  collaborateurObservable! : Observable<Collaborateur>;
+  id: number;
+
   collaborateur = {} as Collaborateur;
+  businessUnit = {} as Businessunit ;
   collaborateurs : Collaborateur[] = [];
   businessUnits : Businessunit[] = [];
-  businessUnit = {} as Businessunit ;
 
   rDate : String = "";
   bDate : String = "";
@@ -30,11 +36,12 @@ export class CollaborateurEditComponent implements OnInit {
     private businessunitService: BusinessunitService,
     private location: Location,
     private formBuilder: FormBuilder
-  ) { }
+  ) {
+    this.id = Number(this.route.snapshot.paramMap.get('id'))
+  }
 
-  ngOnInit(): void {
+  async ngOnInit() {
     this.getCollaborateurs()
-    this.getCollaborateur();
     this.getBusinessunits();
     this.registerForm = this.formBuilder.group({
       name: ['', Validators.required],
@@ -51,6 +58,8 @@ export class CollaborateurEditComponent implements OnInit {
       referrerId: ['', Validators.required],
       businessUnitId: ['', Validators.required],
     });
+    this.collaborateurObservable = this.collaborateurService.getCollaborateur(this.id).pipe(tap(collaborateur => this.registerForm.patchValue(collaborateur)))
+    this.collaborateur = await this.collaborateurObservable.pipe(take(1)).toPromise()
     if (this.collaborateur.resignationDate) {
       this.rDate = new Date(this.collaborateur.resignationDate).toISOString().split('T')[0];
     }
@@ -64,12 +73,6 @@ export class CollaborateurEditComponent implements OnInit {
       .subscribe(collaborateurs => this.collaborateurs = collaborateurs);
   }
 
-  getCollaborateur(): void {
-    const id = Number(this.route.snapshot.paramMap.get('id'))
-    this.collaborateurService.getCollaborateur(id)
-      .subscribe(collaborateur => this.collaborateur = collaborateur);
-  }
-
   getBusinessunits():void {
     this.businessunitService.getBusinessunits()
       .subscribe(businessunits => this.businessUnits = businessunits);
@@ -79,13 +82,6 @@ export class CollaborateurEditComponent implements OnInit {
     this.location.back();
   }
 
-  save():void{
-    if (this.collaborateur){
-      this.collaborateurService.updateCollaborateur(this.collaborateur)
-        .subscribe(()=>this.goBack());
-    }
-  }
-
   delete():void {
     if (this.collaborateur){
       this.collaborateurService.deleteCollaborateur(this.collaborateur)
@@ -99,8 +95,25 @@ export class CollaborateurEditComponent implements OnInit {
     if (this.registerForm.invalid) {
       return;
     }
-    this.collaborateur = this.registerForm.value
-    this.save()
+
+    this.collaborateur.name = this.registerForm.value.name
+    this.collaborateur.firstName = this.registerForm.value.firstName
+    this.collaborateur.birthDate = this.registerForm.value.birthDate
+    this.collaborateur.gender = this.registerForm.value.gender
+    this.collaborateur.resignationDate = this.registerForm.value.resignationDate
+    this.collaborateur.businessUnitId = this.registerForm.value.businessUnitId
+    this.collaborateur.referrerId = this.registerForm.value.referrerId
+    this.collaborateur.apsideMail = this.registerForm.value.apsideMail
+    this.collaborateur.personalMail = this.registerForm.value.personalMail
+    this.collaborateur.telephone = this.registerForm.value.telephone
+    this.collaborateur.address = this.registerForm.value.address
+    this.collaborateur.childrenNumber = this.registerForm.value.childrenNumber
+    this.collaborateur.status = this.registerForm.value.status
+
+    if (this.collaborateur){
+      this.collaborateurService.updateCollaborateur(this.collaborateur)
+        .subscribe(()=>this.goBack());
+    }
   }
 
   get f() { return this.registerForm.controls; }

src/app/services/businessunit.service.ts

@@ -29,10 +29,6 @@ export class BusinessunitService {
     return this.http.put<Businessunit>(this.businessunitsUrl + "/" + id, body, this.httpOptions);
   }
 
-  deleteBusinessunit(businessunit: Businessunit) {
-    return this.http.delete(this.businessunitsUrl + "/" + businessunit.id);
-  }
-
   addBusinessunit(businessunit: Businessunit): Observable<Businessunit> {
     let body = JSON.stringify(businessunit);
     return this.http.post<Businessunit>(this.businessunitsUrl, body, this.httpOptions);