diff --git a/server/src/resolvers/WifiDevice.js b/server/src/resolvers/WifiDevice.js
index 52a20ab..b5496a2 100644
--- a/server/src/resolvers/WifiDevice.js
+++ b/server/src/resolvers/WifiDevice.js
@@ -15,6 +15,8 @@ const WifiDevice = {
})
).user,
+ usage: parent => parent.usage < 0 ? parent.usage * -1 : parent.usage,
+
accessPoint: async parent => {
try {
diff --git a/web/src/plugins/format-bytes.js b/web/src/plugins/format-bytes.js
index fd5d505..0ab0cc8 100644
--- a/web/src/plugins/format-bytes.js
+++ b/web/src/plugins/format-bytes.js
@@ -1,13 +1,18 @@
import Vue from 'vue'
-function bytes(bytes, decimals, kib, maxUnit) {
- console.log(bytes, decimals, kib, maxUnit)
+function bytes(bytes, kib, maxUnit) {
+ const decimals = 1
+
kib = kib || false
+
+ if (bytes < 0) bytes = bytes * -1
+
if (bytes === 0) return '0 Bytes'
+
if (isNaN(parseFloat(bytes)) && !isFinite(bytes)) return ''
+
const k = kib ? 1024 : 1000
- const dm =
- decimals != null && !isNaN(decimals) && decimals >= 0 ? decimals : 2
+
const sizes = kib
? ['Bytes', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB', 'BiB']
: ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB', 'BB']
@@ -16,7 +21,7 @@ function bytes(bytes, decimals, kib, maxUnit) {
const index = sizes.indexOf(maxUnit)
if (index != -1) i = index
}
- return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i]
+ return parseFloat((bytes / Math.pow(k, i)).toFixed(decimals)) + ' ' + sizes[i]
}
Vue.filter('bytes', bytes)
diff --git a/web/src/views/AccessPoints/clients.vue b/web/src/views/AccessPoints/clients.vue
index 433e451..ed994b0 100644
--- a/web/src/views/AccessPoints/clients.vue
+++ b/web/src/views/AccessPoints/clients.vue
@@ -89,7 +89,7 @@
- {{ speed }} Mbps
+ {{ speed }} Mbps
@@ -97,20 +97,23 @@
- {{ protocol || 'Indisponível' }}
+ {{ protocol }}
+ -
- {{ frequency || 'Indisponível' }}
+ {{ frequency || '-' }}
- mdi-account-group
+ mdi-account-group
{{ accessPoint.wifiDevices.length }} clientes conectados
- Voltar
+
+ Voltar
+
@@ -136,10 +139,10 @@ export default {
{ text: 'Uptime', value: 'uptime' },
{ text: 'Usuário', value: 'user' },
{ text: 'Sinal', value: 'signalStrength' },
- { text: 'Frequência', value: 'frequency' },
+ { text: 'Frequência', value: 'frequency', align: 'end' },
{ text: 'Protocolo', value: 'protocol' },
- { text: 'Velocidade', value: 'speed' },
- { text: 'Uso', value: 'usage' }
+ { text: 'Velocidade', value: 'speed', align: 'end' },
+ { text: 'Uso', value: 'usage', align: 'end' }
]
}),
watch: {