From ba7a4fbdfb37c2f4bdf7af9275629d5712f697b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Andr=C3=A9?=
 <sebastien.a-andre@external.total.com>
Date: Tue, 29 Jun 2021 18:10:47 +0200
Subject: [PATCH] Correction sur l'ajout de sauts sur 1 jour.

---
 .../src/app/default/default.component.css     |  4 ++++
 .../src/app/default/default.component.html    |  9 +++++--
 .../src/app/new-jump/new-jump.component.ts    | 24 +++++++++----------
 .../src/services/date.service.ts              |  5 ++--
 .../src/services/jump.service.ts              | 21 +++++++++++-----
 5 files changed, 41 insertions(+), 22 deletions(-)

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 @@
 <div class="content">
   <p>
     <a routerLink="/summary" routerLinkActive="active" skipLocationChange>
-      <img src="../../assets/img/summary.png" alt="Summary of jumps">
+      <mat-icon aria-hidden="false" aria-label="Summary" style="font-size: 256px;">timeline</mat-icon>
     </a>
   </p>
   <p>
     <a routerLink="/newjump" routerLinkActive="active" skipLocationChange>
-      <img src="../../assets/img/addJump_white.png" alt="Add new jumps">
+      <mat-icon aria-hidden="false" aria-label="Add jumps" style="font-size: 256px;">add_circle</mat-icon>
+    </a>
+  </p>
+  <p>
+    <a routerLink="/jumps" routerLinkActive="active" skipLocationChange>
+      <mat-icon aria-hidden="false" aria-label="List of jumps" style="font-size: 256px;">list_alt</mat-icon>
     </a>
   </p>
 </div>
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<Observable<any>>;
+
   constructor(private http: HttpClient, 
               private dateService: DateService,
               private datePipe: DatePipe,
@@ -48,8 +50,9 @@ export class JumpService extends BaseService {
                        defaultDeployAltitude: number,
                        countOfJumps: number,
                        notes: string,
-                       isSpecial: boolean)
+                       isSpecial: boolean): Observable<any[]>
   {
+    this.callsToAdd = new Array<Observable<any>>();
     const diffInDays = this.dateService.DiffBetweenDates(beginDate, endDate) + 1;
     const countOfJumpsPerDay = Math.trunc(countOfJumps / diffInDays);
 
@@ -82,6 +85,8 @@ export class JumpService extends BaseService {
                   restfJumps,
                   notes,
                   isSpecial);
+
+    return forkJoin(this.callsToAdd);
   }
 
   public DeleteJump(item: Jump) {
@@ -134,10 +139,14 @@ export class JumpService extends BaseService {
         isSpecial: isSpecial
       };
 
-      this.http.post(`${this.apiUrl}/Jump`,
-                     bodyNewjump, 
-                     { headers: this.headers, })
-                .subscribe();
+      // let call = this.http.post(`${this.apiUrl}/Jump`,
+      //                             bodyNewjump, 
+      //                             { headers: this.headers });
+      let call = of("2");
+
+      console.warn("Jump : " + i);
+
+      this.callsToAdd.push(call);
     }
   }