From f315c0c0513d686bdabe84e6c0d68a1f5b385c7b Mon Sep 17 00:00:00 2001
From: UpstreamData <brett@upstreamdata.ca>
Date: Fri, 4 Mar 2022 16:10:27 -0700
Subject: [PATCH] added miner model and hashrate as a table in the per miner
 stuff

---
 tools/web_monitor/app.py               |  5 ++++-
 tools/web_monitor/templates/miner.html | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/tools/web_monitor/app.py b/tools/web_monitor/app.py
index 3d45debf..bb342223 100644
--- a/tools/web_monitor/app.py
+++ b/tools/web_monitor/app.py
@@ -105,6 +105,8 @@ async def miner_websocket(websocket: WebSocket, miner_ip):
 
                 data = await asyncio.wait_for(cur_miner.api.multicommand("summary", "fans", "stats"), 5)
 
+                miner_model = await cur_miner.get_model()
+
                 miner_summary = None
                 miner_stats = None
                 miner_fans = None
@@ -152,7 +154,8 @@ async def miner_websocket(websocket: WebSocket, miner_ip):
 
                 data = {"hashrate": hashrate,
                         "fans": fan_speeds,
-                        "datetime": datetime.datetime.now().isoformat()}
+                        "datetime": datetime.datetime.now().isoformat(),
+                        "model": miner_model}
                 await websocket.send_json(data)
                 await asyncio.sleep(1)
             except asyncio.exceptions.TimeoutError:
diff --git a/tools/web_monitor/templates/miner.html b/tools/web_monitor/templates/miner.html
index bbc24e3c..cc0dedb1 100644
--- a/tools/web_monitor/templates/miner.html
+++ b/tools/web_monitor/templates/miner.html
@@ -52,6 +52,15 @@
     </div>
 </div>
 
+
+<div class="d-flex align-items-center mt-4 ms-4 alert alert-secondary">
+    <div class="mx-auto">Model:</div>
+    <div class="mx-auto fw-bolder" id="minerModel">?</div>
+    <div class="mx-auto" style="border-left: 1px solid grey; height: 50px;"></div>
+    <div class="mx-auto">Hashrate:</div>
+    <div class="mx-auto fw-bolder" id="minerHashrate">?</div>
+</div>
+
 <div id="errorContainer" class="d-flex align-items-center mt-4 ms-4 alert alert-danger invisible">
     <strong id="errorCode"></strong>
   <div class="spinner-border ms-auto"></div>
@@ -68,6 +77,8 @@ ws.onmessage = function(event) {
         var err_code = document.getElementById("errorCode")
         err_code.innerHTML = new_data['error']
         err_container.classList.remove("invisible")
+        var miner_hr = document.getElementById("minerHashrate")
+        miner_hr.innerHTML = "?"
     } else {
         var chart = document.getElementById("line-chart")
         var err_container = document.getElementById("errorContainer")
@@ -92,6 +103,10 @@ ws.onmessage = function(event) {
         fan3Chart.update();
         fan4Chart.update();
         minerDataChart.update();
+        var miner_hr = document.getElementById("minerHashrate")
+        miner_hr.innerHTML = new_data["hashrate"] + " TH/s"
+        var miner_model = document.getElementById("minerModel")
+        miner_model.innerHTML = new_data["model"]
     };
 };