diff --git a/src/components/JournalView/JournalTimetables/TimetableDetails.vue b/src/components/JournalView/JournalTimetables/TimetableDetails.vue index 86687bd..a81f12b 100644 --- a/src/components/JournalView/JournalTimetables/TimetableDetails.vue +++ b/src/components/JournalView/JournalTimetables/TimetableDetails.vue @@ -6,14 +6,14 @@ Arrow icon - +
@@ -86,13 +86,11 @@ import { PropType, defineComponent } from 'vue'; import StockList from '../../Global/StockList.vue'; import { API } from '../../../typings/api'; -import driverViewMixin from '../../../mixins/driverViewMixin'; +import { RouteLocationRaw } from 'vue-router'; export default defineComponent({ components: { StockList }, - mixins: [driverViewMixin], - emits: ['toggleExtraInfo'], props: { @@ -127,6 +125,15 @@ export default defineComponent({ stockLength: Number(historyData[3]) || undefined }; }); + }, + driverRouteLocation(): RouteLocationRaw | null { + if (this.timetable.terminated) return null; + return { + name: 'DriverView', + query: { + trainId: `${this.timetable.driverId}|${this.timetable.trainNo}|eu` + } + } } }, methods: { @@ -135,12 +142,6 @@ export default defineComponent({ imageEl.src = '/images/icon-unknown.png'; }, - showTimetable(timetable: API.TimetableHistory.Data, target: EventTarget | null) { - if (timetable?.terminated) return; - - this.driverMixin_showDriverView(`${timetable.driverId}|${timetable.trainNo}|eu`); - }, - toggleExtraInfo() { this.$emit('toggleExtraInfo', this.timetable.id); } diff --git a/src/components/SceneryView/SceneryInfo/SceneryInfoUserList.vue b/src/components/SceneryView/SceneryInfo/SceneryInfoUserList.vue index 4e9ffd0..375c528 100644 --- a/src/components/SceneryView/SceneryInfo/SceneryInfoUserList.vue +++ b/src/components/SceneryView/SceneryInfo/SceneryInfoUserList.vue @@ -18,11 +18,11 @@ tabindex="0" :key="train.id" :data-status="status" - @click.prevent="driverMixin_showDriverView(train.id)" - @keydown.enter="driverMixin_showDriverView(train.id)" > - {{ train.trainNo }} - {{ train.driverName }} + + {{ train.trainNo }} + {{ train.driverName }} + @@ -31,13 +31,12 @@