Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
hdastageeri
hft_awado_app
Commits
387d3010
Commit
387d3010
authored
5 years ago
by
Ratnadeep Rajendra Kharade
Browse files
Options
Download
Email Patches
Plain Diff
extra wrapper added for route selection.
parent
1270866c
master
42-add-log-in-button-on-registration-page-add-extra-messages-for-email-and-password-validation
42-add-log-in-button-on-registration-page-add-extra-messages-for-email-and-password-validation-2
47-show-alternate-routes-for-bike-to-destination
57-registration-not-working-from-app
58-add-flow-on-navigate-button-to-route-from-user-to-bike
62-change-in-feedback-workflow
63-password-reset-api-integration
64-close-button-on-home-page-to-redirect-to-bike-list
66-highlight-selected-route-from-list-of-different-routes
67-deactivate-user-api-integration
68-display-no-go-areas-on-map
69-add-launcher-icon-for-application-on-android
70-add-validation-for-feedback-should-not-be-empty
71-prediction-ui-implementation-send-location-of-bike-to-backend
72-feedback-toast-message
73-removal-here-maps-api-key
Show-Bike-details-when-bike-icon-is-clicked
1 merge request
!43
Resolve "Show alternate routes for bike to destination"
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/app/hirebike/hirebike.page.html
+27
-12
src/app/hirebike/hirebike.page.html
with
27 additions
and
12 deletions
+27
-12
src/app/hirebike/hirebike.page.html
+
27
-
12
View file @
387d3010
...
...
@@ -26,7 +26,8 @@
</ion-card-content>
</ion-card>
<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-icon
name=
"locate"
></ion-icon>
</ion-fab-button>
...
...
@@ -35,12 +36,11 @@
<ion-footer>
<div
class=
"bike-details-container"
*ngIf=
"isBikeReserved"
>
<div
class=
"inner"
>
<div
class=
"button-container"
>
<div
class=
"button-container"
*ngIf=
"isTripStarted"
>
<ion-grid
*ngIf=
"isBikeHired"
class=
"directions"
>
<
ion-item
class=
"waypoint-wrapper"
>
<
div
class=
"waypoint-wrapper"
>
<span
[innerHTML]=
"wayPointsInfo"
></span>
</
ion-item
>
</
div
>
<ion-list
class=
"my-ion-list"
>
<ion-item
*ngFor=
"let maneuver of maneuverList"
>
<li><span
[className]=
"'arrow '+ maneuver.action"
></span><span
[innerHTML]=
"maneuver.instruction"
></span>
...
...
@@ -62,19 +62,34 @@
</ion-row>
</ion-grid>
<ion-grid>
<ion-row
*ngIf=
"!isBikeHired"
>
<ion-col>
<ion-button
size=
"medium"
expand=
"block"
(click)=
"startTrip()"
>
Start Trip
</ion-button>
</ion-col>
</ion-row>
<ion-row
*ngIf=
"isBikeHired"
>
<ion-row>
<ion-col>
<ion-button
size=
"medium"
expand=
"block"
(click)=
"CancelTrip()"
>
End Trip
</ion-button>
</ion-col>
</ion-row>
</ion-grid>
</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>
</ion-footer>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets