Improve barcode handling

www/assets/js/home.js

@@ -16,11 +16,10 @@ $("#clientsearchbar").submit(function (evt) {
     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");
         } else if (matches.length == 1) {
             router.navigate("/machine/" + matches[0]);
@@ -45,6 +44,11 @@ function scanBarcodeOpenMachine() {
     } else {
         router.navigate("/machine/" + code);
     }
+}
+
+function scanBarcodeOpenMachine() {
+    scanBarcode(function (code) {
+        openMachineInfoByBarcode(code);
     }, function (error) {
         app.dialog.alert(error, "Error");
     });