From 9b494106bc1911fe88a5d5c462df154973261474 Mon Sep 17 00:00:00 2001 From: Peter Pfeufer Date: Wed, 26 Feb 2025 21:17:13 +0100 Subject: [PATCH 1/2] [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', }, From 96204b29e8af63a47e4aa137b6b3c2ebfdc45b12 Mon Sep 17 00:00:00 2001 From: Peter Pfeufer Date: Wed, 26 Feb 2025 22:57:19 +0100 Subject: [PATCH 2/2] [REMOVE] Redundant locale information Since momentJS is already loaded with `locale=True`, this is not needed anymore. --- .../templates/services/mumble/mumble_connection_history.html | 3 --- 1 file changed, 3 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 bb651791..97535c5e 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 @@ -84,7 +84,6 @@ {% include "bundles/moment-js.html" with locale=True %} {% get_datatables_language_static LANGUAGE_CODE as DT_LANG_PATH %} - {% get_momentjs_language_code LANGUAGE_CODE as MOMENTJS_LCODE %}