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

Resolve "TRANS - make .env entry for disabling dashboard" #1203

Merged
korina.cordero merged 2 commits from 334-trans-make-env-entry-for-disabling-dashboard into 329-transition-branch-for-cmb-and-resq-merging 2020-02-19 05:26:09 +00:00
Conversation 5 Commits 2 Files changed 3 +10 -5
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 7b5239e548 - Show all commits

1
config/packages/twig.yaml
View file

@ -6,3 +6,4 @@ twig:
gmaps_api_key: "%env(GMAPS_API_KEY)%"
mqtt_host: "%env(MQTT_WS_HOST)%"
mqtt_port: "%env(MQTT_WS_PORT)%"
dashboard_enable: "%env(DASHBOARD_ENABLE)%"

14
templates/home.html.twig
View file

@ -15,7 +15,9 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/paho-mqtt/1.0.1/mqttws31.min.js" type="text/javascript"></script>
<script src="{{ asset('assets/js/dashboard_map.js') }}"></script>
<script src="{{ asset('assets/js/map_mqtt.js') }}"></script>
{{ include('map/' ~ map_js_file) }}
{% if dashboard_enable == 'true' %}
{{ include('map/' ~ map_js_file) }}
{% endif %}
<script>
function initMap(r_markers, c_markers, icons) {
@ -58,6 +60,7 @@ function initEventHandler(dashmap) {
event_handler.connect('{{ app.user.getID }}', '{{ mqtt_host }}', {{ mqtt_port }});
}
{% if dashboard_enable == 'true' %}
// create icons
var icons = {
'rider_active_jo': L.divIcon({
@ -80,11 +83,12 @@ var icons = {
})
};
var r_markers = {};
var c_markers = {};
var r_markers = {};
var c_markers = {};
var dashmap = initMap(r_markers, c_markers, icons);
initEventHandler(dashmap, icons);
var dashmap = initMap(r_markers, c_markers, icons);
initEventHandler(dashmap, icons);
{% endif %}
</script>
{% endblock %}