vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-02 17:00:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix sorting on numeric values

Browse source
This commit is contained in:
emanuele-f 2020-04-16 17:15:11 +02:00
parent fae050b90a
commit 0b6ba8edd0
1 changed files with 31 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

45
scripts/plugins/active_monitoring/httpdocs/active_monitoring_utils.js
View file

@ -280,19 +280,30 @@ $(document).ready(function() {
{
data: 'chart',
class: 'text-center',
render: function(href) {
if (href == "" || href == undefined) return "";
return `<a href='${href}'><i class='fas fa-chart-area'></i></a>`
sortable: false,
render: function(href, type, row) {
if(type === 'display' || type === 'filter') {
if (href == "" || href == undefined) return "";
return `<a href='${href}'><i class='fas fa-chart-area'></i></a>`
}
// The raw data must be returned here for sorting
return(href);
}
},
{
data: 'threshold',
className: 'text-center',
render: function(data, type, row) {
if(row.threshold)
return `${row.threshold} ${row.unit}`
else
return "";
if(type === 'display' || type === 'filter') {
if(row.threshold)
return `${row.threshold} ${row.unit}`
else
return "";
}
// The raw data must be returned here for sorting
return(data);
}
},
{
@ -306,14 +317,20 @@ $(document).ready(function() {
{
data: 'last_measure',
className: 'dt-body-right dt-head-center',
sortable: false,
render: function(data, type, row) {
if(row.value_js_formatter && row.last_measure)
// Call the provided formatting function
return window[row.value_js_formatter](row.last_measure);
else if(row.last_measure)
return `${row.last_measure} ${row.unit}`
else
return "";
if(type === 'display' || type === 'filter') {
if(row.value_js_formatter && row.last_measure)
// Call the provided formatting function
return window[row.value_js_formatter](row.last_measure);
else if(row.last_measure)
return `${row.last_measure} ${row.unit}`
else
return "";
}
// The raw data must be returned here for sorting
return(data);
}
},