From 9b494106bc1911fe88a5d5c462df154973261474 Mon Sep 17 00:00:00 2001 From: Peter Pfeufer Date: Wed, 26 Feb 2025 21:17:13 +0100 Subject: [PATCH] [ADD] Sorting data to the table field Since the localized date and time values can have different formats, sorting with them wasn't gonna work reliably, so we add the original datetime string as sorting data. --- .../mumble/mumble_connection_history.html | 38 +++++++++++-------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/allianceauth/services/modules/mumble/templates/services/mumble/mumble_connection_history.html b/allianceauth/services/modules/mumble/templates/services/mumble/mumble_connection_history.html index 1bfbab94..bb651791 100644 --- a/allianceauth/services/modules/mumble/templates/services/mumble/mumble_connection_history.html +++ b/allianceauth/services/modules/mumble/templates/services/mumble/mumble_connection_history.html @@ -105,29 +105,35 @@ { data: 'version' }, { data: 'last_connect', - render: (data) => { - if (data === null) { - return ''; + render: { + _: (data) => { + return data === null + ? '' + : moment(data) + .locale('{{ MOMENTJS_LCODE }}') + .utc() + .format(MUMBLESTATS_DATETIME_FORMAT); + }, + sort: (data) => { + return data === null ? '' : data; } - - return moment(data) - .locale('{{ MOMENTJS_LCODE }}') - .utc() - .format(MUMBLESTATS_DATETIME_FORMAT); }, className: 'text-end', }, { data: 'last_disconnect', - render: (data) => { - if (data === null) { - return ''; + render: { + _: (data) => { + return data === null + ? '' + : moment(data) + .locale('{{ MOMENTJS_LCODE }}') + .utc() + .format(MUMBLESTATS_DATETIME_FORMAT); + }, + sort: (data) => { + return data === null ? '' : data; } - - return moment(data) - .locale('{{ MOMENTJS_LCODE }}') - .utc() - .format(MUMBLESTATS_DATETIME_FORMAT); }, className: 'text-end', },