From 6e7caaad3673ae9f699c0d1be84049700f7cb4d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Andr=C3=A9?=
 <Sebastien.ANDRE@external.loccitane.com>
Date: Mon, 31 Aug 2020 14:51:25 +0200
Subject: [PATCH] Fix

---
 .../src/app/new-jump/new-jump.component.html  |  2 +-
 .../src/app/new-jump/new-jump.component.ts    | 46 +++++++++----------
 .../src/services/jump.service.ts              | 18 ++++----
 3 files changed, 34 insertions(+), 32 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 a1871da..9352e3f 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,5 +1,5 @@
 <div class="content">
-  <form class="formNewJumps" (ngSubmit)="onFormSubmit()" *ngIf="allDatasLoaded() else loading">
+  <form class="formNewJumps" (ngSubmit)="onFormSubmit()" *ngIf="notLoadingToDisplay() else loading">
     <mat-form-field>
       <mat-label>Choose the jump type</mat-label>
       <input type="text" matInput [matAutocomplete]="autoJumpType" [(ngModel)]="selectedJumpType"
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 e969d41..cfe876a 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
@@ -1,21 +1,21 @@
-import { Component, OnInit } from "@angular/core";
-import { JumpTypeResp } from "../../models/jumpType";
-import { AircraftResp } from "../../models/aircraft";
-import { DropZoneResp } from "../../models/dropzone";
-import { DateService } from "../../services/date.service";
-import { GearResp } from "../../models/gear";
-import { ServiceComm } from "../../services/service-comm.service";
-import { DropzoneService } from "../../services/dropzone.service";
-import { AircraftService } from "../../services/aircraft.service";
-import { JumpService } from "../../services/jump.service";
-import { JumpTypeService } from "../../services/jump-type.service";
-import { GearService } from "../../services/gear.service";
-import { isNumber } from "util";
+import { Component, OnInit } from '@angular/core';
+import { JumpTypeResp } from '../../models/jumpType';
+import { AircraftResp } from '../../models/aircraft';
+import { DropZoneResp } from '../../models/dropzone';
+import { DateService } from '../../services/date.service';
+import { GearResp } from '../../models/gear';
+import { ServiceComm } from '../../services/service-comm.service';
+import { DropzoneService } from '../../services/dropzone.service';
+import { AircraftService } from '../../services/aircraft.service';
+import { JumpService } from '../../services/jump.service';
+import { JumpTypeService } from '../../services/jump-type.service';
+import { GearService } from '../../services/gear.service';
+import { isNumber } from 'util';
 
 @Component({
-  selector: "app-new-jump",
-  templateUrl: "./new-jump.component.html",
-  styleUrls: ["./new-jump.component.css"],
+  selector: 'app-new-jump',
+  templateUrl: './new-jump.component.html',
+  styleUrls: ['./new-jump.component.css'],
 })
 export class NewJumpComponent implements OnInit {
   beginDate: Date;
@@ -44,10 +44,10 @@ export class NewJumpComponent implements OnInit {
     private serviceDropzone: DropzoneService,
     private serviceGear: GearService,
     private dateService: DateService
-  ) {}
+  ) { }
 
   ngOnInit() {
-    this.serviceComm.UpdatedComponentTitle("Add a new jump");
+    this.serviceComm.UpdatedComponentTitle('Add a new jump');
     this.pendingAddRequest = false;
 
     this.endDate = new Date();
@@ -93,11 +93,11 @@ export class NewJumpComponent implements OnInit {
       this.selectedJumpType !== undefined &&
       this.selectedJumpType.id !== undefined &&
       this.exitAltitude !== undefined &&
-      isNumber(this.exitAltitude) &&
+      typeof this.exitAltitude === 'number' &&
       this.deployAltitude !== undefined &&
-      isNumber(this.deployAltitude) &&
+      typeof this.deployAltitude === 'number' &&
       this.countOfJumps !== undefined &&
-      isNumber(this.countOfJumps)
+      typeof this.countOfJumps === 'number'
     );
   }
 
@@ -169,7 +169,7 @@ export class NewJumpComponent implements OnInit {
     );
   }
 
-  public loadingToDisplay(): boolean {
-    return this.pendingAddRequest || this.countDatasLoaded === 4;
+  public notLoadingToDisplay(): boolean {
+    return !(this.pendingAddRequest || this.countDatasLoaded !== 4);
   }
 }
diff --git a/Front/skydivelogs-app/src/services/jump.service.ts b/Front/skydivelogs-app/src/services/jump.service.ts
index 7de8988..d7fdd33 100644
--- a/Front/skydivelogs-app/src/services/jump.service.ts
+++ b/Front/skydivelogs-app/src/services/jump.service.ts
@@ -1,12 +1,12 @@
-import { Injectable } from "@angular/core";
-import { HttpClient } from "@angular/common/http";
-import { Observable } from "rxjs";
-import { map } from "rxjs/operators";
+import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
 
-import { JumpResp, JumpReq } from "../models/jump";
+import { JumpResp, JumpReq } from '../models/jump';
 
-import { DateService } from "./date.service";
-import { BaseService } from "./base.service";
+import { DateService } from './date.service';
+import { BaseService } from './base.service';
 
 @Injectable()
 export class JumpService extends BaseService {
@@ -94,11 +94,13 @@ export class JumpService extends BaseService {
         exitAltitude: defaultExitAltitude,
         deployAltitude: defaultDeployAltitude,
         gearId: selectedRig,
-        notes: "",
+        notes: '',
         id: 0,
         jumpDate: jumpDate,
       };
 
+      console.log(`${this.apiUrl}/Jump`);
+
       this.http.post(`${this.apiUrl}/Jump`, bodyNewjump, {
         headers: this.headers,
       });