From a05f53fd881d780b67a2303368e3971586b7e526 Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Mon, 17 Aug 2020 16:32:43 +0800
Subject: [PATCH] Pass as option the rider availability url. #457

---
 public/assets/js/map_mqtt.js |  8 ++++++--
 templates/home.html.twig     | 17 ++++++++++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/public/assets/js/map_mqtt.js b/public/assets/js/map_mqtt.js
index c3f4db0e..fa206c28 100644
--- a/public/assets/js/map_mqtt.js
+++ b/public/assets/js/map_mqtt.js
@@ -78,8 +78,9 @@ class MapEventHandler {
     }
 
     handleRider(chan_split, payload) {
-        // console.log("rider message");
+        //console.log("rider message");
         var rider_id = chan_split[1];
+        //console.log('url ' + this.dashmap.options.rider_availability_url);
         switch (chan_split[2]) {
             case "availability":
                 console.log("got availability for rider " + chan_split[1] + " - " + payload);
@@ -100,7 +101,10 @@ class MapEventHandler {
                         // cheeck if rider is available / unavailable
                         // TODO: make url not hardcoded
                         var dashmap = this.dashmap;
-                        $.get('https://cmbdev.wildcard.cc/riders/' + chan_split[1] + '/available').done(function(data) {
+                        var url = dashmap.options.rider_availability_url;
+                        var rider_availability_url = url.replace('[id]', chan_split[1]);
+                        //console.log(rider_availability_url);
+                        $.get(rider_availability_url).done(function(data) {
                             console.log('rider availability - ' + data);
                             switch (data) {
                                 case 'available':
diff --git a/templates/home.html.twig b/templates/home.html.twig
index 9e784ab6..4da6bd72 100644
--- a/templates/home.html.twig
+++ b/templates/home.html.twig
@@ -36,7 +36,8 @@ function initMap(r_markers, c_markers, icons) {
         'rider_popup_url': '/riders/[id]/popup',
         'cust_popup_url': '/job-order/[id]/popup',
         'icons': icons,
-        'rider_name_url': '/riders/[id]/name'
+        'rider_name_url': '/riders/[id]/name',
+        'rider_availability_url': '{{ absolute_url('/riders/[id]/available')|raw }}'
     };
 
     var dashmap = new DashboardMap(options, r_markers, c_markers);
@@ -46,7 +47,7 @@ function initMap(r_markers, c_markers, icons) {
     return dashmap;
 }
 
-function initEventHandler(dashmap) {
+function initEventHandler(dashmap, icons, ssl) {
     var options = {
         'track_jo': true,
         'track_rider': true,
@@ -55,11 +56,12 @@ function initEventHandler(dashmap) {
             'rider_status': 'rider/+/status',
             'jo_location': 'jo/+/location',
             'jo_status': 'jo/+/status',
-            'jo_origin': 'jo/+/origin'
+            'jo_origin': 'jo/+/origin',
+            'rider_availability': 'rider/+/availability',
         },
     };
 
-    var event_handler = new MapEventHandler(options, dashmap);
+    var event_handler = new MapEventHandler(options, dashmap, ssl);
     event_handler.connect('{{ app.user.getID }}', '{{ mqtt_host }}', {{ mqtt_port }});
 }
 
@@ -95,8 +97,13 @@ var icons = {
     var r_markers = {};
     var c_markers = {};
 
+    var ssl = false;
+    {% if ssl_enable == 'true' %}
+        ssl = true;
+    {% endif %}
+
     var dashmap = initMap(r_markers, c_markers, icons);
-    initEventHandler(dashmap, icons);
+    initEventHandler(dashmap, icons, ssl);
 {% endif %}
 
 </script>