From e6b561f944c2828cb1b7fc2b5ce0174b36b4c0ca Mon Sep 17 00:00:00 2001
From: Skylar Ittner <admin@netsyms.com>
Date: Thu, 26 Sep 2019 11:06:05 -0600
Subject: [PATCH] Fix bugs

---
 www/assets/js/map.js         | 54 ++++++++++++++++++++----------------
 www/assets/js/map_leaflet.js |  2 +-
 www/assets/js/packages.js    |  4 +--
 3 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/www/assets/js/map.js b/www/assets/js/map.js
index 1ac1372..568c48e 100644
--- a/www/assets/js/map.js
+++ b/www/assets/js/map.js
@@ -45,40 +45,46 @@ $("#app").on("click", "#package-info-sheet .package-info-toggle-status", functio
             openPackageInfoSheet(packages[i], true);
             return;
         }
-    } 
+    }
 });
 
 $("#app").on("click", "#package-info-sheet #package-info-get-directions", function () {
     window.open($(this).attr("href"), "_system");
 });
 
-function openPackageInfoSheet(package, refreshOnly) {
+function openPackageInfoSheet(coordid, refreshOnly) {
     if (typeof refreshOnly == "undefined") {
         refreshOnly = false;
     }
-    
-    $("#package-info-get-directions").attr("href", "geo:" + package.coords[0] + "," + package.coords[1]);
-    $("#package-info-sheet-inner").html("");
 
-    for (var i = 0; i < package.items.length; i++) {
-        $("#package-info-sheet-inner").append(''
-                + '<div class="block margin-top-half">'
-                + '  <div>'
-                + '    <span class="package-info-delivery-status">'
-                + '      ' +  + (package.items[i].delivered ? '<span class="text-color-green"><i class="fas fa-check-circle"></i> Delivered</span>' : '<i class="fas fa-circle"></i> Not delivered')
-                + '    </span>'
-                + '  </div>'
-                + '  <h3>'
-                + '    <span class="package-info-address">' + package.items[i].address + '</span>'
-                + '  </h3>'
-                + '  <div class="button button-fill margin-top" class="package-info-toggle-status" data-id="' + package.items[i].id + '" data-coordid=' + package.id + '>'
-                + '    ' + (package.items[i].delivered ? "Undeliver" : "Deliver")
-                + '  </div>'
-                + '</div>');
-    }
-    
-    if (!refreshOnly) {
-        app.sheet.create({el: "#package-info-sheet"}).open();
+    for (var i = 0; i < packages.length; i++) {
+        if (packages[i].id == coordid) {
+            package = packages[i];
+
+            $("#package-info-get-directions").attr("href", "geo:" + package.coords[0] + "," + package.coords[1]);
+            $("#package-info-sheet-inner").html("");
+
+            for (var i = 0; i < package.items.length; i++) {
+                $("#package-info-sheet-inner").append(''
+                        + '<div class="block margin-top-half">'
+                        + '  <div>'
+                        + '    <span class="package-info-delivery-status">'
+                        + '      ' + +(package.items[i].delivered ? '<span class="text-color-green"><i class="fas fa-check-circle"></i> Delivered</span>' : '<i class="fas fa-circle"></i> Not delivered')
+                        + '    </span>'
+                        + '  </div>'
+                        + '  <h3>'
+                        + '    <span class="package-info-address">' + package.items[i].address + '</span>'
+                        + '  </h3>'
+                        + '  <div class="button button-fill margin-top" class="package-info-toggle-status" data-id="' + package.items[i].id + '" data-coordid=' + package.id + '>'
+                        + '    ' + (package.items[i].delivered ? "Undeliver" : "Deliver")
+                        + '  </div>'
+                        + '</div>');
+            }
+
+            if (!refreshOnly) {
+                app.sheet.create({el: "#package-info-sheet"}).open();
+            }
+        }
     }
 }
 
diff --git a/www/assets/js/map_leaflet.js b/www/assets/js/map_leaflet.js
index fbbc1cc..5cc52e8 100644
--- a/www/assets/js/map_leaflet.js
+++ b/www/assets/js/map_leaflet.js
@@ -78,7 +78,7 @@ function leafletMap() {
                         icon: icon
                     })
                     .on("click", function () {
-                        openPackageInfoSheet(data[i]);
+                        openPackageInfoSheet(data[i].id);
                     });
 
             map.packagelayer.addLayer(marker);
diff --git a/www/assets/js/packages.js b/www/assets/js/packages.js
index 832ddb2..e659b1f 100644
--- a/www/assets/js/packages.js
+++ b/www/assets/js/packages.js
@@ -17,7 +17,7 @@ if (localStorage.getItem("packages") != null) {
  */
 function getUndeliveredCount(address) {
     var undelivered = 0;
-    for (var i = 0; i < address.items.length; j++) {
+    for (var i = 0; i < address.items.length; i++) {
         if (!address.items[i].delivered) {
             undelivered++;
         }
@@ -28,7 +28,7 @@ function getUndeliveredCount(address) {
 function addPackage(address, latitude, longitude) {
     var added = false;
     for (var i = 0; i < packages.length; i++) {
-        if (packages[i].coords == [latitude, longitude] && packages[i].address == address) {
+        if (packages[i].coords[0] == latitude && packages[i].coords[1] == longitude && packages[i].address == address) {
             packages[i].items.push({
                 address: address,
                 delivered: false,