diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 7e77b65f50b3a12268708e69f4d0799034cce742..e94be3cbafda9a2979d9c4f208fa8d88212de7a3 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -28,9 +28,13 @@ export class AppComponent { title: 'My Reservation', url: '/myreservation', icon: 'clipboard' + }, { + title: 'My Rides', + url: '/hirebike', + icon: 'clipboard' }, { - title: 'My Rides', + title: 'Ride History', url: '/ridehistory', icon: 'clipboard' }, diff --git a/src/app/ridehistory/ridehistory.page.html b/src/app/ridehistory/ridehistory.page.html index 55213cbaa55c8b1b04ecc75434f202dad6a649f3..14516e312d296107e828dc6dfa3f51672f232d58 100644 --- a/src/app/ridehistory/ridehistory.page.html +++ b/src/app/ridehistory/ridehistory.page.html @@ -10,9 +10,8 @@ </ion-toolbar> </ion-header> <ion-content> - <div class="ride-list-container" *ngIf="isRideActive"> + <div class="ride-list-container" > <div class="ride-container" *ngFor="let ride of rides"> - <div class="inner" (click)="showRideDetails(bike)"> <ion-grid> <ion-row > <ion-col> @@ -67,65 +66,7 @@ </ion-grid> </div> </div> - </div> - <div class="ride-list-container" *ngIf="!isRideActive"> - <div class="ride-container" *ngFor="let ride of rides"> - <div class="inner" (click)="showRideDetails()"> - <ion-grid> - <ion-row > - <ion-col> - Bike ID - - </ion-col> - <ion-col> - {{ride.bikeId}} - </ion-col> - </ion-row> - <ion-row> - <ion-col> - Price - - </ion-col> - <ion-col> - {{ride.price}} - </ion-col> - - </ion-row> - <ion-row> - <ion-col> - Distance - - </ion-col> - <ion-col> - {{ride.distance}} - </ion-col> - - </ion-row> - <ion-row> - <ion-col> - Start-Date - - </ion-col> - <ion-col> - {{ride.startDate}} - </ion-col> - - </ion-row> - <ion-row> - <ion-col> - End-Date - - </ion-col> - <ion-col> - {{ride.endDate}} - </ion-col> - - </ion-row> - </ion-grid> - </div> - </div> -</div> </ion-content> \ No newline at end of file diff --git a/src/app/ridehistory/ridehistory.page.ts b/src/app/ridehistory/ridehistory.page.ts index c9a92d76a5122ce0a5dfd6eb83a7eac03dab829a..869b31d74b1b6c10efa5061c0a25be9ef169db7c 100644 --- a/src/app/ridehistory/ridehistory.page.ts +++ b/src/app/ridehistory/ridehistory.page.ts @@ -47,7 +47,5 @@ export class RidehistoryPage implements OnInit { //alert('Error getting location - ' + JSON.stringify(error)); }); } - showRideDetails() { - //this.router.navigateByUrl('/myreservation'); - } + }