Merge branch 'features/transfer-3493-3492-3510' of github.com:eReuse/devicehub-teal into features/transfer-3493-3492-3510

This commit is contained in:
Cayo Puigdefabregas 2022-06-21 18:16:10 +02:00
commit 1168842cea
1 changed files with 7 additions and 7 deletions

View File

@ -647,14 +647,14 @@ async function processSelectedDevices() {
}) })
listHTML.html(""); listHTML.html("");
let lot_temporary = lots.filter(lot => !lot.transfer); const lot_temporary = lots.filter(lot => !lot.transfer);
appendMenu(lot_temporary, listHTML, templateLot, selectedDevices, actions, 'Temporary'); appendMenu(lot_temporary, listHTML, templateLot, selectedDevices, actions, "Temporary");
let lot_incoming = lots.filter(lot => lot.transfer && lot.transfer == 'Incoming'); const lot_incoming = lots.filter(lot => lot.transfer && lot.transfer == "Incoming");
appendMenu(lot_incoming, listHTML, templateLot, selectedDevices, actions, 'Incoming'); appendMenu(lot_incoming, listHTML, templateLot, selectedDevices, actions, "Incoming");
let lot_outgoing = lots.filter(lot => lot.transfer && lot.transfer == 'Outgoing'); const lot_outgoing = lots.filter(lot => lot.transfer && lot.transfer == "Outgoing");
appendMenu(lot_outgoing, listHTML, templateLot, selectedDevices, actions, 'Outgoing'); appendMenu(lot_outgoing, listHTML, templateLot, selectedDevices, actions, "Outgoing");
lotsSearcher.enable(); lotsSearcher.enable();
} catch (error) { } catch (error) {
@ -670,6 +670,6 @@ function appendMenu(lots, listHTML, templateLot, selectedDevices, actions, title
lotsList.push(lots.filter(lot => lot.state == "false").sort((a, b) => a.name.localeCompare(b.name))); lotsList.push(lots.filter(lot => lot.state == "false").sort((a, b) => a.name.localeCompare(b.name)));
lotsList = lotsList.flat(); // flat array lotsList = lotsList.flat(); // flat array
listHTML.append("<li style=\"color: black; text-align: center\">" + title + "<hr /></li>"); listHTML.append(`<li style="color: black; text-align: center">${ title }<hr /></li>`);
lotsList.forEach(lot => templateLot(lot, selectedDevices, listHTML, actions)); lotsList.forEach(lot => templateLot(lot, selectedDevices, listHTML, actions));
} }