trustchain-oc1-orchestral
/
devicehub-teal
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add sections in menu of lots

This commit is contained in:
Cayo Puigdefabregas 2022-06-21 17:51:33 +02:00
parent cf4e1df527
commit fc50604011
2 changed files with 41 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ereuse_devicehub/static/js/main_inventory.build.js
View File

@ -681,17 +681,32 @@ async function processSelectedDevices() {
return lot; return lot;
}); });
let lotsList = [];
lotsList.push(lots.filter(lot => lot.state == "true").sort((a, b) => a.name.localeCompare(b.name)));
lotsList.push(lots.filter(lot => lot.state == "indetermined").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
listHTML.html(""); listHTML.html("");
lotsList.forEach(lot => templateLot(lot, selectedDevices, listHTML, actions)); let lot_temporary = lots.filter(lot => !lot.transfer);
appendMenu(lot_temporary, listHTML, templateLot, selectedDevices, actions, 'Temporary');
let lot_incoming = lots.filter(lot => lot.transfer && lot.transfer == 'Incoming');
appendMenu(lot_incoming, listHTML, templateLot, selectedDevices, actions, 'Incoming');
let lot_outgoing = lots.filter(lot => lot.transfer && lot.transfer == 'Outgoing');
appendMenu(lot_outgoing, listHTML, templateLot, selectedDevices, actions, 'Outgoing');
lotsSearcher.enable(); lotsSearcher.enable();
} catch (error) { } catch (error) {
console.log(error); console.log(error);
listHTML.html("<li style=\"color: red; text-align: center\">Error feching devices and lots<br>(see console for more details)</li>"); listHTML.html("<li style=\"color: red; text-align: center\">Error feching devices and lots<br>(see console for more details)</li>");
} }
} }
function appendMenu(lots, listHTML, templateLot, selectedDevices, actions, title) {
let lotsList = [];
lotsList.push(lots.filter(lot => lot.state == "true").sort((a, b) => a.name.localeCompare(b.name)));
lotsList.push(lots.filter(lot => lot.state == "indetermined").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
listHTML.append("<li style=\"color: black; text-align: center\">" + title + "<hr /></li>");
lotsList.forEach(lot => templateLot(lot, selectedDevices, listHTML, actions));
}

27
ereuse_devicehub/static/js/main_inventory.js
View File

@ -646,17 +646,30 @@ async function processSelectedDevices() {
return lot; return lot;
}) })
let lotsList = [];
lotsList.push(lots.filter(lot => lot.state == "true").sort((a, b) => a.name.localeCompare(b.name)));
lotsList.push(lots.filter(lot => lot.state == "indetermined").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
listHTML.html(""); listHTML.html("");
lotsList.forEach(lot => templateLot(lot, selectedDevices, listHTML, actions)); let lot_temporary = lots.filter(lot => !lot.transfer);
appendMenu(lot_temporary, listHTML, templateLot, selectedDevices, actions, 'Temporary');
let lot_incoming = lots.filter(lot => lot.transfer && lot.transfer == 'Incoming');
appendMenu(lot_incoming, listHTML, templateLot, selectedDevices, actions, 'Incoming');
let lot_outgoing = lots.filter(lot => lot.transfer && lot.transfer == 'Outgoing');
appendMenu(lot_outgoing, listHTML, templateLot, selectedDevices, actions, 'Outgoing');
lotsSearcher.enable(); lotsSearcher.enable();
} catch (error) { } catch (error) {
console.log(error); console.log(error);
listHTML.html("<li style=\"color: red; text-align: center\">Error feching devices and lots<br>(see console for more details)</li>"); listHTML.html("<li style=\"color: red; text-align: center\">Error feching devices and lots<br>(see console for more details)</li>");
} }
} }
function appendMenu(lots, listHTML, templateLot, selectedDevices, actions, title) {
let lotsList = [];
lotsList.push(lots.filter(lot => lot.state == "true").sort((a, b) => a.name.localeCompare(b.name)));
lotsList.push(lots.filter(lot => lot.state == "indetermined").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
listHTML.append("<li style=\"color: black; text-align: center\">" + title + "<hr /></li>");
lotsList.forEach(lot => templateLot(lot, selectedDevices, listHTML, actions));
}