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

Resolve "CMB - Data migration for Carfix data" #1355

Closed
korina.cordero wants to merge 57 commits from 460-cmb-data-migration-for-carfix-data into 424-cmb-release
pull from: 460-cmb-data-migration-for-carfix-data
merge into: rgutierrez:424-cmb-release
Conversation 8 Commits 57 Files changed 24 +5 -4
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 763d141860 - Show all commits

9
templates/home.html.twig
View file

@ -46,7 +46,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 +55,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 }});
} }
@ -101,7 +102,7 @@ var icons = {
{% endif %} {% 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>