-
Choisissez un type d'afficheur
+
+
Choisissez un type d'afficheur
+
+ {source === 'supabase' ? 'đïž BDD Ferrovia' : 'đ SNCF (GTFS)'}
+
+
+
{gare &&
Gare sélectionnée : {gare}
}
Mode sélectionné : {mode === 'arrivees' ? 'Arrivées' : 'Départs'}
- {/* Boutons directs pour afficher les afficheurs classiques supprimés */}
-
{types.map((t) => (
-
{
- if (typeof navigate === 'function') {
- const kebab = gare ? String(gare).trim().replace(/\s+/g, '-').replace(/\//g, '/') : '';
- navigate(`/select-afficheur?gare=${encodeURIComponent(kebab)}&mode=${mode}&type=${t.id}`);
- return;
- }
- alert(`${t.label} pour ${gare || 'â'}`);
- }}>
+
{
+ if (typeof navigate === 'function') {
+ const kebab = gare ? String(gare).trim().replace(/\s+/g, '-').replace(/\//g, '/') : '';
+ navigate(`${prefix}/select-afficheur?gare=${encodeURIComponent(kebab)}&mode=${mode}&type=${t.id}`);
+ return;
+ }
+ alert(`${t.label} pour ${gare || 'â'}`);
+ }}
+ >
{t.label}
Afficher le style {t.label} pour la gare {gare || ''}.
@@ -74,29 +91,21 @@ export default function Displays({ onBack, navigate }) {
- {/* Bouton de retour au style WCS SNCF */}
{
- // Appelle le callback fourni par le routeur simple si disponible
try {
if (typeof onBack === 'function') {
onBack();
return;
}
- } catch (e) {
- // ignore
- }
+ } catch (e) {}
- // Fallback : si l'historique du navigateur permet un back, on l'utilise
if (typeof window !== 'undefined' && window.history && window.history.length > 1) {
window.history.back();
} else {
- // Redirection sûre vers la racine
- window.location.href = '/';
+ window.location.href = prefix || '/';
}
}}
label="Retour"
@@ -105,4 +114,3 @@ export default function Displays({ onBack, navigate }) {
);
}
-
diff --git a/src/pages/SelectAfficheur.js b/src/pages/SelectAfficheur.js
index 0246b06..9b754da 100644
--- a/src/pages/SelectAfficheur.js
+++ b/src/pages/SelectAfficheur.js
@@ -1,8 +1,11 @@
import React, { useEffect, useState } from 'react';
-import supabase from '../lib/supabase';
import WcsButton from '../components/WcsButton';
+import { getSourceFromPath, getPlatformsForStation } from '../services/railwayService';
export default function SelectAfficheur({ onBack, navigate }) {
+ const source = getSourceFromPath(window.location.pathname);
+ const prefix = source === 'supabase' ? '/ferrovia' : '';
+
const params = new URLSearchParams(window.location.search || '');
const gareParam = params.get('gare') || '';
const modeParam = params.get('mode') || 'departs';
@@ -21,50 +24,13 @@ export default function SelectAfficheur({ onBack, navigate }) {
useEffect(() => {
let mounted = true;
async function loadPlatforms() {
- if (!supabase) {
- setLoading(false);
- return;
- }
try {
setLoading(true);
- const { data, error } = await supabase.from('horaires').select('quai_reel, voie, quai, gare_depart_nom, gare_arrivee_nom, gares_desservies');
- if (error) throw error;
+ const sortedPlatforms = await getPlatformsForStation(decodedGare || gareParam, source);
if (!mounted) return;
- const platformSet = new Set();
- const normGare = decodedGare.normalize('NFD').replace(/\p{M}/gu, '').toLowerCase().trim();
-
- (data || []).forEach(h => {
- let stopsList = [];
- if (Array.isArray(h.gares_desservies)) {
- stopsList = h.gares_desservies;
- } else if (typeof h.gares_desservies === 'string') {
- try { stopsList = JSON.parse(h.gares_desservies); } catch (e) {}
- }
- if (!Array.isArray(stopsList)) stopsList = [];
-
- let foundStop = stopsList.find(s => {
- const name = (s.gare_nom || s.nom || s.name || '').toString().normalize('NFD').replace(/\p{M}/gu, '').toLowerCase().trim();
- return name === normGare || name.includes(normGare) || normGare.includes(name);
- });
-
- if (foundStop) {
- const platform = (foundStop.quai_reel || foundStop.quai || foundStop.platform || foundStop.quay || '').toString().trim();
- if (platform) platformSet.add(platform);
- } else {
- const origin = (h.gare_depart_nom || '').toString().normalize('NFD').replace(/\p{M}/gu, '').toLowerCase().trim();
- const dest = (h.gare_arrivee_nom || '').toString().normalize('NFD').replace(/\p{M}/gu, '').toLowerCase().trim();
- if (origin === normGare || origin.includes(normGare) || normGare.includes(origin) ||
- dest === normGare || dest.includes(normGare) || normGare.includes(dest)) {
- const platform = (h.quai_reel || h.voie || h.quai || '').toString().trim();
- if (platform) platformSet.add(platform);
- }
- }
- });
-
- const sortedPlatforms = Array.from(platformSet).sort((a, b) => a.localeCompare(b, undefined, { numeric: true, sensitivity: 'base' }));
- setPlatforms(sortedPlatforms);
- if (sortedPlatforms.length > 0) {
+ setPlatforms(sortedPlatforms || []);
+ if (sortedPlatforms && sortedPlatforms.length > 0) {
setSelectedPlatform(sortedPlatforms[0]);
}
} catch (err) {
@@ -78,12 +44,12 @@ export default function SelectAfficheur({ onBack, navigate }) {
return () => {
mounted = false;
};
- }, [gareParam, decodedGare]);
+ }, [gareParam, decodedGare, source]);
const handleGeneral = () => {
if (typeof navigate === 'function') {
const kebab = gareParam ? String(gareParam).trim() : '';
- navigate(`/afficheurs/${modeParam}/${typeParam}?gare=${encodeURIComponent(kebab)}`);
+ navigate(`${prefix}/afficheurs/${modeParam}/${typeParam}?gare=${encodeURIComponent(kebab)}`);
}
};
@@ -95,7 +61,7 @@ export default function SelectAfficheur({ onBack, navigate }) {
}
if (typeof navigate === 'function') {
const kebab = gareParam ? String(gareParam).trim() : '';
- navigate(`/afficheurs/${modeParam}/${typeParam}/quais?gare=${encodeURIComponent(kebab)}&quai=${encodeURIComponent(quai)}`);
+ navigate(`${prefix}/afficheurs/${modeParam}/${typeParam}/quais?gare=${encodeURIComponent(kebab)}&quai=${encodeURIComponent(quai)}`);
}
};
@@ -109,15 +75,27 @@ export default function SelectAfficheur({ onBack, navigate }) {
boxShadow: '0 4px 20px rgba(0, 0, 0, 0.08)',
fontFamily: '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif'
}}>
-
- SĂ©lection de l'Afficheur
-
+
+
+ SĂ©lection de l'Afficheur
+
+
+ {source === 'supabase' ? 'đïž BDD Ferrovia' : 'đ SNCF (GTFS)'}
+
+
+
{
if (v == null) return '';
const tryDate = new Date(v);
if (!isNaN(tryDate.getTime())) {
- const hh = String(tryDate.getHours()).padStart(2, '0');
+ const hh = String(tryDate.getHours() % 24).padStart(2, '0');
const mm = String(tryDate.getMinutes()).padStart(2, '0');
return `${hh}h${mm}`;
}
if (typeof v === 'string') {
const m = v.match(/(\d{1,2}):(\d{2})(?::\d{2})?/);
- if (m) return `${String(m[1]).padStart(2,'0')}h${m[2]}`;
+ if (m) {
+ const h = parseInt(m[1], 10) % 24;
+ return `${String(h).padStart(2,'0')}h${m[2]}`;
+ }
const m2 = v.match(/T(\d{2}):(\d{2})/);
- if (m2) return `${m2[1]}h${m2[2]}`;
+ if (m2) {
+ const h = parseInt(m2[1], 10) % 24;
+ return `${String(h).padStart(2,'0')}h${m2[2]}`;
+ }
+ const m3 = v.match(/(\d{1,2})h(\d{2})/i);
+ if (m3) {
+ const h = parseInt(m3[1], 10) % 24;
+ return `${String(h).padStart(2,'0')}h${m3[2]}`;
+ }
return v.slice(0,5).replace(':','h');
}
return String(v).slice(0,5).replace(':','h');
@@ -155,10 +168,17 @@ export default function AFLArrivees(){
useAnnonceSonoreRealtime(resolvedGareId, 'AFLArrivees');
useAutoAnnonce(horaires, currentTime, true);
- // Récupérer le type de gare une seule fois au montage ou quand les paramÚtres changent
useEffect(() => {
let mounted = true;
+ const source = getSourceFromPath(window.location.pathname);
const fetchStationType = async () => {
+ if (source === 'sncf') {
+ if (mounted) {
+ setStationType('interurbaine');
+ setResolvedGareId(null);
+ }
+ return;
+ }
try {
let fetchedType = null;
let fetchedId = gareIdParam || null;
@@ -188,9 +208,7 @@ export default function AFLArrivees(){
}
} catch (e) { /* ignore */ }
};
- if (supabase) {
- fetchStationType();
- }
+ fetchStationType();
return () => { mounted = false; };
}, [gareIdParam, gareDisplay]);
@@ -315,11 +333,14 @@ export default function AFLArrivees(){
// eslint-disable-next-line no-unused-vars
const parseTimeHM = useCallback((s) => {
if (!s) return null;
- if (typeof s === 'number') return s;
- const m = String(s).match(/(\d{1,2}):(\d{2})/);
- if (m) return parseInt(m[1],10)*60 + parseInt(m[2],10);
+ if (typeof s === 'number') return s % 1440;
+ const m = String(s).match(/(\d{1,2})[:h](\d{2})/i);
+ if (m) {
+ const h = parseInt(m[1], 10) % 24;
+ return h * 60 + parseInt(m[2], 10);
+ }
const d = new Date(s);
- if (!isNaN(d.getTime())) return d.getHours()*60 + d.getMinutes();
+ if (!isNaN(d.getTime())) return d.getHours() * 60 + d.getMinutes();
return null;
}, []);
@@ -626,18 +647,57 @@ export default function AFLArrivees(){
});
}, [buildPerturbMap, computeStatusForHoraireAtStop, gareDisplay, gareIdParam, getStops, normalizeName]);
- // RĂ©cupĂ©ration Supabase â maintenant avec polling pour synchroniser sans recharger la page
+ // RĂ©cupĂ©ration des donnĂ©es (SNCF GTFS ou Supabase) â avec polling pour synchroniser en continu
useEffect(() => {
let mounted = true;
let inFlight = false; // empĂȘche les fetchs concurrents
+ const source = getSourceFromPath(window.location.pathname);
const fetchData = async () => {
if (!mounted) return;
- if (inFlight) return; // éviter les appels simultanés si le fetch précédent n'est pas terminé
+ if (inFlight) return;
inFlight = true;
+
+ if (source === 'sncf') {
+ setLoading(true);
+ setError(null);
+ try {
+ const { data: sncfData, error: sncfErr } = await getSncfTimetable({
+ gareName: gareDisplay || gareParam,
+ mode: 'arrivees'
+ });
+ if (!mounted) { inFlight = false; return; }
+ if (sncfErr) {
+ setError(sncfErr);
+ } else {
+ const formatted = (sncfData || []).map(t => {
+ const timeStr = t.heure_arrivee || t.heure_depart || t.time || '';
+ return {
+ ...t,
+ _displayTime: formatTimeNoSeconds(timeStr),
+ _displayPlatform: t.quai || t.voie || '',
+ _arrHM: (typeof t._arrHM === 'number') ? t._arrHM : parseTimeHM(timeStr),
+ _status: t._status || {
+ label: t.etat === 'supprime' ? 'supprimé' : (t.retard_minutes > 0 ? `retardé +${t.retard_minutes}min.` : "à l'heure"),
+ detail: '',
+ delayMinutes: t.retard_minutes || null,
+ causeDetails: t.cause_retard || null
+ }
+ };
+ });
+ setHoraires(formatted.slice(0, 10));
+ setAllHoraires(formatted);
+ }
+ } catch (e) {
+ if (mounted) setError(e.message || String(e));
+ } finally {
+ if (mounted) setLoading(false);
+ inFlight = false;
+ }
+ return;
+ }
+
if (!supabase) {
- // Supabase non initialisĂ© â avertir et dĂ©finir un message d'erreur pour l'UI
- // eslint-disable-next-line no-console
console.warn('Supabase non initialisĂ© â vĂ©rifiez REACT_APP_SUPABASE_URL et REACT_APP_SUPABASE_ANON_KEY');
setError('Supabase non initialisĂ© â vĂ©rifiez les variables d\'environnement');
setLoading(false);
@@ -1022,7 +1082,7 @@ export default function AFLArrivees(){
const intervalId = setInterval(fetchData, intervalMs);
return () => { mounted = false; clearInterval(intervalId); };
- }, [gareDisplay, gareIdParam, buildPerturbMap, computeStatusForHoraireAtStop, findPerturbsForHoraireAndStop, normalizeName, formatTimeFromHM, applyPerturbationsToHoraires, debug, getStops, getPerturbationJours]);
+ }, [gareDisplay, gareParam, gareIdParam, parseTimeHM, buildPerturbMap, computeStatusForHoraireAtStop, findPerturbsForHoraireAndStop, normalizeName, formatTimeFromHM, applyPerturbationsToHoraires, debug, getStops, getPerturbationJours]);
// Helpers pour perturbations (memoized plus haut)
@@ -1301,6 +1361,10 @@ export default function AFLArrivees(){
+ ) : showPlatform ? (
+
) : null
)}
diff --git a/src/pages/afficheurs/afl/AFLArriveesQuais.js b/src/pages/afficheurs/afl/AFLArriveesQuais.js
index a0e035e..c000de4 100644
--- a/src/pages/afficheurs/afl/AFLArriveesQuais.js
+++ b/src/pages/afficheurs/afl/AFLArriveesQuais.js
@@ -4,19 +4,22 @@ import { fetchAllRows } from '../../../lib/fetchAllRows';
import './AFLArriveesQuais.css';
import useAnnonceSonoreRealtime from '../../../hooks/useAnnonceSonoreRealtime';
import Logo from '../../../components/Logo';
+import { getSourceFromPath } from '../../../services/railwayService';
+import { getSncfTimetable } from '../../../services/sncfApi';
// Helper utilitaire : format HH:MM sans secondes (ex: 15:57)
const formatTimeNoSeconds = (v) => {
if (v == null) return '';
const tryDate = new Date(v);
if (!isNaN(tryDate.getTime())) {
- const hh = String(tryDate.getHours()).padStart(2, '0');
+ const hh = String(tryDate.getHours() % 24).padStart(2, '0');
const mm = String(tryDate.getMinutes()).padStart(2, '0');
return `${hh}:${mm}`;
}
- const parts = String(v).split(':');
- if (parts.length >= 2) {
- return `${parts[0].padStart(2, '0')}:${parts[1].padStart(2, '0')}`;
+ const m = String(v).match(/(\d{1,2})[:h](\d{2})/i);
+ if (m) {
+ const h = parseInt(m[1], 10) % 24;
+ return `${String(h).padStart(2, '0')}:${m[2]}`;
}
return v;
};
@@ -137,9 +140,12 @@ const AFLArriveesQuais = () => {
const parseTimeHM = useCallback((s) => {
if (!s) return null;
- if (typeof s === 'number') return s;
- const m = String(s).match(/(\d{1,2})[h:](\d{2})/);
- if (m) return parseInt(m[1], 10) * 60 + parseInt(m[2], 10);
+ if (typeof s === 'number') return s % 1440;
+ const m = String(s).match(/(\d{1,2})[h:](\d{2})/i);
+ if (m) {
+ const h = parseInt(m[1], 10) % 24;
+ return h * 60 + parseInt(m[2], 10);
+ }
const d = new Date(s);
if (!isNaN(d.getTime())) return d.getHours() * 60 + d.getMinutes();
return null;
@@ -351,6 +357,39 @@ const AFLArriveesQuais = () => {
const fetchData = useCallback(async () => {
try {
+ const source = getSourceFromPath(window.location.pathname);
+ if (source === 'sncf') {
+ const { data: sncfData } = await getSncfTimetable({
+ gareName: gareDisplay || gareParam,
+ mode: 'arrivees',
+ quai: quaiParam
+ });
+ if (sncfData && sncfData.length > 0) {
+ const train = sncfData[0];
+ const enriched = {
+ ...train,
+ _rawTime: train.heure_arrivee || train.heure_depart,
+ _displayTime: formatTimeNoSeconds(train.heure_arrivee || train.heure_depart),
+ _status: {
+ label: train.etat === 'supprime' ? 'supprimé' : (train.retard_minutes > 0 ? `retardé +${train.retard_minutes}min.` : "à l'heure"),
+ detail: '',
+ delayMinutes: train.retard_minutes || null
+ },
+ _nextStationStatus: {
+ label: train.etat === 'supprime' ? 'supprimé' : (train.retard_minutes > 0 ? `retardé +${train.retard_minutes}min.` : "à l'heure")
+ },
+ _isToday: true
+ };
+ setNextArrival(enriched);
+ } else {
+ setNextArrival(null);
+ }
+ setLoading(false);
+ return;
+ }
+
+ if (!supabase) return;
+
const [{ data: horairesData }, { data: subData }, { data: perturbData }, { data: travauxData }] = await Promise.all([
fetchAllRows(supabase.from('horaires').select('*')),
supabase.from('travaux_substitutions').select('*'),
@@ -615,7 +654,7 @@ const AFLArriveesQuais = () => {
console.error(err);
setLoading(false);
}
- }, [applyPerturbationsToHoraires, buildPerturbMap, gareDisplay, getPerturbationJours, getStops, normalizeName, parseTimeHM, quaiParam]);
+ }, [applyPerturbationsToHoraires, buildPerturbMap, gareDisplay, gareParam, getPerturbationJours, getStops, normalizeName, parseTimeHM, quaiParam]);
useEffect(() => {
fetchData();
@@ -706,7 +745,7 @@ const AFLArriveesQuais = () => {
if (gareDisplay && Array.isArray(stopsList)) {
stopForStation = stopsList.find(s => normalizeName((s.gare_nom || s.nom || s.name || '').toString()) === normalizeName(gareDisplay));
}
- const platformStr = ((stopForStation && (stopForStation.quai_reel || stopForStation.quai || stopForStation.platform || stopForStation.quay)) || trainData.quai_reel || trainData.voie || trainData.quai || quaiParam || '').toString().trim();
+ const platformStr = ((stopForStation && (stopForStation.quai_reel || stopForStation.quai || stopForStation.platform || stopForStation.quay)) || trainData.quai_reel || trainData.voie || trainData.quai || trainData._displayPlatform || quaiParam || '').toString().trim() || quaiParam || '1';
// Extraction des origines (si multi-origines / tranches)
let origins = [];
diff --git a/src/pages/afficheurs/afl/AFLDeparts.js b/src/pages/afficheurs/afl/AFLDeparts.js
index d85888d..795540a 100644
--- a/src/pages/afficheurs/afl/AFLDeparts.js
+++ b/src/pages/afficheurs/afl/AFLDeparts.js
@@ -5,21 +5,34 @@ import { fetchAllRows } from '../../../lib/fetchAllRows';
import MarqueeText from '../../../components/MarqueeText';
import useAnnonceSonoreRealtime from '../../../hooks/useAnnonceSonoreRealtime';
import useAutoAnnonce from '../../../hooks/useAutoAnnonce';
+import { getSourceFromPath } from '../../../services/railwayService';
+import { getSncfTimetable } from '../../../services/sncfApi';
// Helper utilitaire : format HHhMM sans secondes (ex: 06h44)
const formatTimeNoSeconds = (v) => {
if (v == null) return '';
const tryDate = new Date(v);
if (!isNaN(tryDate.getTime())) {
- const hh = String(tryDate.getHours()).padStart(2, '0');
+ const hh = String(tryDate.getHours() % 24).padStart(2, '0');
const mm = String(tryDate.getMinutes()).padStart(2, '0');
return `${hh}h${mm}`;
}
if (typeof v === 'string') {
const m = v.match(/(\d{1,2}):(\d{2})(?::\d{2})?/);
- if (m) return `${String(m[1]).padStart(2,'0')}h${m[2]}`;
+ if (m) {
+ const h = parseInt(m[1], 10) % 24;
+ return `${String(h).padStart(2,'0')}h${m[2]}`;
+ }
const m2 = v.match(/T(\d{2}):(\d{2})/);
- if (m2) return `${m2[1]}h${m2[2]}`;
+ if (m2) {
+ const h = parseInt(m2[1], 10) % 24;
+ return `${String(h).padStart(2,'0')}h${m2[2]}`;
+ }
+ const m3 = v.match(/(\d{1,2})h(\d{2})/i);
+ if (m3) {
+ const h = parseInt(m3[1], 10) % 24;
+ return `${String(h).padStart(2,'0')}h${m3[2]}`;
+ }
return v.slice(0,5).replace(':','h');
}
return String(v).slice(0,5).replace(':','h');
@@ -165,7 +178,15 @@ export default function AFLDeparts(){
// Récupérer le type de gare une seule fois au montage ou quand les paramÚtres changent
useEffect(() => {
let mounted = true;
+ const source = getSourceFromPath(window.location.pathname);
const fetchStationType = async () => {
+ if (source === 'sncf') {
+ if (mounted) {
+ setStationType('interurbaine');
+ setResolvedGareId(null);
+ }
+ return;
+ }
try {
let fetchedType = null;
let fetchedId = gareIdParam || null;
@@ -195,9 +216,7 @@ export default function AFLDeparts(){
}
} catch (e) { /* ignore */ }
};
- if (supabase) {
- fetchStationType();
- }
+ fetchStationType();
return () => { mounted = false; };
}, [gareIdParam, gareDisplay]);
@@ -322,11 +341,14 @@ export default function AFLDeparts(){
// eslint-disable-next-line no-unused-vars
const parseTimeHM = useCallback((s) => {
if (!s) return null;
- if (typeof s === 'number') return s;
- const m = String(s).match(/(\d{1,2}):(\d{2})/);
- if (m) return parseInt(m[1],10)*60 + parseInt(m[2],10);
+ if (typeof s === 'number') return s % 1440;
+ const m = String(s).match(/(\d{1,2})[:h](\d{2})/i);
+ if (m) {
+ const h = parseInt(m[1], 10) % 24;
+ return h * 60 + parseInt(m[2], 10);
+ }
const d = new Date(s);
- if (!isNaN(d.getTime())) return d.getHours()*60 + d.getMinutes();
+ if (!isNaN(d.getTime())) return d.getHours() * 60 + d.getMinutes();
return null;
}, []);
@@ -638,18 +660,54 @@ export default function AFLDeparts(){
return () => clearInterval(id);
}, []);
- // RĂ©cupĂ©ration Supabase â maintenant avec polling pour synchroniser sans recharger la page
+ // RĂ©cupĂ©ration des donnĂ©es (SNCF GTFS ou Supabase) â avec polling pour synchroniser en continu
useEffect(() => {
let mounted = true;
let inFlight = false; // empĂȘche les fetchs concurrents
+ const source = getSourceFromPath(window.location.pathname);
const fetchData = async () => {
if (!mounted) return;
- if (inFlight) return; // éviter les appels simultanés si le fetch précédent n'est pas terminé
+ if (inFlight) return;
inFlight = true;
+
+ if (source === 'sncf') {
+ setLoading(true);
+ setError(null);
+ try {
+ const { data: sncfData, error: sncfErr } = await getSncfTimetable({
+ gareName: gareDisplay || gareParam,
+ mode: 'departs'
+ });
+ if (!mounted) { inFlight = false; return; }
+ if (sncfErr) {
+ setError(sncfErr);
+ } else {
+ const formatted = (sncfData || []).map(t => ({
+ ...t,
+ _displayTime: formatTimeNoSeconds(t.heure_depart),
+ _displayPlatform: t.quai || t.voie || '',
+ _depHM: (typeof t._depHM === 'number') ? t._depHM : parseTimeHM(t.heure_depart),
+ _status: t._status || {
+ label: t.etat === 'supprime' ? 'supprimé' : (t.retard_minutes > 0 ? `retardé +${t.retard_minutes}min.` : "à l'heure"),
+ detail: '',
+ delayMinutes: t.retard_minutes || null,
+ causeDetails: t.cause_retard || null
+ }
+ }));
+ setHoraires(formatted.slice(0, 10));
+ setAllHoraires(formatted);
+ }
+ } catch (e) {
+ if (mounted) setError(e.message || String(e));
+ } finally {
+ if (mounted) setLoading(false);
+ inFlight = false;
+ }
+ return;
+ }
+
if (!supabase) {
- // Supabase non initialisĂ© â avertir et dĂ©finir un message d'erreur pour l'UI
- // eslint-disable-next-line no-console
console.warn('Supabase non initialisĂ© â vĂ©rifiez REACT_APP_SUPABASE_URL et REACT_APP_SUPABASE_ANON_KEY');
setError('Supabase non initialisĂ© â vĂ©rifiez les variables d\'environnement');
setLoading(false);
@@ -1049,7 +1107,7 @@ export default function AFLDeparts(){
const intervalId = setInterval(fetchData, intervalMs);
return () => { mounted = false; clearInterval(intervalId); };
- }, [gareDisplay, gareIdParam, buildPerturbMap, computeStatusForHoraireAtStop, findPerturbsForHoraireAndStop, normalizeName, formatTimeFromHM, applyPerturbationsToHoraires, debug, getStops, getPerturbationJours]);
+ }, [gareDisplay, gareParam, gareIdParam, parseTimeHM, buildPerturbMap, computeStatusForHoraireAtStop, findPerturbsForHoraireAndStop, normalizeName, formatTimeFromHM, applyPerturbationsToHoraires, debug, getStops, getPerturbationJours]);
// Helpers pour perturbations (memoized plus haut)
@@ -1194,10 +1252,18 @@ export default function AFLDeparts(){
// Calcul des vias
const stopsList = getStops(horaire);
const viaNames = [];
- if (Array.isArray(stopsList)) {
+ if (Array.isArray(stopsList) && stopsList.length > 0) {
let isAfterStart = false;
+ const hasStartInStops = stopsList.some(s => {
+ const sName = s.gare_nom || s.nom || s.name || s.station_name || (typeof s === 'string' ? s : '');
+ return normalizeName(sName) === normalizeName(stationName || '');
+ });
+ if (!hasStartInStops) {
+ isAfterStart = true;
+ }
+
for (const s of stopsList) {
- const sName = s.gare_nom || s.nom || s.name || s.station_name || '';
+ const sName = s.gare_nom || s.nom || s.name || s.station_name || (typeof s === 'string' ? s : '');
if (!sName) continue;
const norm = normalizeName(sName);
if (norm === normalizeName(stationName || '')) {
@@ -1336,6 +1402,10 @@ export default function AFLDeparts(){
+ ) : showPlatform ? (
+
) : null
)}
- ain.
+ {quaiParam ? `Voie ${quaiParam}` : (selectedHoraire?.horaire?.quai ? `Voie ${selectedHoraire.horaire.quai}` : (selectedHoraire?.stop?.quai ? `Voie ${selectedHoraire.stop.quai}` : ''))}
diff --git a/src/pages/afficheurs/classiques/quais/ClassiquesDepartsQuais.js b/src/pages/afficheurs/classiques/quais/ClassiquesDepartsQuais.js
index 92eb22c..e5bd5e2 100644
--- a/src/pages/afficheurs/classiques/quais/ClassiquesDepartsQuais.js
+++ b/src/pages/afficheurs/classiques/quais/ClassiquesDepartsQuais.js
@@ -4,6 +4,8 @@ import supabase from '../../../../lib/supabase';
import { fetchAllRows } from '../../../../lib/fetchAllRows';
import useAnnonceSonoreRealtime from '../../../../hooks/useAnnonceSonoreRealtime';
import useAutoAnnonce from '../../../../hooks/useAutoAnnonce';
+import { getSourceFromPath } from '../../../../services/railwayService';
+import { getSncfTimetable } from '../../../../services/sncfApi';
function Clock() {
const [now, setNow] = useState(new Date());
useEffect(() => {
@@ -46,7 +48,7 @@ export default function ClassiquesDepartsQuais() {
const [loadingHoraire, setLoadingHoraire] = useState(false);
const [, setHoraireError] = useState(null);
const [, setCandidatesCount] = useState(0);
- const [stationType, setStationType] = useState(null);
+ const [, setStationType] = useState(null);
const [currentTime, setCurrentTime] = useState(new Date());
const [resolvedGareId, setResolvedGareId] = useState(gareIdParam || null);
@@ -111,11 +113,14 @@ export default function ClassiquesDepartsQuais() {
const parseTimeHM = useCallback((s) => {
if (!s) return null;
- if (typeof s === 'number') return s;
- const m = String(s).match(/(\d{1,2}):(\d{2})/);
- if (m) return parseInt(m[1],10)*60 + parseInt(m[2],10);
+ if (typeof s === 'number') return s % 1440;
+ const m = String(s).match(/(\d{1,2})[:h](\d{2})/i);
+ if (m) {
+ const h = parseInt(m[1], 10) % 24;
+ return h * 60 + parseInt(m[2], 10);
+ }
const d = new Date(s);
- if (!isNaN(d.getTime())) return d.getHours()*60 + d.getMinutes();
+ if (!isNaN(d.getTime())) return d.getHours() * 60 + d.getMinutes();
return null;
}, []);
@@ -123,15 +128,26 @@ export default function ClassiquesDepartsQuais() {
if (v == null) return '';
const tryDate = new Date(v);
if (!isNaN(tryDate.getTime())) {
- const hh = String(tryDate.getHours()).padStart(2,'0');
+ const hh = String(tryDate.getHours() % 24).padStart(2,'0');
const mm = String(tryDate.getMinutes()).padStart(2,'0');
return `${hh}h${mm}`;
}
if (typeof v === 'string') {
const m = v.match(/(\d{1,2}):(\d{2})(?::\d{2})?/);
- if (m) return `${String(m[1]).padStart(2,'0')}h${m[2]}`;
+ if (m) {
+ const h = parseInt(m[1], 10) % 24;
+ return `${String(h).padStart(2,'0')}h${m[2]}`;
+ }
const m2 = v.match(/T(\d{2}):(\d{2})/);
- if (m2) return `${m2[1]}h${m2[2]}`;
+ if (m2) {
+ const h = parseInt(m2[1], 10) % 24;
+ return `${String(h).padStart(2,'0')}h${m2[2]}`;
+ }
+ const m3 = v.match(/(\d{1,2})h(\d{2})/i);
+ if (m3) {
+ const h = parseInt(m3[1], 10) % 24;
+ return `${String(h).padStart(2,'0')}h${m3[2]}`;
+ }
return v.slice(0,5).replace(':','h');
}
return String(v).slice(0,5).replace(':','h');
@@ -145,13 +161,7 @@ export default function ClassiquesDepartsQuais() {
return `${hh}h${mm}`;
}, []);
- const thresholdForStationType = useCallback((type) => {
- if (!type) return 0;
- const t = String(type).trim().toLowerCase();
- if (t === 'interurbaine' || t.includes('interurb')) return 360;
- if (t === 'ville' || t.includes('ville')) return 30;
- return 0;
- }, []);
+
@@ -457,6 +467,58 @@ export default function ClassiquesDepartsQuais() {
setLoadingHoraire(true);
setHoraireError(null);
setSelectedHoraire(null);
+
+ const source = getSourceFromPath(window.location.pathname);
+ if (source === 'sncf') {
+ try {
+ const { data: sncfData, error: sncfErr } = await getSncfTimetable({
+ gareName: gareDisplayParam || gareParam,
+ mode: 'departs',
+ quai: quaiParam
+ });
+ if (!mounted) return;
+ if (sncfErr) {
+ setHoraireError(sncfErr);
+ } else if (sncfData && sncfData.length > 0) {
+ const train = sncfData[0];
+ const now = new Date();
+ const nowHM = now.getHours() * 60 + now.getMinutes();
+ const depHM = parseTimeHM(train.heure_depart);
+
+ const chosen = {
+ horaire: {
+ ...train,
+ _status: train._status || {
+ label: train.etat === 'supprime' ? 'supprimé' : (train.retard_minutes > 0 ? `retardé +${train.retard_minutes}min.` : "à l'heure"),
+ detail: '',
+ delayMinutes: train.retard_minutes || null,
+ causeDetails: train.cause_retard || null
+ }
+ },
+ stop: {
+ gare_nom: train.gare_depart_nom || gareDisplayParam || gareParam,
+ heure_depart: train.heure_depart,
+ quai: train.quai || quaiParam,
+ quai_reel: train.quai || quaiParam
+ },
+ depHM: depHM != null ? depHM : nowHM,
+ rawTime: train.heure_depart,
+ circulatesToday: true,
+ circulatesTomorrow: false,
+ isTomorrow: false
+ };
+ setSelectedHoraire(chosen);
+ setCandidatesCount(sncfData.length);
+ setStationType('interurbaine');
+ }
+ } catch (e) {
+ if (mounted) setHoraireError(e.message || String(e));
+ } finally {
+ if (mounted) setLoadingHoraire(false);
+ }
+ return;
+ }
+
if (!supabase) {
setHoraireError('Supabase non initialisé');
setLoadingHoraire(false);
@@ -648,16 +710,10 @@ export default function ClassiquesDepartsQuais() {
loadNextForQuai();
return () => { mounted = false; };
- }, [gareDisplayParam, gareIdParam, quaiParam, parseTimeHM, normalizeName, circulatesOn]);
+ }, [gareDisplayParam, gareParam, gareIdParam, quaiParam, parseTimeHM, normalizeName, circulatesOn]);
// Rail is handled purely in CSS for better performance and alignment
- const showPlatform = (() => {
- const sched = selectedHoraire ? selectedHoraire.depHM : null;
- if (sched === null || !stationType) return true;
- const nowHM = currentTime.getHours() * 60 + currentTime.getMinutes();
- const threshold = thresholdForStationType(stationType);
- return nowHM >= (sched - threshold);
- })();
+ const showPlatform = true;
if (!loadingHoraire && !selectedHoraire) {
return (
@@ -786,7 +842,7 @@ export default function ClassiquesDepartsQuais() {
try { const p = JSON.parse(horaire.gares_desservies); if (Array.isArray(p)) stops = p; } catch (e) { /* ignore */ }
}
}
- if (!Array.isArray(stops) || stops.length === 0) stops = mock.stops || [];
+ if (!Array.isArray(stops) || stops.length === 0) stops = [];
const labeled = stops.map((stop, idx) => {
let label = '';
@@ -868,7 +924,7 @@ export default function ClassiquesDepartsQuais() {
{/* BOTTOM FOOTER: Full Width */}
- ain.
+ {quaiParam ? `Voie ${quaiParam}` : (selectedHoraire?.horaire?.quai ? `Voie ${selectedHoraire.horaire.quai}` : (selectedHoraire?.stop?.quai ? `Voie ${selectedHoraire.stop.quai}` : ''))}
diff --git a/src/pages/afficheurs/eva/EVAArrivees.js b/src/pages/afficheurs/eva/EVAArrivees.js
index 2c11159..de662bb 100644
--- a/src/pages/afficheurs/eva/EVAArrivees.js
+++ b/src/pages/afficheurs/eva/EVAArrivees.js
@@ -5,21 +5,34 @@ import { fetchAllRows } from '../../../lib/fetchAllRows';
import MarqueeText from '../../../components/MarqueeText';
import useAnnonceSonoreRealtime from '../../../hooks/useAnnonceSonoreRealtime';
import useAutoAnnonce from '../../../hooks/useAutoAnnonce';
+import { getSourceFromPath } from '../../../services/railwayService';
+import { getSncfTimetable } from '../../../services/sncfApi';
// Helper utilitaire : format HH:MM avec deux points (ex: 22:39)
const formatTimeWithColon = (v) => {
if (v == null) return '';
const tryDate = new Date(v);
if (!isNaN(tryDate.getTime())) {
- const hh = String(tryDate.getHours()).padStart(2, '0');
+ const hh = String(tryDate.getHours() % 24).padStart(2, '0');
const mm = String(tryDate.getMinutes()).padStart(2, '0');
return `${hh}:${mm}`;
}
if (typeof v === 'string') {
const m = v.match(/(\d{1,2}):(\d{2})(?::\d{2})?/);
- if (m) return `${String(m[1]).padStart(2, '0')}:${m[2]}`;
+ if (m) {
+ const h = parseInt(m[1], 10) % 24;
+ return `${String(h).padStart(2, '0')}:${m[2]}`;
+ }
const m2 = v.match(/T(\d{2}):(\d{2})/);
- if (m2) return `${m2[1]}:${m2[2]}`;
+ if (m2) {
+ const h = parseInt(m2[1], 10) % 24;
+ return `${String(h).padStart(2, '0')}:${m2[2]}`;
+ }
+ const m3 = v.match(/(\d{1,2})h(\d{2})/i);
+ if (m3) {
+ const h = parseInt(m3[1], 10) % 24;
+ return `${String(h).padStart(2, '0')}:${m3[2]}`;
+ }
return v.slice(0, 5).replace('h', ':');
}
return String(v).slice(0, 5).replace('h', ':');
@@ -445,7 +458,15 @@ export default function EVAArrivees() {
// Récupération type de gare
useEffect(() => {
let mounted = true;
+ const source = getSourceFromPath(window.location.pathname);
const fetchStationType = async () => {
+ if (source === 'sncf') {
+ if (mounted) {
+ setStationType('ville');
+ setResolvedGareId(null);
+ }
+ return;
+ }
try {
let fetchedType = null;
let fetchedId = gareIdParam || null;
@@ -475,9 +496,7 @@ export default function EVAArrivees() {
}
} catch (e) { /* ignore */ }
};
- if (supabase) {
- fetchStationType();
- }
+ fetchStationType();
return () => { mounted = false; };
}, [gareIdParam, gareDisplay]);
@@ -831,14 +850,55 @@ export default function EVAArrivees() {
});
}, [buildPerturbMap, computeStatusForHoraireAtStop, gareDisplay, gareIdParam, getStops, normalizeName]);
- // Récupération Supabase avec polling
+ // Récupération des données (SNCF GTFS ou Supabase) avec polling
useEffect(() => {
let mounted = true;
let inFlight = false;
+ const source = getSourceFromPath(window.location.pathname);
const fetchData = async () => {
if (!mounted || inFlight) return;
inFlight = true;
+
+ if (source === 'sncf') {
+ setLoading(true);
+ setError(null);
+ try {
+ const { data: sncfData, error: sncfErr } = await getSncfTimetable({
+ gareName: gareDisplay || gareParam,
+ mode: 'arrivees'
+ });
+ if (!mounted) { inFlight = false; return; }
+ if (sncfErr) {
+ setError(sncfErr);
+ } else {
+ const formatted = (sncfData || []).map(t => {
+ const timeStr = t.heure_arrivee || t.heure_depart || t.time || '';
+ return {
+ ...t,
+ _displayTime: formatTimeWithColon(timeStr),
+ _displayPlatform: t.quai || t.voie || '',
+ _arrHM: t._arrHM || 0,
+ _status: t._status || {
+ label: t.etat === 'supprime' ? 'supprimé' : (t.retard_minutes > 0 ? `retardé +${t.retard_minutes}min.` : "à l'heure"),
+ detail: '',
+ delayMinutes: t.retard_minutes || null,
+ causeDetails: t.cause_retard || null
+ }
+ };
+ });
+ setHoraires(formatted.slice(0, 10));
+ setAllHoraires(formatted);
+ }
+ } catch (e) {
+ if (mounted) setError(e.message || String(e));
+ } finally {
+ if (mounted) setLoading(false);
+ inFlight = false;
+ }
+ return;
+ }
+
if (!supabase) {
setLoading(false);
inFlight = false;
@@ -936,9 +996,12 @@ export default function EVAArrivees() {
const parseTimeHM = (s) => {
if (!s) return null;
- if (typeof s === 'number') return s;
- const m = String(s).match(/(\d{1,2}):(\d{2})/);
- if (m) return parseInt(m[1], 10) * 60 + parseInt(m[2], 10);
+ if (typeof s === 'number') return s % 1440;
+ const m = String(s).match(/(\d{1,2})[:h](\d{2})/i);
+ if (m) {
+ const h = parseInt(m[1], 10) % 24;
+ return h * 60 + parseInt(m[2], 10);
+ }
const d = new Date(s);
if (!isNaN(d.getTime())) return d.getHours() * 60 + d.getMinutes();
return null;
@@ -1129,7 +1192,7 @@ export default function EVAArrivees() {
fetchData();
const intervalId = setInterval(fetchData, 15000);
return () => { mounted = false; clearInterval(intervalId); };
- }, [gareDisplay, gareIdParam, buildPerturbMap, computeStatusForHoraireAtStop, normalizeName, applyPerturbationsToHoraires, getStops, getPerturbationJours]);
+ }, [gareDisplay, gareParam, gareIdParam, buildPerturbMap, computeStatusForHoraireAtStop, normalizeName, applyPerturbationsToHoraires, getStops, getPerturbationJours]);
// Alternance retard / texte toutes les 2s
const [alternateDelay, setAlternateDelay] = useState(false);
diff --git a/src/pages/afficheurs/eva/EVADeparts.js b/src/pages/afficheurs/eva/EVADeparts.js
index 0055be4..eb891d8 100644
--- a/src/pages/afficheurs/eva/EVADeparts.js
+++ b/src/pages/afficheurs/eva/EVADeparts.js
@@ -5,21 +5,34 @@ import { fetchAllRows } from '../../../lib/fetchAllRows';
import MarqueeText from '../../../components/MarqueeText';
import useAnnonceSonoreRealtime from '../../../hooks/useAnnonceSonoreRealtime';
import useAutoAnnonce from '../../../hooks/useAutoAnnonce';
+import { getSourceFromPath } from '../../../services/railwayService';
+import { getSncfTimetable } from '../../../services/sncfApi';
// Helper utilitaire : format HH:MM avec deux points (ex: 22:39)
const formatTimeWithColon = (v) => {
if (v == null) return '';
const tryDate = new Date(v);
if (!isNaN(tryDate.getTime())) {
- const hh = String(tryDate.getHours()).padStart(2, '0');
+ const hh = String(tryDate.getHours() % 24).padStart(2, '0');
const mm = String(tryDate.getMinutes()).padStart(2, '0');
return `${hh}:${mm}`;
}
if (typeof v === 'string') {
const m = v.match(/(\d{1,2}):(\d{2})(?::\d{2})?/);
- if (m) return `${String(m[1]).padStart(2, '0')}:${m[2]}`;
+ if (m) {
+ const h = parseInt(m[1], 10) % 24;
+ return `${String(h).padStart(2, '0')}:${m[2]}`;
+ }
const m2 = v.match(/T(\d{2}):(\d{2})/);
- if (m2) return `${m2[1]}:${m2[2]}`;
+ if (m2) {
+ const h = parseInt(m2[1], 10) % 24;
+ return `${String(h).padStart(2, '0')}:${m2[2]}`;
+ }
+ const m3 = v.match(/(\d{1,2})h(\d{2})/i);
+ if (m3) {
+ const h = parseInt(m3[1], 10) % 24;
+ return `${String(h).padStart(2, '0')}:${m3[2]}`;
+ }
return v.slice(0, 5).replace('h', ':');
}
return String(v).slice(0, 5).replace('h', ':');
@@ -441,7 +454,15 @@ export default function EVADeparts() {
// Récupération type de gare
useEffect(() => {
let mounted = true;
+ const source = getSourceFromPath(window.location.pathname);
const fetchStationType = async () => {
+ if (source === 'sncf') {
+ if (mounted) {
+ setStationType('ville');
+ setResolvedGareId(null);
+ }
+ return;
+ }
try {
let fetchedType = null;
let fetchedId = gareIdParam || null;
@@ -471,9 +492,7 @@ export default function EVADeparts() {
}
} catch (e) { /* ignore */ }
};
- if (supabase) {
- fetchStationType();
- }
+ fetchStationType();
return () => { mounted = false; };
}, [gareIdParam, gareDisplay]);
@@ -827,14 +846,52 @@ export default function EVADeparts() {
});
}, [buildPerturbMap, computeStatusForHoraireAtStop, gareDisplay, gareIdParam, getStops, normalizeName]);
- // Récupération Supabase avec polling
+ // Récupération des données (SNCF GTFS ou Supabase) avec polling
useEffect(() => {
let mounted = true;
let inFlight = false;
+ const source = getSourceFromPath(window.location.pathname);
const fetchData = async () => {
if (!mounted || inFlight) return;
inFlight = true;
+
+ if (source === 'sncf') {
+ setLoading(true);
+ setError(null);
+ try {
+ const { data: sncfData, error: sncfErr } = await getSncfTimetable({
+ gareName: gareDisplay || gareParam,
+ mode: 'departs'
+ });
+ if (!mounted) { inFlight = false; return; }
+ if (sncfErr) {
+ setError(sncfErr);
+ } else {
+ const formatted = (sncfData || []).map(t => ({
+ ...t,
+ _displayTime: formatTimeWithColon(t.heure_depart),
+ _displayPlatform: t.quai || t.voie || '',
+ _depHM: t._depHM || 0,
+ _status: t._status || {
+ label: t.etat === 'supprime' ? 'supprimé' : (t.retard_minutes > 0 ? `retardé +${t.retard_minutes}min.` : "à l'heure"),
+ detail: '',
+ delayMinutes: t.retard_minutes || null,
+ causeDetails: t.cause_retard || null
+ }
+ }));
+ setHoraires(formatted.slice(0, 10));
+ setAllHoraires(formatted);
+ }
+ } catch (e) {
+ if (mounted) setError(e.message || String(e));
+ } finally {
+ if (mounted) setLoading(false);
+ inFlight = false;
+ }
+ return;
+ }
+
if (!supabase) {
setLoading(false);
inFlight = false;
@@ -952,9 +1009,12 @@ export default function EVADeparts() {
const parseTimeHM = (s) => {
if (!s) return null;
- if (typeof s === 'number') return s;
- const m = String(s).match(/(\d{1,2}):(\d{2})/);
- if (m) return parseInt(m[1], 10) * 60 + parseInt(m[2], 10);
+ if (typeof s === 'number') return s % 1440;
+ const m = String(s).match(/(\d{1,2})[:h](\d{2})/i);
+ if (m) {
+ const h = parseInt(m[1], 10) % 24;
+ return h * 60 + parseInt(m[2], 10);
+ }
const d = new Date(s);
if (!isNaN(d.getTime())) return d.getHours() * 60 + d.getMinutes();
return null;
@@ -1145,7 +1205,7 @@ export default function EVADeparts() {
fetchData();
const intervalId = setInterval(fetchData, 15000);
return () => { mounted = false; clearInterval(intervalId); };
- }, [gareDisplay, gareIdParam, buildPerturbMap, computeStatusForHoraireAtStop, normalizeName, applyPerturbationsToHoraires, getStops, getPerturbationJours]);
+ }, [gareDisplay, gareParam, gareIdParam, buildPerturbMap, computeStatusForHoraireAtStop, normalizeName, applyPerturbationsToHoraires, getStops, getPerturbationJours]);
// Alternance retard / texte toutes les 2s
const [alternateDelay, setAlternateDelay] = useState(false);