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

Fix: properly sort itens

Browse Source
This commit is contained in:
Douglas Barone 2020-12-16 11:24:52 -04:00
parent acbe13a0b1
commit ed65680a3b
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/resolvers/Query.js
View File

@ -97,13 +97,11 @@ const Query = {
include: { wifiDevices: true }
})
wifiUsers.sort(
return wifiUsers.sort(
(a, b) =>
b.wifiDevices.filter(device => device.isOnline).length -
a.wifiDevices.filter(device => device.isOnline).length
b.wifiDevices.filter(device => device.status == 'ONLINE').length -
a.wifiDevices.filter(device => device.status == 'ONLINE').length
)
return wifiUsers
},
async userPresence(_, { search }) {

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

@ -211,15 +211,7 @@ export default {
}),
computed: {
sortedWifiUsers() {
const wifiUsers = [...this.wifiUsers]
return wifiUsers
?.sort(
(a, b) =>
b.wifiDevices.filter(device => device.isOnline).length -
a.wifiDevices.filter(device => device.isOnline).length
)
.map(user => ({
return this.wifiUsers?.map(user => ({
...user,
ips: user.wifiDevices.reduce((ips, device) => ` ${device.ip}`, ''),
wifiDevices: user.wifiDevices.sort(a => (a.isOnline ? -1 : 1))