From 3d25119757844016001f65eb114bb535051e91e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Andr=C3=A9?= <sebastien.andre@arolla.fr>
Date: Sat, 23 Nov 2019 23:47:57 +0100
Subject: [PATCH] Ajout des noms des dz ... dans la liste des sauts

---
 Back/skydiveLogs-api/Data/JumpsDb-log.db      | Bin 0 -> 65536 bytes
 .../list-of-jumps.component.html              |  16 +++++---
 .../list-of-jumps/list-of-jumps.component.ts  |  35 +++++++++---------
 Front/skydivelogs-app/src/models/jump.ts      |  13 +++++--
 4 files changed, 37 insertions(+), 27 deletions(-)
 create mode 100644 Back/skydiveLogs-api/Data/JumpsDb-log.db

diff --git a/Back/skydiveLogs-api/Data/JumpsDb-log.db b/Back/skydiveLogs-api/Data/JumpsDb-log.db
new file mode 100644
index 0000000000000000000000000000000000000000..968b986d45cf35785bf338d93c808cab7b005fb1
GIT binary patch
literal 65536
zcmeI*&ubGw6u|K}vsv3}jTNjOiVz{al^(naUW%=Pke&p=O9?i`K+}Y{t@aO*LQfw2
zC))p`6vUGkJ$UiprI$MIZL-Ohq@<!?+V6n-V}7hVpYH9=n-oPPI_;F%a3i<EzrtrP
za^j<KS?V@+&c#sY?OLz0p=Ww=J3t_ZiQWLA3se=w-3%X~*bv1O6ZK9ny*9b5$!n9d
zPFCl`*G)kH0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**##~@tj{KY)`ig6~
ziYti*N(<evYZm|a-$EF5!eXh`_9gV1S*x#$MpvWf+l|(X-BwK=XmvSMYdqDL+qDgu
z3RhXXL`(Jd>vnY`>2=jL1--6WyF|<FX6sdRtM94#u35Xxth}!$OPfhO*<P>7$FN{w
zX1UhdZ0=@t-^0+!m-Xb$lkKGXuDUC7eYKg?-pZ7|+j2Fj$;#554_g*2PG_%E(HZJg
z2F&nA?zPXIp+0oP8J2Thdozrl)v9f|A6kvK_ry3<S=--1cr1<m6d^p9f&c;tAb<b@
z2q1s}0tg_000IagfB*srAb<b@2q1s}0tg^5h61tk?yHn6+doa`4`FbP|2xh9w^EW*
zvGoC(INe<$Fzmc=@Nj3Zc|6$}JMzhi2Hnexwz$ADv@KVg1nrRp>4*RV2q1s}0tg_0
z00IagfB*srAb<b@2q1s}0tg_000IagfIu4G&+`B8s))w_qaPsvKOJcl-U9yQ|6lg}
z|8!kP_<P$X2)gsa)!78$)6>pQ5MkC71Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0
z009ILKwz8%VmINt`Tv@2A9a)ZHU4k;|M9O7`k##o;l9*u?3{H#x?w<W=$T&J4iLy;
zs$RD6VnAoA&KD?()8DR0*QY3^*!O6^Ss`AVoIOBmy<uA?tMj(KgpKd}l(pS?UHU*l
z009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1pae@IXUt3a^&aa&{tf;Rb0vT
z_s_!6_jCf9|6lkS!l1Vc8Vj|6Df$28|A(JxxTFYK{(rjSAbj+;34*SExjLI5NMnD?
zg&9*2KmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0-AYy@IA9SzO@&*J~r7DMQN
zHHyQuM#=xz%;`AGwob3oSSrUpfgEPftgi=`BMbat{=cyg&;O6p{QrXPACPW~p#utf
zaC+#~^=&+0@9cHC00jXA5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#~E_X3Z?
zcK(C%|25k`-2**DF*W{g`~Tbfl;pIN{vVn&AgTe-Ve#38gNHkN&ErWMd4YqIwUAg|
zUeu#SSnYpt1XC|yNLK_9KmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R(;n
DOAMFB

literal 0
HcmV?d00001

diff --git a/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.html b/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.html
index e677f11..e6b3af3 100644
--- a/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.html
+++ b/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.html
@@ -9,17 +9,21 @@
     <td mat-cell *matCellDef="let element">{{element.jumpDate | date: 'yyyy-MM-dd'}} </td>
   </ng-container>
 
-  <ng-container matColumnDef="jumpTypeId">
+  <ng-container matColumnDef="jumpType">
     <th mat-header-cell *matHeaderCellDef>Jump Type</th>
-    <td mat-cell *matCellDef="let element">{{element.jumpTypeId}}</td>
+    <td mat-cell *matCellDef="let element">{{element.jumpType.name}}</td>
   </ng-container>
-  <ng-container matColumnDef="aircraftId">
+  <ng-container matColumnDef="aircraft">
     <th mat-header-cell *matHeaderCellDef>Aircraft</th>
-    <td mat-cell *matCellDef="let element">{{element.aircraftId}}</td>
+    <td mat-cell *matCellDef="let element">{{element.aircraft.name}}</td>
   </ng-container>
-  <ng-container matColumnDef="dropZoneId">
+  <ng-container matColumnDef="dropZone">
     <th mat-header-cell *matHeaderCellDef>Drop Zone</th>
-    <td mat-cell *matCellDef="let element">{{element.dropZoneId}}</td>
+    <td mat-cell *matCellDef="let element">{{element.dropZone.name}}</td>
+  </ng-container>
+  <ng-container matColumnDef="gear">
+    <th mat-header-cell *matHeaderCellDef>Gear</th>
+    <td mat-cell *matCellDef="let element">{{element.gear.name}}</td>
   </ng-container>
 
   <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
diff --git a/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.ts b/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.ts
index 9a4f581..17c5e94 100644
--- a/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.ts
+++ b/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.ts
@@ -1,25 +1,26 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
-import { MatPaginator } from '@angular/material/paginator';
-import { MatTableDataSource } from '@angular/material/table';
+import { Component, OnInit, ViewChild } from "@angular/core";
+import { MatPaginator } from "@angular/material/paginator";
+import { MatTableDataSource } from "@angular/material/table";
 
-import { Observable } from 'rxjs';
-import { JumpResp } from '../../models/jump';
-import { ServiceApiGet } from '../../services/service-api-get.service';
-import { ServiceComm } from '../../services/service-comm.service';
+import { Observable } from "rxjs";
+import { JumpResp } from "../../models/jump";
+import { ServiceApiGet } from "../../services/service-api-get.service";
+import { ServiceComm } from "../../services/service-comm.service";
 
 @Component({
-  selector: 'app-list-of-jumps',
-  templateUrl: './list-of-jumps.component.html',
-  styleUrls: ['./list-of-jumps.component.css']
+  selector: "app-list-of-jumps",
+  templateUrl: "./list-of-jumps.component.html",
+  styleUrls: ["./list-of-jumps.component.css"]
 })
 export class ListOfJumpsComponent implements OnInit {
   public listOfJumps: Observable<Array<JumpResp>>;
   public displayedColumns: Array<string> = [
-    'id',
-    'jumpDate',
-    'jumpTypeId',
-    'aircraftId',
-    'dropZoneId'
+    "id",
+    "jumpDate",
+    "jumpType",
+    "aircraft",
+    "dropZone",
+    "gear"
   ];
   public dataSourceTable;
   public resultsLength = 0;
@@ -28,10 +29,10 @@ export class ListOfJumpsComponent implements OnInit {
   constructor(
     private serviceApi: ServiceApiGet,
     private serviceComm: ServiceComm
-  ) { }
+  ) {}
 
   ngOnInit() {
-    this.serviceComm.updatedComponentTitle('List of jumps');
+    this.serviceComm.updatedComponentTitle("List of jumps");
     this.getListOfJumps();
   }
 
diff --git a/Front/skydivelogs-app/src/models/jump.ts b/Front/skydivelogs-app/src/models/jump.ts
index 41d4519..7c23d66 100644
--- a/Front/skydivelogs-app/src/models/jump.ts
+++ b/Front/skydivelogs-app/src/models/jump.ts
@@ -1,3 +1,8 @@
+import { GearResp } from "./gear";
+import { DropZoneResp } from "./dropzone";
+import { AircraftResp } from "./aircraft";
+import { JumpTypeResp } from "./jumpType";
+
 export class JumpReq {
   constructor(data: any) {
     Object.assign(this, data);
@@ -21,10 +26,10 @@ export class JumpResp {
   }
 
   public id: number;
-  public jumpTypeId: number;
-  public aircraftId: number;
-  public dropZoneId: number;
-  public gearId: number;
+  public jumpType: JumpTypeResp;
+  public aircraft: AircraftResp;
+  public dropZone: DropZoneResp;
+  public gear: GearResp;
   public exitAltitude: number;
   public deployAltitude: number;
   public withCutaway: boolean;