From 5f63387592a73d406e37fc5c6378e037a1a8995c Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Thu, 26 Sep 2019 21:07:46 -0600 Subject: [PATCH] Add package type option to load screen (close #2) --- www/assets/js/manage.js | 2 +- www/assets/js/packages.js | 8 ++++---- www/pages/manage.html | 27 +++++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/www/assets/js/manage.js b/www/assets/js/manage.js index d87f87d..b9fd8c2 100644 --- a/www/assets/js/manage.js +++ b/www/assets/js/manage.js @@ -42,7 +42,7 @@ $("#addpackagebtn").click(function () { } var address = ($("input[name=number]").val() + " " + $("input[name=street]").val()).toUpperCase(); - addPackageByAddress(address, $("input[name=citystate]").val().toUpperCase()); + addPackageByAddress(address, $("input[name=citystate]").val().toUpperCase(), $("input[name=itemtype]:checked").val()); }); // Restore user's last entered city/state combo diff --git a/www/assets/js/packages.js b/www/assets/js/packages.js index 40d5366..da57208 100644 --- a/www/assets/js/packages.js +++ b/www/assets/js/packages.js @@ -201,13 +201,13 @@ function countPackages() { return count; } -function addPackageByAddress(address, citystate) { +function addPackageByAddress(address, citystate, type) { $.getJSON(SETTINGS.geocodeapi, { address: address + " " + citystate }, function (resp) { if (resp.status == "OK") { if (resp.accuracy.ok) { - addPackage(resp.address.street, resp.coords[0], resp.coords[1]); + addPackage(resp.address.street, resp.coords[0], resp.coords[1], type); } else { playSound("error"); app.dialog.confirm( @@ -215,9 +215,9 @@ function addPackageByAddress(address, citystate) { "Accuracy Warning", function (ok) { if (resp.address.street == "") { - addPackage(address, resp.coords[0], resp.coords[1]); + addPackage(address, resp.coords[0], resp.coords[1], type); } else { - addPackage(resp.address.street, resp.coords[0], resp.coords[1]); + addPackage(resp.address.street, resp.coords[0], resp.coords[1], type); } } ); diff --git a/www/pages/manage.html b/www/pages/manage.html index 96aa9fa..f24fe71 100644 --- a/www/pages/manage.html +++ b/www/pages/manage.html @@ -45,6 +45,33 @@ +
  • + +
  • +
  • + +
  • +
  • + +
  • Add Package