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

update web dashboard, add template

Browse Source
This commit is contained in:
KF7EEL 2020-12-30 09:10:23 -08:00
parent e4b55b05fe
commit 6da1c4de0d
3 changed files with 136 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
scripts/dashboard/dashboard.py
View File

@ -1,5 +1,3 @@
#!/usr/bin/env python
#
############################################################################### ###############################################################################
# HBLink - Copyright (C) 2020 Cortney T. Buffington, N0MJS <n0mjs@me.com> # HBLink - Copyright (C) 2020 Cortney T. Buffington, N0MJS <n0mjs@me.com>
# GPS/Data - Copyright (C) 2020 Eric Craw, KF7EEL <kf7eel@qsl.net> # GPS/Data - Copyright (C) 2020 Eric Craw, KF7EEL <kf7eel@qsl.net>
@ -23,18 +21,13 @@
This is a web dashboard for the GPS/Data application. This is a web dashboard for the GPS/Data application.
''' '''
from flask import Flask from flask import Flask, render_template
import ast, os import ast, os
from dashboard_settings import *
app = Flask(__name__) app = Flask(__name__)
dash_entries = ast.literal_eval(os.popen('cat /tmp/gps_data_user_loc.txt').read())
#dash_bb = ast.literal_eval(os.popen('cat /tmp/gps_data_user_bb.txt').read())
def get_data():
dash_loc = ast.literal_eval(os.popen('cat /tmp/gps_data_user_loc.txt').read())
dash_bb = ast.literal_eval(os.popen('cat /tmp/gps_data_user_bb.txt').read())
tmp_bb = ''
tmp_loc = ''
tbl_hdr = ''' tbl_hdr = '''
<table style="border-color: black; margin-left: auto; margin-right: auto;" border="2" cellspacing="6" cellpadding="2"><tbody> <table style="border-color: black; margin-left: auto; margin-right: auto;" border="2" cellspacing="6" cellpadding="2"><tbody>
''' '''
@ -42,22 +35,11 @@ def get_data():
</tbody> </tbody>
</table> </table>
''' '''
bb_hdr = '''
<tr> def get_loc_data():
<td style="text-align: center;"> try:
<h2><strong>&nbsp;Callsign&nbsp;</strong></h2> dash_loc = ast.literal_eval(os.popen('cat /tmp/gps_data_user_loc.txt').read())
</td> tmp_loc = ''
<td style="text-align: center;">
<h2>&nbsp;<strong>DMR ID</strong>&nbsp; </h2>
</td>
<td style="text-align: center;">
<h2>&nbsp;<strong>Bulletin</strong>&nbsp;</h2>
</td>
<td style="text-align: center;">
<h2>&nbsp;<strong>Local Time</strong>&nbsp;</h2>
</td>
</tr>
'''
loc_hdr = ''' loc_hdr = '''
<tr> <tr>
<td style="text-align: center;"> <td style="text-align: center;">
@ -73,6 +55,39 @@ def get_data():
<h2>&nbsp;<strong>Local Time</strong>&nbsp;</h2> <h2>&nbsp;<strong>Local Time</strong>&nbsp;</h2>
</td> </td>
</tr> </tr>
'''
for e in dash_loc:
tmp_loc = tmp_loc + '''<tr>
<td style="text-align: center;"><a href="https://aprs.fi/''' + e['call'] + '''"><strong>''' + e['call'] + '''</strong></a></td>
<td style="text-align: center;"><strong>&nbsp;''' + str(e['lat']) + '''&nbsp;</strong></td>
<td style="text-align: center;"><strong>&nbsp;''' + str(e['lon']) + '''&nbsp;</strong></td>
<td style="text-align: center;">&nbsp;''' + e['time'] + '''&nbsp;</td>
</tr>'''
return str(str('<h1 style="text-align: center;">Positions Received</h1>') + tbl_hdr + loc_hdr + tmp_loc + tbl_ftr)
except:
return str('<h1 style="text-align: center;">No data</h1>')
def get_bb_data():
try:
dash_bb = ast.literal_eval(os.popen('cat /tmp/gps_data_user_bb.txt').read())
tmp_bb = ''
bb_hdr = '''
<tr>
<td style="text-align: center;">
<h2><strong>&nbsp;Callsign&nbsp;</strong></h2>
</td>
<td style="text-align: center;">
<h2>&nbsp;<strong>DMR ID</strong>&nbsp; </h2>
</td>
<td style="text-align: center;">
<h2>&nbsp;<strong>Bulletin</strong>&nbsp;</h2>
</td>
<td style="text-align: center;">
<h2>&nbsp;<strong>Local Time</strong>&nbsp;</h2>
</td>
</tr>
''' '''
for e in dash_bb: for e in dash_bb:
@ -82,16 +97,20 @@ def get_data():
<td style="text-align: center;"><strong>&nbsp;''' + e['bulliten'] + '''&nbsp;</strong></td> <td style="text-align: center;"><strong>&nbsp;''' + e['bulliten'] + '''&nbsp;</strong></td>
<td style="text-align: center;">&nbsp;''' + e['time'] + '''&nbsp;</td> <td style="text-align: center;">&nbsp;''' + e['time'] + '''&nbsp;</td>
</tr>''' </tr>'''
for e in dash_loc:
tmp_loc = tmp_loc + '''<tr> return str('<h1 style="text-align: center;">Bulletin Board</h1>' + tbl_hdr + bb_hdr + tmp_bb + tbl_ftr)
<td style="text-align: center;"><strong>&nbsp;''' + e['call'] + '''&nbsp;</strong></td> except:
<td style="text-align: center;">&nbsp;''' + str(e['lat']) + '''&nbsp;</td> return str('<h1 style="text-align: center;">No data</h1>')
<td style="text-align: center;">&nbsp;''' + str(e['lon']) + '''&nbsp;</td>
<td style="text-align: center;">&nbsp;''' + e['time'] + '''&nbsp;</td>
</tr>'''
return str('<h1 style="text-align: center;">Bulletin Board</h1>' + tbl_hdr + bb_hdr + tmp_bb + tbl_ftr + str('<h1 style="text-align: center;">Positions Received</h1>') + tbl_hdr + loc_hdr + tmp_loc + tbl_ftr)
@app.route('/') @app.route('/')
def dash(): def index():
#return 'Hello, World!' #return get_data()
return get_data() return render_template('index.html', title = dashboard_title, logo = logo)
@app.route('/bulletin_board')
def dash_bb():
return get_bb_data()
#return render_template('index.html', data = str(get_data()))
@app.route('/positions')
def dash_loc():
return get_loc_data()
#return render_template('index.html', data = str(get_data()))

27
scripts/dashboard/dashboard_settings-SAMPLE.py Normal file
View File

@ -0,0 +1,27 @@
###############################################################################
# HBLink - Copyright (C) 2020 Cortney T. Buffington, N0MJS <n0mjs@me.com>
# GPS/Data - Copyright (C) 2020 Eric Craw, KF7EEL <kf7eel@qsl.net>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
###############################################################################
'''
Settings for web dashboard.
'''
# Title of the Dashboard
dashboard_title = 'HBLink3 D-APRS Dashboard'
# Logo used on dashboard page
logo = 'https://raw.githubusercontent.com/kf7eel/hblink3/gps/HBlink.png'

27
scripts/dashboard/templates/index.html Normal file
View File

@ -0,0 +1,27 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta http-equiv="refresh" content="120" >
<title>{{title}}</title>
<style>
body {background-color: D3D3D3;}
h1 {color: green;}
p {
padding: 10px;
margin: 20px;
}
</style>
</head>
<body>
<p><img style="display: block; margin-left: auto; margin-right: auto;" src="{{logo}}" alt="Logo" width="300" height="144" /></p>
<h1 style="text-align: center;">{{title}}</h1>
<hr />
<p align="center"><iframe src="bulletin_board" style="border:none;" height="300" width="700" title="Bulletin Board"></iframe></p></body>
<p align="center"><iframe src="positions" style="border:none;" height="900" width="700" title="Positions Received"></iframe></p></body>
<hr />
<h5 style="text-align: center;">Dashboard created by KF7EEL - <a href="https://github.com/kf7eel/hblink3">https://github.com/kf7eel/hblink3</a></h5>
<p style="text-align: center;">HBLink created by N0MJS.<br /><a href="https://github.com/HBLink-org">HBLink GitHub page</a></p>
</html>