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

Fix tests

Browse Source 
Signed-off-by: yubiuser <github@yubiuser.dev>
This commit is contained in:
yubiuser
2025-11-09 14:36:27 +01:00
committed by Adam Warner
parent f34135b47f
commit ee3a2f47c2
4 changed files with 109 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/js/queries.js
View File

@@ -106,14 +106,20 @@ function initDateRangePicker() {
luxon.DateTime.now().minus({ days: 1 }).endOf("day"),
],
"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")],
"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": [
luxon.DateTime.now().minus({ months: 1 }).startOf("month"),
luxon.DateTime.now().minus({ months: 1 }).endOf("month"),
],
"This Year": [luxon.DateTime.now().startOf("year"), luxon.DateTime.now().endOf("year")],
"All Time": [luxon.DateTime.fromMillis(beginningOfTime * 1000), luxon.DateTime.fromMillis(endOfTime * 1000)], // convert to milliseconds since epoch
"All Time": [
luxon.DateTime.fromMillis(beginningOfTime * 1000),
luxon.DateTime.fromMillis(endOfTime * 1000),
], // convert to milliseconds since epoch
},
// Don't allow selecting dates outside the database range
minDate: minDateMoment,
@@ -389,7 +395,11 @@ function formatInfo(data) {
ttlInfo =
divStart +
"Time-to-live (TTL):&nbsp;&nbsp;" +
luxon.Duration.fromObject({ seconds: data.ttl }).toHuman({smallestUnit: "seconds", maxUnits: 2, stripZeroUnits: "all"}) +
luxon.Duration.fromObject({ seconds: data.ttl }).toHuman({
smallestUnit: "seconds",
maxUnits: 2,
stripZeroUnits: "all",
}) +
" (" +
data.ttl +
"s)</div>";
@@ -603,7 +613,9 @@ $(() => {
width: "10%",
render(data, type) {
if (type === "display") {
return luxon.DateTime.fromMillis(data * 1000).toFormat("yyyy-MM-dd [<br class='hidden-lg'>]HH:mm:ss z");
return luxon.DateTime.fromMillis(data * 1000).toFormat(
"yyyy-MM-dd [<br class='hidden-lg'>]HH:mm:ss z"
);
}
return data;