From cbd9232269d9a629192b3f42ed562b46f30baeb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yana=C3=ABl=20GRETTE?= <yanael.grette@outlook.com>
Date: Wed, 21 Oct 2020 11:17:23 +0200
Subject: [PATCH] =?UTF-8?q?Correction=20d'un=20bug=20qui=20emp=C3=AAchait?=
 =?UTF-8?q?=20d'afficher=20la=20valeur=20actuelle=20du=20statut,=20de=20l'?=
 =?UTF-8?q?origine,=20du=20type=20et=20du=20mode=20d'une=20formation=20lor?=
 =?UTF-8?q?s=20de=20la=20modification=20de=20cette=20derni=C3=A8re?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../edit-formation/edit-formation.component.html          | 8 ++++----
 .../formations/edit-formation/edit-formation.component.ts | 5 +++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/app/formations/edit-formation/edit-formation.component.html b/src/app/formations/edit-formation/edit-formation.component.html
index 816ea9c..7677898 100644
--- a/src/app/formations/edit-formation/edit-formation.component.html
+++ b/src/app/formations/edit-formation/edit-formation.component.html
@@ -17,7 +17,7 @@
     <!-- Attribut : statut -->
     <mat-form-field class="input2">
       <mat-label>Statut formation</mat-label>
-      <mat-select formControlName="statut">
+      <mat-select formControlName="statut" [compareWith]="compare">
         <mat-option *ngFor="let s of statuts" [value]="s">{{s.libelle}}</mat-option>
       </mat-select>
     </mat-form-field>
@@ -25,7 +25,7 @@
     <!-- Attribut : origine -->
     <mat-form-field class="moveright input2">
       <mat-label>Origine formation</mat-label>
-      <mat-select formControlName="origine">
+      <mat-select formControlName="origine" [compareWith]="compare">
         <mat-option *ngFor="let o of origines" [value]="o">{{o.libelle}}</mat-option>
       </mat-select>
     </mat-form-field>
@@ -72,7 +72,7 @@
     <!-- Attribut : type -->
     <mat-form-field class="input2">
       <mat-label>Type formation</mat-label>
-      <mat-select formControlName="type">
+      <mat-select formControlName="type" [compareWith]="compare">
         <mat-option *ngFor="let t of types" [value]="t">{{t.libelle}}</mat-option>
       </mat-select>
     </mat-form-field>
@@ -80,7 +80,7 @@
     <!-- Attribut : mode -->
     <mat-form-field class="moveright input2">
       <mat-label>Mode formation</mat-label>
-      <mat-select formControlName="mode">
+      <mat-select formControlName="mode" [compareWith]="compare">
         <mat-option *ngFor="let m of modes" [value]="m">{{m.libelle}}</mat-option>
       </mat-select>
     </mat-form-field>
diff --git a/src/app/formations/edit-formation/edit-formation.component.ts b/src/app/formations/edit-formation/edit-formation.component.ts
index 24aa690..2bb3d50 100644
--- a/src/app/formations/edit-formation/edit-formation.component.ts
+++ b/src/app/formations/edit-formation/edit-formation.component.ts
@@ -122,6 +122,7 @@ export class EditFormationComponent implements OnInit {
     * Initialisé les champs du formulation à partir de la formation déjà existante
     */
   initFormation(formation:FormationDTO) {
+    console.log(formation);
     this.formationForm= this.fb.group(
       {
         id: [formation.id],
@@ -141,6 +142,10 @@ export class EditFormationComponent implements OnInit {
     );
   }
 
+  compare(s1:any, s2: any) {
+    console.log("coucou");
+    return s1 && s2 && s1.id == s2.id && s1.libelle == s2.libelle;
+  }
 
   updateFormation() {
     //this.formation = this.formationForm.value;