diff --git a/web/app.py b/web/app.py index 9080ff8..44a7ea3 100644 --- a/web/app.py +++ b/web/app.py @@ -782,28 +782,31 @@ def hbnet_web_service(): # The Home page is accessible to anyone @app.route('/') def home_page(): - home_text = Misc.query.filter_by(field_1='home_page').first() - #content = Markup('Index') - try: - l_news = News.query.order_by(News.time.desc()).first() - content = ''' + if mode == 'FULL': + home_text = Misc.query.filter_by(field_1='home_page').first() + #content = Markup('Index') + try: + l_news = News.query.order_by(News.time.desc()).first() + content = ''' -
-
-

''' + l_news.subject + '''

-
+
+
+

''' + l_news.subject + '''

+
+   +

''' + l_news.date + '''

+
  -

''' + l_news.date + '''

-
-   -

''' + l_news.text + '''

-

-
-
- ''' - except: - content = '' - return render_template('index.html', news = Markup(content), content_block = Markup(home_text.field_2)) +

''' + l_news.text + '''

+

+
+
+ ''' + except: + content = '' + return render_template('index.html', news = Markup(content), content_block = Markup(home_text.field_2)) + else: + return redirect('/data_overview') @app.route('/tos') def tos_page(): @@ -820,6 +823,7 @@ def hbnet_web_service(): try: first_loc = False g = GPS_LocLog.query.order_by(GPS_LocLog.time.desc()).filter_by(callsign=call_ssid).all() + f_map = folium.Map(location=center_map, zoom_start=10) for i in g: print(first_loc) lat = i.lat @@ -834,8 +838,9 @@ def hbnet_web_service(): lon = -lon if 'W' not in i.lon: lon = aprs_to_latlon(float(re.sub('[A-Za-z]','', i.lon))) - f_map = folium.Map(location=[lat, lon], zoom_start=10) if first_loc == False: + print('first') + f_map = folium.Map(location=[lat, lon], zoom_start=10) folium.Marker([lat, lon], popup=""" @@ -854,9 +859,10 @@ def hbnet_web_service():
- """, icon=folium.Icon(color="blue", icon="record"), tooltip='' + i.callsign + '').add_to(f_map) + """, icon=folium.Icon(color="green", icon="record"), tooltip='' + i.callsign + '').add_to(f_map) first_loc = True if first_loc == True: + print('subsequent') marker_cluster = MarkerCluster().add_to(f_map) folium.CircleMarker([lat, lon], popup=""" @@ -7055,6 +7061,54 @@ Name: ''' + p.name + '''  -  Port: ''' + str( return render_template('flask_user_layout.html', markup_content = Markup(content)) + + @app.route('/data_overview') + def data_overview(): + + dev_loc = GPS_LocLog.query.order_by(GPS_LocLog.time.desc()).limit(200).all() + bbl = BulletinBoard.query.order_by(BulletinBoard.time.desc()).limit(20).all() + ss_all = Social.query.order_by(Social.time.desc()).limit(20).all() + smsl = SMSLog.query.order_by(SMSLog.time.desc()).limit(30).all() + sms_l = '' + ss_log = '' + dev_content = '' + bb_content = '' + dev_lst = [] + for i in dev_loc: + if i.callsign not in dev_lst: + dev_lst.append(i.callsign) + dev_content = dev_content + ''' + + + + +''' + for b in bbl: + bb_content = bb_content + ''' + + + + +''' + for sms in smsl: + sms_l = sms_l + ''' + + + + + + +''' + for ss in ss_all: + ss_log = ss_log + ''' + + + +''' + + + return render_template('data_overview.html', ll_content = Markup(dev_content), bull_content = Markup(bb_content), sms_log = Markup(sms_l), ss_all = Markup(ss_log)) + @app.route('/aprs') def data_dash(): @@ -7068,7 +7122,7 @@ Name: ''' + p.name + '''  -  Port: ''' + str( dev_lst.append(i.callsign) content = content + ''' - + diff --git a/web/templates/bb.html b/web/templates/bb.html index 5ade4e1..6339237 100644 --- a/web/templates/bb.html +++ b/web/templates/bb.html @@ -12,7 +12,7 @@ - + diff --git a/web/templates/data_overview.html b/web/templates/data_overview.html new file mode 100644 index 0000000..8529c29 --- /dev/null +++ b/web/templates/data_overview.html @@ -0,0 +1,85 @@ +{% extends 'flask_user/_public_base.html' %} +{% block content %} +

 

+ +

Page automatically reloads every 2 minutes.

+ + +
+
+

 

+ +

Bulletin Board

+

\n ''' + str((i.time + timedelta(hours=hbnet_tz)).strftime(time_format)) + '''		''' + i.lat + '''\n''' + i.lon + '''

''' + b.callsign + '''

\n

''' + str(i.dmr_id) + '''

''' + b.bulletin + '''

''' + sms.snd_callsign + '''

''' + sms.rcv_callsign + '''

''' + sms.message + '''

''' + ss.callsign + '''

\n

''' + ss.message + '''

 ''' + i.lat + '''   ''' + i.lon + '''   ''' + str((i.time + timedelta(hours=hbnet_tz)).strftime(time_format)) + ''' 
CallsignBullteinBulletinn Time Server
+ + + + + + + + {{bull_content}} + +
CallsignBulletin
+ +
+

 

+ +

Last Known Location

+ + + + + + + + +{{ll_content}} + + +
CallsignLat/Lon
+
+ +
+
+

 

+

SMS Log

+ + + + + + + + + + +{{sms_log}} + +
SenderReceiverMessage
+ +
+
+
+
+

 

+

Social Status

+ + + + + + + + + +{{ss_all}} + +
UserPost
+ +
+
+ + +

 

+{% endblock %} diff --git a/web/templates/flask_user_layout.html b/web/templates/flask_user_layout.html index 69f6f42..c02a88f 100644 --- a/web/templates/flask_user_layout.html +++ b/web/templates/flask_user_layout.html @@ -60,6 +60,7 @@ Data