From 78b204a3eedee52c97f2a7ee809d770177b52bd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Andr=C3=A9?=
 <Sebastien.ANDRE@external.loccitane.com>
Date: Wed, 13 Nov 2019 14:18:17 +0100
Subject: [PATCH] =?UTF-8?q?Ajout=20des=20infos=20dans=20les=20listes=20d?=
 =?UTF-8?q?=C3=A9roulantes=20du=20formulaire=20d'ajout?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/app/new-jump/new-jump.component.html  | 23 ++++-------
 .../src/app/new-jump/new-jump.component.ts    | 41 +++++++++++++++++++
 2 files changed, 50 insertions(+), 14 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 386e8fa..7019045 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
@@ -2,25 +2,27 @@
   <mat-form-field>
     <mat-label>Choose the jump type</mat-label>
     <mat-select [(ngModel)]="selectedJumpType" name="selectedJumpType">
-      <mat-option value="1">Option 1</mat-option>
-      <mat-option value="2" disabled>Option 2 (disabled)</mat-option>
-      <mat-option value="3">Option 3</mat-option>
+      <mat-option *ngFor="let jumpType of listOfJumpType" [value]="jumpType.id">
+        {{jumpType.name}}
+      </mat-option>
     </mat-select>
   </mat-form-field>
 
   <mat-form-field>
     <mat-label>Choose the aircraft</mat-label>
     <mat-select [(ngModel)]="selectedAircraft" name="selectedAircraft">
-      <mat-option value="4">Option 1</mat-option>
-      <mat-option value="5">Option 2</mat-option>
+      <mat-option *ngFor="let aircraft of listOfAircraft" [value]="aircraft.id">
+        {{aircraft.name}}
+      </mat-option>
     </mat-select>
   </mat-form-field>
 
   <mat-form-field>
     <mat-label>Choose the DZ</mat-label>
     <mat-select [(ngModel)]="selectedDz" name="selectedDz">
-      <mat-option value="6">Option 1</mat-option>
-      <mat-option value="7">Option 2</mat-option>
+      <mat-option *ngFor="let dropZone of listOfDropZone" [value]="dropZone.id">
+        {{dropZone.name}}
+      </mat-option>
     </mat-select>
   </mat-form-field>
 
@@ -34,12 +36,6 @@
 
   <mat-checkbox [(ngModel)]="withCutaway" name="withCutaway">With a cutaway ?</mat-checkbox>
 
-  <!-- <mat-form-field>
-    <input matInput [matDatepicker]="beginDateDp" [(ngModel)]="beginDate2" name="beginDate2" disabled>
-    <mat-datepicker-toggle matSuffix [for]="beginDateDp"></mat-datepicker-toggle>
-    <mat-datepicker #beginDateDp disabled="false"></mat-datepicker>
-  </mat-form-field> -->
-
   <mat-form-field>
     <input matInput [matDatepicker]="beginDateDp" [(ngModel)]="beginDate" name="beginDate" disabled>
     <mat-datepicker-toggle matSuffix [for]="beginDateDp"></mat-datepicker-toggle>
@@ -67,7 +63,6 @@
     </button>
   </mat-form-field>
 
-
   <mat-form-field>
     <input matInput placeholder="Count of jumps" [(ngModel)]="countOfJumps" name="countOfJumps">
     <button mat-button *ngIf="countOfJumps" matSuffix mat-icon-button aria-label="Clear" (click)="countOfJumps=''">
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 19ed0f4..a9a1494 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
@@ -2,6 +2,9 @@ import { Component, OnInit } from '@angular/core';
 import { ServiceComm } from '../../services/serviceComm';
 import { ServiceApiGet } from '../../services/serviceApiGet';
 import { ServiceApiPost } from '../../services/serviceApiPost';
+import { JumpTypeResp } from '../../models/jumpType';
+import { AircraftResp } from '../../models/aircraft';
+import { DropZoneResp } from '../../models/dropzone';
 
 
 @Component({
@@ -20,6 +23,9 @@ export class NewJumpComponent implements OnInit {
   selectedAircraft: number;
   selectedJumpType: number;
   withCutaway: boolean;
+  listOfJumpType: Array<JumpTypeResp>;
+  listOfAircraft: Array<AircraftResp>;
+  listOfDropZone: Array<DropZoneResp>;
 
   constructor(private serviceComm: ServiceComm,
     private serviceApiGet: ServiceApiGet,
@@ -30,11 +36,18 @@ export class NewJumpComponent implements OnInit {
     this.serviceComm.updatedComponentTitle('Add a new jump');
 
     this.beginDate = new Date();
+
+    const t = this.beginDate.getTime();
     this.endDate = new Date();
+    this.endDate.setTime(t - (1000 * 60 * 60 * 24));
 
     this.defaultExitAltitude = 4000;
     this.defaultDeployAltitude = 1000;
     this.countOfJumps = 0;
+
+    this.getListOfJumpTypes();
+    this.getListOfAircrafts();
+    this.getListOfDropZones();
   }
 
   onFormSubmit() {
@@ -51,4 +64,32 @@ export class NewJumpComponent implements OnInit {
       this.countOfJumps
     );
   }
+
+  private getListOfJumpTypes() {
+    this.serviceApiGet.getListOfJumpTypes()
+      .subscribe(data => {
+        this.listOfJumpType = data;
+      });
+  }
+
+  private getListOfAircrafts() {
+    this.serviceApiGet.getListOfAircrafts()
+      .subscribe(data => {
+        this.listOfAircraft = data;
+      });
+  }
+
+  private getListOfDropZones() {
+    this.serviceApiGet.getListOfDropZones()
+      .subscribe(data => {
+        this.listOfDropZone = data;
+      });
+  }
+
+  // private getListOfGears() {
+  //   this.serviceApiGet.getListOfGears()
+  //     .subscribe(data => {
+  //       this.listOfGear = data;
+  //     });
+  // }
 }