From 0f1da477394e64d42749dde03c788f728055cdbf Mon Sep 17 00:00:00 2001 From: nzambello Date: Thu, 23 Feb 2023 12:15:26 +0100 Subject: [PATCH] fix: update elapsed time on start/end dates update --- app/components/SectionTimeElapsed.tsx | 5 ++++- app/components/TimeElapsed.tsx | 9 ++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/components/SectionTimeElapsed.tsx b/app/components/SectionTimeElapsed.tsx index 3c3269d..5deb5f9 100644 --- a/app/components/SectionTimeElapsed.tsx +++ b/app/components/SectionTimeElapsed.tsx @@ -36,7 +36,10 @@ const SectionTimeElapsed = ({ const [elapsed, setElapsed] = useState(total || getElapsedTime()); useEffect(() => { - if (!timeEntries.some((timeEntry) => !timeEntry.endTime)) return; + if (!timeEntries.some((timeEntry) => !timeEntry.endTime)) { + setElapsed(getElapsedTime()); + return; + } const interval = setInterval(() => { setElapsed(getElapsedTime()); diff --git a/app/components/TimeElapsed.tsx b/app/components/TimeElapsed.tsx index 264aaf1..751dea1 100644 --- a/app/components/TimeElapsed.tsx +++ b/app/components/TimeElapsed.tsx @@ -14,7 +14,14 @@ const TimeElapsed = ({ startTime, endTime }: Props) => { ); useEffect(() => { - if (endTime) return; + if (endTime) { + setElapsed( + (new Date(endTime || Date.now()).getTime() - + new Date(startTime).getTime()) / + 1000 + ); + return; + } const interval = setInterval(() => { setElapsed( (new Date(endTime || Date.now()).getTime() -