Dokończono widok listy i karty pociągów

This commit is contained in:
2022-02-03 12:56:19 +01:00
parent 3268ae4b4a
commit 26bee52851
6 changed files with 555 additions and 459 deletions
+7 -451
View File
@@ -1,189 +1,21 @@
<template>
<div class="train-info">
<!-- SIMPLE VIEW -->
<div v-if="simpleView">
<div class="simple-view wrapper">
<span>
<span>
<div>
<span v-if="train.timetableData">
<strong>{{ train.timetableData.category }}</strong>
</span>
<strong> {{ train.trainNo }}</strong>
|
{{ train.driverName }}
</div>
<div>
<strong v-if="train.timetableData">{{ train.timetableData.route.replace('|', ' - ') }}</strong>
</div>
<div style="margin-top: 0.5em" v-if="train.timetableData">
<span style="color: #ccc">
{{ train.locoType }}
</span>
|
<span style="color: gold"> {{ train.timetableData.routeDistance }} km </span>
|
<span>
{{ $t('trains.route-progress') }} {{ confirmedPercentage(train.timetableData.followingStops) }}%</span
>
|
<span v-html="currentDelay(train.timetableData.followingStops)"></span>
<div class="comments" v-if="getSceneriesWithComments(train.timetableData).length > 0">
<img
class="image-warning"
:src="icons.warning"
:title="
`${$t('trains.timetable-comments')} (${getSceneriesWithComments(train.timetableData).join(',')})`
"
/>
<b>{{ $t('trains.timetable-comments').toUpperCase() }}</b>
</div>
</div>
<div style="margin-top: 2em" v-else>
{{ train.locoType }}
</div>
</span>
</span>
<span class="train-image" style="display: flex; justify-content: center; align-items: center;">
<img :src="train.locoURL" alt="Not Found" @error="onImageError" />
</span>
<span class="info-stats">
<span v-for="stat in STATS.main" :key="stat.name">
<span>{{ $t(`trains.option-${stat.name}`).toUpperCase() }}</span
>:
<span class="text--primary">{{ `${~~(train[stat.name] * (stat.multiplier || 1))}${stat.unit}` }} </span>
</span>
</span>
</div>
</div>
<!-- EXTENDED VIEW -->
<div class="extended-view wrapper" v-else>
<span class="info-timetable">
<div v-if="!train.timetableData">
<div class="timetable_general">
<span>
{{ train.trainNo }} |
<span style="color: gold">
{{ $t('trains.no-timetable') }}
</span>
</span>
</div>
</div>
<div v-else>
<div class="timetable_general">
<span class="timetable_hero">
<span class="timetable_warnings">
<span class="warning twr" v-if="train.timetableData.TWR">
TWR
</span>
<span class="warning skr" v-if="train.timetableData.SKR">
SKR
</span>
</span>
<span class="timetable_driver-stats">
<div>
<b>{{ train.timetableData.category }}</b>
<b>{{ ' ' + train.trainNo }}</b> |
<span>{{ train.driverName }}</span>
</div>
</span>
</span>
</div>
<div class="timetable_route">
{{ train.timetableData.route.replace('|', ' - ') }}
</div>
<div class="timetable_stops">
<span v-if="train.timetableData.followingStops.length > 2">
{{ $t('trains.via-title') }}
<span v-html="displayStopList(train.timetableData.followingStops)"></span>
</span>
</div>
</div>
<div class="info_comments" v-if="getSceneriesWithComments(train.timetableData).length > 0">
<img
class="image-warning"
:src="icons.warning"
:title="`${$t('trains.timetable-comments')} (${getSceneriesWithComments(train.timetableData).join(',')})`"
/>
</div>
</span>
<span class="info-driver">
<div class="driver_cars">
<!-- <span v-else>{{ displayLocoInfo(train.locoType) }}</span> -->
</div>
<div style="display: flex; justify-content: center;">
<span class="text--primary"> {{ train.timetableData?.routeDistance }}</span>
<span>km</span>
<span v-for="stat in STATS.main" :key="stat.name">
<span>&nbsp;&bull;&nbsp;</span>
<span class="text--primary">{{ `${~~(train[stat.name] * (stat.multiplier || 1))}` }}</span>
<span>{{ stat.unit }}</span>
</span>
</div>
<div class="driver_position" style="display: flex; justify-content: center;">
<span v-if="train.currentStationName">
Na scenerii <b class="text--primary">{{ train['currentStationName'] }}</b>
</span>
<span v-if="train.signal">
&nbsp;przy semaforze <b class="text--primary">{{ train['signal'] }}</b>
</span>
<span v-if="train.connectedTrack">
&nbsp;na szlaku <b class="text--primary">{{ train['connectedTrack'] }}</b>
</span>
</div>
<div style="display: flex; justify-content: center; margin-top: 0.5em;">
<span> {{ train.locoType }} </span>
<span v-if="train.cars.length > 0">
&nbsp;&bull; {{ $t('trains.cars') }}:
<span class="count">{{ train.cars.length }}</span>
</span>
</div>
<div class="driver_stock">
<img class="train-image" :src="train.locoURL" alt="loco" @error="onImageError" />
<img
v-for="(car, i) in train.cars"
:key="i"
:src="`https://rj.td2.info.pl/dist/img/thumbnails/${car.split(':')[0]}.png`"
@error="onImageError"
alt="car"
srcset=""
/>
</div>
</span>
<div class="wrapper">
<train-info-simple :train="train" v-if="simpleView" />
<train-info-extended :train="train" v-else />
</div>
</div>
</template>
<script lang="ts">
import Train from '@/scripts/interfaces/Train';
import TrainStop from '@/scripts/interfaces/TrainStop';
import { defineComponent } from 'vue';
import TrainInfoExtended from './TrainInfoExtended.vue';
import TrainInfoSimple from './TrainInfoSimple.vue';
export default defineComponent({
components: { TrainInfoSimple, TrainInfoExtended },
props: {
train: {
type: Object as () => Train,
@@ -195,292 +27,16 @@ export default defineComponent({
default: false,
},
},
data: () => ({
icons: {
warning: require('@/assets/icon-warning.svg'),
},
STATS: {
main: [
{
name: 'speed',
unit: 'km/h',
},
{
name: 'length',
unit: 'm',
},
{
name: 'mass',
unit: 't',
multiplier: 0.001,
},
],
position: [
{
name: 'scenery',
prop: 'currentStationName',
},
{
name: 'route',
prop: 'connectedTrack',
},
{
name: 'signal',
prop: 'signal',
},
{
name: 'distance',
prop: 'distance',
unit: 'm',
},
],
},
}),
methods: {
displayStopList(stops: TrainStop[]): string | undefined {
if (!stops) return '';
return stops
.reduce((acc: string[], stop: TrainStop, i: number) => {
if (stop.stopType.includes('ph') && !stop.stopNameRAW.includes('po.'))
acc.push(`<strong style='color:${stop.confirmed ? 'springgreen' : 'white'}'>${stop.stopName}</strong>`);
else if (
i > 0 &&
i < stops.length - 1 &&
!stop.stopNameRAW.includes('po.') &&
!stop.stopNameRAW.includes('SBL')
)
acc.push(`<span style='color:${stop.confirmed ? 'springgreen' : 'lightgray'}'>${stop.stopName}</span>`);
return acc;
}, [])
.join(' > ');
},
confirmedPercentage(stops: TrainStop[]) {
return ((stops.filter((stop) => stop.confirmed).length / stops.length) * 100).toFixed(0);
},
currentDelay(stops: TrainStop[]) {
const delay =
stops.find((stop, i) => (i == 0 && !stop.confirmed) || (i > 0 && stops[i - 1].confirmed && !stop.confirmed))
?.departureDelay || 0;
if (delay > 0) return `<span style='color: salmon'>${this.$t('trains.delayed')} ${delay} min</span>`;
else if (delay < 0) return `<span style='color: lightgreen'>${this.$t('trains.preponed')} ${delay} min</span>`;
else return this.$t('trains.on-time');
},
displayLocoInfo(locoType: string) {
if (locoType.includes('EN')) return `${this.$t('trains.EZT')}`;
if (locoType.includes('SN')) return `${this.$t('trains.SZT')}`;
if (locoType.startsWith('E')) return `${this.$t('trains.loco-electric')}`;
if (locoType.startsWith('S')) return `${this.$t('trains.loco-diesel')}`;
return '';
},
getSceneriesWithComments(timetableData: Train['timetableData']) {
return (
timetableData?.followingStops.reduce((acc, stop) => {
if (stop.comments) acc.push(stop.stopNameRAW);
return acc;
}, [] as string[]) || []
);
},
onImageError(e: Event) {
const imageEl = e.target as HTMLImageElement;
imageEl.src = require('@/assets/unknown.png');
console.log('error');
},
},
});
</script>
<style lang="scss" scoped>
@import '../../styles/responsive.scss';
.image-warning {
width: 1.35em;
}
.wrapper {
padding: 1em;
&.extended-view {
/* grid-template-columns: repeat(auto-fit, minmax(20em, 1fr));
grid-template-rows: 1fr; */
margin-top: 0.5em;
}
&.simple-view {
display: grid;
grid-template-columns: 2fr 1fr 1fr;
grid-template-rows: 1fr;
gap: 0.5em;
&:hover {
background: #424242;
}
.info-stats {
text-align: right;
display: flex;
flex-direction: column;
}
.comments {
display: flex;
align-items: center;
font-size: 0.9em;
margin-top: 1em;
img {
margin-right: 0.5em;
}
}
@include smallScreen() {
grid-template-columns: 1fr;
gap: 1em 0;
text-align: center;
.info-stats {
text-align: center;
}
.comments {
flex-direction: column;
justify-content: center;
img {
margin: 0 0 0.5em 0;
}
}
}
}
@include smallScreen() {
font-size: 1.2em;
}
}
.info-timetable {
display: flex;
}
.timetable {
&_general {
display: flex;
justify-content: space-between;
align-items: center;
}
&_hero {
display: flex;
}
&_srjp .activator {
display: flex;
align-items: center;
background-color: #22a8d1;
border-radius: 0.5em;
padding: 0.1em 0.35em;
}
&_route {
display: flex;
align-items: center;
font-weight: bold;
margin: 5px 0;
font-size: 1.1em;
}
&_stops {
margin-bottom: 10px;
font-size: 0.8em;
}
&_warnings {
display: flex;
color: black;
.warning {
padding: 0.1em 0.65em;
margin-right: 0.35em;
font-weight: bold;
&.twr {
background: var(--clr-twr);
}
&.skr {
background: var(--clr-skr);
}
}
}
}
.driver {
display: flex;
align-items: center;
justify-content: center;
flex-flow: column;
padding-top: 1em;
&_header {
text-align: center;
word-wrap: break-word;
margin-top: 1em;
}
&_cars {
margin: 0.65em 0;
white-space: pre-wrap;
text-align: center;
color: #c5c5c5;
.count {
color: var(--clr-primary);
}
}
&_stock {
display: flex;
align-items: flex-end;
overflow-x: auto;
width: 100%;
padding: 0.5em 0;
img {
margin: 0 auto;
}
}
&_position {
span {
text-align: center;
}
}
}
</style>
@@ -0,0 +1,251 @@
<template>
<div class="train-info extended">
<section class="info-timetable">
<div v-if="!train.timetableData">
<div class="timetable_general">
<span>
{{ train.trainNo }} |
<span>{{ train.driverName }}</span>
</span>
</div>
</div>
<div v-else>
<div class="timetable_general">
<span class="timetable_hero">
<span class="timetable_warnings">
<span class="warning twr" v-if="train.timetableData.TWR">
TWR
</span>
<span class="warning skr" v-if="train.timetableData.SKR">
SKR
</span>
</span>
<span class="timetable_driver-stats">
<div>
<b>{{ train.timetableData.category }}</b>
<b>{{ ' ' + train.trainNo }}</b> |
<span>{{ train.driverName }}</span>
</div>
</span>
</span>
</div>
<div class="timetable_route">
{{ train.timetableData.route.replace('|', ' - ') }}
<img
v-if="getSceneriesWithComments(train.timetableData).length > 0"
class="image-warning"
:src="icons.warning"
:title="`${$t('trains.timetable-comments')} (${getSceneriesWithComments(train.timetableData).join(',')})`"
/>
</div>
<div class="timetable_stops">
<span v-if="train.timetableData.followingStops.length > 2">
{{ $t('trains.via-title') }}
<span v-html="displayStopList(train.timetableData.followingStops)"></span>
</span>
</div>
</div>
</section>
<section class="info-driver">
<div class="driver_cars">
<!-- <span v-else>{{ displayLocoInfo(train.locoType) }}</span> -->
</div>
<div class="color: #444;">
<span v-if="train.timetableData">
<span class="text--primary"> {{ train.timetableData.routeDistance }} </span>km &bull;
</span>
<span v-for="(stat, i) in STATS.main" :key="stat.name">
<span v-if="i > 0">&nbsp;&bull;&nbsp;</span>
<span class="text--primary">{{ `${~~(train[stat.name] * (stat.multiplier || 1))}` }}</span>
<span>{{ stat.unit }}</span>
</span>
</div>
<div class="driver_position">
<span v-if="train.currentStationName">
Na scenerii <b class="text--primary">{{ train['currentStationName'] }}</b>
</span>
<span v-if="train.signal">
przy semaforze <b class="text--primary">{{ train['signal'] }}</b>
</span>
<span v-if="train.connectedTrack">
na szlaku <b class="text--primary">{{ train['connectedTrack'] }}</b>
</span>
</div>
<div style="margin-top: 0.5em;">
<b class="text--grayed"> {{ train.locoType }} </b>
<span v-if="train.cars.length > 0">
&nbsp;&bull; {{ $t('trains.cars') }}:
<span class="count">{{ train.cars.length }}</span>
</span>
</div>
<div class="driver_stock">
<img class="train-image" :src="train.locoURL" alt="loco" @error="onImageError" />
<img v-if="train.locoType.startsWith('EN')" :src="train.locoURL.replace('rb', 's')" alt="" />
<img v-if="train.locoType.startsWith('EN71')" :src="train.locoURL.replace('rb', 's')" alt="" />
<img v-if="train.locoType.startsWith('EN')" :src="train.locoURL.replace('rb', 'ra')" alt="" />
<img
v-for="(car, i) in train.cars"
:key="i"
:src="`https://rj.td2.info.pl/dist/img/thumbnails/${car.split(':')[0]}.png`"
@error="onImageError"
alt="car"
/>
</div>
</section>
</div>
</template>
<script lang="ts">
import trainInfoMixin from '@/mixins/trainInfoMixin';
import Train from '@/scripts/interfaces/Train';
import { defineComponent } from 'vue';
export default defineComponent({
props: {
train: {
type: Object as () => Train,
required: true,
},
},
mixins: [trainInfoMixin],
data: () => ({
icons: {
warning: require('@/assets/icon-warning.svg'),
},
}),
});
</script>
<style lang="scss" scoped>
.image-warning {
width: 1em;
}
.extended {
margin-top: 0.5em;
padding: 1em;
}
.info-timetable {
display: flex;
}
.timetable {
&_general {
display: flex;
justify-content: space-between;
align-items: center;
}
&_hero {
display: flex;
}
&_srjp .activator {
display: flex;
align-items: center;
background-color: #22a8d1;
border-radius: 0.5em;
padding: 0.1em 0.35em;
}
&_route {
display: flex;
align-items: center;
font-weight: bold;
margin: 5px 0;
font-size: 1.1em;
}
&_stops {
margin-bottom: 10px;
font-size: 0.8em;
}
&_warnings {
display: flex;
color: black;
.warning {
padding: 0.1em 0.65em;
margin-right: 0.35em;
font-weight: bold;
&.twr {
background: var(--clr-twr);
}
&.skr {
background: var(--clr-skr);
}
}
}
}
.driver {
display: flex;
align-items: center;
justify-content: center;
flex-flow: column;
padding-top: 1em;
&_header {
text-align: center;
word-wrap: break-word;
margin-top: 1em;
}
&_cars {
margin: 0.65em 0;
white-space: pre-wrap;
text-align: center;
color: #c5c5c5;
.count {
color: var(--clr-primary);
}
}
&_stock {
display: flex;
align-items: flex-end;
overflow-x: auto;
width: 100%;
padding: 0.5em 0;
}
&_position {
span {
text-align: center;
}
}
}
</style>
@@ -0,0 +1,189 @@
<template>
<div class="train-info simple">
<section>
<span>
<div>
<strong v-if="train.timetableData">{{ train.timetableData.category }}&nbsp;</strong>
<strong>{{ train.trainNo }}</strong>
<span>&nbsp;| {{ train.driverName }}</span>
</div>
<div class="timetable_route">
<strong v-if="train.timetableData">{{ train.timetableData.route.replace('|', ' - ') }}</strong>
<img
v-if="getSceneriesWithComments(train.timetableData).length > 0"
class="image-warning"
:src="icons.warning"
:title="`${$t('trains.timetable-comments')} (${getSceneriesWithComments(train.timetableData).join(',')})`"
/>
</div>
<hr style="margin: 0.25em 0" />
<div class="timetable_stops" v-if="train.timetableData">
<span v-if="train.timetableData.followingStops.length > 2">
{{ $t('trains.via-title') }}
<span v-html="displayStopList(train.timetableData.followingStops)"></span>
</span>
</div>
<div style="margin-top: 0.5em" v-if="train.timetableData">
<span class="text--primary"> {{ train.timetableData.routeDistance }} km </span>
|
<span>
{{ $t('trains.route-progress') }} {{ confirmedPercentage(train.timetableData.followingStops) }}%
</span>
|
<span v-html="currentDelay(train.timetableData.followingStops)"></span>
</div>
<div class="driver_position text--grayed">
<span v-if="train.currentStationName">
Na scenerii <span>{{ train['currentStationName'] }}</span>
</span>
<span v-if="train.signal">
przy semaforze <span>{{ train['signal'] }}</span>
</span>
<span v-if="train.connectedTrack">
na szlaku <span>{{ train['connectedTrack'] }}</span>
</span>
</div>
</span>
</section>
<section class="train-image" style="display: flex; justify-content: center; align-items: center;">
<img :src="train.locoURL" alt="Not Found" @error="onImageError" />
<div class="text--grayed">
{{ train.locoType }}
<span v-if="train.cars.length > 0">
&nbsp;&bull; {{ $t('trains.cars') }}:
<span class="count">{{ train.cars.length }}</span>
</span>
</div>
<div>
<div>
<span v-for="(stat, i) in STATS.main" :key="stat.name">
<span v-if="i > 0"> &bull; </span>
<span>{{ `${~~(train[stat.name] * (stat.multiplier || 1))}${stat.unit}` }} </span>
</span>
</div>
</div>
</section>
<!-- <span class="info-stats">
<span v-for="stat in STATS.main" :key="stat.name">
<span>{{ $t(`trains.option-${stat.name}`).toUpperCase() }}</span
>:
<span class="text--primary">{{ `${~~(train[stat.name] * (stat.multiplier || 1))}${stat.unit}` }} </span>
</span>
</span> -->
</div>
</template>
<script lang="ts">
import trainInfoMixin from '@/mixins/trainInfoMixin';
import Train from '@/scripts/interfaces/Train';
import { defineComponent } from 'vue';
export default defineComponent({
props: {
train: {
type: Object as () => Train,
required: true,
},
},
mixins: [trainInfoMixin],
data: () => ({
icons: {
warning: require('@/assets/icon-warning.svg'),
},
}),
});
</script>
<style lang="scss" scoped>
@import '../../styles/responsive.scss';
.image-warning {
width: 1em;
height: 1em;
margin-left: 0.25em;
}
.train-image {
display: flex;
flex-direction: column;
img {
margin: 0.5em 0;
width: 12em;
}
}
.simple {
display: grid;
grid-template-columns: 2fr 1fr;
grid-template-rows: 1fr;
padding: 1em;
gap: 0.5em;
&:hover {
background: #424242;
}
}
.timetable_stops {
font-size: 0.75em;
}
.timetable_route {
display: flex;
align-items: center;
}
.comments {
display: flex;
align-items: center;
font-size: 0.9em;
margin-top: 1em;
img {
margin-right: 0.5em;
}
}
@include smallScreen() {
.simple {
grid-template-columns: 1fr;
gap: 1em 0;
text-align: center;
}
.info-stats {
text-align: center;
}
.timetable_route {
justify-content: center;
}
.comments {
flex-direction: column;
justify-content: center;
img {
margin: 0 0 0.5em 0;
}
}
}
</style>
@@ -6,7 +6,7 @@
</div>
<train-info :train="train" />
<train-schedule :followingStops="train.timetableData?.followingStops" ref="card-inner" tabindex="0" @focus="test" />
<train-schedule :followingStops="train.timetableData?.followingStops" ref="card-inner" tabindex="0" />
</section>
</template>
@@ -38,11 +38,7 @@ export default defineComponent({
methods: {
close() {
this.$emit('close');
},
test() {
console.log('xd');
},
}
},
});
</script>
@@ -73,7 +69,7 @@ export default defineComponent({
padding: 0.5em;
width: 100%;
max-width: 1000px;
max-width: 1300px;
@include smallScreen {