diff --git a/Front/skydivelogs-app/src/app/default/default.component.css b/Front/skydivelogs-app/src/app/default/default.component.css index 33a5371..43332bf 100644 --- a/Front/skydivelogs-app/src/app/default/default.component.css +++ b/Front/skydivelogs-app/src/app/default/default.component.css @@ -5,3 +5,7 @@ flex-direction: column; align-items: initial; } + +p { + margin: 0; +} diff --git a/Front/skydivelogs-app/src/app/default/default.component.html b/Front/skydivelogs-app/src/app/default/default.component.html index 11c39da..82e1225 100644 --- a/Front/skydivelogs-app/src/app/default/default.component.html +++ b/Front/skydivelogs-app/src/app/default/default.component.html @@ -1,12 +1,17 @@
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 a829dbb..fd58fe7 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 @@ -99,18 +99,17 @@ export class NewJumpComponent implements OnInit { this.deployAltitude, this.countOfJumps, this.comments, - this.isSpecial === undefined ? false : this.isSpecial); + this.isSpecial === undefined ? false : this.isSpecial) + .subscribe(() => { + this.comments = undefined; + this.withCutaway = false; + this.isSpecial = false; - setTimeout(() => { - this.comments = undefined; - this.withCutaway = false; - this.isSpecial = false; - - if (this.resetForm === true) { - this.initForm(); - } - this.pendingAddRequest = false; - }, 1000); + if (this.resetForm === true) { + this.initForm(); + } + this.pendingAddRequest = false; + }); } public isValidatedForm(): boolean { @@ -169,7 +168,8 @@ export class NewJumpComponent implements OnInit { private initForm() { this.endDate = new Date(); - this.beginDate = this.dateService.AddDays(new Date(), -1); + this.endDate.setHours(0, 0, 0, 0); + this.beginDate = this.dateService.AddDays(this.endDate, -1); this.exitAltitude = 4000; this.deployAltitude = 1000; diff --git a/Front/skydivelogs-app/src/services/date.service.ts b/Front/skydivelogs-app/src/services/date.service.ts index 0a1dc43..99ec6bb 100644 --- a/Front/skydivelogs-app/src/services/date.service.ts +++ b/Front/skydivelogs-app/src/services/date.service.ts @@ -11,10 +11,11 @@ export class DateService { public AddDays(currentDate: Date, nbDays: number): Date { const totalMilliSeconds = nbDays * this.milliSeconInDay; const currentTime = currentDate.getTime(); + const tmpDate = new Date(currentDate.getTime()); - currentDate.setTime(currentTime + totalMilliSeconds); + tmpDate.setTime(currentTime + totalMilliSeconds); - return currentDate; + return tmpDate; } public DiffBetweenDates(beginDate: Date, endDate: Date): number { diff --git a/Front/skydivelogs-app/src/services/jump.service.ts b/Front/skydivelogs-app/src/services/jump.service.ts index d37ef6b..f05ccf8 100644 --- a/Front/skydivelogs-app/src/services/jump.service.ts +++ b/Front/skydivelogs-app/src/services/jump.service.ts @@ -1,7 +1,7 @@ import { Injectable } from "@angular/core"; import { HttpClient } from "@angular/common/http"; import { DatePipe } from '@angular/common'; -import { Observable } from "rxjs"; +import { forkJoin, Observable, of } from "rxjs"; import { map } from "rxjs/operators"; import { JumpResp, JumpReq, Jump } from "../models/jump"; @@ -19,6 +19,8 @@ import { GearService } from "./gear.service"; @Injectable() export class JumpService extends BaseService { + private callsToAdd : Array