Improved sorting

server/package-lock.json

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

server/package.json

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

server/src/resolvers/Query/userPresence.js

@@ -44,7 +44,9 @@ export async function userPresence(_, { search, onlyServants }) {
     )
     : usersWithWifiDevices
 
-  const sortedUsers = filteredUsers.sort((a, b) => {
+  const sortedUsers = filteredUsers
+    .sort((a, b) => b.displayName.localeCompare(a.displayName))
+    .sort((a, b) => {
       const [aStatus, bStatus] = [
         a.wifiDevices[0].status,
         b.wifiDevices[0].status
@@ -62,7 +64,7 @@ export async function userPresence(_, { search, onlyServants }) {
       )
         return 1
 
-    return 0
+      return a.wifiDevices[0].lastSeen < b.wifiDevices[0].lastSeen ? 1 : -1
     })
 
   const userPresence = sortedUsers

web/package-lock.json

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

web/package.json

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

web/src/views/UserPresence.vue

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