From a331e55af95962a83c74f177b77ee7688f9091f8 Mon Sep 17 00:00:00 2001
From: FurWaz <fur.waz06@gmail.com>
Date: Thu, 6 Apr 2023 08:39:34 +0200
Subject: [PATCH] Fixed wrong trip steps in preview

---
 src/frontend/src/views/Main.vue | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/frontend/src/views/Main.vue b/src/frontend/src/views/Main.vue
index 76ea051b..fb9e9543 100644
--- a/src/frontend/src/views/Main.vue
+++ b/src/frontend/src/views/Main.vue
@@ -177,7 +177,7 @@
                         :key="trip.id"
                         :trip="trip"
                         class="md:m-8 m-4"
-                        @click="selectTrip(trip.id)"
+                        @click="selectTrip(trip)"
                     />
                 </div>
             </div>
@@ -190,8 +190,8 @@
             <trip-detail
                 ref="trip-comp"
                 :trip-id="selectedTripId"
-                :trip-start="startCity"
-                :trip-end="endCity"
+                :trip-start="startingCity"
+                :trip-end="endingCity"
             />
         </card-popup>
     </div>
@@ -323,7 +323,7 @@ export default {
         CardPopup
     },
     data() {
-        return { lang: Lang.CurrentLang, trips: [], startCity: {}, endCity: {}, selectedTripId: null }
+        return { lang: Lang.CurrentLang, trips: [], startCity: {}, endCity: {}, startingCity: null, endingCity: null, selectedTripId: null }
     },
     mounted() {
         Lang.AddCallback(lang => this.lang = lang);
@@ -472,11 +472,15 @@ export default {
                 });
             }
         },
-        selectTrip(id) {
-            this.$refs["trip-comp"].setPopup(this.$refs["trip-details"]);
+        selectTrip(trip) {
             this.selectedTripId = null;
-            this.selectedTripId = id;
+            this.selectedTripId = trip.id;
+
+            this.startingCity = {value: trip.startCity};
+            this.endingCity = {value: trip.endCity};
+
             const popup = this.$refs["trip-details"];
+            this.$refs["trip-comp"].setPopup(popup);
             popup.show();
         },
         onpopupcancel(popup) {
-- 
GitLab