From 599f549ab92a78c6ec284fd766091930c8958a62 Mon Sep 17 00:00:00 2001
From: KF7EEL <kf7eel@qsl.net>
Date: Wed, 3 Mar 2021 16:36:25 -0800
Subject: [PATCH] add dashboard APRS message hook

---
 scripts/dashboard/dashboard.py | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/scripts/dashboard/dashboard.py b/scripts/dashboard/dashboard.py
index c322b67..b9b75d5 100644
--- a/scripts/dashboard/dashboard.py
+++ b/scripts/dashboard/dashboard.py
@@ -448,7 +448,7 @@ def mailbox():
     if not recipient:
         mail_content = """
         <p>The Mailbox is a place where users can leave messages via DMR SMS. A user can leave a message for someone else by sending a specially formatted SMS to <strong>""" + data_call_id + """</strong>.
-        The message recipient can then use the mailbox to check for messages. Enter your call sign below to check for messages. See the <a href="help">help</a> page for more information.</p>
+        The message recipient can then use the mailbox to check for messages. You can also check for APRS mesages addressed to your DMR radio. Enter your call sign below to check for messages. See the <a href="help">help</a> page for more information.</p>
         <form action="mailbox" method="get">
         <table style="margin-left: auto; margin-right: auto;">
         <tbody>
@@ -478,10 +478,23 @@ def mailbox():
         '''
         for messages in mailbox_file:
             if messages['recipient'] == recipient.upper():
+                sender = """
+                <tr>
+                <td style="width: 63px;"><strong>DMR ID:</strong></td>
+                <td style="width: 292.55px; text-align: center;">""" + str(messages['dmr_id']) + """</td>
+                </tr>
+                """
                 if type(messages['time']) == str:
                     loc_time = str(messages['time'])
                 if type(messages['time']) == int or type(messages['time']) == float:
                     loc_time = datetime.fromtimestamp(messages['time']).strftime(time_format)
+                if type(messages['dmr_id']) == str:
+                    sender = """
+                <tr>
+                <td style="width: 63px;"><strong>APRS Call:</strong></td>
+                <td style="width: 292.55px; text-align: center;">""" + str(messages['dmr_id']) + """</td>
+                </tr>
+                """
                 mail_content = mail_content + """
                 <table style="margin-left: auto; margin-right: auto; width: 372.55px;" border="1">
                 <tbody>
@@ -489,10 +502,7 @@ def mailbox():
                 <td style="width: 63px;"><strong>From:</strong></td>
                 <td style="text-align: center; width: 292.55px;"><strong>""" + messages['call'] + """</strong></td>
                 </tr>
-                <tr>
-                <td style="width: 63px;"><strong>DMR ID:</strong></td>
-                <td style="width: 292.55px; text-align: center;">""" + str(messages['dmr_id']) + """</td>
-                </tr>
+                """ + sender + """
                 <tr>
                 <td style="width: 63px;"><strong>Time:</strong></td>
                 <td style="width: 292.55px; text-align: center;">""" + loc_time + """</td>