status: Fix byte rates calculation for uplinks
This commit is contained in:
parent
8c09df0364
commit
0975b1ccce
|
|
@ -740,6 +740,7 @@ app.controller('aprscc', [ '$scope', '$http', 'graphs', 'ngDialog', function($sc
|
||||||
if ($scope.status) {
|
if ($scope.status) {
|
||||||
d.tick_dif = d.server.tick_now - $scope.status.server.tick_now;
|
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['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);
|
$scope.status['listeners_id'] = array_to_dict_by_id($scope.status.listeners);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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 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_tx }}</td>
|
||||||
<td>{{ c.bytes_rx }}</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 }}
|
<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.clients_id[c.id].bytes_rx) / status.tick_dif | ratestr }}</span></td>
|
/ {{ (c.bytes_rx - status_prev.uplinks_id[c.id].bytes_rx) / status.tick_dif | ratestr }}</span></td>
|
||||||
<td>{{ c.obuf_q }}</td>
|
<td>{{ c.obuf_q }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue