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 acb5c68..1800f83 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 @@ -50,6 +50,14 @@ {{element.gear.name}} + + + + delete + + + 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 a83fdba..9b9c1bb 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 @@ -22,7 +22,8 @@ export class ListOfJumpsComponent implements OnInit { 'jumpDate', 'jumpType', 'aircraft', - 'dropZone' + 'dropZone', + 'actions' ]; public dataSourceTable; public resultsLength = 0; @@ -51,11 +52,15 @@ export class ListOfJumpsComponent implements OnInit { openDialog(item: JumpResp) { this.dialog.open(JumpInfosComponent, { - data: item //, - // position: { - // top: '0px', - // left: '0px' - // } + data: item }); } + + delete(item: JumpResp) { + let data : Array = this.dataSourceTable.data; + data = data.filter(d => d.id !== item.id); + this.dataSourceTable.data = data; + + this.serviceApi.DeleteJump(item); + } } 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 26f51909..7f90c61 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 @@ -2,6 +2,7 @@
+

Reset form after adding :

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 94f8989..aada49e 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 @@ -17,24 +17,25 @@ import { GearService } from "../../services/gear.service"; styleUrls: ["./new-jump.component.css"] }) export class NewJumpComponent implements OnInit { - beginDate: Date; - endDate: Date; - exitAltitude: number; - deployAltitude: number; - countOfJumps: number; - selectedDz: DropZoneResp; - selectedGear: GearResp; - selectedAircraft: AircraftResp; - selectedJumpType: JumpTypeResp; - withCutaway: boolean; - listOfJumpType: Array; - listOfAircraft: Array; - private listOfDropZone: Array; - listOfFilteredDropZone: Array; - listOfGear: Array; + public beginDate: Date; + public endDate: Date; + public exitAltitude: number; + public deployAltitude: number; + public countOfJumps: number; + public selectedDz: DropZoneResp; + public selectedGear: GearResp; + public selectedAircraft: AircraftResp; + public selectedJumpType: JumpTypeResp; + public withCutaway: boolean; + public listOfJumpType: Array; + public listOfAircraft: Array; + public listOfFilteredDropZone: Array; + public listOfGear: Array; + public comments: string; + public resetForm: boolean; private countDatasLoaded: number; private pendingAddRequest: boolean; - comments: string; + private listOfDropZone: Array; constructor(private serviceComm: ServiceComm, private serviceJump: JumpService, @@ -69,28 +70,28 @@ export class NewJumpComponent implements OnInit { this.comments); setTimeout(() => { - this.initForm(); + if (this.resetForm === true) { + this.initForm(); + } this.pendingAddRequest = false; }, 1000); } public isValidatedForm(): boolean { - return ( - this.selectedDz !== undefined && - this.selectedDz.id !== undefined && - this.selectedGear !== undefined && - this.selectedGear.id !== undefined && - this.selectedAircraft !== undefined && - this.selectedAircraft.id !== undefined && - this.selectedJumpType !== undefined && - this.selectedJumpType.id !== undefined && - this.exitAltitude !== undefined && - typeof this.exitAltitude === "number" && - this.deployAltitude !== undefined && - typeof this.deployAltitude === "number" && - this.countOfJumps !== undefined && - typeof this.countOfJumps === "number" - ); + return (this.selectedDz !== undefined && + this.selectedDz.id !== undefined && + this.selectedGear !== undefined && + this.selectedGear.id !== undefined && + this.selectedAircraft !== undefined && + this.selectedAircraft.id !== undefined && + this.selectedJumpType !== undefined && + this.selectedJumpType.id !== undefined && + this.exitAltitude !== undefined && + typeof this.exitAltitude === "number" && + this.deployAltitude !== undefined && + typeof this.deployAltitude === "number" && + this.countOfJumps !== undefined && + typeof this.countOfJumps === "number"); } private getListOfJumpTypes() { diff --git a/Front/skydivelogs-app/src/services/jump.service.ts b/Front/skydivelogs-app/src/services/jump.service.ts index 415916a..2ec562f 100644 --- a/Front/skydivelogs-app/src/services/jump.service.ts +++ b/Front/skydivelogs-app/src/services/jump.service.ts @@ -74,6 +74,12 @@ export class JumpService extends BaseService { notes); } + public DeleteJump(item: JumpResp) { + this.http.delete(`${this.apiUrl}/Jump/${item.id}`, + { headers: this.headers, }) + .subscribe((data) => console.log(data)); + } + private AddJumps(selectedJumpType: number, selectedAircraft: number, selectedDz: number, @@ -99,11 +105,10 @@ export class JumpService extends BaseService { jumpDate: this.datePipe.transform(jumpDate, "yyyy-MM-dd") }; - this.http - .post(`${this.apiUrl}/Jump`, bodyNewjump, { - headers: this.headers, - }) - .subscribe((data) => console.log(data)); + this.http.post(`${this.apiUrl}/Jump`, + bodyNewjump, + { headers: this.headers, }) + .subscribe((data) => console.log(data)); } } }