From 8e5912fa605e40f00fbb287a76ff278150139b0f Mon Sep 17 00:00:00 2001
From: KF7EEL <kf7eel@qsl.net>
Date: Tue, 12 Oct 2021 15:37:05 -0700
Subject: [PATCH] fix discussion layout, modify menu items, start sms_que
 functions

---
 web/app.py                           | 67 ++++++++++++++++++++++++----
 web/templates/disc.html              |  1 -
 web/templates/flask_user_layout.html |  2 +-
 3 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/web/app.py b/web/app.py
index 3debf47..622c252 100644
--- a/web/app.py
+++ b/web/app.py
@@ -511,6 +511,20 @@ def hbnet_web_service():
         text = db.Column(db.String(5000), nullable=False, server_default='')
         time = db.Column(db.DateTime())
 
+    class SMS_Que(db.Model):
+        __tablename__ = 'sms_que'
+        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(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='')
+        snd_id = db.Column(db.Integer(), primary_key=False)
+        rcv_id = db.Column(db.Integer(), primary_key=False)
+        msg_type = db.Column(db.String(100), nullable=False, server_default='')
+        call_type = db.Column(db.String(100), nullable=False, server_default='')
+
 
     class Misc(db.Model):
         __tablename__ = 'misc'
@@ -2545,7 +2559,7 @@ TG #: <strong> ''' + str(tg_d.tg) + '''</strong>
         for i in tpl:
             try:
                 options_l = ''
-                if str(current_user.username).upper() == str(i.author).upper():
+                if str(current_user.username).upper() == str(i.author).upper() or current_user.has_roles('Admin'):
                     options_l = '''<a href="/add_tp?delete_page=''' + str(i.id) + '''"><button type="button" class="btn btn-danger">Delete</button></a>'''
             except:
                 options_l = ''
@@ -2561,8 +2575,8 @@ TG #: <strong> ''' + str(tg_d.tg) + '''</strong>
 
     @app.route('/discussion', methods=['POST', 'GET'])
     def portal_discussion():
-##        dl = Disc.query.order_by(Disc.time.desc()).limit(30).all()
-        dl = Disc.query.order_by(Disc.time.desc()).all()
+        dl = Disc.query.order_by(Disc.time.desc()).limit(100).all()
+##        dl = Disc.query.order_by(Disc.time.desc()).all()
         content = ''' '''
         show_table = True
         if request.args.get('post'):
@@ -2584,16 +2598,30 @@ TG #: <strong> ''' + str(tg_d.tg) + '''</strong>
             for i in dl:
                 try:
                     options_l = ''
-                    if str(current_user.username).upper() == str(i.poster).upper():
+                    if str(current_user.username).upper() == str(i.poster).upper() or current_user.has_roles('Admin'):
                         options_l = '''<a href="/discussion?delete=''' + str(i.id) + '''"><button type="button" class="btn btn-danger">Delete</button></a>'''
                 except:
                     options_l = ''
+##                content = content + '''
+##        <tr>
+##          <td><strong>''' + i.poster + '''</strong></td>
+##          <td>''' + i.text + '''</td>
+##          <td>''' + options_l + '''</td>
+##        </tr>'''
                 content = content + '''
-        <tr>
-          <td><strong>''' + i.poster + '''</strong></td>
-          <td>''' + i.text + '''</td>
-          <td>''' + options_l + '''</td>
-        </tr>'''
+<tr>
+<td>
+<div class="card" style="width:300px">
+  <div class="card-header"><strong>''' + i.poster + '''</strong></div>
+  <div class="card-body">''' + i.text + '''</div>
+  <div class="card-footer">''' + str(i.time.strftime(time_format)) + '''</div>
+</div>
+</td>
+<td>
+''' + options_l + '''
+</td>
+</tr>
+'''
         return render_template('disc.html', markup_content = Markup(content), table = show_table)
 
 
@@ -2902,6 +2930,17 @@ Name: <strong>''' + p.name + '''</strong>&nbsp; -&nbsp; Port: <strong>''' + str(
         return render_template('flask_user_layout.html', markup_content = Markup(content))
 
 ###### DB functions #############################
+
+    def sms_que(_server):
+        que_db = SMS_Que.query.filter_by(server=_server).all()
+        que_list = []
+        for i in que_db:
+            print(i)
+
+    def sms_que_add():
+        pass
+    def sms_que_purge():
+        pass
     
     def get_peer_configs(_server_name):
         mmdvm_pl = mmdvmPeer.query.filter_by(server=_server_name).filter_by(enabled=True).all()
@@ -6744,6 +6783,16 @@ Name: <strong>''' + p.name + '''</strong>&nbsp; -&nbsp; Port: <strong>''' + str(
     ##                except:
     ##                    message = jsonify(message='Config error')
     ##                    response = make_response(message, 401)
+                    .
+
+            elif 'get_sms_que' in hblink_req:
+                if hblink_req['get_sms_que']: 
+
+                    response = jsonify(
+                            que=server_get(hblink_req['get_config'])
+    ##                        OBP=get_OBP(hblink_req['get_config'])
+
+                            )      
             elif 'get_rules' in hblink_req:
                 if hblink_req['get_rules']: # == 'burn_list':
                     
diff --git a/web/templates/disc.html b/web/templates/disc.html
index 18de658..e446757 100644
--- a/web/templates/disc.html
+++ b/web/templates/disc.html
@@ -35,7 +35,6 @@
   <table data-toggle="table" data-pagination="true" data-search="true" >
   <thead>
     <tr>
-      <th>Author</th>
       <th>Post</th>
       <th>Options</th>
     </tr>
diff --git a/web/templates/flask_user_layout.html b/web/templates/flask_user_layout.html
index 635d3c2..838770f 100644
--- a/web/templates/flask_user_layout.html
+++ b/web/templates/flask_user_layout.html
@@ -135,7 +135,7 @@
           </a>
           <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> Change {{ current_user.username or current_user.email }} </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>
             <li><a class="dropdown-item" href="{{url}}/aprs_settings"><i class="bi bi-geo"></i> APRS Configuration </a></li>
           </ul>
         </li>