From 3d96299c23b017eee663e6275ec794ef21ce5031 Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Thu, 1 Oct 2020 22:31:48 +0800 Subject: [PATCH] Initialize rider availability in dashboard map #514 --- public/assets/js/dashboard_map.js | 7 +++++-- public/assets/js/map_mqtt.js | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/public/assets/js/dashboard_map.js b/public/assets/js/dashboard_map.js index 2df2d69f..bc5696e2 100644 --- a/public/assets/js/dashboard_map.js +++ b/public/assets/js/dashboard_map.js @@ -313,10 +313,13 @@ class DashboardMap { var lng = data.longitude; var name = ''; - if (data.has_jo) + if (data.has_jo) { + my.rider_availability[id] = false; my.putRiderActiveJOMarker(id, lat, lng); - else + } else { + my.rider_availability[id] = true; my.putRiderAvailableMarker(id, lat, lng); + } }); // console.log(rider_markers); diff --git a/public/assets/js/map_mqtt.js b/public/assets/js/map_mqtt.js index 30f646cd..f0aab74f 100644 --- a/public/assets/js/map_mqtt.js +++ b/public/assets/js/map_mqtt.js @@ -161,7 +161,7 @@ class MapEventHandler { display_marker = false; } } else { - console.log('rider not in availability check'); + console.log('rider not in availability check - ' + chan_split[1]); display_marker = false; }