From fcb6498d6dc4e99307fb59ddd4d03a7d63a07ebe Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Thu, 6 Jan 2022 22:06:16 +0100
Subject: [PATCH] =?UTF-8?q?Optymalizacja=20listy=20poci=C4=85g=C3=B3w;=20d?=
 =?UTF-8?q?odatkowe=20informacje=20o=20uwagach=20ekspl.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TrainsView/TrainTable.vue | 35 +++++++++++++++++-------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/components/TrainsView/TrainTable.vue b/src/components/TrainsView/TrainTable.vue
index d4f6c2c..9316c4c 100644
--- a/src/components/TrainsView/TrainTable.vue
+++ b/src/components/TrainsView/TrainTable.vue
@@ -15,7 +15,7 @@
     <ul class="train-list">
       <li
         class="train-row"
-        v-for="(train) in computedTrains.filter((_, i) => i < 10)"
+        v-for="train in computedTrains.filter((_, i) => i < 10)"
         :key="train.trainNo + train.driverId"
         tabindex="0"
         @keydown.enter="changeScheduleShowState(train.timetableData?.timetableId)"
@@ -80,8 +80,13 @@
               </div>
             </div>
 
-            <div class="info_comments" v-if="hasTimetableComments(train.timetableData)">
-              <img :src="icons.warning" :title="$t('trains.timetable-comments')" />
+            <div class="info_comments" v-if="getSceneriesWithComments(train.timetableData).length > 0">
+              <img
+                :src="icons.warning"
+                :title="
+                  `${$t('trains.timetable-comments')} (${getSceneriesWithComments(train.timetableData).join(',')})`
+                "
+              />
             </div>
           </span>
 
@@ -107,10 +112,14 @@
 
                 <span v-else>{{ displayLocoInfo(train.locoType) }}</span>
               </div>
-              
-              <img v-if="defaultVehicleIcons.includes(train.locoType)" class="train-image" :src="defaultLocoImage" alt="default vehicle">
-              <img v-else class="train-image" :src="train.locoURL" :alt="train.locoType" @error="onImageError" />
 
+              <img
+                v-if="defaultVehicleIcons.includes(train.locoType)"
+                class="train-image"
+                :src="defaultLocoImage"
+                alt="default vehicle"
+              />
+              <img v-else class="train-image" :src="train.locoURL" :alt="train.locoType" @error="onImageError" />
             </span>
           </span>
 
@@ -153,7 +162,7 @@
 import { computed, ComputedRef, defineComponent, Ref, ref } from '@vue/runtime-core';
 import { useStore } from '@/store';
 
-import defaultVehicleIconsJSON from "@/data/defaultVehicleIcons.json";
+import defaultVehicleIconsJSON from '@/data/defaultVehicleIcons.json';
 
 import Train from '@/scripts/interfaces/Train';
 import TrainStop from '@/scripts/interfaces/TrainStop';
@@ -251,7 +260,7 @@ export default defineComponent({
         () =>
           props.computedTrains.findIndex(({ timetableData }) => timetableData && timetableData.routeDistance > 200) !=
           -1
-      )
+      ),
     };
   },
 
@@ -342,8 +351,14 @@ export default defineComponent({
       return '';
     },
 
-    hasTimetableComments(timetableData: Train['timetableData']) {
-      return timetableData?.followingStops.some((stop) => stop.comments) || false;
+    getSceneriesWithComments(timetableData: Train['timetableData']) {
+      return (
+        timetableData?.followingStops.reduce((acc, stop) => {
+          if (stop.comments) acc.push(stop.stopNameRAW);
+
+          return acc;
+        }, [] as string[]) || []
+      );
     },
   },