merge: 'dominik-korsa-links' into development

This commit is contained in:
2024-08-22 02:27:53 +02:00
11 changed files with 73 additions and 81 deletions
+4 -7
View File
@@ -192,17 +192,14 @@ export default defineComponent({
return Math.min(vehicleSpeed, acc);
}, 300);
}
},
methods: {
navigateToJournal() {
this.$router.push({
},
journalRouteLocation() {
return {
path: '/journal/timetables',
query: {
'search-driver': this.train.driverName
}
});
}
}
}
});
+3 -9
View File
@@ -17,11 +17,10 @@
class="train-row"
v-for="train in trains"
:key="train.id"
tabindex="0"
@click.stop="driverMixin_showDriverView(train.id)"
@keydown.enter="driverMixin_showDriverView(train.id)"
>
<TrainInfo :train="train" :extended="false" />
<router-link class="a-block" :to="train.driverRouteLocation">
<TrainInfo :train="train" :extended="false" />
</router-link>
</li>
</transition-group>
</div>
@@ -35,13 +34,10 @@ import Loading from '../Global/Loading.vue';
import TrainInfo from './TrainInfo.vue';
import { Status, Train } from '../../typings/common';
import { useApiStore } from '../../store/apiStore';
import driverViewMixin from '../../mixins/driverViewMixin';
export default defineComponent({
components: { Loading, TrainInfo },
mixins: [driverViewMixin],
props: {
trains: {
type: Array as PropType<Train[]>,
@@ -107,7 +103,5 @@ li.train-row {
background-color: var(--clr-secondary);
margin-bottom: 1em;
width: 100%;
cursor: pointer;
}
</style>