rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Pass as option the rider availability url. #457

Browse source
This commit is contained in:
root 2020-08-17 16:32:43 +08:00
parent 2f60c28068
commit a05f53fd88
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
public/assets/js/map_mqtt.js
View file

@ -80,6 +80,7 @@ class MapEventHandler {
handleRider(chan_split, payload) { handleRider(chan_split, payload) {
//console.log("rider message"); //console.log("rider message");
var rider_id = chan_split[1]; var rider_id = chan_split[1];
//console.log('url ' + this.dashmap.options.rider_availability_url);
switch (chan_split[2]) { switch (chan_split[2]) {
case "availability": case "availability":
console.log("got availability for rider " + chan_split[1] + " - " + payload); console.log("got availability for rider " + chan_split[1] + " - " + payload);
@ -100,7 +101,10 @@ class MapEventHandler {
// cheeck if rider is available / unavailable // cheeck if rider is available / unavailable
// TODO: make url not hardcoded // TODO: make url not hardcoded
var dashmap = this.dashmap; 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); console.log('rider availability - ' + data);
switch (data) { switch (data) {
case 'available': case 'available':

17
templates/home.html.twig
View file

@ -36,7 +36,8 @@ function initMap(r_markers, c_markers, icons) {
'rider_popup_url': '/riders/[id]/popup', 'rider_popup_url': '/riders/[id]/popup',
'cust_popup_url': '/job-order/[id]/popup', 'cust_popup_url': '/job-order/[id]/popup',
'icons': icons, '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); var dashmap = new DashboardMap(options, r_markers, c_markers);
@ -46,7 +47,7 @@ function initMap(r_markers, c_markers, icons) {
return dashmap; return dashmap;
} }
function initEventHandler(dashmap) { function initEventHandler(dashmap, icons, ssl) {
var options = { var options = {
'track_jo': true, 'track_jo': true,
'track_rider': true, 'track_rider': true,
@ -55,11 +56,12 @@ function initEventHandler(dashmap) {
'rider_status': 'rider/+/status', 'rider_status': 'rider/+/status',
'jo_location': 'jo/+/location', 'jo_location': 'jo/+/location',
'jo_status': 'jo/+/status', '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 }}); event_handler.connect('{{ app.user.getID }}', '{{ mqtt_host }}', {{ mqtt_port }});
} }
@ -95,8 +97,13 @@ var icons = {
var r_markers = {}; var r_markers = {};
var c_markers = {}; var c_markers = {};
var ssl = false;
{% if ssl_enable == 'true' %}
ssl = true;
{% endif %}
var dashmap = initMap(r_markers, c_markers, icons); var dashmap = initMap(r_markers, c_markers, icons);
initEventHandler(dashmap, icons); initEventHandler(dashmap, icons, ssl);
{% endif %} {% endif %}
</script> </script>