From 8bdaf3a209826a9b9a11d31be3e4554eaed09ffb Mon Sep 17 00:00:00 2001 From: Priyanka Upadhye <92uppr1mst@hft-stuttgart.de> Date: Thu, 28 Nov 2019 13:31:43 +0100 Subject: [PATCH 1/2] Setup Initial container for bike details information --- src/app/home/home.page.html | 70 +++++++++++++++++++++++++++---------- src/app/home/home.page.scss | 4 +++ src/app/home/home.page.ts | 8 +++++ 3 files changed, 64 insertions(+), 18 deletions(-) diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index 6681bae..91c37d9 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -7,39 +7,73 @@ Home - - 3D - + + 3D + - +
- - - - + + + + - -
- + +
-
- {{bike.name}} +
+
+ {{bike.name}} +
+
+
+ +
+
{{bike.batteryPercentage + " %"}}
+
+
+
{{bike.distance + "m"}}
+
{{bike.address}}
+
+
+
+
+ +
+
+
+ {{selectedBike.name}}
-
-
{{bike.batteryPercentage + " %"}}
+
+ +
+
{{selectedBike.batteryPercentage + " %"}}
-
{{bike.distance + "m"}}
-
{{bike.address}}
+
{{selectedBike.distance + "m"}}
+
{{selectedBike.address}}
+
+
+ + + + Reserve + + + Navigate + + +
+
- + \ No newline at end of file diff --git a/src/app/home/home.page.scss b/src/app/home/home.page.scss index ad23a37..3762aea 100644 --- a/src/app/home/home.page.scss +++ b/src/app/home/home.page.scss @@ -99,4 +99,8 @@ ion-footer{ .get-position{ margin-bottom:10px; +} + +.button-container{ + clear: both; } \ No newline at end of file diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 4d5101b..2ad9314 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -23,6 +23,8 @@ export class HomePage { private currentLocation = { lat: 0, lng: 0 }; public is3DChecked = false; + public isDetailsVisible = false; + public selectedBike ={}; public tempArr = [1, 2]; public locationArr = [{ lat: 48.778409, lng: 9.179252 }, @@ -223,4 +225,10 @@ export class HomePage { this.loadmap("3D"); }, 100); } + + showBikeDetails(bike) { + + this.selectedBike=bike; + this.isDetailsVisible = true; + } } -- GitLab From 14f24a4ef6dec0f2b59bd35950eb1ad215d01756 Mon Sep 17 00:00:00 2001 From: Priyanka Upadhye <92uppr1mst@hft-stuttgart.de> Date: Thu, 28 Nov 2019 13:57:44 +0100 Subject: [PATCH 2/2] bike details page formated with ptoper display --- src/app/home/home.page.html | 42 ++++++++++++++++++++++++++++++++----- src/app/home/home.page.ts | 1 + 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index 91c37d9..0b5ff18 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -48,10 +48,8 @@
-
- {{selectedBike.name}} -
-
+ +
+ + + Bike Name + + + {{selectedBike.name}} + + + + + Battery Level + + + + + {{selectedBike.batteryPercentage + " %"}} + + + + + Bike Location + + + {{selectedBike.address}} + + + + + Bike Distance + + + {{selectedBike.distance + "m"}} + + Reserve diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 2ad9314..16fd7c2 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -231,4 +231,5 @@ export class HomePage { this.selectedBike=bike; this.isDetailsVisible = true; } + } -- GitLab