From f079a2926b3a528a453f3ec7ea31475ce643c423 Mon Sep 17 00:00:00 2001 From: Nikola Ubavic <53820106+ubavic@users.noreply.github.com> Date: Wed, 10 Aug 2022 23:20:45 +0200 Subject: [PATCH] feat: add period of three days --- new-lamassu-admin/src/pages/Analytics/Analytics.js | 2 ++ .../src/pages/Analytics/graphs/OverTimeDotGraph.js | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/new-lamassu-admin/src/pages/Analytics/Analytics.js b/new-lamassu-admin/src/pages/Analytics/Analytics.js index b7eed8fa..2e0afc7f 100644 --- a/new-lamassu-admin/src/pages/Analytics/Analytics.js +++ b/new-lamassu-admin/src/pages/Analytics/Analytics.js @@ -34,11 +34,13 @@ const REPRESENTING_OPTIONS = [ ] const PERIOD_OPTIONS = [ { code: 'day', display: 'Last 24 hours' }, + { code: 'threeDays', display: 'Last 3 days' }, { code: 'week', display: 'Last 7 days' }, { code: 'month', display: 'Last 30 days' } ] const TIME_OPTIONS = { day: DAY, + threeDays: 3 * DAY, week: WEEK, month: MONTH } diff --git a/new-lamassu-admin/src/pages/Analytics/graphs/OverTimeDotGraph.js b/new-lamassu-admin/src/pages/Analytics/graphs/OverTimeDotGraph.js index acd7a181..2dad847c 100644 --- a/new-lamassu-admin/src/pages/Analytics/graphs/OverTimeDotGraph.js +++ b/new-lamassu-admin/src/pages/Analytics/graphs/OverTimeDotGraph.js @@ -46,6 +46,7 @@ const Graph = ({ const periodDomains = { day: [NOW - DAY, NOW], + threeDays: [NOW - 3 * DAY, NOW], week: [NOW - WEEK, NOW], month: [NOW - MONTH, NOW] } @@ -58,6 +59,12 @@ const Graph = ({ tick: d3.utcHour.every(1), labelFormat: '%H:%M' }, + threeDays: { + freq: 12, + step: 6 * 60 * 60 * 1000, + tick: d3.utcDay.every(1), + labelFormat: '%a %d' + }, week: { freq: 7, step: 24 * 60 * 60 * 1000,