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 }}