From fdce6c02a48fe729830ecabd683e1b6487c95cc6 Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Mon, 27 Jul 2020 09:49:53 +0000
Subject: [PATCH] Add name to rider label. #424

---
 public/assets/js/dashboard_map.js | 18 ++++++++++++------
 src/Controller/HomeController.php |  5 +++++
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/public/assets/js/dashboard_map.js b/public/assets/js/dashboard_map.js
index 82debb56..f0fd7900 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, 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);
diff --git a/src/Controller/HomeController.php b/src/Controller/HomeController.php
index 1a157b78..ffaba318 100644
--- a/src/Controller/HomeController.php
+++ b/src/Controller/HomeController.php
@@ -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