Commit 6db8aa5c authored by Gauri Amol Pande's avatar Gauri Amol Pande
Browse files

Merge branch '64-close-button-on-home-page-to-redirect-to-bike-list' into 'master'

Resolve "Close button on home page to redirect to bike list"

Closes #64

See merge request 92khra1mst/hft_awado_app!53
parents 2d954e1b b0a6e3ff
...@@ -66,16 +66,22 @@ ...@@ -66,16 +66,22 @@
</div> </div>
</div> </div>
<div class="bike-details-container" *ngIf="isDetailsVisible"> <div class="bike-details-container" *ngIf="isDetailsVisible">
<ion-icon class="close-circle-cancel" name="close-circle" (click)="navigatetoBikeList()"></ion-icon>
<div class="inner"> <div class="inner">
<div class="button-container"> <div class="button-container">
<ion-grid> <ion-grid>
<ion-row> <ion-row>
<ion-col> <ion-col>
Bike Name Bike Name
</ion-col> </ion-col>
<ion-col> <ion-col>
{{selectedBike.name}} {{selectedBike.name}}
</ion-col> </ion-col>
</ion-row> </ion-row>
<ion-row> <ion-row>
<ion-col> <ion-col>
......
...@@ -160,4 +160,7 @@ ion-footer{ ...@@ -160,4 +160,7 @@ ion-footer{
.button-container{ .button-container{
clear: both; clear: both;
}
.close-circle-cancel{
margin-left: 93%;
} }
\ No newline at end of file
...@@ -51,6 +51,7 @@ export class HomePage implements OnInit, OnDestroy { ...@@ -51,6 +51,7 @@ export class HomePage implements OnInit, OnDestroy {
} }
ngOnInit() { ngOnInit() {
} }
ngAfterViewInit() { ngAfterViewInit() {
...@@ -225,6 +226,10 @@ export class HomePage implements OnInit, OnDestroy { ...@@ -225,6 +226,10 @@ export class HomePage implements OnInit, OnDestroy {
this.locationsGroup.addObjects([marker]); this.locationsGroup.addObjects([marker]);
} }
navigatetoBikeList() {
this.isDetailsVisible = false;
this.ionViewWillEnter();
}
enable3DMaps() { enable3DMaps() {
this.map.setBaseLayer(this.defaultLayers.vector.normal.map); this.map.setBaseLayer(this.defaultLayers.vector.normal.map);
......
...@@ -5,6 +5,7 @@ import { Injectable } from '@angular/core'; ...@@ -5,6 +5,7 @@ import { Injectable } from '@angular/core';
}) })
export class FeedbackService { export class FeedbackService {
feedbackBikeDetails = {name : "",bikeid:""} feedbackBikeDetails = {name : "",bikeid:""}
constructor() { } constructor() { }
public getBikeid(){ public getBikeid(){
return this.feedbackBikeDetails.bikeid return this.feedbackBikeDetails.bikeid
......
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