From 13579451cf4bfa6852d364144109a2db8f8b7586 Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Fri, 16 Oct 2020 23:05:56 -0600 Subject: [PATCH] Maybe allow printing when wifi has no internet --- package-lock.json | 12 ++++++++++++ package.json | 8 ++++++-- www/assets/js/labels.js | 15 ++++++++++++++- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index b84368d..53ec291 100644 --- a/package-lock.json +++ b/package-lock.json @@ -144,6 +144,12 @@ "resolved": "https://registry.npmjs.org/cordova-plugin-splashscreen/-/cordova-plugin-splashscreen-5.0.4.tgz", "integrity": "sha512-zmyhBrObNuwDH4KB4zuZrJ9IKC113EM6KJpqC0/2f3o9GRznPk1S4j9O9rosJT4EASg4X3hdssv9XkAH3D5ZYg==" }, + "cordova-plugin-wifiwizard2": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/cordova-plugin-wifiwizard2/-/cordova-plugin-wifiwizard2-3.1.1.tgz", + "integrity": "sha512-Vd4aYUAxCTR6+zhhSOToWi67wT4Vycq4lYB4HnnxFWxrL3ewuKshq9eLxrrwIHwPvPI4u4g06+5jO9PnwEiKOw==", + "dev": true + }, "cross-spawn": { "version": "6.0.5", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", @@ -194,6 +200,12 @@ "objectorarray": "^1.0.4" } }, + "es6-promise-plugin": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/es6-promise-plugin/-/es6-promise-plugin-4.1.0.tgz", + "integrity": "sha1-8GEHOZhEUJ6quo7QcHfSiKXKaX4=", + "dev": true + }, "fast-json-parse": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/fast-json-parse/-/fast-json-parse-1.0.3.tgz", diff --git a/package.json b/package.json index ba5a5be..0faddf8 100644 --- a/package.json +++ b/package.json @@ -34,8 +34,12 @@ "phonegap-plugin-barcodescanner": { "ANDROID_SUPPORT_V4_VERSION": "27.+" }, - "cordova-plugin-splashscreen": {} + "cordova-plugin-splashscreen": {}, + "wifiwizard2": {} } }, - "devDependencies": {} + "devDependencies": { + "cordova-plugin-wifiwizard2": "^3.1.1", + "es6-promise-plugin": "^4.1.0" + } } \ No newline at end of file diff --git a/www/assets/js/labels.js b/www/assets/js/labels.js index 151c262..ba8bfab 100644 --- a/www/assets/js/labels.js +++ b/www/assets/js/labels.js @@ -9,6 +9,7 @@ var pdfobject = null; function labelListAsync(routeTo, routeFrom, resolve, reject) { app.dialog.preloader("Loading..."); + apirequest( "listlabels", {}, @@ -78,6 +79,11 @@ function getPDFLabelAndDisplay(machineid, labeltype) { } function sendPDFToPrintServer() { + try { + WifiWizard2.setBindAll(); + } catch (ex) { + + } var bytesArray = new Uint8Array(pdfobject); var printurl = getStorage("printserverurl"); @@ -104,7 +110,14 @@ function sendPDFToPrintServer() { type: 'POST', contentType: 'application/octet-stream', data: bytesArray, - processData: false + processData: false, + success: function () { + try { + WifiWizard2.resetBindAll(); + } catch (ex) { + + } + } }); } }).open();