From 659bbed3221105d43c6ebdc62625249ae881cd76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Andr=C3=A9?=
 <Sebastien.ANDRE@external.loccitane.com>
Date: Tue, 29 Oct 2019 14:46:47 +0100
Subject: [PATCH] Avancement sur le formulaire d'ajout de sauts

---
 .../src/app/new-jump/new-jump.component.html  | 44 ++++++++++---------
 .../src/app/new-jump/new-jump.component.ts    | 23 +++++++++-
 .../src/services/serviceComm.ts               |  2 +-
 3 files changed, 45 insertions(+), 24 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 3c3f880..7968890 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
@@ -1,51 +1,51 @@
-<div class="example-container">
+<form class="example-container" (ngSubmit)="onFormSubmit()" [ngModelOptions]="{standalone: true}">
   <mat-form-field>
     <mat-label>Choose the jump type</mat-label>
-    <mat-select>
-      <mat-option value="option1">Option 1</mat-option>
-      <mat-option value="option2" disabled>Option 2 (disabled)</mat-option>
-      <mat-option value="option3">Option 3</mat-option>
+    <mat-select [(value)]="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-select>
   </mat-form-field>
 
   <mat-form-field>
     <mat-label>Choose the aircraft</mat-label>
-    <mat-select>
-      <mat-option value="option1">Option 1</mat-option>
-      <mat-option value="option2">Option 2</mat-option>
+    <mat-select [(value)]="selectedAircraft">
+      <mat-option value="4">Option 1</mat-option>
+      <mat-option value="5">Option 2</mat-option>
     </mat-select>
   </mat-form-field>
 
   <mat-form-field>
     <mat-label>Choose the DZ</mat-label>
-    <mat-select>
-      <mat-option value="option1">Option 1</mat-option>
-      <mat-option value="option2">Option 2</mat-option>
+    <mat-select [(value)]="selectedDz">
+      <mat-option value="6">Option 1</mat-option>
+      <mat-option value="7">Option 2</mat-option>
     </mat-select>
   </mat-form-field>
 
-  <mat-checkbox>With a cutaway ?</mat-checkbox>
+  <mat-checkbox [(checked)]="withCutaway">With a cutaway ?</mat-checkbox>
 
   <mat-form-field>
-    <input matInput [matDatepicker]="beginDate" [value]="date.value" disabled>
-    <mat-datepicker-toggle matSuffix [for]="beginDate"></mat-datepicker-toggle>
-    <mat-datepicker #beginDate disabled="false"></mat-datepicker>
+    <input matInput [matDatepicker]="beginDateDp" [value]="beginDate.value" 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]="endDate" [value]="date.value" disabled>
-    <mat-datepicker-toggle matSuffix [for]="endDate"></mat-datepicker-toggle>
-    <mat-datepicker #endDate disabled="false"></mat-datepicker>
+    <input matInput [matDatepicker]="endDateDp" [value]="endDate.value" disabled>
+    <mat-datepicker-toggle matSuffix [for]="endDateDp"></mat-datepicker-toggle>
+    <mat-datepicker #endDateDp disabled="false"></mat-datepicker>
   </mat-form-field>
 
   <mat-form-field>
-    <input matInput placeholder="Exit altitude" [(ngModel)]="defaultExitAltitude">
+    <input matInput placeholder="Exit altitude" [(value)]="defaultExitAltitude">
     <button mat-button *ngIf="defaultExitAltitude" matSuffix mat-icon-button aria-label="Clear"
       (click)="defaultExitAltitude=''">
       <mat-icon>close</mat-icon>
     </button>
   </mat-form-field>
   <mat-form-field>
-    <input matInput placeholder="Deploy altitude" [(ngModel)]="defaultDeployAltitude">
+    <input matInput placeholder="Deploy altitude" [(value)]="defaultDeployAltitude">
     <button mat-button *ngIf="defaultDeployAltitude" matSuffix mat-icon-button aria-label="Clear"
       (click)="defaultDeployAltitude=''">
       <mat-icon>close</mat-icon>
@@ -60,4 +60,6 @@
     </button>
   </mat-form-field>
 
-</div>
+  <br />
+  <button class="btn btn-primary">Submit</button>
+</form>
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 d49997b..f293171 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
@@ -10,13 +10,20 @@ import { ServiceComm } from '../../services/serviceComm';
   styleUrls: ['./new-jump.component.css']
 })
 export class NewJumpComponent implements OnInit {
-  date: FormControl;
+  beginDate: Date;
+  endDate: Date;
   defaultExitAltitude: number;
   defaultDeployAltitude: number;
   countOfJumps: number;
+  selectedDz: number;
+  selectedAircraft: number;
+  selectedJumpType: number;
+  withCutaway: boolean;
 
   constructor(private serviceComm: ServiceComm) {
-    this.date = new FormControl(new Date());
+    this.beginDate = new Date();
+    this.endDate = new Date();
+
     this.defaultExitAltitude = 4000;
     this.defaultDeployAltitude = 1000;
     this.countOfJumps = 0;
@@ -25,4 +32,16 @@ export class NewJumpComponent implements OnInit {
   ngOnInit() {
     this.serviceComm.updatedComponentTitle('Add a new jump');
   }
+
+  onFormSubmit() {
+    console.log(this.selectedJumpType);
+    console.log(this.selectedAircraft);
+    console.log(this.selectedDz);
+    console.log(this.withCutaway);
+    console.log(this.beginDate);
+    console.log(this.endDate);
+    console.log(this.defaultExitAltitude);
+    console.log(this.defaultDeployAltitude);
+    console.log(this.countOfJumps);
+  }
 }
diff --git a/Front/skydivelogs-app/src/services/serviceComm.ts b/Front/skydivelogs-app/src/services/serviceComm.ts
index b67e754..cd85d21 100644
--- a/Front/skydivelogs-app/src/services/serviceComm.ts
+++ b/Front/skydivelogs-app/src/services/serviceComm.ts
@@ -3,7 +3,7 @@ import { BehaviorSubject } from 'rxjs';
 
 @Injectable()
 export class ServiceComm {
-  private componentTitleSource = new BehaviorSubject<string>("");
+  private componentTitleSource = new BehaviorSubject<string>('');
   componentTitle = this.componentTitleSource.asObservable();
 
   constructor() { }