ua1zbe
/
gps
mirror of https://github.com/kf7eel/hbnet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

finish web service modes

This commit is contained in:
KF7EEL 2022-02-18 20:47:31 -08:00
parent f5e19ddf02
commit bf54d6b599
3 changed files with 49 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
web/app.py
View File

@ -980,44 +980,45 @@ def hbnet_web_service():
dev_list = [] dev_list = []
f_map = folium.Map(location=center_map, zoom_start=map_zoom) f_map = folium.Map(location=center_map, zoom_start=map_zoom)
peer_l = PeerLoc.query.all() peer_l = PeerLoc.query.all()
print(peer_l) ## print(peer_l)
for i in dev_loc: if mode == 'FULL' or mode == 'DASH_ONLY':
if i.callsign in dev_list: for i in dev_loc:
pass if i.callsign in dev_list:
elif i.callsign not in dev_list: pass
dev_list.append(i.callsign) elif i.callsign not in dev_list:
lat = i.lat dev_list.append(i.callsign)
lon = i.lon lat = i.lat
if 'S' in i.lat: lon = i.lon
lat = aprs_to_latlon(float(re.sub('[A-Za-z]','', i.lat))) if 'S' in i.lat:
lat = -lat lat = aprs_to_latlon(float(re.sub('[A-Za-z]','', i.lat)))
if 'S' not in i.lat: lat = -lat
lat = aprs_to_latlon(float(re.sub('[A-Za-z]','', i.lat))) if 'S' not in i.lat:
if 'W' in i.lon: lat = aprs_to_latlon(float(re.sub('[A-Za-z]','', i.lat)))
lon = aprs_to_latlon(float(re.sub('[A-Za-z]','', i.lon))) if 'W' in i.lon:
lon = -lon lon = aprs_to_latlon(float(re.sub('[A-Za-z]','', i.lon)))
if 'W' not in i.lon: lon = -lon
lon = aprs_to_latlon(float(re.sub('[A-Za-z]','', i.lon))) if 'W' not in i.lon:
folium.Marker([lat, lon], popup="""<i> lon = aprs_to_latlon(float(re.sub('[A-Za-z]','', i.lon)))
<table style="width: 150px;"> folium.Marker([lat, lon], popup="""<i>
<tbody> <table style="width: 150px;">
<tr> <tbody>
<td style="text-align: center;">Last Location:</td> <tr>
</tr> <td style="text-align: center;">Last Location:</td>
<tr> </tr>
<td style="text-align: center;"><strong><a href="/map_gps/"""+ str(i.callsign) +"""" target="_blank" rel="noopener">"""+ str(i.callsign) +"""</a></strong></td> <tr>
</tr> <td style="text-align: center;"><strong><a href="/map_gps/"""+ str(i.callsign) +"""" target="_blank" rel="noopener">"""+ str(i.callsign) +"""</a></strong></td>
<tr> </tr>
<td style="text-align: center;"><strong>"""+ str(i.comment) +"""</strong></td> <tr>
</tr> <td style="text-align: center;"><strong>"""+ str(i.comment) +"""</strong></td>
<tr> </tr>
<td style="text-align: center;"><em>"""+ str((i.time + timedelta(hours=hbnet_tz)).strftime(time_format)) + """</em></td> <tr>
</tr> <td style="text-align: center;"><em>"""+ str((i.time + timedelta(hours=hbnet_tz)).strftime(time_format)) + """</em></td>
</tbody> </tr>
</table> </tbody>
</i> </table>
""", icon=folium.Icon(color="blue", icon="record"), tooltip='<strong>' + i.callsign + '</strong>').add_to(f_map) </i>
if mode == 'FULL': """, icon=folium.Icon(color="blue", icon="record"), tooltip='<strong>' + i.callsign + '</strong>').add_to(f_map)
if mode == 'FULL' or mode == 'DMR_ONLY':
for l in peer_l: for l in peer_l:
## print(time.time() - l.time().total_seconds() > 3600 ) ## print(time.time() - l.time().total_seconds() > 3600 )
## print(datetime.datetime.now() - timedelta(days = 2)) ## print(datetime.datetime.now() - timedelta(days = 2))

2
web/config-SAMPLE.py
View File

@ -30,6 +30,8 @@ secret_key = '123456789123456789123456789123456789123456789'
# Options are: # Options are:
# FULL - Normal HBNet web service # FULL - Normal HBNet web service
# DASH_ONLY - To be used with FreeDMR or HBLink # DASH_ONLY - To be used with FreeDMR or HBLink
# DMR_ONLY - Hides all SMS/GPS stuff
mode = 'FULL' mode = 'FULL'
# Timezone to show time stamps in. Stored in DB as UTC. Offset in hours. # Timezone to show time stamps in. Stored in DB as UTC. Offset in hours.

12
web/templates/flask_user_layout.html
View File

@ -48,13 +48,14 @@
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="{{url}}/"><i class="bi bi-house-fill"></i> Home </a> <a class="nav-link" href="{{url}}/"><i class="bi bi-house-fill"></i> Home </a>
</li> </li>
{% if global_config['mode'] == 'FULL' %} {% if global_config['mode'] == 'FULL' or global_config['mode'] == 'DMR_ONLY' %}
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="{{url}}/talkgroups"><i class="bi bi-card-list"></i> Talkgroups </a> <a class="nav-link" href="{{url}}/talkgroups"><i class="bi bi-card-list"></i> Talkgroups </a>
{% endif %} {% endif %}
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="{{url}}/map"><i class="bi bi-map"></i> Map </a> <a class="nav-link" href="{{url}}/map"><i class="bi bi-map"></i> Map </a>
</li> </li>
{% if global_config['mode'] == 'FULL' or global_config['mode'] == 'DASH_ONLY' %}
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="aprs_menu" role="button" data-bs-toggle="dropdown" aria-expanded="false"> <a class="nav-link dropdown-toggle" href="#" id="aprs_menu" role="button" data-bs-toggle="dropdown" aria-expanded="false">
<i class="bi bi-window"></i> Data <i class="bi bi-window"></i> Data
@ -69,6 +70,7 @@
<li><a class="dropdown-item" href="{{url}}/tags"><i class="bi bi-hash"></i> Tags </a></li> <li><a class="dropdown-item" href="{{url}}/tags"><i class="bi bi-hash"></i> Tags </a></li>
</ul> </ul>
</li> </li>
{% endif %}
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="{{url}}/news"><i class="bi bi-newspaper"></i> News </a> <a class="nav-link" href="{{url}}/news"><i class="bi bi-newspaper"></i> News </a>
@ -100,7 +102,7 @@
</a> </a>
<ul class="dropdown-menu" aria-labelledby="mmdvm_admin"> <ul class="dropdown-menu" aria-labelledby="mmdvm_admin">
<li><a class="dropdown-item" href="{{url}}/manage_servers">Manage Servers</a></li> <li><a class="dropdown-item" href="{{url}}/manage_servers">Manage Servers</a></li>
{% if global_config['mode'] == 'FULL' %} {% if global_config['mode'] == 'FULL' or global_config['mode'] == 'DMR_ONLY' %}
<li><a class="dropdown-item" href="{{url}}/manage_peers">Manage Peers</a></li> <li><a class="dropdown-item" href="{{url}}/manage_peers">Manage Peers</a></li>
<li><a class="dropdown-item" href="{{url}}/manage_masters">Manage Masters</a></li> <li><a class="dropdown-item" href="{{url}}/manage_masters">Manage Masters</a></li>
<li><a class="dropdown-item" href="{{url}}/manage_rules">Manage Rules</a></li> <li><a class="dropdown-item" href="{{url}}/manage_rules">Manage Rules</a></li>
@ -113,7 +115,7 @@
<li><hr class="dropdown-divider"></li> <li><hr class="dropdown-divider"></li>
<li><a class="dropdown-item" href="{{url}}/manage_news">Manage News</a></li> <li><a class="dropdown-item" href="{{url}}/manage_news">Manage News</a></li>
<li><a class="dropdown-item" href="{{url}}/misc_settings">Misc Options</a></li> <li><a class="dropdown-item" href="{{url}}/misc_settings">Misc Options</a></li>
{% if global_config['mode'] == 'FULL' %} {% if global_config['mode'] == 'FULL' or global_config['mode'] == 'DMR_ONLY' %}
<li><a class="dropdown-item" href="{{url}}/auth_log">Authorization Log</a></li> <li><a class="dropdown-item" href="{{url}}/auth_log">Authorization Log</a></li>
{% endif %} {% endif %}
<a class="dropdown-item" href="{{url}}/all_mail/{{ current_user.username or current_user.email }}">Manage Mail</a> <a class="dropdown-item" href="{{url}}/all_mail/{{ current_user.username or current_user.email }}">Manage Mail</a>
@ -139,7 +141,7 @@
<li><a class="dropdown-item" href="{{url}}/mail/{{ current_user.username or current_user.email }}"><i class="bi bi-mailbox"></i> Mailbox </a></li> <li><a class="dropdown-item" href="{{url}}/mail/{{ current_user.username or current_user.email }}"><i class="bi bi-mailbox"></i> Mailbox </a></li>
{% endif %} {% endif %}
<li><a class="dropdown-item" href="{{url}}/discussion"><i class="bi bi-chat-right-quote"></i> Discussion </a></li> <li><a class="dropdown-item" href="{{url}}/discussion"><i class="bi bi-chat-right-quote"></i> Discussion </a></li>
{% if global_config['mode'] == 'FULL' %} {% if global_config['mode'] == 'FULL' or global_config['mode'] == 'DMR_ONLY' %}
<li><a class="dropdown-item" href="{{url}}/generate_passphrase"><i class="bi bi-info-square"></i> Server(s) </a></li> <li><a class="dropdown-item" href="{{url}}/generate_passphrase"><i class="bi bi-info-square"></i> Server(s) </a></li>
{% endif %} {% endif %}
</ul> </ul>
@ -152,7 +154,9 @@
<ul class="dropdown-menu" aria-labelledby="settings_menu"> <ul class="dropdown-menu" aria-labelledby="settings_menu">
<li><a class="dropdown-item" href="{{ url_for('user.edit_user_profile') }}"><i class="bi bi-file-person"></i> Edit Profile </a></li> <li><a class="dropdown-item" href="{{ url_for('user.edit_user_profile') }}"><i class="bi bi-file-person"></i> Edit Profile </a></li>
{% if global_config['mode'] == 'FULL' or global_config['mode'] == 'DASH_ONLY' %}
<li><a class="dropdown-item" href="{{url}}/aprs_settings"><i class="bi bi-geo"></i> APRS Configuration </a></li> <li><a class="dropdown-item" href="{{url}}/aprs_settings"><i class="bi bi-geo"></i> APRS Configuration </a></li>
{% endif %}
</ul> </ul>
</li> </li>