diff --git a/package.json b/package.json index f647ad63..dc0b3b0c 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,8 @@ "datatables.net-bs4": "^1.10.19", "datatables.net-responsive": "^2.2.3", "datatables.net-responsive-bs4": "^2.2.3", + "datatables.net-colreorder": "^1.5.1", + "datatables.net-colreorder-bs4": "^1.5.1", "jquery": "^3.3.1", "jquery-serializejson": "^2.8.1", "jquery-ui-dist": "^1.12.1", diff --git a/public/viewjs/batteries.js b/public/viewjs/batteries.js index 76f0d5fe..0f334454 100644 --- a/public/viewjs/batteries.js +++ b/public/viewjs/batteries.js @@ -5,7 +5,8 @@ { 'orderable': false, 'targets': 0 } ], 'language': JSON.parse(L('datatables_localization')), - 'scrollY': false + 'scrollY': false, + 'colReorder': true }); $("#search").on("keyup", function() diff --git a/public/viewjs/batteriesoverview.js b/public/viewjs/batteriesoverview.js index cde2b71d..df25bd33 100644 --- a/public/viewjs/batteriesoverview.js +++ b/public/viewjs/batteriesoverview.js @@ -5,7 +5,8 @@ { 'orderable': false, 'targets': 0 } ], 'language': JSON.parse(L('datatables_localization')), - 'scrollY': false + 'scrollY': false, + 'colReorder': true }); $("#search").on("keyup", function() diff --git a/public/viewjs/habits.js b/public/viewjs/habits.js index 2959908a..7f14c342 100644 --- a/public/viewjs/habits.js +++ b/public/viewjs/habits.js @@ -5,7 +5,8 @@ { 'orderable': false, 'targets': 0 } ], 'language': JSON.parse(L('datatables_localization')), - 'scrollY': false + 'scrollY': false, + 'colReorder': true }); $("#search").on("keyup", function() diff --git a/public/viewjs/habitsoverview.js b/public/viewjs/habitsoverview.js index e0413d83..49712e87 100644 --- a/public/viewjs/habitsoverview.js +++ b/public/viewjs/habitsoverview.js @@ -5,7 +5,8 @@ { 'orderable': false, 'targets': 0 } ], 'language': JSON.parse(L('datatables_localization')), - 'scrollY': false + 'scrollY': false, + 'colReorder': true }); $("#search").on("keyup", function() diff --git a/public/viewjs/locations.js b/public/viewjs/locations.js index 493fa340..b05e9057 100644 --- a/public/viewjs/locations.js +++ b/public/viewjs/locations.js @@ -5,7 +5,8 @@ { 'orderable': false, 'targets': 0 } ], 'language': JSON.parse(L('datatables_localization')), - 'scrollY': false + 'scrollY': false, + 'colReorder': true }); $("#search").on("keyup", function() diff --git a/public/viewjs/manageapikeys.js b/public/viewjs/manageapikeys.js index dc3c4bfb..96cabc46 100644 --- a/public/viewjs/manageapikeys.js +++ b/public/viewjs/manageapikeys.js @@ -5,7 +5,8 @@ { 'orderable': false, 'targets': 0 } ], 'language': JSON.parse(L('datatables_localization')), - 'scrollY': false + 'scrollY': false, + 'colReorder': true }); var createdApiKeyId = GetUriParam('CreatedApiKeyId'); diff --git a/public/viewjs/products.js b/public/viewjs/products.js index cd02b8f8..81cd9f59 100644 --- a/public/viewjs/products.js +++ b/public/viewjs/products.js @@ -5,7 +5,8 @@ { 'orderable': false, 'targets': 0 } ], 'language': JSON.parse(L('datatables_localization')), - 'scrollY': false + 'scrollY': false, + 'colReorder': true }); $("#search").on("keyup", function() diff --git a/public/viewjs/quantityunits.js b/public/viewjs/quantityunits.js index d3eb75bc..f7edc41a 100644 --- a/public/viewjs/quantityunits.js +++ b/public/viewjs/quantityunits.js @@ -5,7 +5,8 @@ { 'orderable': false, 'targets': 0 } ], 'language': JSON.parse(L('datatables_localization')), - 'scrollY': false + 'scrollY': false, + 'colReorder': true }); $("#search").on("keyup", function() diff --git a/public/viewjs/shoppinglist.js b/public/viewjs/shoppinglist.js index 7841095f..f8750191 100644 --- a/public/viewjs/shoppinglist.js +++ b/public/viewjs/shoppinglist.js @@ -5,7 +5,8 @@ { 'orderable': false, 'targets': 0 } ], 'language': JSON.parse(L('datatables_localization')), - 'scrollY': false + 'scrollY': false, + 'colReorder': true }); $("#search").on("keyup", function() diff --git a/public/viewjs/stockoverview.js b/public/viewjs/stockoverview.js index 148acce7..7867a545 100644 --- a/public/viewjs/stockoverview.js +++ b/public/viewjs/stockoverview.js @@ -6,7 +6,8 @@ { 'visible': false, 'targets': 4 } ], 'language': JSON.parse(L('datatables_localization')), - 'scrollY': false + 'scrollY': false, + 'colReorder': true }); $("#location-filter").on("change", function() diff --git a/views/layout/default.blade.php b/views/layout/default.blade.php index 1dedf34b..aba4bec8 100644 --- a/views/layout/default.blade.php +++ b/views/layout/default.blade.php @@ -17,8 +17,9 @@ - + + @@ -227,6 +228,8 @@ + + diff --git a/yarn.lock b/yarn.lock index acb3abfa..b7ba3097 100644 --- a/yarn.lock +++ b/yarn.lock @@ -74,6 +74,21 @@ datatables.net-bs4@^1.10.15, datatables.net-bs4@^1.10.19: datatables.net "1.10.19" jquery ">=1.7" +datatables.net-colreorder-bs4@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/datatables.net-colreorder-bs4/-/datatables.net-colreorder-bs4-1.5.1.tgz#7ded353a68296b85f0dbfb234b8cb5d8fc2bee3c" + dependencies: + datatables.net-bs4 "^1.10.15" + datatables.net-colreorder "1.5.1" + jquery ">=1.7" + +datatables.net-colreorder@1.5.1, datatables.net-colreorder@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/datatables.net-colreorder/-/datatables.net-colreorder-1.5.1.tgz#ee5eacd7178b5fd9396aab44d4907aae35086f8c" + dependencies: + datatables.net "^1.10.15" + jquery ">=1.7" + datatables.net-responsive-bs4@^2.2.3: version "2.2.3" resolved "https://registry.yarnpkg.com/datatables.net-responsive-bs4/-/datatables.net-responsive-bs4-2.2.3.tgz#639de17c1d31210ebf2b3c25f1c774c13f729e94"