From 4b099cc47e97fe2fc22a928b0131a072009d7348 Mon Sep 17 00:00:00 2001 From: MrTimbones Date: Mon, 14 Nov 2022 12:08:44 +0000 Subject: [PATCH 1/3] Automatically refresh the graph every minute when embedded in a dashboard --- embed.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/embed.php b/embed.php index 4b0117b..4c69e60 100644 --- a/embed.php +++ b/embed.php @@ -139,6 +139,10 @@ yaxismax2 = result.yaxismax2; feedlist = result.feedlist; + // attempt to update time selector to match the view + var hours = Math.round((view.end - view.start) / 3600 / 1000); + $('.graph_time').val(hours); + // show settings showmissing = result.showmissing; showtag = result.showtag; @@ -163,6 +167,16 @@ datetimepickerInit(); graph_resize(); graph_reload(); + + // automatic refresh + window.setInterval(function() { + if (floatingtime) { + $('.graph_time_refresh').click(); + } + else { + graph_reload(); + } + }, 60000); } }); From 26712ca6f0ba4aa99f83a83956cfaebe1f7197dc Mon Sep 17 00:00:00 2001 From: MrTimbones Date: Tue, 6 Feb 2024 15:52:54 +0000 Subject: [PATCH 2/3] Attempt to update time selector to match the view --- embed.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/embed.php b/embed.php index 4c69e60..89842cd 100644 --- a/embed.php +++ b/embed.php @@ -140,9 +140,15 @@ feedlist = result.feedlist; // attempt to update time selector to match the view - var hours = Math.round((view.end - view.start) / 3600 / 1000); - $('.graph_time').val(hours); - + var hours = Math.floor((view.end - view.start) / 3600 / 1000); + dropdown = $('.graph_time').children() + for (var i = dropdown.length - 1; i > 0; i--) { + if (hours >= dropdown[i].value) { + $('.graph_time').val(dropdown[i].value); + break; + } + } + // show settings showmissing = result.showmissing; showtag = result.showtag; From efc518ec5b2bc558c12e0b17092029b6f89c0c0a Mon Sep 17 00:00:00 2001 From: MrTimbones Date: Wed, 7 Feb 2024 23:55:27 +0000 Subject: [PATCH 3/3] Use graph interval as refresh interval, within limits --- embed.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/embed.php b/embed.php index 89842cd..b449f63 100644 --- a/embed.php +++ b/embed.php @@ -173,8 +173,9 @@ datetimepickerInit(); graph_resize(); graph_reload(); - - // automatic refresh + + // automatic refresh every 60s < interval < 1 day + var refresh = Math.min(Math.max(60, view.interval / 2), 86400); window.setInterval(function() { if (floatingtime) { $('.graph_time_refresh').click(); @@ -182,7 +183,7 @@ else { graph_reload(); } - }, 60000); + }, refresh * 1000); // ms } });