diff --git a/Back/skydiveLogs-api/Data/JumpsDb-log.db b/Back/skydiveLogs-api/Data/JumpsDb-log.db
new file mode 100644
index 0000000..968b986
Binary files /dev/null and b/Back/skydiveLogs-api/Data/JumpsDb-log.db differ
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 @@
{{element.jumpDate | date: 'yyyy-MM-dd'}} |
-
+
Jump Type |
- {{element.jumpTypeId}} |
+ {{element.jumpType.name}} |
-
+
Aircraft |
- {{element.aircraftId}} |
+ {{element.aircraft.name}} |
-
+
Drop Zone |
- {{element.dropZoneId}} |
+ {{element.dropZone.name}} |
+
+
+ Gear |
+ {{element.gear.name}} |
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>;
public displayedColumns: Array = [
- '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;