diff --git a/changelog/65_UNRELEASED_xxxx-xx-xx.md b/changelog/65_UNRELEASED_xxxx-xx-xx.md index 0a741130..122cec69 100644 --- a/changelog/65_UNRELEASED_xxxx-xx-xx.md +++ b/changelog/65_UNRELEASED_xxxx-xx-xx.md @@ -7,6 +7,7 @@ - Fixed that the "Add as new product" productpicker workflow, started from the shopping list item form, always selected the default shopping list after finishing the flow - Fixed that when undoing a product opened transaction and when the product has "Default due days after opened", the original due date wasn't restored - Fixed that "Track date only"-chores were shown as overdue on the due day on the chores overview page +- Fixed that dropdown filters for tables maybe did not work after reordering columns ### API - Fixed that backslashes were not allowed in API query filters diff --git a/public/viewjs/batteriesoverview.js b/public/viewjs/batteriesoverview.js index ae956dd5..085c04ef 100644 --- a/public/viewjs/batteriesoverview.js +++ b/public/viewjs/batteriesoverview.js @@ -25,7 +25,7 @@ $("#clear-filter-button").on("click", function() { $("#search").val(""); $("#status-filter").val("all"); - batteriesOverviewTable.column(5).search("").draw(); + batteriesOverviewTable.column(batteriesOverviewTable.colReorder.transpose(5)).search("").draw(); batteriesOverviewTable.search("").draw(); }); @@ -40,7 +40,7 @@ $("#status-filter").on("change", function() // Transfer CSS classes of selected element to dropdown element (for background) $(this).attr("class", $("#" + $(this).attr("id") + " option[value='" + value + "']").attr("class") + " form-control"); - batteriesOverviewTable.column(5).search(value).draw(); + batteriesOverviewTable.column(batteriesOverviewTable.colReorder.transpose(5)).search(value).draw(); }); $(".status-filter-message").on("click", function() diff --git a/public/viewjs/choresoverview.js b/public/viewjs/choresoverview.js index 6a00f2d1..2a8ea6d2 100644 --- a/public/viewjs/choresoverview.js +++ b/public/viewjs/choresoverview.js @@ -33,7 +33,7 @@ $("#status-filter").on("change", function() // Transfer CSS classes of selected element to dropdown element (for background) $(this).attr("class", $("#" + $(this).attr("id") + " option[value='" + value + "']").attr("class") + " form-control"); - choresOverviewTable.column(5).search(value).draw(); + choresOverviewTable.column(choresOverviewTable.colReorder.transpose(5)).search(value).draw(); }); $("#user-filter").on("change", function() @@ -47,7 +47,7 @@ $("#user-filter").on("change", function() // Transfer CSS classes of selected element to dropdown element (for background) $(this).attr("class", $("#" + $(this).attr("id") + " option[value='" + value + "']").attr("class") + " form-control"); - choresOverviewTable.column(6).search(value).draw(); + choresOverviewTable.column(choresOverviewTable.colReorder.transpose(6)).search(value).draw(); if (!value.isEmpty()) { @@ -60,8 +60,8 @@ $("#clear-filter-button").on("click", function() $("#search").val(""); $("#status-filter").val("all"); $("#user-filter").val("all"); - choresOverviewTable.column(5).search("").draw(); - choresOverviewTable.column(6).search("").draw(); + choresOverviewTable.column(choresOverviewTable.colReorder.transpose(5)).search("").draw(); + choresOverviewTable.column(choresOverviewTable.colReorder.transpose(6)).search("").draw(); choresOverviewTable.search("").draw(); RemoveUriParam("user"); }); diff --git a/public/viewjs/products.js b/public/viewjs/products.js index 7aa3b9a2..18b2b3af 100644 --- a/public/viewjs/products.js +++ b/public/viewjs/products.js @@ -29,14 +29,14 @@ $("#product-group-filter").on("change", function() value = ""; } - productsTable.column(6).search(value).draw(); + productsTable.column(productsTable.colReorder.transpose(6)).search(value).draw(); }); $("#clear-filter-button").on("click", function() { $("#search").val(""); $("#product-group-filter").val("all"); - productsTable.column(6).search("").draw(); + productsTable.column(productsTable.colReorder.transpose(6)).search("").draw(); productsTable.search("").draw(); if ($("#show-disabled").is(":checked") || $("#show-only-in-stock").is(":checked")) { diff --git a/public/viewjs/recipes.js b/public/viewjs/recipes.js index 00ca3ac6..3c39fb54 100644 --- a/public/viewjs/recipes.js +++ b/public/viewjs/recipes.js @@ -99,7 +99,7 @@ $("#status-filter").on("change", function() value = ""; } - recipesTables.column(5).search(value).draw(); + recipesTables.column(recipesTables.colReorder.transpose(5)).search(value).draw(); $('.recipe-gallery-item').removeClass('d-none'); if (value !== "") diff --git a/public/viewjs/shoppinglist.js b/public/viewjs/shoppinglist.js index 33f49557..d9d44d40 100644 --- a/public/viewjs/shoppinglist.js +++ b/public/viewjs/shoppinglist.js @@ -65,7 +65,7 @@ $("#status-filter").on("change", function() // Transfer CSS classes of selected element to dropdown element (for background) $(this).attr("class", $("#" + $(this).attr("id") + " option[value='" + value + "']").attr("class") + " form-control"); - shoppingListTable.column(4).search(value).draw(); + shoppingListTable.column(shoppingListTable.colReorder.transpose(4)).search(value).draw(); }); $("#selected-shopping-list").on("change", function() diff --git a/public/viewjs/stockjournal.js b/public/viewjs/stockjournal.js index 47f92fbb..2664fa65 100644 --- a/public/viewjs/stockjournal.js +++ b/public/viewjs/stockjournal.js @@ -32,7 +32,7 @@ $("#transaction-type-filter").on("change", function() text = ""; } - stockJournalTable.column(4).search(text).draw(); + stockJournalTable.column(stockJournalTable.colReorder.transpose(4)).search(text).draw(); }); $("#location-filter").on("change", function() @@ -44,7 +44,7 @@ $("#location-filter").on("change", function() text = ""; } - stockJournalTable.column(5).search(text).draw(); + stockJournalTable.column(stockJournalTable.colReorder.transpose(5)).search(text).draw(); }); $("#user-filter").on("change", function() @@ -56,7 +56,7 @@ $("#user-filter").on("change", function() text = ""; } - stockJournalTable.column(6).search(text).draw(); + stockJournalTable.column(stockJournalTable.colReorder.transpose(6)).search(text).draw(); }); $("#daterange-filter").on("change", function() diff --git a/public/viewjs/stockjournalsummary.js b/public/viewjs/stockjournalsummary.js index 8af9a262..6b9f98e6 100644 --- a/public/viewjs/stockjournalsummary.js +++ b/public/viewjs/stockjournalsummary.js @@ -14,11 +14,11 @@ $("#product-filter").on("change", function() var text = $("#product-filter option:selected").text(); if (value === "all") { - journalSummaryTable.column(1).search("").draw(); + journalSummaryTable.column(journalSummaryTable.colReorder.transpose(1)).search("").draw(); } else { - journalSummaryTable.column(1).search("^" + text + "$", true, false).draw(); + journalSummaryTable.column(journalSummaryTable.colReorder.transpose(1)).search("^" + text + "$", true, false).draw(); } }); @@ -31,7 +31,7 @@ $("#transaction-type-filter").on("change", function() text = ""; } - journalSummaryTable.column(2).search(text).draw(); + journalSummaryTable.column(journalSummaryTable.colReorder.transpose(2)).search(text).draw(); }); $("#user-filter").on("change", function() @@ -43,7 +43,7 @@ $("#user-filter").on("change", function() text = ""; } - journalSummaryTable.column(3).search(text).draw(); + journalSummaryTable.column(journalSummaryTable.colReorder.transpose(3)).search(text).draw(); }); $("#search").on("keyup", Delay(function() @@ -64,8 +64,8 @@ $("#clear-filter-button").on("click", function() $("#location-filter").val("all"); $("#user-filter").val("all"); $("#product-filter").val("all"); - journalSummaryTable.column(1).search("").draw(); - journalSummaryTable.column(2).search("").draw(); - journalSummaryTable.column(3).search("").draw(); + journalSummaryTable.column(journalSummaryTable.colReorder.transpose(1)).search("").draw(); + journalSummaryTable.column(journalSummaryTable.colReorder.transpose(2)).search("").draw(); + journalSummaryTable.column(journalSummaryTable.colReorder.transpose(3)).search("").draw(); journalSummaryTable.search("").draw(); }); diff --git a/public/viewjs/stockoverview.js b/public/viewjs/stockoverview.js index 95c6d3a3..4dc03eac 100755 --- a/public/viewjs/stockoverview.js +++ b/public/viewjs/stockoverview.js @@ -45,7 +45,7 @@ $("#location-filter").on("change", function() value = "xx" + value + "xx"; } - stockOverviewTable.column(6).search(value).draw(); + stockOverviewTable.column(stockOverviewTable.colReorder.transpose(6)).search(value).draw(); }); $("#product-group-filter").on("change", function() @@ -60,7 +60,7 @@ $("#product-group-filter").on("change", function() value = "xx" + value + "xx"; } - stockOverviewTable.column(8).search(value).draw(); + stockOverviewTable.column(stockOverviewTable.colReorder.transpose(8)).search(value).draw(); }); $("#status-filter").on("change", function() @@ -74,7 +74,7 @@ $("#status-filter").on("change", function() // Transfer CSS classes of selected element to dropdown element (for background) $(this).attr("class", $("#" + $(this).attr("id") + " option[value='" + value + "']").attr("class") + " form-control"); - stockOverviewTable.column(7).search(value).draw(); + stockOverviewTable.column(stockOverviewTable.colReorder.transpose(7)).search(value).draw(); }); $(".status-filter-message").on("click", function() @@ -90,9 +90,9 @@ $("#clear-filter-button").on("click", function() $("#status-filter").val("all"); $("#product-group-filter").val("all"); $("#location-filter").val("all"); - stockOverviewTable.column(6).search("").draw(); - stockOverviewTable.column(7).search("").draw(); - stockOverviewTable.column(8).search("").draw(); + stockOverviewTable.column(stockOverviewTable.colReorder.transpose(6)).search("").draw(); + stockOverviewTable.column(stockOverviewTable.colReorder.transpose(7)).search("").draw(); + stockOverviewTable.column(stockOverviewTable.colReorder.transpose(8)).search("").draw(); stockOverviewTable.search("").draw(); }); diff --git a/public/viewjs/tasks.js b/public/viewjs/tasks.js index f0f02afa..fcdde80e 100644 --- a/public/viewjs/tasks.js +++ b/public/viewjs/tasks.js @@ -31,7 +31,7 @@ $("#status-filter").on("change", function() // Transfer CSS classes of selected element to dropdown element (for background) $(this).attr("class", $("#" + $(this).attr("id") + " option[value='" + value + "']").attr("class") + " form-control"); - tasksTable.column(5).search(value).draw(); + tasksTable.column(tasksTable.colReorder.transpose(5)).search(value).draw(); }); $("#clear-filter-button").on("click", function() diff --git a/public/viewjs/userfields.js b/public/viewjs/userfields.js index d5d12bfc..39231a10 100644 --- a/public/viewjs/userfields.js +++ b/public/viewjs/userfields.js @@ -27,7 +27,7 @@ $("#entity-filter").on("change", function() value = ""; } - userfieldsTable.column(1).search(value).draw(); + userfieldsTable.column(userfieldsTable.colReorder.transpose(1)).search(value).draw(); $("#new-userfield-button").attr("href", U("/userfield/new?embedded&entity=" + value)); }); @@ -35,7 +35,7 @@ $("#clear-filter-button").on("click", function() { $("#search").val(""); $("#entity-filter").val("all"); - userfieldsTable.column(1).search("").draw(); + userfieldsTable.column(userfieldsTable.colReorder.transpose(1)).search("").draw(); userfieldsTable.search("").draw(); });