statool/statoolinfosweb
statool/statoolinfosweb
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Activity

Fixed emoji sorting in organization list and service list views.

Browse source
This commit is contained in:
Christian P. MOMON 2022-01-21 19:41:41 +01:00
parent ebff7251e8
commit a1b0c34645
2 changed files with 78 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/fr/devinsy/statoolinfos/htmlize/organizationListView.xhtml
View file

@ -49,12 +49,45 @@
{ {
$.fn.dataTable.moment('DD/MM/YYYY'); $.fn.dataTable.moment('DD/MM/YYYY');
$.extend($.fn.dataTable.ext.type.order,
{
"custom-sort-asc": function(x, y)
{
if (!(!isNaN(x) || !isNaN(y)))
return 0;
else if (isNaN(x))
return -1;
else if (isNaN(y))
return +1;
else
return x-y;
},
"custom-sort-desc": function(x, y)
{
if (!(!isNaN(x) || !isNaN(y)))
return 0;
else if (isNaN(x))
return +1;
else if (isNaN(y))
return -1;
else
return y-x;
}
} );
$('#organizations').DataTable( $('#organizations').DataTable(
{ {
paging: false, paging: false,
ordering: true, ordering: true,
"order": [[ 2, "desc" ]], "order": [[ 2, "desc" ]],
language: dataTableFrench language: dataTableFrench,
"columnDefs":
[
{ targets: 2, "type": 'custom-sort' },
{ targets: 3, "type": 'custom-sort' },
{ targets: 4, "type": 'custom-sort' }
]
}); });
} ); } );
</script> </script>

33
src/fr/devinsy/statoolinfos/htmlize/serviceListView.xhtml
View file

@ -138,12 +138,43 @@
{ {
$.fn.dataTable.moment('DD/MM/YYYY'); $.fn.dataTable.moment('DD/MM/YYYY');
$.extend($.fn.dataTable.ext.type.order,
{
"custom-sort-asc": function(x, y)
{
if (!(!isNaN(x) || !isNaN(y)))
return 0;
else if (isNaN(x))
return -1;
else if (isNaN(y))
return +1;
else
return x-y;
},
"custom-sort-desc": function(x, y)
{
if (!(!isNaN(x) || !isNaN(y)))
return 0;
else if (isNaN(x))
return +1;
else if (isNaN(y))
return -1;
else
return y-x;
}
} );
$('#serviceListTable').DataTable( $('#serviceListTable').DataTable(
{ {
paging: false, paging: false,
ordering: true, ordering: true,
"order": [[ 2, "desc" ]], "order": [[ 2, "desc" ]],
language: dataTableFrench language: dataTableFrench,
"columnDefs":
[
{ targets: 4, "type": 'custom-sort' },
{ targets: 5, "type": 'custom-sort' }
]
}); });
}); });
</script> </script>