Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-20 02:38:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor date range initialization to fetch earliest timestamp from API and update date picker accordingly.

Browse Source 
We use the on-disk earliest timestamp to get the complete range.

Treat 0.0 response as NULL. Also get the in-memory timetamp, and then use whichever of the two timestamps is smallest (and non-zero)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
Adam Warner
2025-11-27 22:20:36 +00:00
parent 7da0bfd9de
commit 8a3df77420
1 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
scripts/js/queries.js
View File

@@ -12,8 +12,9 @@
// These values are provided by the API (/info/database). // These values are provided by the API (/info/database).
// We initialize them as null and populate them during page init. // We initialize them as null and populate them during page init.
let beginningOfTime = null; // seconds since epoch (set from API: info/database.earliest_timestamp) let beginningOfTime = null; // seconds since epoch (set from API: info/database.earliest_timestamp)
// endOfTime should be the end of today (local), in seconds since epoch // endOfTime should be the start of tomorrow in seconds since epoch
const endOfTime = moment().endOf("day").unix(); // We don't use 23:59:59 (endOf("day")) as the picker increments are set to 5 minutes
const endOfTime = luxon.DateTime.now().plus({ days: 1 }).startOf("day").toSeconds(); // seconds since epoch (start of tomorrow)
let from = null; let from = null;
let until = null; let until = null;
@@ -84,9 +85,10 @@ function initDateRangePicker() {
return; return;
} }
const minDateMoment = moment.unix(beginningOfTime); const now = luxon.DateTime.now();
const maxDateMoment = moment.unix(endOfTime); const minDateDt = luxon.DateTime.fromSeconds(beginningOfTime);
const earliestDateStr = minDateMoment.format(dateformat); const maxDateDt = luxon.DateTime.fromSeconds(endOfTime);
const earliestDateStr = minDateDt.toFormat(dateformat);
$("#querytime-note").text(`Earliest date: ${earliestDateStr}`); $("#querytime-note").text(`Earliest date: ${earliestDateStr}`);
$("#querytime").daterangepicker( $("#querytime").daterangepicker(
@@ -94,36 +96,32 @@ function initDateRangePicker() {
timePicker: true, timePicker: true,
timePickerIncrement: 5, timePickerIncrement: 5,
timePicker24Hour: true, timePicker24Hour: true,
locale: { format: dateformat }, locale: {
startDate: luxon.DateTime.fromMillis(from * 1000), // convert to milliseconds since epoch format: dateformat,
endDate: luxon.DateTime.fromMillis(until * 1000), // convert to milliseconds since epoch firstDay: 7,
},
// Use Luxon DateTime objects for the picker ranges/start/end. The
// daterangepicker in this build expects Luxon DateTime or ISO strings.
startDate: luxon.DateTime.fromSeconds(from),
endDate: luxon.DateTime.fromSeconds(until),
ranges: { ranges: {
"Last 10 Minutes": [luxon.DateTime.now().minus({ minutes: 10 }), luxon.DateTime.now()], "Last 10 Minutes": [now.minus({ minutes: 10 }), now],
"Last Hour": [luxon.DateTime.now().minus({ hours: 1 }), luxon.DateTime.now()], "Last Hour": [now.minus({ hours: 1 }), now],
Today: [luxon.DateTime.now().startOf("day"), luxon.DateTime.now().endOf("day")], Today: [now.startOf("day"), maxDateDt],
Yesterday: [ Yesterday: [now.minus({ days: 1 }).startOf("day"), now.minus({ days: 1 }).endOf("day")],
luxon.DateTime.now().minus({ days: 1 }).startOf("day"), "Last 7 Days": [now.minus({ days: 6 }).startOf("day"), maxDateDt],
luxon.DateTime.now().minus({ days: 1 }).endOf("day"), "Last 30 Days": [now.minus({ days: 29 }).startOf("day"), maxDateDt],
], "This Month": [now.startOf("month"), maxDateDt],
"Last 7 Days": [luxon.DateTime.now().minus({ days: 6 }), luxon.DateTime.now().endOf("day")],
"Last 30 Days": [
luxon.DateTime.now().minus({ days: 29 }),
luxon.DateTime.now().endOf("day"),
],
"This Month": [luxon.DateTime.now().startOf("month"), luxon.DateTime.now().endOf("month")],
"Last Month": [ "Last Month": [
luxon.DateTime.now().minus({ months: 1 }).startOf("month"), now.minus({ months: 1 }).startOf("month"),
luxon.DateTime.now().minus({ months: 1 }).endOf("month"), now.minus({ months: 1 }).endOf("month"),
], ],
"This Year": [luxon.DateTime.now().startOf("year"), luxon.DateTime.now().endOf("year")], "This Year": [now.startOf("year"), maxDateDt],
"All Time": [ "All Time": [minDateDt, maxDateDt],
luxon.DateTime.fromMillis(beginningOfTime * 1000),
luxon.DateTime.fromMillis(endOfTime * 1000),
], // convert to milliseconds since epoch
}, },
// Don't allow selecting dates outside the database range // Don't allow selecting dates outside the database range
minDate: minDateMoment, minDate: minDateDt,
maxDate: maxDateMoment, maxDate: maxDateDt,
opens: "center", opens: "center",
showDropdowns: true, showDropdowns: true,
autoUpdateInput: true, autoUpdateInput: true,