1839811/ifms-pti
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor to use isOnline prop

Browse Source
This commit is contained in:
Douglas Barone 2020-11-30 14:50:20 -04:00
parent 73fb2c49ae
commit 12b65aa560
6 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/src/components/UserPresenceStatusList.vue
View File

@ -10,9 +10,7 @@
<v-list-item-avatar size="52px" style="overflow: visible">
<v-badge
:color="
userPresence.wifiDevices.some(
wifiDevice => wifiDevice.status === 'ONLINE'
)
userPresence.wifiDevices.some(wifiDevice => wifiDevice.isOnline)
? 'green'
: 'grey'
"
@ -28,9 +26,7 @@
<v-list-item-title>
{{ userPresence.user.displayName }}
</v-list-item-title>
<v-list-item-subtitle
v-if="userPresence.wifiDevices[0].status === 'OFFLINE'"
>
<v-list-item-subtitle v-if="!userPresence.wifiDevices[0].isOnline">
<span class="font-weight-medium">Off-line.</span>
Visto {{ userPresence.wifiDevices[0].lastSeen | from }}
</v-list-item-subtitle>

6
web/src/components/WifiDevice.vue
View File

@ -3,9 +3,7 @@
<v-expansion-panel-header>
<v-icon
class="shrink mr-2"
:color="
wifiDevice.status === 'ONLINE' ? 'green darken-1' : 'grey lighten-1'
"
:color="wifiDevice.isOnline ? 'green darken-1' : 'grey lighten-1'"
>
mdi-cellphone-link
</v-icon>
@ -15,7 +13,7 @@
</v-expansion-panel-header>
<v-expansion-panel-content>
<v-list>
<v-list-item v-if="wifiDevice.status === 'ONLINE'">
<v-list-item v-if="wifiDevice.isOnline">
<v-list-item-action>
<v-icon color="green darken-1">mdi-wifi</v-icon>
</v-list-item-action>

2
web/src/components/widgets/DevicesWidget.vue
View File

@ -40,7 +40,7 @@ export default {
lastSeen
mac
oui
status
isOnline
uptime
}
}

2
web/src/views/UserPresence.vue
View File

@ -83,7 +83,7 @@ export default {
apName
id
lastSeen
status
isOnline
controller
}
}

3
web/src/views/WifiDevices.vue
View File

@ -212,7 +212,7 @@ export default {
ip
uptime
apName
status
isOnline
}
}
`
@ -225,7 +225,6 @@ export default {
return this.wifiDevices?.map(device => ({
...device,
hostname: device.hostname || 'Desconhecido',
isOnline: device.status == 'ONLINE',
displayName: device.user?.displayName || 'Não autenticado',
sAMAccountName: device.user?.sAMAccountName,
thumbnailPhoto: device.user?.thumbnailPhoto,

20
web/src/views/WifiUsers.vue
View File

@ -41,7 +41,7 @@
bottom
:content="
user.wifiDevices
.filter(wifiDevice => wifiDevice.status === 'ONLINE')
.filter(wifiDevice => wifiDevice.isOnline)
.length.toString()
"
>
@ -53,7 +53,7 @@
bottom
:content="
user.wifiDevices
.filter(wifiDevice => wifiDevice.status === 'OFFLINE')
.filter(wifiDevice => !wifiDevice.isOnline)
.length.toString()
"
>
@ -69,9 +69,7 @@
>
<v-expansion-panel-header>
<div>
<v-icon
left
:color="device.status == 'ONLINE' ? 'green' : ''"
<v-icon left :color="device.isOnline ? 'green' : ''"
>mdi-cellphone-wireless</v-icon
>
{{ device.hostname || device.mac }} {{ device.oui }}
@ -79,7 +77,7 @@
</v-expansion-panel-header>
<v-expansion-panel-content
><v-list dense>
<v-list-item v-if="device.status == 'ONLINE'">
<v-list-item v-if="device.isOnline">
<v-list-item-action>
<v-icon color="green darken-1">mdi-wifi</v-icon>
</v-list-item-action>
@ -197,14 +195,12 @@ export default {
return this.wifiUsers
?.sort(
(a, b) =>
b.wifiDevices.filter(device => device.status == 'ONLINE').length -
a.wifiDevices.filter(device => device.status == 'ONLINE').length
b.wifiDevices.filter(device => device.isOnline).length -
a.wifiDevices.filter(device => device.isOnline).length
)
.map(user => ({
...user,
wifiDevices: user.wifiDevices.sort(a =>
a.status == 'ONLINE' ? -1 : 1
)
wifiDevices: user.wifiDevices.sort(a => (a.isOnline ? -1 : 1))
}))
}
},
@ -224,7 +220,7 @@ export default {
hostname
firstSeen
lastSeen
status
isOnline
apName
essid
}