From 032489d7364c3f4cc2b13f52d200f6a8773d80c1 Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Wed, 10 Feb 2021 07:05:00 +0000
Subject: [PATCH] Fix dashboard issues. #535

---
 public/assets/js/dashboard_map.js  | 8 ++++++--
 public/assets/js/map_mqtt.js       | 1 +
 src/Controller/RiderController.php | 5 +++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/public/assets/js/dashboard_map.js b/public/assets/js/dashboard_map.js
index 3f02d1f4..ce32461f 100644
--- a/public/assets/js/dashboard_map.js
+++ b/public/assets/js/dashboard_map.js
@@ -3,6 +3,7 @@ class DashboardMap {
         this.options = options;
         this.rider_markers = rider_markers;
         this.cust_markers = cust_markers;
+        this.rider_availability = {};
 
         // layer groups
         this.layer_groups = {
@@ -253,10 +254,13 @@ class DashboardMap {
                 var lat = data.latitude;
                 var lng = data.longitude;
 
-                if (data.has_jo)
+                if (data.has_jo) {
+                    my.rider_availability[id] = false;
                     my.putRiderActiveJOMarker(id, lat, lng);
-                else
+                } else {
+                    my.rider_availability[id] = true;
                     my.putRiderAvailableMarker(id, lat, lng);
+                }
             });
 
             // console.log(rider_markers);
diff --git a/public/assets/js/map_mqtt.js b/public/assets/js/map_mqtt.js
index d277013c..2452646b 100644
--- a/public/assets/js/map_mqtt.js
+++ b/public/assets/js/map_mqtt.js
@@ -145,6 +145,7 @@ class MapEventHandler {
                                     break;
                             }
                         });
+                        break;
                 }
                 break;
         }
diff --git a/src/Controller/RiderController.php b/src/Controller/RiderController.php
index 247123d5..afcd9287 100644
--- a/src/Controller/RiderController.php
+++ b/src/Controller/RiderController.php
@@ -602,8 +602,9 @@ class RiderController extends Controller
      */
     public function ajaxAvailable(EntityManagerInterface $em, Rider $rider)
     {
-        $jo = $rider->getRiderActiveJobOrder();
-        if ($jo == null || $jo->isClosed())
+        //$jo = $rider->getRiderActiveJobOrder();
+        $jo_results = $rider->getActiveJobOrder();
+        if (empty($jo_results))
             $avail = 'available';
         else
             $avail = 'unavailable';