From d27cc46f64d30f49bd45ac3086cd45e47adf16c0 Mon Sep 17 00:00:00 2001 From: RubenPX Date: Wed, 11 May 2022 11:09:38 +0200 Subject: [PATCH] refactor device selection --- ereuse_devicehub/static/js/main_inventory.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/ereuse_devicehub/static/js/main_inventory.js b/ereuse_devicehub/static/js/main_inventory.js index 3bae4ce3..0f1d9b7e 100644 --- a/ereuse_devicehub/static/js/main_inventory.js +++ b/ereuse_devicehub/static/js/main_inventory.js @@ -83,8 +83,6 @@ window.addEventListener("DOMContentLoaded", () => { const alertInfoDevices = document.getElementById("select-devices-info"); function itemListCheckChanged() { - const listDevices = TableController.getAllDevicesInCurrentPage() - const isAllChecked = listDevices.map(itm => itm.checked); alertInfoDevices.innerHTML = `Selected devices: ${TableController.getSelectedDevices().length} ${TableController.getAllDevices().length != TableController.getSelectedDevices().length ? `Select all devices (${TableController.getAllDevices().length})` @@ -97,14 +95,14 @@ window.addEventListener("DOMContentLoaded", () => { alertInfoDevices.classList.remove("d-none"); } - if (isAllChecked.every(bool => bool == true)) { + if (TableController.getAllDevices().length == TableController.getSelectedDevices().length) { btnSelectAll.checked = true; btnSelectAll.indeterminate = false; - } else if (isAllChecked.every(bool => bool == false)) { + } else if(TableController.getAllDevices().length < TableController.getSelectedDevices().length) { + btnSelectAll.indeterminate = true; + } else { btnSelectAll.checked = false; btnSelectAll.indeterminate = false; - } else { - btnSelectAll.indeterminate = true; } }