allerta-vvf
/
allerta-vvf
mirror of https://github.com/allerta-vvf/allerta-vvf
1
0
Fork 0
Code Issues Releases Wiki Activity

Update user list order

This commit is contained in:
Matteo Gheza 2023-09-01 15:14:12 +02:00
parent f9c50b0d2d
commit 20c90dce38
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/app/Http/Controllers/UserController.php
View File

@ -22,9 +22,10 @@ class UserController extends Controller
->select($requestedCols) ->select($requestedCols)
->orderBy('available', 'desc') ->orderBy('available', 'desc')
->orderBy('chief', 'desc') ->orderBy('chief', 'desc')
->orderBy('driver', 'desc')
->orderBy('services', 'asc') ->orderBy('services', 'asc')
->orderBy('trainings', 'desc') ->orderBy('trainings', 'desc')
->orderBy('availability_minutes', 'asc') ->orderBy('availability_minutes', 'desc')
->orderBy('name', 'asc') ->orderBy('name', 'asc')
->get(); ->get();
} }

10
backend/app/Telegram/WebhookController.php
View File

@ -167,7 +167,15 @@ class WebhookController extends
return; return;
} }
//Get all users with availability true //Get all users with availability true
$users = User::where('available', true)->where('hidden', false)->get(); $users = User::where('available', true)
->where('hidden', false)
->orderBy('chief', 'desc')
->orderBy('driver', 'desc')
->orderBy('services', 'asc')
->orderBy('trainings', 'desc')
->orderBy('availability_minutes', 'desc')
->orderBy('name', 'asc')
->get();
if(count($users) == 0) { if(count($users) == 0) {
$text = "⚠️ Nessun vigile attualmente disponibile."; $text = "⚠️ Nessun vigile attualmente disponibile.";
} else { } else {