From 6bc87611e38ebaa77e0e6450c2f05a95a53464ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Andr=C3=A9?= <sebastien.andre@arolla.fr>
Date: Sun, 2 May 2021 12:52:09 +0200
Subject: [PATCH] =?UTF-8?q?Affichage=20de=20la=20voile=20principale=20sur?=
 =?UTF-8?q?=20la=20s=C3=A9lection=20du=20pi=C3=A8ge?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/app/new-jump/new-jump.component.html              | 8 ++++----
 .../src/app/new-jump/new-jump.component.ts                | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Front/skydivelogs-app/src/app/new-jump/new-jump.component.html b/Front/skydivelogs-app/src/app/new-jump/new-jump.component.html
index a9c06ad..0856693 100644
--- a/Front/skydivelogs-app/src/app/new-jump/new-jump.component.html
+++ b/Front/skydivelogs-app/src/app/new-jump/new-jump.component.html
@@ -9,7 +9,7 @@
       <mat-label>Choose the jump type</mat-label>
       <input type="text" matInput [matAutocomplete]="autoJumpType" [(ngModel)]="selectedJumpType"
         name="selectedJumpType">
-      <mat-autocomplete #autoJumpType="matAutocomplete" [displayWith]="displayFn">
+      <mat-autocomplete #autoJumpType="matAutocomplete" [displayWith]="displayNameFn">
         <mat-option *ngFor="let jumpType of listOfJumpType" [value]="jumpType">
           {{jumpType.name}}
         </mat-option>
@@ -24,7 +24,7 @@
       <mat-label>Choose the aircraft</mat-label>
       <input type="text" matInput [matAutocomplete]="autoAircraft" [(ngModel)]="selectedAircraft"
         name="selectedAircraft">
-      <mat-autocomplete #autoAircraft="matAutocomplete" [displayWith]="displayFn">
+      <mat-autocomplete #autoAircraft="matAutocomplete" [displayWith]="displayNameFn">
         <mat-option *ngFor="let aircraft of listOfAircraft" [value]="aircraft">
           {{aircraft.name}}
         </mat-option>
@@ -39,7 +39,7 @@
       <mat-label>Choose the DZ</mat-label>
       <input type="text" matInput [matAutocomplete]="autoDropZone" [(ngModel)]="selectedDz"
         (ngModelChange)="onChangeDz($event)" name="selectedDz">
-      <mat-autocomplete #autoDropZone="matAutocomplete" [displayWith]="displayFn">
+      <mat-autocomplete #autoDropZone="matAutocomplete" [displayWith]="displayNameFn">
         <mat-option *ngFor="let dropZone of listOfFilteredDropZone" [value]="dropZone">
           {{dropZone.name}}
           <mat-icon aria-hidden="false" aria-label="Favorite" *ngIf="dropZone.isFavorite === true" color="primary">
@@ -54,7 +54,7 @@
     <mat-form-field>
       <mat-label>Choose the used gear</mat-label>
       <input type="text" matInput [matAutocomplete]="autoGear" [(ngModel)]="selectedGear" name="selectedGear">
-      <mat-autocomplete #autoGear="matAutocomplete" [displayWith]="displayFn">
+      <mat-autocomplete #autoGear="matAutocomplete" [displayWith]="displayGearFn">
         <mat-option *ngFor="let gear of listOfGear" [value]="gear">
           {{gear.name}} ({{gear.mainCanopy}})
         </mat-option>
diff --git a/Front/skydivelogs-app/src/app/new-jump/new-jump.component.ts b/Front/skydivelogs-app/src/app/new-jump/new-jump.component.ts
index 3e15422..3d57497 100644
--- a/Front/skydivelogs-app/src/app/new-jump/new-jump.component.ts
+++ b/Front/skydivelogs-app/src/app/new-jump/new-jump.component.ts
@@ -181,9 +181,12 @@ export class NewJumpComponent implements OnInit {
     this.isSpecial = false;
   }
 
-  public displayFn(data?: JumpTypeResp): string | undefined {
+  public displayNameFn(data?: any): string | undefined {
     return data ? data.name : undefined;
   }
+  public displayGearFn(data?: GearResp): string | undefined {
+    return data ? `${data.name} (${data.mainCanopy})` : undefined;
+  }
 
   public onChangeDz(event: any) {
     let filterValue: string;