diff --git a/src/components/JournalView/JournalTimetables/TimetableDetails.vue b/src/components/JournalView/JournalTimetables/TimetableDetails.vue
index 6f283af..86687bd 100644
--- a/src/components/JournalView/JournalTimetables/TimetableDetails.vue
+++ b/src/components/JournalView/JournalTimetables/TimetableDetails.vue
@@ -86,12 +86,12 @@
import { PropType, defineComponent } from 'vue';
import StockList from '../../Global/StockList.vue';
import { API } from '../../../typings/api';
-import modalTrainMixin from '../../../mixins/modalTrainMixin';
+import driverViewMixin from '../../../mixins/driverViewMixin';
export default defineComponent({
components: { StockList },
- mixins: [modalTrainMixin],
+ mixins: [driverViewMixin],
emits: ['toggleExtraInfo'],
@@ -138,7 +138,7 @@ export default defineComponent({
showTimetable(timetable: API.TimetableHistory.Data, target: EventTarget | null) {
if (timetable?.terminated) return;
- this.selectModalTrainById(`${timetable.driverName}${timetable.trainNo}`, target);
+ this.driverMixin_showDriverView(`${timetable.driverId}|${timetable.trainNo}|eu`);
},
toggleExtraInfo() {
diff --git a/src/components/JournalView/JournalTimetables/TimetableGeneral.vue b/src/components/JournalView/JournalTimetables/TimetableGeneral.vue
index d97349f..7ce7975 100644
--- a/src/components/JournalView/JournalTimetables/TimetableGeneral.vue
+++ b/src/components/JournalView/JournalTimetables/TimetableGeneral.vue
@@ -74,13 +74,12 @@ import { PropType, defineComponent } from 'vue';
import { API } from '../../../typings/api';
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, trainCategoryMixin],
+ mixins: [dateMixin, styleMixin, trainCategoryMixin],
data() {
return {
diff --git a/src/components/SceneryView/SceneryInfo/SceneryInfoUserList.vue b/src/components/SceneryView/SceneryInfo/SceneryInfoUserList.vue
index 80d0991..4e9ffd0 100644
--- a/src/components/SceneryView/SceneryInfo/SceneryInfoUserList.vue
+++ b/src/components/SceneryView/SceneryInfo/SceneryInfoUserList.vue
@@ -18,8 +18,8 @@
tabindex="0"
:key="train.id"
:data-status="status"
- @click.prevent="selectModalTrain(train, $event.currentTarget)"
- @keydown.enter="selectModalTrain(train, $event.currentTarget)"
+ @click.prevent="driverMixin_showDriverView(train.id)"
+ @keydown.enter="driverMixin_showDriverView(train.id)"
>
{{ train.trainNo }}
{{ train.driverName }}
@@ -30,14 +30,14 @@
+
+
diff --git a/src/views/JournalTimetables.vue b/src/views/JournalTimetables.vue
index 5b7a1ae..927de8c 100644
--- a/src/views/JournalTimetables.vue
+++ b/src/views/JournalTimetables.vue
@@ -40,7 +40,6 @@ import { defineComponent, provide, reactive, Ref, ref } from 'vue';
import dateMixin from '../mixins/dateMixin';
import routerMixin from '../mixins/routerMixin';
-import modalTrainMixin from '../mixins/modalTrainMixin';
import JournalOptions from '../components/JournalView/JournalOptions.vue';
import JournalStats from '../components/JournalView/JournalStats.vue';
@@ -148,7 +147,7 @@ export default defineComponent({
JournalHeader,
JournalTimetablesList
},
- mixins: [dateMixin, routerMixin, modalTrainMixin],
+ mixins: [dateMixin, routerMixin],
name: 'JournalTimetables',
@@ -462,7 +461,7 @@ export default defineComponent({
this.timetableHistory = responseData;
// Stats display
- this.store.driverStatsName =
+ this.mainStore.driverStatsName =
this.timetableHistory.length > 0 && this.searchersValues['search-driver'].trim()
? this.timetableHistory[0].driverName
: '';
diff --git a/src/views/TrainsView.vue b/src/views/TrainsView.vue
index 3b86937..7f19f2e 100644
--- a/src/views/TrainsView.vue
+++ b/src/views/TrainsView.vue
@@ -19,7 +19,6 @@
import { computed, ComputedRef, defineComponent, provide, reactive, ref, watch } from 'vue';
import TrainOptions from '../components/TrainsView/TrainOptions.vue';
import TrainTable from '../components/TrainsView/TrainTable.vue';
-import modalTrainMixin from '../mixins/modalTrainMixin';
import { useMainStore } from '../store/mainStore';
import { TrainFilter, trainFilters } from '../components/TrainsView/typings';
import { filteredTrainList } from '../managers/trainFilterManager';
@@ -33,8 +32,6 @@ export default defineComponent({
TrainStats
},
- mixins: [modalTrainMixin],
-
props: {
train: {
type: String,
@@ -106,12 +103,6 @@ export default defineComponent({
this.searchedTrain = this.train;
this.searchedDriver = this.driver || '';
}
-
- this.$nextTick(() => {
- if (this.trainId) {
- this.selectModalTrainById(this.trainId);
- }
- });
}
});