Skip to content

Replace spacetime with Temporal API #988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
VerifiedJoseph wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Replace spacetime with Temporal API #988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7e5792
Replace spacetime with Temporal for date handling
VerifiedJoseph Jan 20, 2026
89162b6
Simplify time label formatting in Plot.js
VerifiedJoseph Jan 20, 2026
75a8990
Update ChartFilter.js
VerifiedJoseph Feb 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 27 additions & 11 deletions frontend/js/class/Filter/ChartFilter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,8 @@ import { Settings } from '../Settings.js'
import { Dataset } from '../Dataset.js'
import { Filter } from './Filter.js'
import { FilterChip } from '../FilterChip.js'
import spacetime from 'spacetime'

export class ChartFilter extends Filter {
#hourDisplayFormat = '{year}-{iso-month}-{date-pad} {hour-24-pad}:00'
#dateDisplayFormat = '{year}-{iso-month}-{date-pad}'

constructor () {
super()
this.chip = new FilterChip('chart')
Expand Down Expand Up @@ -157,16 +153,18 @@ export class ChartFilter extends Filter {
* @param {int} hours Number of hours
*/
#createHourGroups (hours) {
let hour = spacetime.now(Settings.getTimezone()).subtract(hours, 'hours')
let hour = Temporal.Now.plainDateTimeISO(Settings.getTimezone())
hour = hour.subtract({ hours: hours});

const groups = []
const keys = []

for (let i = 1; i <= hours; i++) {
if (i > 1) {
hour = hour.add('1', 'hours')
hour = hour.add({hours: 1})
}

const hourFormatted = hour.format(this.#hourDisplayFormat)
const hourFormatted = this.#formatDateTimeTostring(hour, true)

keys.push(hourFormatted)
groups.push({
Expand All @@ -182,16 +180,18 @@ export class ChartFilter extends Filter {

/**
* Create day groups
* @param {int} hours Number of days
* @param {int} days Number of days
*/
#createDayGroups (days) {
let date = spacetime.now(Settings.getTimezone()).subtract(days, 'days')
let date = Temporal.Now.plainDateTimeISO(Settings.getTimezone())
date = date.subtract({ days: days});

const groups = []
const keys = []

for (let i = 1; i <= days; i++) {
date = date.add(1, 'day')
const dateFormatted = date.format(this.#dateDisplayFormat)
date = date.add({days: 1})
const dateFormatted = this.#formatDateTimeTostring(date)

keys.push(dateFormatted)
groups.push({
Expand Down Expand Up @@ -235,4 +235,20 @@ export class ChartFilter extends Filter {
hasData: true
}
}

#formatDateTimeTostring (dateTime, includeHour = false)
{
var text = `${dateTime.year}-${this.#padNumber(dateTime.month)}-${this.#padNumber(dateTime.day)}`

if (includeHour === true) {
text += ` ${this.#padNumber(dateTime.hour)}:00`
}

return text;
}

#padNumber (number)
{
return String(number).padStart(2, '0');
}
}
3 changes: 1 addition & 2 deletions frontend/js/class/Plot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,13 @@ export class Plot {
callback: function (val, index) {
let x = 2
let value = this.getLabelForValue(val)
const time = new Date(value)

if (data.type === 'last14days') {
x = -1
}

if (data.type === 'last24hours' || data.type === 'last48hours') {
value = time.toLocaleString(navigator.languages[0], { hour: 'numeric', minute: 'numeric', hour12: false })
value = value.split(' ')[1]

if (data.type === 'last48hours') {
x = 6
Expand Down