From 785bc4569fc87aa289766847c862dd8148c5de0b Mon Sep 17 00:00:00 2001 From: Ariel Costas Guerrero Date: Thu, 6 Nov 2025 16:56:30 +0100 Subject: Fix timetable page --- src/frontend/app/routes/timetable-$id.tsx | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/frontend/app/routes/timetable-$id.tsx b/src/frontend/app/routes/timetable-$id.tsx index 702989a..5ecebc8 100644 --- a/src/frontend/app/routes/timetable-$id.tsx +++ b/src/frontend/app/routes/timetable-$id.tsx @@ -54,12 +54,12 @@ const filterTimetableData = (data: ScheduledTable[], currentTime: string, showPa const currentMinutes = timeToMinutes(currentTime); const sortedData = [...data].sort((a, b) => - timeToMinutes(a.departure_time) - timeToMinutes(b.departure_time) + timeToMinutes(a.calling_time) - timeToMinutes(b.calling_time) ); // Find the current position const currentIndex = sortedData.findIndex(entry => - timeToMinutes(entry.departure_time) >= currentMinutes + timeToMinutes(entry.calling_time) >= currentMinutes ); if (currentIndex === -1) { @@ -164,11 +164,11 @@ export default function Timetable() { setTimeout(() => { const currentMinutes = timeToMinutes(currentTime); const sortedData = [...timetableBody].sort((a, b) => - timeToMinutes(a.departure_time) - timeToMinutes(b.departure_time) + timeToMinutes(a.calling_time) - timeToMinutes(b.calling_time) ); const nextIndex = sortedData.findIndex(entry => - timeToMinutes(entry.departure_time) >= currentMinutes + timeToMinutes(entry.calling_time) >= currentMinutes ); if (nextIndex !== -1 && nextEntryRef.current) { @@ -299,13 +299,13 @@ const TimetableTableWithScroll: React.FC<{
{data.map((entry, index) => { - const entryMinutes = timeToMinutes(entry.departure_time); + const entryMinutes = timeToMinutes(entry.calling_time); const isPast = entryMinutes < nowMinutes; - const isNext = !isPast && (index === 0 || timeToMinutes(data[index - 1]?.departure_time || '00:00:00') < nowMinutes); + const isNext = !isPast && (index === 0 || timeToMinutes(data[index - 1]?.calling_time || '00:00:00') < nowMinutes); return (
- +
- {entry.trip.headsign && entry.trip.headsign.trim() ? ( - {entry.trip.headsign} + {entry.route && entry.route.trim() ? ( + {entry.route} ) : ( - {t("timetable.noDestination", "Línea")} {entry.line.name} + {t("timetable.noDestination", "Línea")} {entry.line} )}
- {entry.departure_time.slice(0, 5)} + {entry.calling_time.slice(0, 5)}
- {parseServiceId(entry.trip.service_id)} + {parseServiceId(entry.service_id)}
-- cgit v1.3