Spythere/srjp-td2
1
0
Fork 0
mirror of https://github.com/Spythere/srjp-td2.git synced 2026-05-03 05:28:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

hotfix(timetable): incorrect display for departure lines; removed doubling 0.000km and excessive top border

Browse Source
This commit is contained in:
Spythere
2026-04-06 20:24:41 +02:00
parent 8fea27f5a6
commit 9afbd3b1eb
1 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/Timetable/TimetableContent.vue
+34 -19
View File
@@ -66,28 +66,31 @@
class="text-center align-top border-l border-l-black dark:border-l-white relative" class="text-center align-top border-l border-l-black dark:border-l-white relative"
:class="{ :class="{
'border-t border-t-black dark:border-t-white': 'border-t border-t-black dark:border-t-white':
row.lastRowRef != null && row.lastRowRef.arrivalLineNumber != row.arrivalLineNumber, row.lastRowRef != null && row.lastRowRef.departureLineNumber != row.arrivalLineNumber,
'border-b border-b-black dark:border-b-white': i == computedTimetableRows.length - 1 'border-b border-b-black dark:border-b-white': i == computedTimetableRows.length - 1
}" }"
> >
<div class="absolute -top-[0.5px] left-0 w-full h-full"> <div class="absolute -top-[0.5px] left-0 w-full h-full">
<table class="h-full w-full border-collapse"> <table class="h-full w-full border-collapse">
<tbody> <tbody>
<!-- Arrival Km --> <!-- Arrival Line -->
<tr class="align-top"> <tr class="align-top">
<td> <td>
{{ {{
row.lastRowRef == null || row.lastRowRef == null ||
row.lastRowRef.arrivalLineNumber != row.arrivalLineNumber row.lastRowRef.departureLineNumber != row.arrivalLineNumber
? row.arrivalLineNumber ? row.arrivalLineNumber
: '&nbsp;' : '&nbsp;'
}} }}
</td> </td>
</tr> </tr>
<!-- Departure Km --> <!-- Departure Line -->
<tr class="align-top"> <tr class="align-top">
<!-- <td>{{ row.departureLineNumber != row.arrivalLineNumber ? row.departureLineNumber : '&nbsp;' }}</td> --> <td v-if="row.departureLineNumber != row.arrivalLineNumber" class="border-t">
{{ row.departureLineNumber }}
</td>
<td v-else>&nbsp;</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@@ -107,18 +110,23 @@
<!-- Arrival Km --> <!-- Arrival Km -->
<tr> <tr>
<td <td
class="align-top border-t text-inherit" class="align-top border-t"
:class="{ v-if="
'border-t-0 text-transparent': row.lastRowRef &&
row.lastRowRef && (row.lastRowRef.departureSpeedL != row.arrivalSpeedL ||
row.lastRowRef.departureSpeedL == row.arrivalSpeedL && row.lastRowRef.departureSpeedP != row.arrivalSpeedP ||
row.lastRowRef.departureSpeedP == row.arrivalSpeedP && row.lastRowRef.departureTracks != row.arrivalTracks ||
row.lastRowRef.departureTracks == row.arrivalTracks && row.lastRowRef.departureLineNumber != row.arrivalLineNumber)
row.lastRowRef.arrivalLineNumber == row.arrivalLineNumber "
}"
> >
&nbsp;{{ row.arrivalKm }} &nbsp;{{ row.arrivalKm }}
</td> </td>
<td class="align-top" v-else-if="row.lastRowRef == null">
&nbsp;{{ row.arrivalKm }}
</td>
<td v-else>&nbsp;</td>
</tr> </tr>
<!-- Departure Km --> <!-- Departure Km -->
@@ -127,11 +135,13 @@
'border-black dark:border-white border-t align-top': 'border-black dark:border-white border-t align-top':
row.arrivalTracks != row.departureTracks || row.arrivalTracks != row.departureTracks ||
row.departureSpeedL != row.arrivalSpeedL || row.departureSpeedL != row.arrivalSpeedL ||
row.departureSpeedP != row.arrivalSpeedP, row.departureSpeedP != row.arrivalSpeedP ||
row.departureLineNumber != row.arrivalLineNumber,
hidden: hidden:
row.arrivalTracks == row.departureTracks && row.arrivalTracks == row.departureTracks &&
row.departureSpeedL == row.arrivalSpeedL && row.departureSpeedL == row.arrivalSpeedL &&
row.departureSpeedP == row.arrivalSpeedP row.departureSpeedP == row.arrivalSpeedP &&
row.departureLineNumber == row.arrivalLineNumber
}" }"
> >
<td>&nbsp;{{ row.departureKm }}</td> <td>&nbsp;{{ row.departureKm }}</td>
@@ -580,7 +590,6 @@ const computedTimetableRows = computed(() => {
arrivalSpeedL = correctedDepartureSpeedL || arrivalSpeedL; arrivalSpeedL = correctedDepartureSpeedL || arrivalSpeedL;
arrivalSpeedP = correctedDepartureSpeedP || arrivalSpeedP; arrivalSpeedP = correctedDepartureSpeedP || arrivalSpeedP;
arrivalTracks = correctedDepartureTracks || arrivalTracks; arrivalTracks = correctedDepartureTracks || arrivalTracks;
if (stop.departureTimestamp) lastDepartureTimestamp = stop.departureTimestamp; if (stop.departureTimestamp) lastDepartureTimestamp = stop.departureTimestamp;
@@ -619,7 +628,10 @@ const computedTimetableRows = computed(() => {
? Math.min(currentPath.departureLineData.routeSpeedExit, stockVmax) ? Math.min(currentPath.departureLineData.routeSpeedExit, stockVmax)
: stopRows[i].departureSpeedL; : stopRows[i].departureSpeedL;
stopRows[i].arrivalLineNumber = // stopRows[i].arrivalLineNumber =
// currentPath.departureLineData.realLineNo?.toString() ?? '';
stopRows[i].departureLineNumber =
currentPath.departureLineData.realLineNo?.toString() ?? ''; currentPath.departureLineData.realLineNo?.toString() ?? '';
if (stopRows[i].isMain || stopRows[i].pointName.endsWith(', podg')) { if (stopRows[i].isMain || stopRows[i].pointName.endsWith(', podg')) {
@@ -639,7 +651,8 @@ const computedTimetableRows = computed(() => {
// currentPath.sceneryName, // currentPath.sceneryName,
// stop.stopDistance, // stop.stopDistance,
// currentPath.departureLineData.routeLength, // currentPath.departureLineData.routeLength,
// currentPath.departureLineData.isRouteSBL // currentPath.departureLineData.isRouteSBL,
// currentPath.departureLineData.realLineNo
// ); // );
abbrevs = getAbbrevs(currentPath.departureLineData); abbrevs = getAbbrevs(currentPath.departureLineData);
@@ -652,6 +665,8 @@ const computedTimetableRows = computed(() => {
? Math.min(currentPath.departureLineData.routeSpeedExit, stockVmax) ? Math.min(currentPath.departureLineData.routeSpeedExit, stockVmax)
: stopRows[i].arrivalSpeedP; : stopRows[i].arrivalSpeedP;
stopRows[i].arrivalTracks = currentPath.departureLineData.routeTracks; stopRows[i].arrivalTracks = currentPath.departureLineData.routeTracks;
stopRows[i].arrivalLineNumber =
currentPath.departureLineData.realLineNo?.toString() ?? '';
} }
} }