From 354e05c141a6d55e35cab6b5c03eb408870ee4ac Mon Sep 17 00:00:00 2001 From: KF7EEL Date: Tue, 12 Oct 2021 11:46:37 -0700 Subject: [PATCH] change templates, continue tiny pages, start APRS settings --- web/app.py | 131 ++++++++++++++++++++++++--- web/templates/aprs_settings.html | 19 ++++ web/templates/flask_user_layout.html | 1 + web/templates/tp_add.html | 5 +- web/templates/tp_all.html | 2 +- 5 files changed, 141 insertions(+), 17 deletions(-) create mode 100644 web/templates/aprs_settings.html diff --git a/web/app.py b/web/app.py index 0b08f63..3538be3 100644 --- a/web/app.py +++ b/web/app.py @@ -446,7 +446,7 @@ def hbnet_web_service(): id = db.Column(db.Integer(), primary_key=True) snd_callsign = db.Column(db.String(100), nullable=False, server_default='') rcv_callsign = db.Column(db.String(100), nullable=False, server_default='') - message = db.Column(db.String(150), nullable=False, server_default='') + message = db.Column(db.String(300), nullable=False, server_default='') time = db.Column(db.DateTime()) server = db.Column(db.String(100), nullable=False, server_default='') system_name = db.Column(db.String(100), nullable=False, server_default='') @@ -456,7 +456,7 @@ def hbnet_web_service(): class News(db.Model): __tablename__ = 'news' id = db.Column(db.Integer(), primary_key=True) - subject = db.Column(db.String(100), nullable=False, server_default='') + subject = db.Column(db.String(200), nullable=False, server_default='') text = db.Column(db.String(5000), nullable=False, server_default='') date = db.Column(db.String(100), nullable=False, server_default='') time = db.Column(db.DateTime()) @@ -507,10 +507,10 @@ def hbnet_web_service(): class Misc(db.Model): __tablename__ = 'misc' id = db.Column(db.Integer(), primary_key=True) - field_1 = db.Column(db.String(500), nullable=True, server_default='') - field_2 = db.Column(db.String(500), nullable=True, server_default='') - field_3 = db.Column(db.String(500), nullable=True, server_default='') - field_4 = db.Column(db.String(500), nullable=True, server_default='') + field_1 = db.Column(db.String(5000), nullable=True, server_default='') + field_2 = db.Column(db.String(5000), nullable=True, server_default='') + field_3 = db.Column(db.String(5000), nullable=True, server_default='') + field_4 = db.Column(db.String(5000), nullable=True, server_default='') int_1 = db.Column(db.Integer(), nullable=True) int_2 = db.Column(db.Integer(), nullable=True) int_3 = db.Column(db.Integer(), nullable=True) @@ -2361,6 +2361,83 @@ TG #: ''' + str(tg_d.tg) + ''' response = Response(gen_csv, mimetype="text/csv") return response + @app.route('/aprs_settings') + def aprs_settings(): + user_aprs = User.query.filter_by(username=current_user.username).first() + print(user_aprs.aprs) + settings = ast.literal_eval(user_aprs.aprs) + content = ''' +

APRS Settings

+ + + + + + + + + + + + + + + + +''' + show_form = True + for i in settings.items(): + content = content + ''' + + + + + + + + + + +''' + +## for i in bbl: +## content = content + ''' +## +## +## +## +## +## +## ''' + content = content + '
DMR IDCallsignSSIDIconCommentPINAPRS MSG?Options
''' + str(i[0]) + '''''' + i[1][0]['call'] + '''
+ + +
+ + +
+ + +
''' + str(i[1][5]['APRS']) + '''

''' + i.callsign + '''

\n 		''' + i.bulletin + '''''' + str(i.time.strftime(time_format)) + '''''' + i.server + ' - ' + i.system_name + '''
' + return render_template('flask_user_layout.html', markup_content = Markup(content)) + @app.route('/talkgroups') ## @login_required def tg_list(): @@ -2458,28 +2535,51 @@ TG #: ''' + str(tg_d.tg) + ''' tpl = TinyPage.query.order_by(TinyPage.time.desc()).all() content = ''' ''' for i in tpl: + try: + options_l = '' + if str(current_user.username).upper() == str(i.author).upper(): + options_l = '''''' + except: + options_l = '' content = content + ''' ''' + i.query_term + ''' ''' + i.content + ''' ''' + i.author + ''' - + ''' + options_l + ''' ''' return render_template('tp_all.html', markup_content = Markup(content)) @app.route('/add_tp', methods=['POST', 'GET']) -## @app.route('/add_tp') + @login_required def new_tp(): u = current_user - print(u.username) + content = '' + show_form = True if request.args.get('add_page'): tp_add(u.username, request.form.get('query'), request.form.get('content')) - content = '''

Saved Tiny Page.

-

Redirecting in 1 seconds.

- ''' - + show_form = False + + content = '''

Added page.

+

Redirecting in 1 seconds.

+ ''' + elif request.args.get('delete_page'): + show_form = False + tpd = TinyPage.query.filter_by(id=int(request.args.get('delete_page'))).first() + if str(current_user.username).upper() == str(tpd.author).upper(): + tp_del(int(request.args.get('delete_page'))) + content = '''

Deleted page.

+

Redirecting in 1 seconds.

+ ''' + else: + content = '''

Not authorized.

+

Redirecting in 1 seconds.

+ ''' else: content = '' + +## if not request.args.get('add_page') or not request.args.get('delete_page'): +## content = '' ## tpl = TinyPage.query.order_by(TinyPage.time.desc()).all() ## content = ''' ''' ## for i in tpl: @@ -2490,7 +2590,7 @@ TG #: ''' + str(tg_d.tg) + ''' ## ''' + i.author + ''' ## ## ''' - return render_template('tp_add.html', markup_content = Markup(content), url = url) + return render_template('tp_add.html', markup_content = Markup(content), url = url, form = show_form) @app.route('/ss') def get_all_ss(): @@ -6550,9 +6650,10 @@ Name: ''' + p.name + '''  -  Port: ''' + str( ## del_unit_table(hblink_req['unit_table']) try: delete_misc_field_1('unit_table_' + hblink_req['unit_table']) + misc_add('unit_table_' + hblink_req['unit_table'], str(hblink_req['data']), '', '', 0, 0, 0, 0, False, False) except: print('entry error') - misc_add('unit_table_' + hblink_req['unit_table'], str(hblink_req['data']), '', '', 0, 0, 0, 0, False, False) + misc_add('unit_table_' + hblink_req['unit_table'], str(hblink_req['data']), '', '', 0, 0, 0, 0, False, False) ## unit_table_add(hblink_req['data']) response = 'rcvd' diff --git a/web/templates/aprs_settings.html b/web/templates/aprs_settings.html new file mode 100644 index 0000000..96e17be --- /dev/null +++ b/web/templates/aprs_settings.html @@ -0,0 +1,19 @@ +{% extends 'flask_user/_public_base.html' %} +{% block content %} + +

APRS Settings

+ + + + + + + + {{markup_content}} + + + + + + +{% endblock %} diff --git a/web/templates/flask_user_layout.html b/web/templates/flask_user_layout.html index 33b793b..3f0420b 100644 --- a/web/templates/flask_user_layout.html +++ b/web/templates/flask_user_layout.html @@ -62,6 +62,7 @@
  • SMS Log
  • Bulletin Board
  • Social Status
    • +
  • Tiny Pages
    • diff --git a/web/templates/tp_add.html b/web/templates/tp_add.html index c2f6c92..638ef66 100644 --- a/web/templates/tp_add.html +++ b/web/templates/tp_add.html @@ -7,6 +7,9 @@
    +{{markup_content}} + +{% if form %}
    @@ -22,9 +25,9 @@

    +{% endif %}
    -

     

    {% endblock %} diff --git a/web/templates/tp_all.html b/web/templates/tp_all.html index 372abad..b8a857d 100644 --- a/web/templates/tp_all.html +++ b/web/templates/tp_all.html @@ -7,7 +7,7 @@
    {% if call_or_get(current_user.is_authenticated) %} - + {% endif %}