Commit 145c011f authored by Priyanka Upadhye's avatar Priyanka Upadhye
Browse files

integrated with hire API

parent 136c3398
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<div #mapElement style="width: 100%; height: 100%" id="mapContainer"></div> <div #mapElement style="width: 100%; height: 100%" id="mapContainer"></div>
</ion-content> </ion-content>
<ion-footer> <ion-footer>
<div class="bike-details-container"> <div class="bike-details-container" *ngIf="!isBikeHired">
<div class="inner"> <div class="inner">
<div class="button-container"> <div class="button-container">
<ion-grid> <ion-grid>
...@@ -39,4 +39,22 @@ ...@@ -39,4 +39,22 @@
</div> </div>
</div> </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> </ion-footer>
\ No newline at end of file
...@@ -22,6 +22,7 @@ export class HirebikePage implements OnInit { ...@@ -22,6 +22,7 @@ export class HirebikePage implements OnInit {
reservedBike: any = {}; reservedBike: any = {};
bikeDetails: any = {}; bikeDetails: any = {};
isBikeHired=false;
noReservation = true; noReservation = true;
...@@ -91,20 +92,26 @@ export class HirebikePage implements OnInit { ...@@ -91,20 +92,26 @@ export class HirebikePage implements OnInit {
}, (bikeDetailsError) => console.log(bikeDetailsError)); }, (bikeDetailsError) => console.log(bikeDetailsError));
}); });
} }
startTrip(){
cancelReservation() {
this.storage.get('token').then((token) => { 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); 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) => { bikeApi.subscribe((resp) => {
console.log('Reservation Cancelled: ', resp); console.log('my data: ', resp);
this.toastService.showToast("Bike Reservation successfully cancelled."); this.toastService.showToast("Trip Started");
this.router.navigateByUrl('/home'); this.isBikeHired=true;
}, (error) => console.log(error)); }, (error) => {
console.log(error)
this.toastService.showToast("Unable to Hire Bike")
});
}); });
} }
loadmap() { loadmap() {
var defaultLayers = this.platform.createDefaultLayers(); var defaultLayers = this.platform.createDefaultLayers();
this.map = new H.Map( this.map = new H.Map(
...@@ -259,8 +266,6 @@ export class HirebikePage implements OnInit { ...@@ -259,8 +266,6 @@ export class HirebikePage implements OnInit {
//this.map.setZoom(this.map.getZoom() - 4.3, true); //this.map.setZoom(this.map.getZoom() - 4.3, true);
} }
}; };
hireBike() {
this.router.navigateByUrl('/hirebike');
}
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment