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

Resolve "Resq - message prompt for non-serviceable area" #1353

Merged
korina.cordero merged 176 commits from 463-resq-message-prompt-for-non-serviceable-area into 465-resq-august-13-release 2020-08-12 05:41:57 +00:00
Conversation 3 Commits 176 Files changed 3 +17 -6
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit fdce6c02a4 - Show all commits

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

@ -147,7 +147,7 @@ class DashboardMap {
}
}
putMarkerWithLabel(id, lat, lng, markers, icon, layer_group, popup_url) {
putMarkerWithLabel(id, name, lat, lng, markers, icon, layer_group, popup_url) {
var my = this;
// existing marker
if (markers.hasOwnProperty(id)) {
@ -162,7 +162,10 @@ class DashboardMap {
{ icon: icon }
);
markers[id].bindTooltip(id,
var marker_label = id + ' - ' + name;
console.log(marker_label);
markers[id].bindTooltip(marker_label,
{
permanent: true,
direction: 'right'
@ -228,9 +231,10 @@ class DashboardMap {
);
}
putRiderAvailableMarker(id, lat, lng) {
putRiderAvailableMarker(id, name, lat, lng) {
this.putMarkerWithLabel(
id,
name,
lat,
lng,
this.rider_markers,
@ -240,9 +244,10 @@ class DashboardMap {
);
}
putRiderActiveJOMarker(id, lat, lng) {
putRiderActiveJOMarker(id, name, lat, lng) {
this.putMarkerWithLabel(
id,
name,
lat,
lng,
this.rider_markers,
@ -298,11 +303,12 @@ class DashboardMap {
$.each(riders, function(id, data) {
var lat = data.latitude;
var lng = data.longitude;
var name = data.name;
if (data.has_jo)
my.putRiderActiveJOMarker(id, lat, lng);
my.putRiderActiveJOMarker(id, name, lat, lng);
else
my.putRiderAvailableMarker(id, lat, lng);
my.putRiderAvailableMarker(id, name, lat, lng);
});
// console.log(rider_markers);

5
src/Controller/HomeController.php
View file

@ -58,11 +58,16 @@ 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;
else
$riders[$rider_id]['has_jo'] = true;
}
// get active JOs and check transaction origin for TransactionOrigin::MOBILE_APP