From cb0d59de611e7555d4d84a39a7e1ae2b08d575df Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 5 May 2019 17:52:26 +0200
Subject: [PATCH] make receiver details dynamic

---
 htdocs/index.wrx    | 8 ++++----
 htdocs/openwebrx.js | 7 +++++++
 owrx/controllers.py | 7 +++++++
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/htdocs/index.wrx b/htdocs/index.wrx
index 1a7aee9..3dea6ea 100644
--- a/htdocs/index.wrx
+++ b/htdocs/index.wrx
@@ -50,8 +50,8 @@
                     <img id="webrx-rx-avatar" src="static/gfx/openwebrx-avatar.png" onclick="toggle_rx_photo();"/>
                 </div>
                 <div id="webrx-rx-texts">
-                    <div id="webrx-rx-title" onclick="toggle_rx_photo();">%[RX_TITLE]</div>
-                    <div id="webrx-rx-desc" onclick="toggle_rx_photo();">%[RX_LOC] | Loc: %[RX_QRA], ASL: %[RX_ASL] m, <a href="https://www.google.hu/maps/place/%[RX_GPS]" target="_blank" onclick="dont_toggle_rx_photo();">[maps]</a></div>
+                    <div id="webrx-rx-title" onclick="toggle_rx_photo();"></div>
+                    <div id="webrx-rx-desc" onclick="toggle_rx_photo();"></div>
                 </div>
                 <div id="openwebrx-rx-details-arrow">
                     <a id="openwebrx-rx-details-arrow-up" onclick="toggle_rx_photo();"><img src="static/gfx/openwebrx-rx-details-arrow-up.png" /></a>
@@ -65,8 +65,8 @@
                     </ul>
                 </section>
             </div>
-            <div id="webrx-rx-photo-title">%[RX_PHOTO_TITLE]</div>
-            <div id="webrx-rx-photo-desc">%[RX_PHOTO_DESC]</div>
+            <div id="webrx-rx-photo-title"></div>
+            <div id="webrx-rx-photo-desc"></div>
         </div>
     </div>
     <div id="webrx-main-container">
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index f974730..1694c30 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1182,6 +1182,13 @@ function on_ws_recv(evt)
 						waterfall_init();
 						audio_preinit();
                     break;
+                    case "receiver_details":
+                        var r = json.value;
+                        e('webrx-rx-title').innerHTML = r.receiver_name;
+                        e('webrx-rx-desc').innerHTML = r.receiver_location + ' | Loc: ' + r.receiver_qra + ', ASL: ' + r.receiver_asl + ' m, <a href="https://www.google.hu/maps/place/' + r.receiver_gps[0] + ',' + r.receiver_gps[1] + '" target="_blank" onclick="dont_toggle_rx_photo();">[maps]</a>';
+                        e('webrx-rx-photo-title').innerHTML = r.photo_title;
+                        e('webrx-rx-photo-desc').innerHTML = r.photo_desc;
+                    break;
                     case "smeter":
                         setSmeterAbsoluteValue(json.value);
                     break;
diff --git a/owrx/controllers.py b/owrx/controllers.py
index 10009b5..1a83da1 100644
--- a/owrx/controllers.py
+++ b/owrx/controllers.py
@@ -78,6 +78,13 @@ class WebSocketMessageHandler(object):
             conn.send({"type":"config","value":config})
             print("client connection intitialized")
 
+            receiver_details = dict((key, pm.getPropertyValue(key)) for key in ["receiver_name", "receiver_location",
+                                                                                "receiver_qra", "receiver_asl",
+                                                                                "receiver_gps", "photo_title",
+                                                                                "photo_desc"]
+                                    )
+            conn.send({"type":"receiver_details","value":receiver_details})
+
             self.forwarder = SpectrumForwarder(conn)
             SpectrumThread.getSharedInstance().add_client(self.forwarder)
             CpuUsageThread.getSharedInstance().add_client(self.forwarder)