Merge branch 'sorting-data' into 'master'

[ADD] Sorting data to the tables datetime fields

See merge request allianceauth/allianceauth!1691
This commit is contained in:
Ariel Rin 2025-02-27 03:37:30 +00:00
commit f4d3d6c0b1

View File

@ -84,7 +84,6 @@
{% include "bundles/moment-js.html" with locale=True %} {% include "bundles/moment-js.html" with locale=True %}
{% get_datatables_language_static LANGUAGE_CODE as DT_LANG_PATH %} {% get_datatables_language_static LANGUAGE_CODE as DT_LANG_PATH %}
{% get_momentjs_language_code LANGUAGE_CODE as MOMENTJS_LCODE %}
<script> <script>
$(document).ready(function () { $(document).ready(function () {
@ -105,29 +104,33 @@
{ data: 'version' }, { data: 'version' },
{ {
data: 'last_connect', data: 'last_connect',
render: (data) => { render: {
if (data === null) { _: (data) => {
return ''; return data === null
? ''
: moment(data)
.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', className: 'text-end',
}, },
{ {
data: 'last_disconnect', data: 'last_disconnect',
render: (data) => { render: {
if (data === null) { _: (data) => {
return ''; return data === null
? ''
: moment(data)
.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', className: 'text-end',
}, },