diff --git a/config/routes/rider.yaml b/config/routes/rider.yaml index 5e31dfb4..da41058d 100644 --- a/config/routes/rider.yaml +++ b/config/routes/rider.yaml @@ -61,8 +61,3 @@ rider_ajax_avialable: path: /riders/{id}/available controller: App\Controller\RiderController::ajaxAvailable methods: [GET] - -rider_ajax_rider_name: - path: /riders/rider_name - controller: App\Controller\RiderController::ajaxRiderName - methods: [GET] diff --git a/public/assets/js/dashboard_map.js b/public/assets/js/dashboard_map.js index a00612a6..c429ad79 100644 --- a/public/assets/js/dashboard_map.js +++ b/public/assets/js/dashboard_map.js @@ -302,7 +302,7 @@ class DashboardMap { $.each(riders, function(id, data) { var lat = data.latitude; var lng = data.longitude; - var name = data.name; + var name = ''; if (data.has_jo) my.putRiderActiveJOMarker(id, lat, lng, name); diff --git a/public/assets/js/map_mqtt.js b/public/assets/js/map_mqtt.js index 825bf065..c3f4db0e 100644 --- a/public/assets/js/map_mqtt.js +++ b/public/assets/js/map_mqtt.js @@ -79,98 +79,89 @@ class MapEventHandler { handleRider(chan_split, payload) { // console.log("rider message"); - // get rider name using chan_split[1] which is rider id var rider_id = chan_split[1]; - $.ajax({ - method: "GET", - url: "{{ url('rider_ajax_rider_name') }}", - data: {id: rider_id} - }).done(function(response) { - var name = response.rider_name; - console.log('rider_name ' + name); - switch (chan_split[2]) { - case "availability": - console.log("got availability for rider " + chan_split[1] + " - " + payload); - var obj = JSON.parse(payload); + switch (chan_split[2]) { + case "availability": + console.log("got availability for rider " + chan_split[1] + " - " + payload); + var obj = JSON.parse(payload); - var status = obj.status; - console.log("status " + status); - switch (status) { - case 'rider_offline': - this.dashmap.rider_availability[chan_split[1]] = false; - this.dashmap.removeRiderMarker(chan_split[1]); - break; - case 'rider_online': - this.dashmap.rider_availability[chan_split[1]] = true; - var lat = parseFloat(obj.latitude); - var lng = parseFloat(obj.longitude); - - // cheeck if rider is available / unavailable - // TODO: make url not hardcoded - var dashmap = this.dashmap; - $.get('https://cmbdev.wildcard.cc/riders/' + chan_split[1] + '/available').done(function(data) { - console.log('rider availability - ' + data); - switch (data) { - case 'available': - console.log('putting available marker ' + chan_split[1] + ' ' + lat + ':' + lng); - dashmap.switchRiderStatus(chan_split[1], 'available'); - dashmap.putRiderAvailableMarker(chan_split[1], lat, lng, name); - break; - case 'unavailable': - console.log('putting active jo marker ' + chan_split[1] + ' ' + lat + ':' + lng); - dashmap.switchRiderStatus(chan_split[1], 'jo'); - dashmap.putRiderActiveJOMarker(chan_split[1], lat, lng, name); - break; - } - }); - break; - } - break; - case "location": - // console.log("got location for rider " + chan_split[1] + " - " + payload); - var pl_split = payload.split(':'); - // console.log(pl_split); - - // check for correct format - if (pl_split.length != 2) + var status = obj.status; + console.log("status " + status); + switch (status) { + case 'rider_offline': + this.dashmap.rider_availability[chan_split[1]] = false; + this.dashmap.removeRiderMarker(chan_split[1]); break; + case 'rider_online': + this.dashmap.rider_availability[chan_split[1]] = true; + var lat = parseFloat(obj.latitude); + var lng = parseFloat(obj.longitude); - var lat = parseFloat(pl_split[0]); - var lng = parseFloat(pl_split[1]); + // cheeck if rider is available / unavailable + // TODO: make url not hardcoded + var dashmap = this.dashmap; + $.get('https://cmbdev.wildcard.cc/riders/' + chan_split[1] + '/available').done(function(data) { + console.log('rider availability - ' + data); + switch (data) { + case 'available': + console.log('putting available marker ' + chan_split[1] + ' ' + lat + ':' + lng); + dashmap.switchRiderStatus(chan_split[1], 'available'); + dashmap.putRiderAvailableMarker(chan_split[1], lat, lng); + break; + case 'unavailable': + console.log('putting active jo marker ' + chan_split[1] + ' ' + lat + ':' + lng); + dashmap.switchRiderStatus(chan_split[1], 'jo'); + dashmap.putRiderActiveJOMarker(chan_split[1], lat, lng); + break; + } + }); + break; + } + break; + case "location": + // console.log("got location for rider " + chan_split[1] + " - " + payload + var pl_split = payload.split(':'); + // console.log(pl_split); - var display_marker = true; - if (this.dashmap.rider_availability.hasOwnProperty(chan_split[1])) { - if (!this.dashmap.rider_availability[chan_split[1]]) { - console.log('NOT displaying marker for inactive rider'); - display_marker = false; - } - } else { - console.log('rider not in availability check'); - } - - // TODO: cache rider availability (available vs active jo) status and check before displaying icon - // NOTE: we really should fix our terms since available can mean many things - if (display_marker) { - this.dashmap.putRiderAvailableMarker(chan_split[1], lat, lng, name); - } + // check for correct format + if (pl_split.length != 2) break; - case "status": - console.log("got status for rider " + chan_split[1] + " - " + payload); - switch (payload) { - case 'available': - this.dashmap.switchRiderStatus(chan_split[1], 'available'); - break; - case 'jo': - console.log('jo status'); - this.dashmap.switchRiderStatus(chan_split[1], 'jo'); - break; - case 'logout': - this.dashmap.removeRiderMarker(chan_split[1]); - break; + + var lat = parseFloat(pl_split[0]); + var lng = parseFloat(pl_split[1]); + + var display_marker = true; + if (this.dashmap.rider_availability.hasOwnProperty(chan_split[1])) { + if (!this.dashmap.rider_availability[chan_split[1]]) { + console.log('NOT displaying marker for inactive rider'); + display_marker = false; } - break; - } - }); + } else { + console.log('rider not in availability check'); + } + + // TODO: cache rider availability (available vs active jo) status and check before displaying icon + // NOTE: we really should fix our terms since available can mean many things + if (display_marker) { + this.dashmap.putRiderAvailableMarker(chan_split[1], lat, lng); + } + break; + case "status": + console.log("got status for rider " + chan_split[1] + " - " + payload); + switch (payload) { + case 'available': + this.dashmap.switchRiderStatus(chan_split[1], 'available'); + break; + case 'jo': + console.log('jo status'); + this.dashmap.switchRiderStatus(chan_split[1], 'jo'); + break; + case 'logout': + this.dashmap.removeRiderMarker(chan_split[1]); + break; + } + break; + } } handleJobOrder(chan_split, payload) { diff --git a/src/Controller/HomeController.php b/src/Controller/HomeController.php index 46f50c19..1a157b78 100644 --- a/src/Controller/HomeController.php +++ b/src/Controller/HomeController.php @@ -58,10 +58,6 @@ class HomeController extends Controller continue; } - // get full name of rider - $name = $rider->getFullName(); - $riders[$rider_id]['name'] = $name; - $jo = $rider->getActiveJobOrder(); if ($jo == null) $riders[$rider_id]['has_jo'] = false;