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

Compare commits

base: Spythere/srjp-td2:development
Branches Tags
Spythere/srjp-td2:main Spythere/srjp-td2:development Spythere/srjp-td2:main-old Spythere/srjp-td2:feat/journal Spythere/srjp-td2:master
Spythere/srjp-td2:v1.1.3
..
compare: Spythere/srjp-td2:v1.1.3
Branches Tags
Spythere/srjp-td2:main Spythere/srjp-td2:development Spythere/srjp-td2:main-old Spythere/srjp-td2:feat/journal Spythere/srjp-td2:master
Spythere/srjp-td2:v1.1.3

9 Commits
development .. v1.1.3

Author SHA1 Message Date
Spythere d27b66cfd9 Merge pull request #9 from Spythere/development 
v1.1.3
 2026-04-06 15:47:02 +02:00
Spythere fa71587ca7 Merge pull request #8 from Spythere/development 
Added information bar about migration to a new domain
 2026-03-10 00:06:08 +01:00
Spythere 96a14778c8 Merge pull request #7 from Spythere/development 
v1.1.2
 2025-07-06 16:18:35 +02:00
Spythere c767ee6d2b Merge pull request #6 from Spythere/development 
v1.1.1
 2025-06-22 14:13:27 +02:00
Spythere 1df3510df1 Merge pull request #5 from Spythere/development 
hotfix: PWA installation settings
 2025-05-03 14:19:16 +02:00
Spythere ceb0a49932 Merge pull request #4 from Spythere/development 
v1.1.0
 2025-05-03 14:13:51 +02:00
Spythere ca393057e4 Merge pull request #3 from Spythere/development 
v1.0.5
 2025-04-15 20:45:48 +02:00
Spythere e028905048 Merge pull request #2 from Spythere/development 
v1.0.4
 2025-04-14 15:34:08 +02:00
Spythere 5c46209fd3 Merge pull request #1 from Spythere/development 
v1.0.3
 2025-02-11 19:16:48 +01:00
1 changed files with 19 additions and 34 deletions
Expand all files Collapse all files
src/components/Timetable/TimetableContent.vue
+19 -34
View File
@@ -66,31 +66,28 @@
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.departureLineNumber != row.arrivalLineNumber, row.lastRowRef != null && row.lastRowRef.arrivalLineNumber != 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 Line --> <!-- Arrival Km -->
<tr class="align-top"> <tr class="align-top">
<td> <td>
{{ {{
row.lastRowRef == null || row.lastRowRef == null ||
row.lastRowRef.departureLineNumber != row.arrivalLineNumber row.lastRowRef.arrivalLineNumber != row.arrivalLineNumber
? row.arrivalLineNumber ? row.arrivalLineNumber
: '&nbsp;' : '&nbsp;'
}} }}
</td> </td>
</tr> </tr>
<!-- Departure Line --> <!-- Departure Km -->
<tr class="align-top"> <tr class="align-top">
<td v-if="row.departureLineNumber != row.arrivalLineNumber" class="border-t"> <!-- <td>{{ row.departureLineNumber != row.arrivalLineNumber ? row.departureLineNumber : '&nbsp;' }}</td> -->
{{ row.departureLineNumber }}
</td>
<td v-else>&nbsp;</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@@ -110,23 +107,18 @@
<!-- Arrival Km --> <!-- Arrival Km -->
<tr> <tr>
<td <td
class="align-top border-t" class="align-top border-t text-inherit"
v-if=" :class="{
row.lastRowRef && 'border-t-0 text-transparent':
(row.lastRowRef.departureSpeedL != row.arrivalSpeedL || row.lastRowRef &&
row.lastRowRef.departureSpeedP != row.arrivalSpeedP || row.lastRowRef.departureSpeedL == row.arrivalSpeedL &&
row.lastRowRef.departureTracks != row.arrivalTracks || row.lastRowRef.departureSpeedP == row.arrivalSpeedP &&
row.lastRowRef.departureLineNumber != row.arrivalLineNumber) row.lastRowRef.departureTracks == row.arrivalTracks &&
" 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 -->
@@ -135,13 +127,11 @@
'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>
@@ -590,6 +580,7 @@ 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;
@@ -628,10 +619,7 @@ 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')) {
@@ -651,8 +639,7 @@ 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);
@@ -665,8 +652,6 @@ 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() ?? '';
} }
} }