From a7455677de1c3a544bc0562b57b9a97562ae0485 Mon Sep 17 00:00:00 2001
From: Adam Goldsmith <adam@adamgoldsmith.name>
Date: Sat, 13 Jul 2019 08:48:50 -0400
Subject: [PATCH] Add last micE and last comment to table

---
 src/StationRow.vue   | 14 +++++++++++---
 src/StatusScreen.vue |  2 ++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/StationRow.vue b/src/StationRow.vue
index 484de28..8b9cfe6 100644
--- a/src/StationRow.vue
+++ b/src/StationRow.vue
@@ -5,8 +5,10 @@
       <td>{{ formatTime(status.lastHeard) }}</td>
       <td>{{ formatTime(now - status.lastHeard, true) }}</td>
       <td>{{ formatTime(Math.round(status.avgDelta), true) }}</td>
+      <td>{{ status.lastMicE }}</td>
       <td>{{ status.lastVoltage || "" }}</td>
       <td>{{ status.lastTemperature || "" }}</td>
+      <td>{{ status.lastComment }}</td>
     </template>
     <template v-else>
       <td>Never Heard</td>
@@ -14,6 +16,8 @@
       <td>Never Heard</td>
       <td>Never Heard</td>
       <td>Never Heard</td>
+      <td>Never Heard</td>
+      <td>Never Heard</td>
     </template>
   </tr>
 </template>
@@ -76,9 +80,13 @@ export default {
             let delta = message.date.getTime() - arr[idx - 1].date.getTime();
             acc.avgDelta = (acc.avgDelta * (idx - 1) + delta) / idx;
           }
-          if ("data" in message && "analog" in message.data) {
-            acc.lastVoltage = message.data.analog[0] / 10;
-            acc.lastTemperature = message.data.analog[1];
+          if ("data" in message) {
+            if ("analog" in message.data) {
+              acc.lastVoltage = message.data.analog[0] / 10;
+              acc.lastTemperature = message.data.analog[1];
+            }
+            acc.lastMicE = message.data.mice;
+            acc.lastComment = message.data.comment;
           }
           return acc;
         }, {})
diff --git a/src/StatusScreen.vue b/src/StatusScreen.vue
index 7c86b30..d2eae71 100644
--- a/src/StatusScreen.vue
+++ b/src/StatusScreen.vue
@@ -6,8 +6,10 @@
         <th>Last Heard</th>
         <th>Time since Last Heard</th>
         <th>Avg. Period</th>
+        <th>Last MicE</th>
         <th>Last Voltage</th>
         <th>Last Temperature</th>
+        <th>Last Comment</th>
       </tr>
 
       <StationRow