Merge pull request #52

fix: data wcześniejszego przyjazdu dla 0pt
This commit is contained in:
Spythere
2023-08-27 23:07:01 +02:00
committed by GitHub
+119 -119
View File
@@ -1,119 +1,119 @@
<template> <template>
<span class="stop-date"> <span class="stop-date">
<span <span
class="date arrival" class="date arrival"
v-if="!stop.beginsHere" v-if="!stop.beginsHere"
:class="{ :class="{
delayed: stop.arrivalDelay > 0 && stop.confirmed, delayed: stop.arrivalDelay > 0 && (stop.confirmed || stop.stopped),
preponed: stop.arrivalDelay < 0 && stop.confirmed, preponed: stop.arrivalDelay < 0 && (stop.confirmed || stop.stopped),
'on-time': stop.arrivalDelay == 0 && stop.confirmed, 'on-time': stop.arrivalDelay == 0 && stop.confirmed,
}" }"
> >
<span v-if="stop.arrivalDelay != 0 && stop.confirmed"> <span v-if="stop.arrivalDelay != 0 && (stop.confirmed || stop.stopped)">
<s>{{ timestampToString(stop.arrivalTimestamp) }}</s> <s>{{ timestampToString(stop.arrivalTimestamp) }}</s>
{{ timestampToString(stop.arrivalRealTimestamp) }} {{ timestampToString(stop.arrivalRealTimestamp) }}
({{ stop.arrivalDelay > 0 ? '+' : '' }}{{ stop.arrivalDelay }}) ({{ stop.arrivalDelay > 0 ? '+' : '' }}{{ stop.arrivalDelay }})
</span> </span>
<span v-else> <span v-else>
{{ timestampToString(stop.arrivalTimestamp) }} {{ timestampToString(stop.arrivalTimestamp) }}
</span> </span>
</span> </span>
<span class="date stop" v-if="stop.stopTime" :class="stop.stopType.replace(', ', '-')"> <span class="date stop" v-if="stop.stopTime || stop.stopped" :class="stop.stopType.replace(', ', '-')">
{{ stop.stopTime }} {{ stop.stopType == '' ? 'pt' : stop.stopType }} {{ stop.stopTime }} {{ stop.stopType == '' ? 'pt' : stop.stopType }}
</span> </span>
<span <span
class="date departure" class="date departure"
v-if="!stop.terminatesHere && stop.stopTime != 0" v-if="!stop.terminatesHere && (stop.stopTime != 0 || stop.stopped)"
:class="{ :class="{
delayed: stop.departureDelay > 0 && stop.confirmed, delayed: stop.departureDelay > 0 && stop.confirmed,
preponed: stop.departureDelay < 0 && stop.confirmed, preponed: stop.departureDelay < 0 && stop.confirmed,
}" }"
> >
<span v-if="stop.departureDelay != 0 && stop.confirmed"> <span v-if="stop.departureDelay != 0 && stop.confirmed">
<s>{{ timestampToString(stop.departureTimestamp) }}</s> <s>{{ timestampToString(stop.departureTimestamp) }}</s>
{{ timestampToString(stop.departureRealTimestamp) }} {{ timestampToString(stop.departureRealTimestamp) }}
({{ stop.departureDelay > 0 ? '+' : '' }}{{ stop.departureDelay }}) ({{ stop.departureDelay > 0 ? '+' : '' }}{{ stop.departureDelay }})
</span> </span>
<span v-else> <span v-else>
{{ timestampToString(stop.departureTimestamp) }} {{ timestampToString(stop.departureTimestamp) }}
</span> </span>
</span> </span>
</span> </span>
</template> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent } from 'vue'; import { defineComponent } from 'vue';
import dateMixin from '../../mixins/dateMixin'; import dateMixin from '../../mixins/dateMixin';
import TrainStop from '../../scripts/interfaces/TrainStop'; import TrainStop from '../../scripts/interfaces/TrainStop';
export default defineComponent({ export default defineComponent({
mixins: [dateMixin], mixins: [dateMixin],
props: { props: {
stop: { stop: {
type: Object as () => TrainStop, type: Object as () => TrainStop,
required: true, required: true,
}, },
}, },
setup() { setup() {
return {}; return {};
}, },
}); });
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
$preponedClr: lime; $preponedClr: lime;
$delayedClr: salmon; $delayedClr: salmon;
$dateClr: #525151; $dateClr: #525151;
$stopExchangeClr: #db8e29; $stopExchangeClr: #db8e29;
$stopDefaultClr: #252525; $stopDefaultClr: #252525;
.stop-date { .stop-date {
display: flex; display: flex;
align-items: center; align-items: center;
.date { .date {
background: $dateClr; background: $dateClr;
padding: 0.3em 0.5em; padding: 0.3em 0.5em;
} }
.stop { .stop {
&.ph, &.ph,
&.ph-pm, &.ph-pm,
&.pm { &.pm {
background: $stopExchangeClr; background: $stopExchangeClr;
} }
background: $stopDefaultClr; background: $stopDefaultClr;
} }
.arrival, .arrival,
.departure { .departure {
&.delayed { &.delayed {
s { s {
color: #999; color: #999;
} }
span { span {
color: $delayedClr; color: $delayedClr;
} }
} }
&.preponed { &.preponed {
s { s {
color: #999; color: #999;
} }
span { span {
color: $preponedClr; color: $preponedClr;
} }
} }
} }
} }
</style> </style>