diff --git a/current_site/src/pages/table/main.js b/current_site/src/pages/table/main.js index bb15a13..dadfc63 100644 --- a/current_site/src/pages/table/main.js +++ b/current_site/src/pages/table/main.js @@ -29,16 +29,14 @@ function doInit() { } sorting.applySortButton.addEventListener("click", () => { - if (!sortTable('list', sorting)) { - clearTable('list'); - createTable(ram_sticks, 'list'); - sortTable('list', sorting) - } + clearTable('list'); + filterTable(ram_sticks, 'list', filters) + sortTable('list', sorting) }); sorting.resetSortButton.addEventListener("click", () => { resetSort(sorting); clearTable('list'); - createTable(ram_sticks, 'list'); + filterTable(ram_sticks, 'list', filters) }); } @@ -84,6 +82,10 @@ const updateOptions = (current_index, sort_form) => { elem.disabled |= elem_collection[current_index-1].value==0; } + if(elem.disabled){ + elem.value = 0; + } + save_val = 0; if (!used_options_list.includes(all_fields[elem.value - 1])) { save_val = elem.value; diff --git a/current_site/src/pages/table/sort.js b/current_site/src/pages/table/sort.js index 4ab6c66..67f7c15 100644 --- a/current_site/src/pages/table/sort.js +++ b/current_site/src/pages/table/sort.js @@ -32,7 +32,7 @@ const createSortArr = (data) => { return sortArr; }; -const numberColumns = [4, 5] +const numberColumns = [2, 4, 5] const sortTable = (idTable, formData) => {