From 46bcf7f209aac99c0f5756f9787ec6857592412b Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Tue, 4 Aug 2020 08:08:56 +0000
Subject: [PATCH] Fix zoom issue in dashboard map. #424

---
 public/assets/js/dashboard_map.js | 9 ++++++---
 src/Controller/HomeController.php | 4 ++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/public/assets/js/dashboard_map.js b/public/assets/js/dashboard_map.js
index 653b0bd7..a00612a6 100644
--- a/public/assets/js/dashboard_map.js
+++ b/public/assets/js/dashboard_map.js
@@ -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;
         // existing marker
         if (markers.hasOwnProperty(id)) {
@@ -238,7 +238,8 @@ class DashboardMap {
             this.rider_markers,
             this.options.icons.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.options.icons.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) {
                 var lat = data.latitude;
                 var lng = data.longitude;
+                var name = data.name;
 
                 if (data.has_jo)
                     my.putRiderActiveJOMarker(id, lat, lng, name);
diff --git a/src/Controller/HomeController.php b/src/Controller/HomeController.php
index 1a157b78..46f50c19 100644
--- a/src/Controller/HomeController.php
+++ b/src/Controller/HomeController.php
@@ -58,6 +58,10 @@ 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;