Netsyms/MachineManagerApp
2
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Improve barcode handling

Browse Source
This commit is contained in:
Skylar Ittner 2020-10-22 09:37:46 -06:00
parent 808ff0f4a8
commit b99e577d63
1 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
www/assets/js/home.js
View File

@ -16,11 +16,10 @@ $("#clientsearchbar").submit(function (evt) {
router.navigate("/clients/" + $("#clientsearchbar input[type=search]").val()); router.navigate("/clients/" + $("#clientsearchbar input[type=search]").val());
}); });
function scanBarcodeOpenMachine() { function openMachineInfoByBarcode(code) {
scanBarcode(function (code) { if (code.startsWith("http") || !code.match(/^([A-Z0-9])+$/)) {
if (code.startsWith("http")) { matches = code.match(/[0-9A-Z]{8,}/g);
matches = code.match(/[0-9]{8,}/g); if (matches == null || matches.length == 0) {
if (matches.length == 0) {
app.dialog.alert("No IDs detected in barcode.", "Error"); app.dialog.alert("No IDs detected in barcode.", "Error");
} else if (matches.length == 1) { } else if (matches.length == 1) {
router.navigate("/machine/" + matches[0]); router.navigate("/machine/" + matches[0]);
@ -45,6 +44,11 @@ function scanBarcodeOpenMachine() {
} else { } else {
router.navigate("/machine/" + code); router.navigate("/machine/" + code);
} }
}
function scanBarcodeOpenMachine() {
scanBarcode(function (code) {
openMachineInfoByBarcode(code);
}, function (error) { }, function (error) {
app.dialog.alert(error, "Error"); app.dialog.alert(error, "Error");
}); });