From c629f7ca7b26cbe5c2cda65092558e65d70177c8 Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Thu, 19 Mar 2020 00:23:08 -0600 Subject: [PATCH] Add POSTNET barcode to address lookup, refine lookup tool --- scripts/remove_bloat.sh | 4 ++++ www/assets/js/toolbox_addresslookup.js | 26 ++++++++++++++++++++++++-- www/index.html | 1 + www/package.json | 1 + www/pages/toolbox/addrlookup.html | 25 ++++++++++--------------- www/pages/toolbox/trackinginfo.html | 2 +- 6 files changed, 41 insertions(+), 18 deletions(-) diff --git a/scripts/remove_bloat.sh b/scripts/remove_bloat.sh index 622278a..2c67160 100755 --- a/scripts/remove_bloat.sh +++ b/scripts/remove_bloat.sh @@ -19,6 +19,10 @@ rm -rf {util-deprecate,vt-pbf,wgs84} # Make npm stop complaining that these don't exist by actually removing them rm -rf .bin/* +cd bwip-js +rm -rf {bin,examples,src,barcode.ps,demo.html,stb_truetype.h} +rm -rf dist/bwip-js.js +rm -rf dist/node-bwipjs.js cd @fortawesome/fontawesome-free rm -rf {js,less,metadata,scss,sprites,svgs} diff --git a/www/assets/js/toolbox_addresslookup.js b/www/assets/js/toolbox_addresslookup.js index aee6c4f..54eb341 100644 --- a/www/assets/js/toolbox_addresslookup.js +++ b/www/assets/js/toolbox_addresslookup.js @@ -24,7 +24,6 @@ function addressLookup() { method: 'post', data: { "street": $("#numberstreetinput").val(), - "unit": $("#unitinput").val(), "city": $("#cityinput").val(), "state": $("#stateinput").val(), "zip": $("#zipcodeinput").val() @@ -40,21 +39,44 @@ function addressLookup() { var address = resp.address; $(".item-text #address").text(address.address); var zipstr = ""; + var postnetstr = ""; + var postnetspacedstr = ""; if (address.zip != "") { zipstr = address.zip; + postnetstr = address.zip; + postnetspacedstr = address.zip; } if (address.plus4 != "") { zipstr += "-" + address.plus4; + postnetstr += "" + address.plus4; + postnetspacedstr += " " + address.plus4; + } + if (address.delivery_point != "") { + postnetstr += "" + address.delivery_point; + postnetspacedstr += " " + address.delivery_point; } $(".item-text #citystate").text(address.city + " " + address.state + " " + zipstr); - + $(".item-text #dp").text(address.delivery_point); $(".item-text #route").text(address.route); $(".item-text #county").text(address.county); $(".item-text #dpvconfirmed").text(address.dpv_confirmed ? "Yes" : "No"); $(".addrresult").removeClass("display-none"); + let canvas = document.createElement('canvas'); + bwipjs.toCanvas(canvas, { + bcid: 'postnet', // Barcode type + text: postnetstr, // Text to encode + scale: 2, + height: 3, // Bar height, in millimeters + alttext: postnetspacedstr, + includetext: true, // Show human-readable text + textxalign: 'center', // Always good to set this + }); + document.getElementById("postnetbarcode").src = canvas.toDataURL('image/png'); + $(".barcoderesult").removeClass("display-none"); } else { $(".addrresult").addClass("display-none"); + $(".barcoderesult").addClass("display-none"); app.dialog.alert(resp.address.message, "Error"); } if (resp.geocode.status == "OK") { diff --git a/www/index.html b/www/index.html index 0ef2e31..38e3d54 100644 --- a/www/index.html +++ b/www/index.html @@ -42,6 +42,7 @@ + diff --git a/www/package.json b/www/package.json index c6d77f7..710f226 100644 --- a/www/package.json +++ b/www/package.json @@ -6,6 +6,7 @@ "dependencies": { "@fortawesome/fontawesome-free": "^5.10.2", "@zxing/library": "^0.15.2", + "bwip-js": "^2.0.6", "framework7": "^5.1.3", "jquery": "^3.4.1", "jsbarcode": "^3.11.0", diff --git a/www/pages/toolbox/addrlookup.html b/www/pages/toolbox/addrlookup.html index a3e305c..8dd99c5 100644 --- a/www/pages/toolbox/addrlookup.html +++ b/www/pages/toolbox/addrlookup.html @@ -21,21 +21,11 @@
diff --git a/www/pages/toolbox/trackinginfo.html b/www/pages/toolbox/trackinginfo.html index dc85bdb..ebda36d 100644 --- a/www/pages/toolbox/trackinginfo.html +++ b/www/pages/toolbox/trackinginfo.html @@ -51,7 +51,7 @@
  • -
    +