finish web service modes

web/app.py

@@ -980,7 +980,8 @@ def hbnet_web_service():
         dev_list = []
         f_map = folium.Map(location=center_map, zoom_start=map_zoom)
         peer_l = PeerLoc.query.all()
-        print(peer_l)
+##        print(peer_l)
+        if mode == 'FULL' or mode == 'DASH_ONLY':
             for i in dev_loc:
                 if i.callsign in dev_list:
                     pass
@@ -1017,7 +1018,7 @@ def hbnet_web_service():
                         </table>
                         </i>
                         """, icon=folium.Icon(color="blue", icon="record"), tooltip='<strong>' + i.callsign + '</strong>').add_to(f_map)
-        if mode == 'FULL':            
+        if mode == 'FULL' or mode == 'DMR_ONLY':            
             for l in peer_l:
     ##            print(time.time() - l.time().total_seconds() > 3600 )
     ##            print(datetime.datetime.now() - timedelta(days = 2))

web/config-SAMPLE.py

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

web/templates/flask_user_layout.html

@@ -48,13 +48,14 @@
       <li class="nav-item">
         <a class="nav-link" href="{{url}}/"><i class="bi bi-house-fill"></i> Home </a>
       </li>
-    {% if global_config['mode'] == 'FULL' %}
+    {% if global_config['mode'] == 'FULL' or global_config['mode'] == 'DMR_ONLY' %}
       <li class="nav-item">
         <a class="nav-link" href="{{url}}/talkgroups"><i class="bi bi-card-list"></i> Talkgroups </a>
     {% endif %}
     <li class="nav-item">
         <a class="nav-link" href="{{url}}/map"><i class="bi bi-map"></i> Map </a>
       </li>
+    {% if global_config['mode'] == 'FULL' or global_config['mode'] == 'DASH_ONLY' %}
     <li class="nav-item dropdown">
           <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 
@@ -69,6 +70,7 @@
             <li><a class="dropdown-item" href="{{url}}/tags"><i class="bi bi-hash"></i> Tags </a></li>
           </ul>
         </li>
+    {% endif %}
     
     <li class="nav-item">
         <a class="nav-link" href="{{url}}/news"><i class="bi bi-newspaper"></i> News </a>
@@ -100,7 +102,7 @@
           </a>
           <ul class="dropdown-menu" aria-labelledby="mmdvm_admin">
             <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_masters">Manage Masters</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><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>
-    {% 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>
     {% endif %}
             <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>
     {% endif %}
             <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>
     {% endif %}
           </ul>
@@ -152,7 +154,9 @@
           <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>
+    {% 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>
+    {% endif %}
           </ul>
         </li>