From f3d42e7b5372b76b43f32f8c8c9b25f39069c904 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Mon, 17 Feb 2020 12:00:00 -0800 Subject: [PATCH] Show Gbps bandwidth --- data/interfaces/default/current_activity_instance.html | 4 +++- data/interfaces/default/index.html | 10 ++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/data/interfaces/default/current_activity_instance.html b/data/interfaces/default/current_activity_instance.html index 96f57096..474d4a6a 100644 --- a/data/interfaces/default/current_activity_instance.html +++ b/data/interfaces/default/current_activity_instance.html @@ -330,7 +330,9 @@ DOCUMENTATION :: END % if data['media_type'] != 'photo' and data['bandwidth'] != 'Unknown': <% bw = helpers.cast_to_int(data['bandwidth']) - if bw > 1000: + if bw > 1000000: + bw = str(round(bw / 1000000.0, 1)) + ' Gbps' + elif bw > 1000: bw = str(round(bw / 1000.0, 1)) + ' Mbps' else: bw = str(bw) + ' kbps' diff --git a/data/interfaces/default/index.html b/data/interfaces/default/index.html index 969cfd88..e2fe56c1 100644 --- a/data/interfaces/default/index.html +++ b/data/interfaces/default/index.html @@ -334,13 +334,13 @@ streams_header = streams_header.replace(/, $/, '') + ')'; $('#currentActivityHeader-streams').text(streams_header); - var bandwidth_header = ((total_bw > 1000) ? ((total_bw / 1000).toFixed(1) + ' Mbps') : (total_bw + ' kbps')); + var bandwidth_header = ((total_bw > 1000000) ? ((total_bw / 1000000).toFixed(1) + ' Gbps') : ((total_bw > 1000) ? ((total_bw / 1000).toFixed(1) + ' Mbps') : (total_bw + ' kbps'))); var lan_wan_bandwidth_header = ''; if (lan_bw) { - lan_wan_bandwidth_header += 'LAN: ' + ((lan_bw > 1000) ? ((lan_bw / 1000).toFixed(1) + ' Mbps') : (lan_bw + ' kbps')) + ', '; + lan_wan_bandwidth_header += 'LAN: ' + ((lan_bw > 1000000) ? ((lan_bw / 1000000).toFixed(1) + ' Gbps') : ((lan_bw > 1000) ? ((lan_bw / 1000).toFixed(1) + ' Mbps') : (lan_bw + ' kbps'))); + ', '; } if (wan_bw) { - lan_wan_bandwidth_header += 'WAN: ' + ((wan_bw > 1000) ? ((wan_bw / 1000).toFixed(1) + ' Mbps') : (wan_bw + ' kbps')) + ', '; + lan_wan_bandwidth_header += 'WAN: ' + ((wan_bw > 1000000) ? ((wan_bw / 1000000).toFixed(1) + ' Gbps') : ((wan_bw > 1000) ? ((wan_bw / 1000).toFixed(1) + ' Mbps') : (wan_bw + ' kbps'))); + ', '; } if (lan_wan_bandwidth_header) { bandwidth_header += ' (' + lan_wan_bandwidth_header.replace(/, $/, '') + ')'; @@ -507,7 +507,9 @@ if (s.media_type !== 'photo' && s.quality_profile !== 'Unknown') { var br = parseInt(s.stream_bitrate) || ''; if (br) { - if (br > 1000) { + if (br > 1000000) { + br = ' (' + (br / 1000000).toFixed(1) + ' Gbps)'; + } else if (br > 1000) { br = ' (' + (br / 1000).toFixed(1) + ' Mbps)'; } else { br = ' (' + br + ' kbps)';