diff --git a/src/app/hirebike/hirebike.page.html b/src/app/hirebike/hirebike.page.html index 2fd2754e089ba669fa808a4fd53f63b2db2c20b3..d5d6e505aae5a84f7be8f97926637de320665108 100644 --- a/src/app/hirebike/hirebike.page.html +++ b/src/app/hirebike/hirebike.page.html @@ -18,7 +18,7 @@ <div #mapElement style="width: 100%; height: 100%" id="mapContainer"></div> </ion-content> <ion-footer> - <div class="bike-details-container"> + <div class="bike-details-container" *ngIf="!isBikeHired"> <div class="inner"> <div class="button-container"> <ion-grid> @@ -39,4 +39,22 @@ </div> </div> </div> + <div class="problem-container" *ngIf="isBikeHired"> + <div class="inner"> + <div class="button-container"> + <ion-grid> + <ion-row> + <ion-col>Any Problems?</ion-col> + + </ion-row> + + <ion-row> + <ion-col> + <ion-button size="medium" expand="block" (click)="CancelTrip()">Cancel Trip</ion-button> + </ion-col> + </ion-row> + </ion-grid> + </div> + </div> + </div> </ion-footer> \ No newline at end of file diff --git a/src/app/hirebike/hirebike.page.ts b/src/app/hirebike/hirebike.page.ts index a9282ced8575c86e0db48547c91c7f434a16f264..90b941320dfa7104028c84408ecb62d9109c3cab 100644 --- a/src/app/hirebike/hirebike.page.ts +++ b/src/app/hirebike/hirebike.page.ts @@ -22,6 +22,7 @@ export class HirebikePage implements OnInit { reservedBike: any = {}; bikeDetails: any = {}; + isBikeHired=false; noReservation = true; @@ -91,20 +92,26 @@ export class HirebikePage implements OnInit { }, (bikeDetailsError) => console.log(bikeDetailsError)); }); } + startTrip(){ - cancelReservation() { this.storage.get('token').then((token) => { - let url = 'http://193.196.52.237:8081/reservation' + '?bikeId=' + this.bikeDetails.id; + let url = 'http://193.196.52.237:8081/rent' + '?bikeId=' + this.bikeDetails.id; const headers = new HttpHeaders().set("Authorization", "Bearer " + token); - let bikeApi = this.httpClient.delete(url, { headers }); + let bikeApi = this.httpClient.get(url, { headers }); bikeApi.subscribe((resp) => { - console.log('Reservation Cancelled: ', resp); - this.toastService.showToast("Bike Reservation successfully cancelled."); - this.router.navigateByUrl('/home'); - }, (error) => console.log(error)); + console.log('my data: ', resp); + this.toastService.showToast("Trip Started"); + this.isBikeHired=true; + }, (error) => { + console.log(error) + this.toastService.showToast("Unable to Hire Bike") + }); }); + } + + loadmap() { var defaultLayers = this.platform.createDefaultLayers(); this.map = new H.Map( @@ -259,8 +266,6 @@ export class HirebikePage implements OnInit { //this.map.setZoom(this.map.getZoom() - 4.3, true); } }; - hireBike() { - this.router.navigateByUrl('/hirebike'); - } + }