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

Bugfix

Browse Source
This commit is contained in:
Douglas Barone 2022-04-04 12:07:43 -04:00
parent c5785757ee
commit fcedb29135
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
server/src/resolvers/Query/userPresence.js
View File

@ -19,19 +19,19 @@ export async function userPresence(_, { search }) {
const filteredUsers = search const filteredUsers = search
? usersWithWifiDevices.filter( ? usersWithWifiDevices.filter(
user => user =>
Object.keys(user).some( Object.keys(user).some(
key => typeof user[key] == 'string' && user[key].contains(search) key => typeof user[key] == 'string' && user[key].contains(search)
) || ) ||
user.wifiDevices?.some( user.wifiDevices?.some(
device => device =>
device.status != 'OFFLINE' && device.status != 'OFFLINE' &&
(device.ip?.startsWith(search) || (device.ip?.startsWith(search) ||
device.apName?.contains(search) || device.apName?.contains(search) ||
device.essid?.contains(search) || device.essid?.contains(search) ||
device.hostname?.contains(search)) device.hostname?.contains(search))
) )
) )
: usersWithWifiDevices : usersWithWifiDevices
const sortedUsers = filteredUsers.sort((a, b) => { const sortedUsers = filteredUsers.sort((a, b) => {
@ -62,8 +62,8 @@ export async function userPresence(_, { search }) {
thumbnailPhoto: userPresence.thumbnailPhoto, thumbnailPhoto: userPresence.thumbnailPhoto,
lastSeen: userPresence.wifiDevices[0].lastSeen, lastSeen: userPresence.wifiDevices[0].lastSeen,
status: userPresence.wifiDevices[0].status, status: userPresence.wifiDevices[0].status,
apName: userPresence.wifiDevices[0].apName, apName: userPresence.wifiDevices[0].accessPoint?.name || userPresence.wifiDevices[0].apName || userPresence.wifiDevices[0].accessPoint?.hostname,
local: userPresence.wifiDevices[0].accessPoint.local local: userPresence.wifiDevices[0].accessPoint?.local
})) }))
.slice(0, 200) .slice(0, 200)
} }

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

@ -139,8 +139,15 @@
<span class="font-weight-medium">On-line</span> <span class="font-weight-medium">On-line</span>
</v-list-item-subtitle> </v-list-item-subtitle>
<v-list-item-subtitle> <v-list-item-subtitle>
<span class="font-weight-medium"> <span
{{ userPresence.local || userPresence.apName }} v-if="userPresence.local"
class="font-weight-medium"
>
{{ userPresence.local }}
</span>
<span v-else>
Próximo ao AP
{{ userPresence.apName }}
</span> </span>
</v-list-item-subtitle> </v-list-item-subtitle>
</template> </template>