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
e758ba22
Commit
e758ba22
authored
5 years ago
by
Priyanka Upadhye
Browse files
Options
Download
Email Patches
Plain Diff
end trip api called
parent
c181bd02
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
+1
-5
src/app/hirebike/hirebike.page.html
src/app/hirebike/hirebike.page.ts
+17
-1
src/app/hirebike/hirebike.page.ts
with
18 additions
and
6 deletions
+18
-6
src/app/hirebike/hirebike.page.html
+
1
-
5
View file @
e758ba22
...
@@ -46,14 +46,10 @@
...
@@ -46,14 +46,10 @@
<div
class=
"inner"
>
<div
class=
"inner"
>
<div
class=
"button-container"
>
<div
class=
"button-container"
>
<ion-grid>
<ion-grid>
<ion-row>
<ion-col>
Any Problems?
</ion-col>
</ion-row>
<ion-row>
<ion-row>
<ion-col>
<ion-col>
<ion-button
size=
"medium"
expand=
"block"
(click)=
"CancelTrip()"
>
Cancel
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>
...
...
This diff is collapsed.
Click to expand it.
src/app/hirebike/hirebike.page.ts
+
17
-
1
View file @
e758ba22
...
@@ -110,7 +110,23 @@ export class HirebikePage implements OnInit {
...
@@ -110,7 +110,23 @@ export class HirebikePage implements OnInit {
}
}
CancelTrip
(){
this
.
storage
.
get
(
'
token
'
).
then
((
token
)
=>
{
let
url
=
'
http://193.196.52.237:8081/rent
'
+
'
?bikeId=
'
+
this
.
bikeDetails
.
id
;
const
headers
=
new
HttpHeaders
().
set
(
"
Authorization
"
,
"
Bearer
"
+
token
);
let
bikeApi
=
this
.
httpClient
.
delete
(
url
,
{
headers
});
bikeApi
.
subscribe
((
resp
)
=>
{
console
.
log
(
'
my data:
'
,
resp
);
this
.
toastService
.
showToast
(
"
Trip Ended!
"
);
},
(
error
)
=>
{
console
.
log
(
error
)
this
.
toastService
.
showToast
(
"
Unavle to end trip
"
)
});
});
}
loadmap
()
{
loadmap
()
{
var
defaultLayers
=
this
.
platform
.
createDefaultLayers
();
var
defaultLayers
=
this
.
platform
.
createDefaultLayers
();
...
...
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