From b2e9cd76811fadcf0618ec84db8a254ef94d3424 Mon Sep 17 00:00:00 2001 From: ray Date: Mon, 15 Apr 2024 16:13:36 -0700 Subject: [PATCH] DBC22-2024: fixed date processing format in Safari --- src/frontend/src/Components/OpenSeason.js | 10 +++++----- src/frontend/src/Components/data/restStops.js | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/frontend/src/Components/OpenSeason.js b/src/frontend/src/Components/OpenSeason.js index 19d391e39..b68c89167 100644 --- a/src/frontend/src/Components/OpenSeason.js +++ b/src/frontend/src/Components/OpenSeason.js @@ -11,20 +11,20 @@ export default function OpenSeason({ openDate, closeDate, returnState=false}) { const today = new Date(); const year = today.getFullYear(); - const openDateY = new Date(openDate.toString() + "-" + year.toString()); - const closeDateY = new Date(closeDate.toString() + "-" + year.toString()); + const openDateY = new Date(year.toString() + "-" + openDate.toString()); + const closeDateY = new Date(year.toString() + "-" + closeDate.toString()); const openDateFormatted = formatter.format(openDateY); const closeDateFormatted = formatter.format(closeDateY); if (returnState) { const isInSeason = (today.getTime() > openDateY.getTime()) && (today.getTime() < closeDateY.getTime()); - + if (isInSeason) return "open"; - else + else return "closed"; } - + return

{openDateFormatted} – {closeDateFormatted}

; } diff --git a/src/frontend/src/Components/data/restStops.js b/src/frontend/src/Components/data/restStops.js index 9522be5f8..af8328b56 100644 --- a/src/frontend/src/Components/data/restStops.js +++ b/src/frontend/src/Components/data/restStops.js @@ -25,8 +25,8 @@ export function isRestStopClosed(restStopProperties) { const openDate = restStopProperties.OPEN_DATE; const closeDate = restStopProperties.CLOSE_DATE; if(openDate && closeDate){ - const openDateY = new Date(openDate.toString() + "-" + year.toString()); - const closeDateY = new Date(closeDate.toString() + "-" + year.toString()); + const openDateY = new Date(year.toString() + "-" + openDate.toString()); + const closeDateY = new Date(year.toString() + "-" + closeDate.toString()); const isInSeason = (today.getTime() > openDateY.getTime()) && (today.getTime() < closeDateY.getTime()); const isClosed = isInSeason? false: true; return isClosed;