ShaYmez/hbnet
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add generic template to dashboard

Browse Source
This commit is contained in:
KF7EEL 2021-03-01 14:18:51 -08:00
parent ee7c7eccf1
commit dfedf9eade
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/dashboard/dashboard.py
View File

@ -249,7 +249,7 @@ def view_map():
if map_size == 'full': if map_size == 'full':
map_view = folium_map._repr_html_() map_view = folium_map._repr_html_()
return '{} {}'.format(''' content = '''
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="refresh" content="''' + str(reload_time) + """" > <meta http-equiv="refresh" content="''' + str(reload_time) + """" >
@ -267,11 +267,14 @@ def view_map():
</select> </select>
<p style="text-align: center;"><button onclick="self.close()">Close</button><button onclick="history.back()">Back</button> <p style="text-align: center;"><button onclick="self.close()">Close</button><button onclick="history.back()">Back</button>
</p> </p>
""", map_view) """ + map_view
return render_template('generic.html', title = dashboard_title, logo = logo, content = Markup(content))
except: except:
return """<h1 style="text-align: center;">Station not found.</h1> content = """<h1 style="text-align: center;">Station not found.</h1>
<p style="text-align: center;"><button onclick="self.close()">Close Window</button> <p style="text-align: center;"><button onclick="self.close()">Close Window</button>
</p>""" </p>"""
return render_template('generic.html', title = dashboard_title, logo = logo, content = Markup(content))
if not track_call: if not track_call:
folium_map = folium.Map(location=map_center, tiles=map_theme, zoom_start=int(zoom_level)) folium_map = folium.Map(location=map_center, tiles=map_theme, zoom_start=int(zoom_level))
marker_cluster = MarkerCluster().add_to(folium_map) marker_cluster = MarkerCluster().add_to(folium_map)
@ -318,6 +321,7 @@ def view_map():
""", tooltip=str(user_coord['call']), fill=True, fill_color="#3186cc", radius=4).add_to(marker_cluster) """, tooltip=str(user_coord['call']), fill=True, fill_color="#3186cc", radius=4).add_to(marker_cluster)
return folium_map._repr_html_() return folium_map._repr_html_()
@app.route('/map/') @app.route('/map/')
def map(): def map():
return render_template('map.html', title = dashboard_title, logo = logo) return render_template('map.html', title = dashboard_title, logo = logo)
@ -358,6 +362,8 @@ def user_settings():
ssid = aprs_ssid ssid = aprs_ssid
if icon == '': if icon == '':
icon = '\[' icon = '\['
if comment == '':
comment = 'Default comment.'
#for result in user_settings: #for result in user_settings:
#return user_settings[int(user_id)][0] #return user_settings[int(user_id)][0]
#return user_id #return user_id