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

Improved sorting

Browse Source
This commit is contained in:
Douglas Barone 2022-04-28 13:33:59 -04:00
parent 3d7cdbf6dc
commit 9ecc501f0c
6 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "ifms-pti-svr", "name": "ifms-pti-svr",
"version": "2.13.3", "version": "2.14.0",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "ifms-pti-svr", "name": "ifms-pti-svr",
"version": "2.13.3", "version": "2.14.0",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@prisma/client": "^3.13.0", "@prisma/client": "^3.13.0",

2
server/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "ifms-pti-svr", "name": "ifms-pti-svr",
"version": "2.13.3", "version": "2.14.0",
"description": "Servidor do Portal de TI do IFMS", "description": "Servidor do Portal de TI do IFMS",
"main": "src/index.js", "main": "src/index.js",
"scripts": { "scripts": {

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

@ -44,26 +44,28 @@ export async function userPresence(_, { search, onlyServants }) {
) )
: usersWithWifiDevices : usersWithWifiDevices
const sortedUsers = filteredUsers.sort((a, b) => { const sortedUsers = filteredUsers
const [aStatus, bStatus] = [ .sort((a, b) => b.displayName.localeCompare(a.displayName))
a.wifiDevices[0].status, .sort((a, b) => {
b.wifiDevices[0].status const [aStatus, bStatus] = [
] a.wifiDevices[0].status,
if ( b.wifiDevices[0].status
(aStatus == 'ONLINE' && bStatus == 'RECENT') || ]
(aStatus == 'ONLINE' && bStatus == 'OFFLINE') || if (
(aStatus == 'RECENT' && bStatus == 'OFFLINE') (aStatus == 'ONLINE' && bStatus == 'RECENT') ||
) (aStatus == 'ONLINE' && bStatus == 'OFFLINE') ||
return -1 (aStatus == 'RECENT' && bStatus == 'OFFLINE')
if ( )
(bStatus == 'ONLINE' && aStatus == 'RECENT') || return -1
(bStatus == 'ONLINE' && aStatus == 'OFFLINE') || if (
(bStatus == 'RECENT' && aStatus == 'OFFLINE') (bStatus == 'ONLINE' && aStatus == 'RECENT') ||
) (bStatus == 'ONLINE' && aStatus == 'OFFLINE') ||
return 1 (bStatus == 'RECENT' && aStatus == 'OFFLINE')
)
return 1
return 0 return a.wifiDevices[0].lastSeen < b.wifiDevices[0].lastSeen ? 1 : -1
}) })
const userPresence = sortedUsers const userPresence = sortedUsers
.map(userPresence => ({ .map(userPresence => ({

4
web/package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "ifms-pti", "name": "ifms-pti",
"version": "2.13.3", "version": "2.14.0",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "ifms-pti", "name": "ifms-pti",
"version": "2.13.3", "version": "2.14.0",
"dependencies": { "dependencies": {
"@mdi/font": "^6.6.96", "@mdi/font": "^6.6.96",
"apollo-link-ws": "^1.0.20", "apollo-link-ws": "^1.0.20",

2
web/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "ifms-pti", "name": "ifms-pti",
"version": "2.13.3", "version": "2.14.0",
"private": true, "private": true,
"scripts": { "scripts": {
"serve": "vue-cli-service serve", "serve": "vue-cli-service serve",

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

@ -16,8 +16,6 @@
class="mt-5 ml-4" class="mt-5 ml-4"
hint="Somente servidores" hint="Somente servidores"
label="Somente servidores" label="Somente servidores"
v-bind="attrs"
v-on="on"
> >
</v-checkbox> </v-checkbox>
</v-toolbar> </v-toolbar>