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
242c61f0
Commit
242c61f0
authored
5 years ago
by
gap95
Browse files
Options
Download
Email Patches
Plain Diff
Seperate page for ride history
parent
42877ca7
master
18-design-feedback-page-2
20-ride-history-2
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
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
!35
Resolve "Ride History"
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/app/app.component.ts
+5
-1
src/app/app.component.ts
src/app/ridehistory/ridehistory.page.html
+1
-60
src/app/ridehistory/ridehistory.page.html
src/app/ridehistory/ridehistory.page.ts
+1
-3
src/app/ridehistory/ridehistory.page.ts
with
7 additions
and
64 deletions
+7
-64
src/app/app.component.ts
+
5
-
1
View file @
242c61f0
...
...
@@ -28,9 +28,13 @@ export class AppComponent {
title
:
'
My Reservation
'
,
url
:
'
/myreservation
'
,
icon
:
'
clipboard
'
},
{
title
:
'
My Rides
'
,
url
:
'
/hirebike
'
,
icon
:
'
clipboard
'
},
{
title
:
'
My
Ride
s
'
,
title
:
'
Ride
History
'
,
url
:
'
/ridehistory
'
,
icon
:
'
clipboard
'
},
...
...
This diff is collapsed.
Click to expand it.
src/app/ridehistory/ridehistory.page.html
+
1
-
60
View file @
242c61f0
...
...
@@ -10,9 +10,8 @@
</ion-toolbar>
</ion-header>
<ion-content>
<div
class=
"ride-list-container"
*ngIf=
"isRideActive"
>
<div
class=
"ride-list-container"
>
<div
class=
"ride-container"
*ngFor=
"let ride of rides"
>
<div
class=
"inner"
(click)=
"showRideDetails(bike)"
>
<ion-grid>
<ion-row
>
<ion-col>
...
...
@@ -67,65 +66,7 @@
</ion-grid>
</div>
</div>
</div>
<div
class=
"ride-list-container"
*ngIf=
"!isRideActive"
>
<div
class=
"ride-container"
*ngFor=
"let ride of rides"
>
<div
class=
"inner"
(click)=
"showRideDetails()"
>
<ion-grid>
<ion-row
>
<ion-col>
Bike ID
</ion-col>
<ion-col>
{{ride.bikeId}}
</ion-col>
</ion-row>
<ion-row>
<ion-col>
Price
</ion-col>
<ion-col>
{{ride.price}}
</ion-col>
</ion-row>
<ion-row>
<ion-col>
Distance
</ion-col>
<ion-col>
{{ride.distance}}
</ion-col>
</ion-row>
<ion-row>
<ion-col>
Start-Date
</ion-col>
<ion-col>
{{ride.startDate}}
</ion-col>
</ion-row>
<ion-row>
<ion-col>
End-Date
</ion-col>
<ion-col>
{{ride.endDate}}
</ion-col>
</ion-row>
</ion-grid>
</div>
</div>
</div>
</ion-content>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/app/ridehistory/ridehistory.page.ts
+
1
-
3
View file @
242c61f0
...
...
@@ -47,7 +47,5 @@ export class RidehistoryPage implements OnInit {
//alert('Error getting location - ' + JSON.stringify(error));
});
}
showRideDetails
()
{
//this.router.navigateByUrl('/myreservation');
}
}
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