pi-hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2024-12-06 19:36:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix inital date/time (#2828)

Browse Source 
Fix timestamps in seconds and milliseconds (javascript)
This commit is contained in:
RD WebDesign
2023-11-13 18:34:43 -03:00
committed by GitHub
parent 4c50b49ed3 3cf7eb82b9
commit 11bb3ecc2f
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/pi-hole/js/queries.js
+9 -6
View File
@@ -7,8 +7,8 @@
/* global moment:false, utils:false */
const beginningOfTime = 1262304000000; // Jan 01 2010, 00:00
const endOfTime = 2147483647000; // Jan 19, 2038, 03:14
const beginningOfTime = 1262304000; // Jan 01 2010, 00:00 in seconds
const endOfTime = 2147483647; // Jan 19, 2038, 03:14 in seconds
var from = beginningOfTime;
var until = endOfTime;
@@ -34,8 +34,8 @@ function initDateRangePicker() {
timePickerIncrement: 5,
timePicker24Hour: true,
locale: { format: dateformat },
startDate: moment(from * 1000),
endDate: moment(until * 1000),
startDate: moment(from * 1000), // convert to milliseconds since epoch
endDate: moment(until * 1000), // convert to milliseconds since epoch
ranges: {
"Last 10 Minutes": [moment().subtract(10, "minutes"), moment()],
"Last Hour": [moment().subtract(1, "hours"), moment()],
@@ -52,13 +52,15 @@ function initDateRangePicker() {
moment().subtract(1, "month").endOf("month"),
],
"This Year": [moment().startOf("year"), moment().endOf("year")],
"All Time": [moment(beginningOfTime), moment(endOfTime)],
"All Time": [moment(beginningOfTime * 1000), moment(endOfTime * 1000)], // convert to milliseconds since epoch
},
opens: "center",
showDropdowns: true,
autoUpdateInput: true,
},
function (startt, endt) {
// Update global variables
// Convert milliseconds (JS) to seconds (API)
from = moment(startt).utc().valueOf() / 1000;
until = moment(endt).utc().valueOf() / 1000;
}
@@ -447,7 +449,8 @@ function getAPIURL(filters) {
}
// Omit from/until filtering if we cannot reach these times. This will speed
// up the database lookups notably on slow devices.
// up the database lookups notably on slow devices. The API accepts timestamps
// in seconds since epoch
if (from > beginningOfTime) apiurl += "&from=" + from;
if (until > beginningOfTime && until < endOfTime) apiurl += "&until=" + until;