From 1852d3e234ac541886afec1df4694410b449a268 Mon Sep 17 00:00:00 2001 From: Spythere Date: Fri, 9 Aug 2024 15:24:26 +0200 Subject: [PATCH 1/4] feat: category codes explanation tooltips --- .../JournalTimetables/TimetableGeneral.vue | 9 +++- .../SceneryView/SceneryTimetable.vue | 18 +++++--- src/components/Tooltip/BaseTooltip.vue | 1 + src/components/TrainsView/TrainInfo.vue | 18 ++++---- src/locales/en.json | 40 ++++++++++++++++++ src/locales/pl.json | 41 +++++++++++++++++++ src/mixins/trainCategoryMixin.ts | 12 ++++++ src/styles/global.scss | 4 ++ 8 files changed, 128 insertions(+), 15 deletions(-) create mode 100644 src/mixins/trainCategoryMixin.ts diff --git a/src/components/JournalView/JournalTimetables/TimetableGeneral.vue b/src/components/JournalView/JournalTimetables/TimetableGeneral.vue index 3def7ef..47c84ee 100644 --- a/src/components/JournalView/JournalTimetables/TimetableGeneral.vue +++ b/src/components/JournalView/JournalTimetables/TimetableGeneral.vue @@ -9,7 +9,11 @@ - + {{ timetable.trainCategoryCode }}  {{ timetable.trainNo }} @@ -83,9 +87,10 @@ import dateMixin from '../../../mixins/dateMixin'; import modalTrainMixin from '../../../mixins/modalTrainMixin'; import styleMixin from '../../../mixins/styleMixin'; import { useApiStore } from '../../../store/apiStore'; +import trainCategoryMixin from '../../../mixins/trainCategoryMixin'; export default defineComponent({ - mixins: [dateMixin, modalTrainMixin, styleMixin], + mixins: [dateMixin, modalTrainMixin, styleMixin, trainCategoryMixin], data() { return { diff --git a/src/components/SceneryView/SceneryTimetable.vue b/src/components/SceneryView/SceneryTimetable.vue index 81908e6..432e79a 100644 --- a/src/components/SceneryView/SceneryTimetable.vue +++ b/src/components/SceneryView/SceneryTimetable.vue @@ -73,15 +73,20 @@ > - - {{ row.train.timetableData!.category }} - {{ row.train.trainNo }} - + + + {{ row.train.timetableData!.category }} + +  {{ row.train.trainNo }} -  |  +  •  {{ row.train.driverName }} @@ -180,13 +185,14 @@ import { useApiStore } from '../../store/apiStore'; import { ActiveScenery, Station } from '../../typings/common'; import { SceneryTimetableRow } from './typings'; import { getTrainStopStatus, stopStatusPriority } from './utils'; +import trainCategoryMixin from '../../mixins/trainCategoryMixin'; export default defineComponent({ name: 'SceneryTimetable', components: { Loading, ScheduledTrainStatus }, - mixins: [dateMixin, routerMixin, modalTrainMixin], + mixins: [dateMixin, routerMixin, modalTrainMixin, trainCategoryMixin], props: { station: { diff --git a/src/components/Tooltip/BaseTooltip.vue b/src/components/Tooltip/BaseTooltip.vue index 940db0f..6e4a14f 100644 --- a/src/components/Tooltip/BaseTooltip.vue +++ b/src/components/Tooltip/BaseTooltip.vue @@ -23,6 +23,7 @@ export default defineComponent({ justify-content: center; align-items: center; gap: 0.5em; + white-space: pre-line; padding: 0.25em 0.5em; border-radius: 0.25em; diff --git a/src/components/TrainsView/TrainInfo.vue b/src/components/TrainsView/TrainInfo.vue index 17c0e15..282c326 100644 --- a/src/components/TrainsView/TrainInfo.vue +++ b/src/components/TrainsView/TrainInfo.vue @@ -28,12 +28,15 @@ - - {{ train.timetableData.category }}  - {{ train.trainNo }} - + + {{ train.timetableData.category }} + + {{ train.trainNo }} • Date: Fri, 9 Aug 2024 15:24:48 +0200 Subject: [PATCH 2/4] bump: v1.26.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 82368d0..433edf1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "stacjownik", - "version": "1.26.0", + "version": "1.26.1", "private": true, "type": "module", "scripts": { From 30a0f05922119943be001ada5b48c8a359daca3d Mon Sep 17 00:00:00 2001 From: Spythere Date: Sat, 10 Aug 2024 14:00:25 +0200 Subject: [PATCH 3/4] feat: journal dispatchers filtering by sc. hash --- src/locales/en.json | 2 +- src/locales/pl.json | 2 +- src/views/JournalDispatchers.vue | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/locales/en.json b/src/locales/en.json index 78dc96c..f89a453 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -163,7 +163,7 @@ "search-train": "Train no.", "search-driver": "Driver name", "search-dispatcher": "Dispatcher name", - "search-station": "Scenery name", + "search-station": "Scenery name / #", "search-author": "Timetable author name", "search-issuedFrom": "Issuing scenery name", "search-via": "Via scenery name", diff --git a/src/locales/pl.json b/src/locales/pl.json index dcbb81f..37ae7a5 100644 --- a/src/locales/pl.json +++ b/src/locales/pl.json @@ -160,7 +160,7 @@ "search-train": "Nr pociągu / #", "search-driver": "Nick maszynisty", "search-dispatcher": "Nick dyżurnego", - "search-station": "Nazwa scenerii", + "search-station": "Nazwa scenerii / #", "search-author": "Nick autora rozkładu jazdy", "search-issuedFrom": "Sceneria początkowa", "search-via": "Przez scenerię", diff --git a/src/views/JournalDispatchers.vue b/src/views/JournalDispatchers.vue index 785ef21..fda4acb 100644 --- a/src/views/JournalDispatchers.vue +++ b/src/views/JournalDispatchers.vue @@ -267,7 +267,10 @@ export default defineComponent({ const timestampTo = timestampFrom ? timestampFrom + 86400000 : undefined; if (dispatcher) queries.push(`dispatcherName=${dispatcher}`); - if (station) queries.push(`stationName=${station}`); + + if (station.startsWith("#")) queries.push(`stationHash=${station.slice(1)}`); + else if (station.length > 0) queries.push(`stationName=${station}`); + if (timestampFrom && timestampTo) queries.push(`timestampFrom=${timestampFrom}`, `timestampTo=${timestampTo}`); From 7e0e9146a5bbc4e5fffb9c40501a6d06176bae37 Mon Sep 17 00:00:00 2001 From: Spythere Date: Sat, 10 Aug 2024 14:08:32 +0200 Subject: [PATCH 4/4] fix: vehicle thumbnail cargo info --- src/components/Global/StockList.vue | 9 ++++++--- src/components/Global/VehicleThumbnail.vue | 3 +-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/components/Global/StockList.vue b/src/components/Global/StockList.vue index d8dedcb..a85ea62 100644 --- a/src/components/Global/StockList.vue +++ b/src/components/Global/StockList.vue @@ -2,7 +2,9 @@
  • @@ -13,7 +15,7 @@ @@ -63,7 +65,8 @@ export default defineComponent({ images: [] as string[], imagesFallbacks: [] as string[], vehicleName, - vehicleCargo + vehicleCargo, + vehicleString }; // Generowanie członów EN57 diff --git a/src/components/Global/VehicleThumbnail.vue b/src/components/Global/VehicleThumbnail.vue index 43dcd0e..206dfa6 100644 --- a/src/components/Global/VehicleThumbnail.vue +++ b/src/components/Global/VehicleThumbnail.vue @@ -5,10 +5,9 @@ :src="`https://static.spythere.eu/thumbnails/v2/${imgName}.png`" height="60" loading="lazy" - :data-mouseover="vehicleName" + data-tooltip-type="VehiclePreviewTooltip" :data-tooltip-content="vehicleName" :data-load-status="imgStatus" - data-tooltip-type="VehiclePreviewTooltip" @error="onImageError" @load="onImageLoad" />