diff options
Diffstat (limited to 'gn2/wqflask/static/new')
3 files changed, 48 insertions, 48 deletions
diff --git a/gn2/wqflask/static/new/javascript/initialize_show_trait_tables.js b/gn2/wqflask/static/new/javascript/initialize_show_trait_tables.js index 44076c17..970a49a3 100644 --- a/gn2/wqflask/static/new/javascript/initialize_show_trait_tables.js +++ b/gn2/wqflask/static/new/javascript/initialize_show_trait_tables.js @@ -141,7 +141,7 @@ buildColumns = function() { columnList.push( { 'title': "<div title='" + js_data.attributes[attrKeys[i]].description + "' style='text-align: " + js_data.attributes[attrKeys[i]].alignment + "'>" + js_data.attributes[attrKeys[i]].name + "</div>", - 'type': "natural", + 'type': "natural-minus-na", 'data': null, 'targets': attrStart + i, 'render': function(data, type, row, meta) { diff --git a/gn2/wqflask/static/new/javascript/search_results.js b/gn2/wqflask/static/new/javascript/search_results.js index c263ef49..29050c2b 100644 --- a/gn2/wqflask/static/new/javascript/search_results.js +++ b/gn2/wqflask/static/new/javascript/search_results.js @@ -325,53 +325,6 @@ $(function() { $("#export_traits").click(exportTraits); $("#export_collection").click(exportCollection); - let naturalAsc = $.fn.dataTableExt.oSort["natural-ci-asc"] - let naturalDesc = $.fn.dataTableExt.oSort["natural-ci-desc"] - - let na_equivalent_vals = ["N/A", "--", ""]; //ZS: Since there are multiple values that should be treated the same as N/A - - function extractInnerText(the_string){ - var span = document.createElement('span'); - span.innerHTML = the_string; - return span.textContent || span.innerText; - } - - function sortNAs(a, b, sort_function){ - if ( na_equivalent_vals.includes(a) && na_equivalent_vals.includes(b)) { - return 0; - } - if (na_equivalent_vals.includes(a)){ - return 1 - } - if (na_equivalent_vals.includes(b)) { - return -1; - } - return sort_function(a, b) - } - - $.extend( $.fn.dataTableExt.oSort, { - "natural-minus-na-asc": function (a, b) { - return sortNAs(extractInnerText(a), extractInnerText(b), naturalAsc) - }, - "natural-minus-na-desc": function (a, b) { - return sortNAs(extractInnerText(a), extractInnerText(b), naturalDesc) - } - }); - - $.fn.dataTable.ext.order['dom-checkbox'] = function ( settings, col ) - { - return this.api().column( col, {order:'index'} ).nodes().map( function ( td, i ) { - return $('input', td).prop('checked') ? '1' : '0'; - } ); - }; - - $.fn.dataTable.ext.order['dom-inner-text'] = function ( settings, col ) - { - return this.api().column( col, {order:'index'} ).nodes().map( function ( td, i ) { - return $(td).text(); - } ); - } - applyDefault = function() { let default_collection_id = $.cookie('default_collection'); if (default_collection_id) { diff --git a/gn2/wqflask/static/new/javascript/table_functions.js b/gn2/wqflask/static/new/javascript/table_functions.js index 62888cd9..a648778e 100644 --- a/gn2/wqflask/static/new/javascript/table_functions.js +++ b/gn2/wqflask/static/new/javascript/table_functions.js @@ -88,3 +88,50 @@ function saveColumnSettings(tableId, traitTable) { // Save (or update) the settings in localStorage localStorage.setItem(tableId, JSON.stringify(userColumnDefs)); } + +let naturalAsc = $.fn.dataTableExt.oSort["natural-ci-asc"] +let naturalDesc = $.fn.dataTableExt.oSort["natural-ci-desc"] + +let na_equivalent_vals = ["N/A", "--", "", "NULL"]; //ZS: Since there are multiple values that should be treated the same as N/A + +function extractInnerText(the_string){ + var span = document.createElement('span'); + span.innerHTML = the_string; + return span.textContent || span.innerText; +} + +function sortNAs(a, b, sort_function){ + if ( na_equivalent_vals.includes(a) && na_equivalent_vals.includes(b)) { + return 0; + } + if (na_equivalent_vals.includes(a)){ + return 1 + } + if (na_equivalent_vals.includes(b)) { + return -1; + } + return sort_function(a, b) +} + +$.extend( $.fn.dataTableExt.oSort, { + "natural-minus-na-asc": function (a, b) { + return sortNAs(extractInnerText(a), extractInnerText(b), naturalAsc) + }, + "natural-minus-na-desc": function (a, b) { + return sortNAs(extractInnerText(a), extractInnerText(b), naturalDesc) + } +}); + +$.fn.dataTable.ext.order['dom-checkbox'] = function ( settings, col ) +{ + return this.api().column( col, {order:'index'} ).nodes().map( function ( td, i ) { + return $('input', td).prop('checked') ? '1' : '0'; + } ); +}; + +$.fn.dataTable.ext.order['dom-inner-text'] = function ( settings, col ) +{ + return this.api().column( col, {order:'index'} ).nodes().map( function ( td, i ) { + return $(td).text(); + } ); +}
\ No newline at end of file |