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);

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

@ -79,98 +79,89 @@ 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({ switch (chan_split[2]) {
method: "GET", case "availability":
url: "{{ url('rider_ajax_rider_name') }}", console.log("got availability for rider " + chan_split[1] + " - " + payload);
data: {id: rider_id} var obj = JSON.parse(payload);
}).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);
var status = obj.status; var status = obj.status;
console.log("status " + status); console.log("status " + status);
switch (status) { switch (status) {
case 'rider_offline': case 'rider_offline':
this.dashmap.rider_availability[chan_split[1]] = false; this.dashmap.rider_availability[chan_split[1]] = false;
this.dashmap.removeRiderMarker(chan_split[1]); 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)
break; 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]); // cheeck if rider is available / unavailable
var lng = parseFloat(pl_split[1]); // 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; // check for correct format
if (this.dashmap.rider_availability.hasOwnProperty(chan_split[1])) { if (pl_split.length != 2)
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);
}
break; break;
case "status":
console.log("got status for rider " + chan_split[1] + " - " + payload); var lat = parseFloat(pl_split[0]);
switch (payload) { var lng = parseFloat(pl_split[1]);
case 'available':
this.dashmap.switchRiderStatus(chan_split[1], 'available'); var display_marker = true;
break; if (this.dashmap.rider_availability.hasOwnProperty(chan_split[1])) {
case 'jo': if (!this.dashmap.rider_availability[chan_split[1]]) {
console.log('jo status'); console.log('NOT displaying marker for inactive rider');
this.dashmap.switchRiderStatus(chan_split[1], 'jo'); display_marker = false;
break;
case 'logout':
this.dashmap.removeRiderMarker(chan_split[1]);
break;
} }
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) { 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;