Netsyms/PackageHelper
2
0
Fork 1
Code Issues 9 Pull Requests Releases 12 Wiki Activity

Fix map icons staying "alerted" after marking delivered

Browse Source
This commit is contained in:
Skylar Ittner 2020-06-07 20:24:23 -06:00
parent 3962a56db8
commit b21140de11
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
www/assets/js/map_leaflet.js
View File

@ -80,13 +80,14 @@ function leafletMap() {
//console.log(iconName); //console.log(iconName);
var classes = "package-marker package-marker-leaflet"; var classes = "package-marker package-marker-leaflet";
// Prevent selection highlight from going away after map refresh // Prevent selection highlight from going away after map refresh
if (map.openedPanelIconID != null && map.openedPanelIconID == datai.id) { if (map.openedPanelIconID != null && map.openedPanelIconID == datai.id) {
classes += " selected"; classes += " selected";
} }
// Show different color highlight when nearby // Show different color highlight when nearby and undelivered
if (packages[i].distance * 1 < getStorage("alertradius") * 1) { if (packages[i].distance * 1 < getStorage("alertradius") * 1
&& getUndeliveredCount(packages[i]) > 0) {
classes += " alerted"; classes += " alerted";
} }
var icon = L.icon({ var icon = L.icon({

5
www/assets/js/map_mapbox.js
View File

@ -110,8 +110,9 @@ function mapboxMap() {
if (map.openedPanelIconID != null && map.openedPanelIconID == datai.id) { if (map.openedPanelIconID != null && map.openedPanelIconID == datai.id) {
el.className += " selected"; el.className += " selected";
} }
// Show different color highlight when nearby // Show different color highlight when nearby and undelivered
if (packages[i].distance * 1 < getStorage("alertradius") * 1) { if (packages[i].distance * 1 < getStorage("alertradius") * 1
&& getUndeliveredCount(packages[i]) > 0) {
el.className += " alerted"; el.className += " alerted";
} }

2
www/assets/js/packages.js
View File

@ -719,7 +719,7 @@ function addPackageByBarcode(barcode, type, callback) {
ajaxlookup(); ajaxlookup();
} }
} }
prelookup(); prelookup();
} }