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

Fix zoom issue in dashboard map. #424

Browse source
This commit is contained in:
Korina Cordero 2020-08-04 08:08:56 +00:00
parent 8f6aa72cc0
commit 46bcf7f209
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
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, lat, lng, markers, icon, layer_group, popup_url, name) {
var my = this; var my = this;
// existing marker // existing marker
if (markers.hasOwnProperty(id)) { if (markers.hasOwnProperty(id)) {
@ -238,7 +238,8 @@ class DashboardMap {
this.rider_markers, this.rider_markers,
this.options.icons.rider_available, this.options.icons.rider_available,
this.layer_groups.rider_available, this.layer_groups.rider_available,
this.options.rider_popup_url this.options.rider_popup_url,
name
); );
} }
@ -250,7 +251,8 @@ class DashboardMap {
this.rider_markers, this.rider_markers,
this.options.icons.rider_active_jo, this.options.icons.rider_active_jo,
this.layer_groups.rider_active_jo, this.layer_groups.rider_active_jo,
this.options.rider_popup_url this.options.rider_popup_url,
name
); );
} }
@ -300,6 +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;
if (data.has_jo) if (data.has_jo)
my.putRiderActiveJOMarker(id, lat, lng, name); my.putRiderActiveJOMarker(id, lat, lng, name);

4
src/Controller/HomeController.php
View file

@ -58,6 +58,10 @@ 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;