From ff00b88fd798976131b67680c26fa11ebf603733 Mon Sep 17 00:00:00 2001 From: RubenPX Date: Mon, 9 May 2022 14:18:41 +0200 Subject: [PATCH] fix indeterminated checkbox --- ereuse_devicehub/static/js/main_inventory.js | 28 +++++++++++++------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/ereuse_devicehub/static/js/main_inventory.js b/ereuse_devicehub/static/js/main_inventory.js index 848c72e4..c8159c83 100644 --- a/ereuse_devicehub/static/js/main_inventory.js +++ b/ereuse_devicehub/static/js/main_inventory.js @@ -90,11 +90,10 @@ window.addEventListener("DOMContentLoaded", () => { btnSelectAll.checked = true; btnSelectAll.indeterminate = false; alertInfoDevices.innerHTML = `Selected devices: ${TableController.getSelectedDevices().length} - ${ - TableController.getAllDevices().length != TableController.getSelectedDevices().length - ? `Select all devices (${TableController.getAllDevices().length})` - : "Cancel selection" - }`; + ${TableController.getAllDevices().length != TableController.getSelectedDevices().length + ? `Select all devices (${TableController.getAllDevices().length})` + : "Cancel selection" + }`; alertInfoDevices.classList.remove("d-none"); } else if (isAllChecked.every(bool => bool == false)) { btnSelectAll.checked = false; @@ -315,19 +314,30 @@ async function processSelectedDevices() { const lotID = lot.id; const srcElement = event.srcElement.parentElement.children[0] const checked = !srcElement.checked; + const { indeterminate } = srcElement const found = this.list.filter(list => list.lot.id == lotID)[0]; if (checked) { if (found && found.type == "Remove") { - found.type = "Add"; + const affectedDevices = found.devices.filter(dev => found.lot.devices.includes(dev.id)) + if (affectedDevices.length > 0 && found.indeterminate == false) { // Remove action from list + actions.list = actions.list.filter(x => x.lot.id != found.lot.id) + } else { + found.type = "Add"; + } } else { - this.list.push({ type: "Add", lot, devices: selectedDevices }); + this.list.push({ type: "Add", lot, devices: selectedDevices, indeterminate }); } } else if (found && found.type == "Add") { - found.type = "Remove"; + const affectedDevices = found.devices.filter(dev => !found.lot.devices.includes(dev.id)) + if (affectedDevices.length > 0 && found.indeterminate == false) { // Remove action from list + actions.list = actions.list.filter(x => x.lot.id != found.lot.id) + } else { + found.type = "Remove"; + } } else { - this.list.push({ type: "Remove", lot, devices: selectedDevices }); + this.list.push({ type: "Remove", lot, devices: selectedDevices, indeterminate }); } if (this.list.length > 0) {