From 0975b1ccceef3bbd44f29d9d746c9e940a7ffab1 Mon Sep 17 00:00:00 2001
From: Heikki Hannikainen <hessu@hes.iki.fi>
Date: Wed, 3 Aug 2016 20:38:42 +0300
Subject: [PATCH] status: Fix byte rates calculation for uplinks

---
 src/web/aprsc.js   | 1 +
 src/web/index.html | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/web/aprsc.js b/src/web/aprsc.js
index efc9ebf..c8d9d25 100644
--- a/src/web/aprsc.js
+++ b/src/web/aprsc.js
@@ -740,6 +740,7 @@ app.controller('aprscc', [ '$scope', '$http', 'graphs', 'ngDialog', function($sc
 			if ($scope.status) {
 				d.tick_dif = d.server.tick_now - $scope.status.server.tick_now;
 				$scope.status['clients_id'] = array_to_dict_by_id($scope.status.clients);
+				$scope.status['uplinks_id'] = array_to_dict_by_id($scope.status.uplinks);
 				$scope.status['listeners_id'] = array_to_dict_by_id($scope.status.listeners);
 			}
 			
diff --git a/src/web/index.html b/src/web/index.html
index 3ccef79..bdd1f1f 100644
--- a/src/web/index.html
+++ b/src/web/index.html
@@ -152,8 +152,8 @@
   <td ng-class='pkts_rx_class(c)' ng-click='pkts_rx_dialog(c)'>{{ c.pkts_rx }}/{{ c.pkts_dup }}/{{ c.pkts_ign }}</td>
   <td>{{ c.bytes_tx }}</td>
   <td>{{ c.bytes_rx }}</td>
-  <td><span ng-show='status.tick_dif'>{{ (c.bytes_tx - status_prev.clients_id[c.id].bytes_tx) / status.tick_dif | ratestr }}
-       / {{ (c.bytes_rx - status_prev.clients_id[c.id].bytes_rx) / status.tick_dif | ratestr }}</span></td>
+  <td><span ng-show='status.tick_dif'>{{ (c.bytes_tx - status_prev.uplinks_id[c.id].bytes_tx) / status.tick_dif | ratestr }}
+       / {{ (c.bytes_rx - status_prev.uplinks_id[c.id].bytes_rx) / status.tick_dif | ratestr }}</span></td>
   <td>{{ c.obuf_q }}</td>
   </tr>
 </table>