From 221d2907a963642c0d2c85ed33d875fbf67e62e8 Mon Sep 17 00:00:00 2001
From: Ratnadeep Rajendra Kharade <92khra1mst@hft-stuttgart.de>
Date: Sun, 8 Dec 2019 19:37:41 +0100
Subject: [PATCH] displayed loading page on hire bike page for api call
---
src/app/hirebike/hirebike.page.ts | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/app/hirebike/hirebike.page.ts b/src/app/hirebike/hirebike.page.ts
index 219a0b4..789c3ee 100644
--- a/src/app/hirebike/hirebike.page.ts
+++ b/src/app/hirebike/hirebike.page.ts
@@ -160,6 +160,7 @@ export class HirebikePage implements OnInit {
}
getReservedBike() {
+ this.loadingService.showLoader();
this.storage.get('token').then((token) => {
const headers = new HttpHeaders().set("Authorization", "Bearer " + token);
//call reserved bike api
@@ -181,24 +182,34 @@ export class HirebikePage implements OnInit {
//pass reserved bike subject here map
this.gotReservedBikeSubject.next(resp.data);
- }, (reservedBikeError) => console.log(reservedBikeError));
+ this.loadingService.hideLoader();
+ }, (reservedBikeError) => {
+ console.log(reservedBikeError);
+ this.loadingService.hideLoader();
+ });
}
- }, (bikeDetailsError) => console.log(bikeDetailsError));
+ }, (bikeDetailsError) => {
+ console.log(bikeDetailsError);
+ this.loadingService.hideLoader();
+ });
});
}
startTrip1() {
+ this.loadingService.showLoader();
this.storage.get('token').then((token) => {
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.get(url, { headers });
bikeApi.subscribe((resp) => {
console.log('my data: ', resp);
+ this.loadingService.hideLoader();
this.toastService.showToast("Trip Started");
this.isBikeHired = true;
}, (error) => {
- console.log(error)
- this.toastService.showToast("This is ongoing Trip")
+ console.log(error);
+ this.loadingService.hideLoader();
+ this.toastService.showToast("This is ongoing Trip");
});
});
@@ -210,15 +221,18 @@ export class HirebikePage implements OnInit {
}
CancelTrip() {
+ this.loadingService.showLoader();
this.storage.get('token').then((token) => {
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 });
bikeApi.subscribe((resp) => {
console.log('my data: ', resp);
+ this.loadingService.hideLoader();
this.toastService.showToast("Trip Ended!");
}, (error) => {
- console.log(error)
+ console.log(error);
+ this.loadingService.hideLoader();
this.toastService.showToast("No Ongong Trip to End")
});
});
--
GitLab