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(''
- + '
'
- + '
'
- + ' '
- + ' ' + + (package.items[i].delivered ? ' Delivered' : ' Not delivered')
- + ' '
- + '
'
- + '
'
- + ' ' + package.items[i].address + ''
- + '
'
- + '
'
- + ' ' + (package.items[i].delivered ? "Undeliver" : "Deliver")
- + '
'
- + '
');
- }
-
- 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(''
+ + ''
+ + '
'
+ + ' '
+ + ' ' + +(package.items[i].delivered ? ' Delivered' : ' Not delivered')
+ + ' '
+ + '
'
+ + '
'
+ + ' ' + package.items[i].address + ''
+ + '
'
+ + '
'
+ + ' ' + (package.items[i].delivered ? "Undeliver" : "Deliver")
+ + '
'
+ + '
');
+ }
+
+ 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,