From 5c47b3e05e121fb4bc76631bc07dda4f34a0c320 Mon Sep 17 00:00:00 2001 From: prisar Date: Thu, 27 Jul 2023 10:29:13 +0530 Subject: [PATCH] if no current day data, show last day --- src/components/TestAnalytics.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/components/TestAnalytics.js b/src/components/TestAnalytics.js index ce22fd1..cc7cb30 100644 --- a/src/components/TestAnalytics.js +++ b/src/components/TestAnalytics.js @@ -114,15 +114,18 @@ const TestAnalytics = () => { result[day]++; return result; }, {}); - - setDailyResults(Object.entries(dailyCounts).sort().map(x => { + const dailyCountsList = Object.entries(dailyCounts).sort().map(x => { return { date: x[0], count: x[1] }; - })); + }); + setDailyResults(dailyCountsList); const rss = _.groupBy(hposTests, function (test) { return moment(test.testTime).startOf('day').format(); }); // setDailyResults(rss); - const todaysTests = hposTests.filter((x) => moment(x.testTime).isBetween(moment().startOf('day'), moment().endOf('day'))); + + const [lastTested] = dailyCountsList.reverse(); + const { date: lastTestedDate } = lastTested; + const todaysTests = hposTests.filter((x) => moment(x.testTime).isBetween(moment(lastTestedDate).startOf('day'), moment(lastTestedDate).endOf('day'))); setCurDayTests(todaysTests); const dailyCategoryCounts = todaysTests.reduce(function (result, test) { const category = test.result;