From c748db4ae50e44f2cde4103c0ad210db48a089da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Andr=C3=A9?= <sebastien.andre@arolla.fr>
Date: Sun, 24 Nov 2019 18:56:58 +0100
Subject: [PATCH] Ajout d'un check de validation sur le formulaire d'ajout de
 sauts

---
 .../src/app/new-jump/new-jump.component.html  | 19 ++++++------
 .../src/app/new-jump/new-jump.component.ts    | 29 ++++++++++++-------
 2 files changed, 28 insertions(+), 20 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 aad4f8e..0de5444 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
@@ -50,27 +50,28 @@
   </mat-form-field>
 
   <mat-form-field>
-    <input matInput placeholder="Exit altitude" [(ngModel)]="defaultExitAltitude" name="defaultExitAltitude">
-    <button mat-button *ngIf="defaultExitAltitude" matSuffix mat-icon-button aria-label="Clear"
-      (click)="defaultExitAltitude=''">
+    <input matInput placeholder="Exit altitude" [(ngModel)]="exitAltitude" name="exitAltitude" type="number">
+    <button mat-button *ngIf="exitAltitude" matSuffix mat-icon-button aria-label="Clear"
+      (click)="exitAltitude=undefined">
       <mat-icon>close</mat-icon>
     </button>
   </mat-form-field>
   <mat-form-field>
-    <input matInput placeholder="Deploy altitude" [(ngModel)]="defaultDeployAltitude" name="defaultDeployAltitude">
-    <button mat-button *ngIf="defaultDeployAltitude" matSuffix mat-icon-button aria-label="Clear"
-      (click)="defaultDeployAltitude=''">
+    <input matInput placeholder="Deploy altitude" [(ngModel)]="deployAltitude" name="deployAltitude" type="number">
+    <button mat-button *ngIf="deployAltitude" matSuffix mat-icon-button aria-label="Clear"
+      (click)="deployAltitude=undefined">
       <mat-icon>close</mat-icon>
     </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=''">
+    <input matInput placeholder="Count of jumps" [(ngModel)]="countOfJumps" name="countOfJumps" type="number">
+    <button mat-button *ngIf="countOfJumps" matSuffix mat-icon-button aria-label="Clear"
+      (click)="countOfJumps=undefined">
       <mat-icon>close</mat-icon>
     </button>
   </mat-form-field>
 
   <br />
-  <button class="btn btn-primary" *ngIf="isValidatedForm">Submit</button>
+  <button class="btn btn-primary" *ngIf="isValidatedForm()">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 642c3fe..32c69b2 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
@@ -7,6 +7,7 @@ import { AircraftResp } from "../../models/aircraft";
 import { DropZoneResp } from "../../models/dropzone";
 import { DateService } from "../../services/date.service";
 import { GearResp } from "../../models/gear";
+import { isNumber } from "util";
 
 @Component({
   selector: "app-new-jump",
@@ -16,8 +17,8 @@ import { GearResp } from "../../models/gear";
 export class NewJumpComponent implements OnInit {
   beginDate: Date;
   endDate: Date;
-  defaultExitAltitude: number;
-  defaultDeployAltitude: number;
+  exitAltitude: number;
+  deployAltitude: number;
   countOfJumps: number;
   selectedDz: number;
   selectedGear: number;
@@ -43,8 +44,8 @@ export class NewJumpComponent implements OnInit {
 
     this.beginDate = this.dateService.AddDays(new Date(), -1);
 
-    this.defaultExitAltitude = 4000;
-    this.defaultDeployAltitude = 1000;
+    this.exitAltitude = 4000;
+    this.deployAltitude = 1500;
     this.countOfJumps = 1;
 
     this.getListOfJumpTypes();
@@ -59,17 +60,23 @@ export class NewJumpComponent implements OnInit {
       this.withCutaway,
       this.beginDate,
       this.endDate,
-      this.defaultExitAltitude,
-      this.defaultDeployAltitude,
+      this.exitAltitude,
+      this.deployAltitude,
       this.countOfJumps
     );
   }
 
-  public isValidatedForm: boolean =
-    this.selectedDz != undefined &&
-    this.selectedGear != undefined &&
-    this.selectedAircraft != undefined &&
-    this.selectedJumpType != undefined;
+  public isValidatedForm(): boolean {
+    return (
+      this.selectedDz != undefined &&
+      this.selectedGear != undefined &&
+      this.selectedAircraft != undefined &&
+      this.selectedJumpType != undefined &&
+      this.exitAltitude != undefined && isNumber(this.exitAltitude) &&
+      this.deployAltitude != undefined && isNumber(this.deployAltitude) &&
+      this.countOfJumps != undefined && isNumber(this.countOfJumps)
+    );
+  }
 
   private getListOfJumpTypes() {
     this.serviceApiGet.getListOfJumpTypes().subscribe(data => {