rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Merge branch '457-cmb-add-telephone-number-to-search' into '424-cmb-release'

Browse source 
Remove rider name from labels in Dashboard. #457

See merge request jankstudio/resq!539
This commit is contained in:
Korina Cordero 2020-08-06 08:39:04 +00:00
commit 66e46c4bad
4 changed files with 77 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
config/routes/rider.yaml
View file

@ -61,8 +61,3 @@ rider_ajax_avialable:
path: /riders/{id}/available path: /riders/{id}/available
controller: App\Controller\RiderController::ajaxAvailable controller: App\Controller\RiderController::ajaxAvailable
methods: [GET] methods: [GET]
rider_ajax_rider_name:
path: /riders/rider_name
controller: App\Controller\RiderController::ajaxRiderName
methods: [GET]

2
public/assets/js/dashboard_map.js
View file

@ -302,7 +302,7 @@ class DashboardMap {
$.each(riders, function(id, data) { $.each(riders, function(id, data) {
var lat = data.latitude; var lat = data.latitude;
var lng = data.longitude; var lng = data.longitude;
var name = data.name; var name = '';
if (data.has_jo) if (data.has_jo)
my.putRiderActiveJOMarker(id, lat, lng, name); my.putRiderActiveJOMarker(id, lat, lng, name);

17
public/assets/js/map_mqtt.js
View file

@ -79,15 +79,7 @@ class MapEventHandler {
handleRider(chan_split, payload) { handleRider(chan_split, payload) {
// console.log("rider message"); // console.log("rider message");
// get rider name using chan_split[1] which is rider id
var rider_id = chan_split[1]; 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]) { switch (chan_split[2]) {
case "availability": case "availability":
console.log("got availability for rider " + chan_split[1] + " - " + payload); console.log("got availability for rider " + chan_split[1] + " - " + payload);
@ -114,12 +106,12 @@ class MapEventHandler {
case 'available': case 'available':
console.log('putting available marker ' + chan_split[1] + ' ' + lat + ':' + lng); console.log('putting available marker ' + chan_split[1] + ' ' + lat + ':' + lng);
dashmap.switchRiderStatus(chan_split[1], 'available'); dashmap.switchRiderStatus(chan_split[1], 'available');
dashmap.putRiderAvailableMarker(chan_split[1], lat, lng, name); dashmap.putRiderAvailableMarker(chan_split[1], lat, lng);
break; break;
case 'unavailable': case 'unavailable':
console.log('putting active jo marker ' + chan_split[1] + ' ' + lat + ':' + lng); console.log('putting active jo marker ' + chan_split[1] + ' ' + lat + ':' + lng);
dashmap.switchRiderStatus(chan_split[1], 'jo'); dashmap.switchRiderStatus(chan_split[1], 'jo');
dashmap.putRiderActiveJOMarker(chan_split[1], lat, lng, name); dashmap.putRiderActiveJOMarker(chan_split[1], lat, lng);
break; break;
} }
}); });
@ -127,7 +119,7 @@ class MapEventHandler {
} }
break; break;
case "location": case "location":
// console.log("got location for rider " + chan_split[1] + " - " + payload); // console.log("got location for rider " + chan_split[1] + " - " + payload
var pl_split = payload.split(':'); var pl_split = payload.split(':');
// console.log(pl_split); // console.log(pl_split);
@ -151,7 +143,7 @@ class MapEventHandler {
// TODO: cache rider availability (available vs active jo) status and check before displaying icon // 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 // NOTE: we really should fix our terms since available can mean many things
if (display_marker) { if (display_marker) {
this.dashmap.putRiderAvailableMarker(chan_split[1], lat, lng, name); this.dashmap.putRiderAvailableMarker(chan_split[1], lat, lng);
} }
break; break;
case "status": case "status":
@ -170,7 +162,6 @@ class MapEventHandler {
} }
break; break;
} }
});
} }
handleJobOrder(chan_split, payload) { handleJobOrder(chan_split, payload) {

4
src/Controller/HomeController.php
View file

@ -58,10 +58,6 @@ class HomeController extends Controller
continue; continue;
} }
// get full name of rider
$name = $rider->getFullName();
$riders[$rider_id]['name'] = $name;
$jo = $rider->getActiveJobOrder(); $jo = $rider->getActiveJobOrder();
if ($jo == null) if ($jo == null)
$riders[$rider_id]['has_jo'] = false; $riders[$rider_id]['has_jo'] = false;