diff --git a/Back/skydiveLogs-api/Data/JumpsDb-log.db b/Back/skydiveLogs-api/Data/JumpsDb-log.db deleted file mode 100644 index 968b986..0000000 Binary files a/Back/skydiveLogs-api/Data/JumpsDb-log.db and /dev/null differ diff --git a/Back/skydiveLogs-api/Data/JumpsDb.db b/Back/skydiveLogs-api/Data/JumpsDb.db index 3236cbe..1b224f6 100644 Binary files a/Back/skydiveLogs-api/Data/JumpsDb.db and b/Back/skydiveLogs-api/Data/JumpsDb.db differ diff --git a/Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.html b/Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.html index 36c72dd..0299008 100644 --- a/Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.html +++ b/Front/skydivelogs-app/src/app/list-of-aircrafts/list-of-aircrafts.component.html @@ -1,15 +1,18 @@ - - - - - +
+
ID{{element.id}}
+ + + + - - - - + + + + - - -
ID{{element.id}}Name{{element.name}}Name{{element.name}}
- + + + + + +Waiting... diff --git a/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.html b/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.html index aa40d83..932abbb 100644 --- a/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.html +++ b/Front/skydivelogs-app/src/app/list-of-dzs/list-of-dzs.component.html @@ -1,37 +1,40 @@ - - - - - +
+
ID{{element.id}}
+ + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - -
ID{{element.id}}Name{{element.name}} iciName{{element.name}} iciLatitude{{element.latitude}}Longitude{{element.longitude}}Latitude{{element.latitude}}Longitude{{element.longitude}}AddressE-mail{{element.email}}Type{{element.type}}AddressE-mail{{element.email}}Type{{element.type}}
- + + + + + +Waiting... diff --git a/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.html b/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.html index c25ba42..31aef74 100644 --- a/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.html +++ b/Front/skydivelogs-app/src/app/list-of-gears/list-of-gears.component.html @@ -1,37 +1,40 @@ - - - - - +
+
ID{{element.id}}
+ + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - -
ID{{element.id}}Name{{element.name}} iciName{{element.name}} iciLatitude{{element.latitude}}Longitude{{element.longitude}}Latitude{{element.latitude}}Longitude{{element.longitude}}AddressE-mail{{element.email}}Type{{element.type}}AddressE-mail{{element.email}}Type{{element.type}}
- + + + + + +Waiting... diff --git a/Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.html b/Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.html index 36c72dd..0299008 100644 --- a/Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.html +++ b/Front/skydivelogs-app/src/app/list-of-jump-types/list-of-jump-types.component.html @@ -1,15 +1,18 @@ - - - - - +
+
ID{{element.id}}
+ + + + - - - - + + + + - - -
ID{{element.id}}Name{{element.name}}Name{{element.name}}
- + + + + + +Waiting... 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 e6b3af3..d3e0931 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 @@ -1,32 +1,35 @@ - - - - - +
+
ID{{element.id}}
+ + + + - - - - + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - -
ID{{element.id}}Date{{element.jumpDate | date: 'yyyy-MM-dd'}} Date{{element.jumpDate | date: 'yyyy-MM-dd'}} Jump Type{{element.jumpType.name}}Aircraft{{element.aircraft.name}}Drop Zone{{element.dropZone.name}}Gear{{element.gear.name}}Jump Type{{element.jumpType.name}}Aircraft{{element.aircraft.name}}Drop Zone{{element.dropZone.name}}Gear{{element.gear.name}}
- + + + + + +Waiting... 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 ba55d6f..aad4f8e 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 @@ -72,5 +72,5 @@
- + 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 0eb37a9..642c3fe 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 @@ -65,6 +65,12 @@ export class NewJumpComponent implements OnInit { ); } + public isValidatedForm: boolean = + this.selectedDz != undefined && + this.selectedGear != undefined && + this.selectedAircraft != undefined && + this.selectedJumpType != undefined; + private getListOfJumpTypes() { this.serviceApiGet.getListOfJumpTypes().subscribe(data => { this.listOfJumpType = data;