From 3eefe47ef1386924572047787f320eb7610fa669 Mon Sep 17 00:00:00 2001 From: Andrew Date: Mon, 10 Mar 2025 18:16:38 +0000 Subject: [PATCH] [frontend]: Better handling of Luas forecast information --- frontend/src/components/LuasPopup.jsx | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/LuasPopup.jsx b/frontend/src/components/LuasPopup.jsx index 46311af..a6caf58 100644 --- a/frontend/src/components/LuasPopup.jsx +++ b/frontend/src/components/LuasPopup.jsx @@ -17,11 +17,28 @@ const LuasPopup = ({ item, objectTitle, luasLine }) => { // Ensure 'tram' is an array, if it's not, convert it into an array const trams = Array.isArray(direction.tram) ? direction.tram : [direction.tram]; - const tramDetails = trams.map(tram => - `Destination: ${tram["@destination"]}, Arrival: ${tram["@dueMins"]} mins` - ).join("
"); + // const tramDetails = trams.map(tram => + // `Destination: ${tram["@destination"]}, Arrival: ${tram["@dueMins"]} mins` + // ).join("
"); - return `${direction["@name"]}:
${tramDetails}`; + let tramDetails = ""; + trams.forEach(tram => { + if (tram["@dueMins"] === "DUE") { + tramDetails += `
Destination: ${tram["@destination"]}; Arrival: DUE NOW.`; + } + else if (tram["@dueMins"] === "1") { + tramDetails += `
Destination: ${tram["@destination"]}; Arrival: 1 minute.`; + } + else if (tram["@destination"] == "No trams forecast") { + tramDetails += "
No trams forecast"; + } + else { + tramDetails += `
Destination: ${tram["@destination"]}; Arrival: ${tram["@dueMins"]} minutes.`; + } + }); + + + return `${direction["@name"]}: ${tramDetails}`; }).join("

"); setLuasInfo(tramInfo);