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
d4429a26
Commit
d4429a26
authored
5 years ago
by
Priyanka Upadhye
Browse files
Options
Download
Email Patches
Plain Diff
Ent trip API integrated
parent
e758ba22
master
18-design-feedback-page-2
20-ride-history
20-ride-history-2
36-cancel-hired-bike
37-display-username-on-homepage
38-display-calculated-name-of-the-street-on-reservation-and-hire-page
39-validation-on-login-page
40-map-performance-improvement-map-angle-doesn-t-change-when-selected-3d
41-display-live-location-of-user-on-map
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
45-show-stepwise-navigation-instructions-on-my-ride-page
46-show-bicycle-route-between-bike-and-user-s-destination
47-show-alternate-routes-for-bike-to-destination
48-create-a-common-service-for-getting-user-s-current-location-and-live-location
49-show-loading-page
50-add-dependencies-locally-to-improve-app-performance
51-while-navigating-between-pages-map-doesn-t-load-properly
52-page-loader-is-getting-displayed-everywhere
53-scrollining-in-ride-history
53-scrollining-in-ride-history-2
55-change-password
56-create-dummy-page-or-menu-for-hotline-contact
57-registration-not-working-from-app
58-add-flow-on-navigate-button-to-route-from-user-to-bike
60-create-common-theming-styles-and-colors
61-chnage-styles-for-bike-list-and-bug-fixes
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
search_functionality
1 merge request
!20
Resolve "Cancel Hired Bike"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/app/hirebike/hirebike.page.html
+5
-12
src/app/hirebike/hirebike.page.html
src/app/hirebike/hirebike.page.ts
+2
-1
src/app/hirebike/hirebike.page.ts
with
7 additions
and
13 deletions
+7
-13
src/app/hirebike/hirebike.page.html
+
5
-
12
View file @
d4429a26
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
<div
#mapElement
style=
"width: 100%; height: 100%"
id=
"mapContainer"
></div>
<div
#mapElement
style=
"width: 100%; height: 100%"
id=
"mapContainer"
></div>
</ion-content>
</ion-content>
<ion-footer>
<ion-footer>
<div
class=
"bike-details-container"
*ngIf=
"!isBikeHired"
>
<div
class=
"bike-details-container"
>
<div
class=
"inner"
>
<div
class=
"inner"
>
<div
class=
"button-container"
>
<div
class=
"button-container"
>
<ion-grid>
<ion-grid>
...
@@ -33,21 +33,13 @@
...
@@ -33,21 +33,13 @@
<ion-col>
Bike Location
</ion-col>
<ion-col>
Bike Location
</ion-col>
<ion-col>
{{bikeDetails.address}}
</ion-col>
<ion-col>
{{bikeDetails.address}}
</ion-col>
</ion-row>
</ion-row>
<ion-row>
<ion-row
*ngIf=
"!isBikeHired"
>
<ion-col>
<ion-col>
<ion-button
size=
"medium"
expand=
"block"
(click)=
"startTrip()"
>
Start Trip
</ion-button>
<ion-button
size=
"medium"
expand=
"block"
(click)=
"startTrip()"
>
Start Trip
</ion-button>
</ion-col>
</ion-col>
</ion-row>
</ion-row>
</ion-grid>
</div>
<ion-row
*ngIf=
"isBikeHired"
>
</div>
</div>
<div
class=
"problem-container"
*ngIf=
"isBikeHired"
>
<div
class=
"inner"
>
<div
class=
"button-container"
>
<ion-grid>
<ion-row>
<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>
...
@@ -56,4 +48,5 @@
...
@@ -56,4 +48,5 @@
</div>
</div>
</div>
</div>
</div>
</div>
</ion-footer>
</ion-footer>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/app/hirebike/hirebike.page.ts
+
2
-
1
View file @
d4429a26
...
@@ -102,6 +102,7 @@ export class HirebikePage implements OnInit {
...
@@ -102,6 +102,7 @@ export class HirebikePage implements OnInit {
bikeApi
.
subscribe
((
resp
)
=>
{
bikeApi
.
subscribe
((
resp
)
=>
{
console
.
log
(
'
my data:
'
,
resp
);
console
.
log
(
'
my data:
'
,
resp
);
this
.
toastService
.
showToast
(
"
Trip Started
"
);
this
.
toastService
.
showToast
(
"
Trip Started
"
);
this
.
isBikeHired
=
true
;
},
(
error
)
=>
{
},
(
error
)
=>
{
console
.
log
(
error
)
console
.
log
(
error
)
this
.
toastService
.
showToast
(
"
This is ongoing Trip
"
)
this
.
toastService
.
showToast
(
"
This is ongoing Trip
"
)
...
@@ -121,7 +122,7 @@ export class HirebikePage implements OnInit {
...
@@ -121,7 +122,7 @@ export class HirebikePage implements OnInit {
this
.
toastService
.
showToast
(
"
Trip Ended!
"
);
this
.
toastService
.
showToast
(
"
Trip Ended!
"
);
},
(
error
)
=>
{
},
(
error
)
=>
{
console
.
log
(
error
)
console
.
log
(
error
)
this
.
toastService
.
showToast
(
"
Unavle
to
e
nd
trip
"
)
this
.
toastService
.
showToast
(
"
No Ongong Trip
to
E
nd
"
)
});
});
});
});
...
...
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