From 55a445558635912bf7b00aa99527323946df5e4d Mon Sep 17 00:00:00 2001
From: Kendrick Chan <kc@jankstudio.com>
Date: Tue, 4 Aug 2020 05:39:07 +0000
Subject: [PATCH] Revert "Add name to rider label. #424"

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

diff --git a/public/assets/js/dashboard_map.js b/public/assets/js/dashboard_map.js
index f0fd7900..82debb56 100644
--- a/public/assets/js/dashboard_map.js
+++ b/public/assets/js/dashboard_map.js
@@ -147,7 +147,7 @@ class DashboardMap {
         }
     }
 
-    putMarkerWithLabel(id, name, lat, lng, markers, icon, layer_group, popup_url) {
+    putMarkerWithLabel(id, lat, lng, markers, icon, layer_group, popup_url) {
         var my = this;
         // existing marker
         if (markers.hasOwnProperty(id)) {
@@ -162,10 +162,7 @@ class DashboardMap {
             { icon: icon }
         );
 
-        var marker_label = id + ' - ' + name;
-        console.log(marker_label);
-
-        markers[id].bindTooltip(marker_label,
+        markers[id].bindTooltip(id,
             {
                 permanent: true,
                 direction: 'right'
@@ -231,10 +228,9 @@ class DashboardMap {
         );
     }
 
-    putRiderAvailableMarker(id, name, lat, lng) {
+    putRiderAvailableMarker(id, lat, lng) {
         this.putMarkerWithLabel(
             id,
-            name,
             lat,
             lng,
             this.rider_markers,
@@ -244,10 +240,9 @@ class DashboardMap {
         );
     }
 
-    putRiderActiveJOMarker(id, name, lat, lng) {
+    putRiderActiveJOMarker(id, lat, lng) {
         this.putMarkerWithLabel(
             id,
-            name,
             lat,
             lng,
             this.rider_markers,
@@ -303,12 +298,11 @@ 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, name, lat, lng);
+                    my.putRiderActiveJOMarker(id, lat, lng);
                 else
-                    my.putRiderAvailableMarker(id, name, lat, lng);
+                    my.putRiderAvailableMarker(id, lat, lng);
             });
 
             // console.log(rider_markers);
diff --git a/src/Controller/HomeController.php b/src/Controller/HomeController.php
index ffaba318..1a157b78 100644
--- a/src/Controller/HomeController.php
+++ b/src/Controller/HomeController.php
@@ -58,16 +58,11 @@ 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