Commit 2c2bd6fc authored by Ratnadeep Rajendra Kharade's avatar Ratnadeep Rajendra Kharade
Browse files

Merge branch '47-show-alternate-routes-for-bike-to-destination' into 'master'

Resolve "Show alternate routes for bike to destination"

Closes #47

See merge request 92khra1mst/hft_awado_app!43
parents 38b7d90a eaedd7d2
...@@ -26,7 +26,8 @@ ...@@ -26,7 +26,8 @@
</ion-card-content> </ion-card-content>
</ion-card> </ion-card>
<div #mapElement style="width: 100%; height: 100%" id="mapContainer" *ngIf="isBikeReserved"></div> <div #mapElement style="width: 100%; height: 100%" id="mapContainer" *ngIf="isBikeReserved"></div>
<ion-fab *ngIf="isBikeReserved" class="get-position" vertical="bottom" horizontal="end" (click)="getCurrentPosition()" slot="fixed"> <ion-fab *ngIf="isBikeReserved" class="get-position" vertical="bottom" horizontal="end" (click)="getCurrentPosition()"
slot="fixed">
<ion-fab-button> <ion-fab-button>
<ion-icon name="locate"></ion-icon> <ion-icon name="locate"></ion-icon>
</ion-fab-button> </ion-fab-button>
...@@ -35,12 +36,11 @@ ...@@ -35,12 +36,11 @@
<ion-footer> <ion-footer>
<div class="bike-details-container" *ngIf="isBikeReserved"> <div class="bike-details-container" *ngIf="isBikeReserved">
<div class="inner"> <div class="inner">
<div class="button-container"> <div class="button-container" *ngIf="isTripStarted">
<ion-grid *ngIf="isBikeHired" class="directions"> <ion-grid *ngIf="isBikeHired" class="directions">
<ion-item class="waypoint-wrapper"> <div class="waypoint-wrapper">
<span [innerHTML]="wayPointsInfo"></span> <span [innerHTML]="wayPointsInfo"></span>
</ion-item> </div>
<ion-list class="my-ion-list"> <ion-list class="my-ion-list">
<ion-item *ngFor="let maneuver of maneuverList"> <ion-item *ngFor="let maneuver of maneuverList">
<li><span [className]="'arrow '+ maneuver.action"></span><span [innerHTML]="maneuver.instruction"></span> <li><span [className]="'arrow '+ maneuver.action"></span><span [innerHTML]="maneuver.instruction"></span>
...@@ -62,19 +62,34 @@ ...@@ -62,19 +62,34 @@
</ion-row> </ion-row>
</ion-grid> </ion-grid>
<ion-grid> <ion-grid>
<ion-row *ngIf="!isBikeHired"> <ion-row>
<ion-col>
<ion-button size="medium" expand="block" (click)="startTrip()">Start Trip</ion-button>
</ion-col>
</ion-row>
<ion-row *ngIf="isBikeHired">
<ion-col> <ion-col>
<ion-button size="medium" expand="block" (click)="CancelTrip()">End Trip</ion-button> <ion-button size="medium" expand="block" (click)="CancelTrip()">End Trip</ion-button>
</ion-col> </ion-col>
</ion-row> </ion-row>
</ion-grid> </ion-grid>
</div> </div>
<div id="route-selection-container" *ngIf="!isTripStarted">
<div class="route-selection-header" *ngIf="gotRouteOptions">
<div class="waypoint-wrapper">
<div [innerHTML]="wayPointsInfo"></div>
<div> Select Route:</div>
</div>
</div>
<div class="routes-list-wrapper">
<div class="routes-list-inner">
<div class="route-option-wrapper" *ngFor="let route of routeList | keyvalue; let i = index">
<div class="route-option-inner" (click)="selectRoute(route.value.route, i)">
<div class="route-heading">{{getRouteType(route.value.mode)}}:</div>
<div class="route-summary">{{route.value.summary}}</div>
<div class="route-prediction"></div>
</div>
</div>
</div>
</div>
<ion-button *ngIf="!isRouteSelected && !gotRouteOptions" [disabled]="!isDestinationSelected" size="medium" expand="block" (click)="getRouteOptions()">Get Routes</ion-button>
<ion-button *ngIf="isRouteSelected" size="medium" expand="block" (click)="startTrip2()">Start Trip</ion-button>
</div>
</div> </div>
</div> </div>
</ion-footer> </ion-footer>
\ No newline at end of file
...@@ -5,7 +5,28 @@ ...@@ -5,7 +5,28 @@
} }
.waypoint-wrapper{ .waypoint-wrapper{
font-weight: 700; padding: 8px;
font-weight: 500;
border-bottom: 1px solid #ddd;
background-color: #34a080;
text-align: center;
color: #fff;
}
.routes-list-wrapper{
font-size: 14px;
color: #444444;
.route-option-wrapper{
padding: 8px;
border-bottom: 1px solid #ddd;
font-size: 14px;
.route-heading{
font-weight: 500;
margin-bottom: 5px;
}
}
} }
.directions li span.arrow { .directions li span.arrow {
......
This diff is collapsed.
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