iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Active angels page: Fix fa angels sorting

This commit is contained in:
Igor Scheller 2024-03-29 14:31:59 +01:00
parent c82e902360
commit fcf23d3824
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
includes/pages/admin_active.php
View File

@ -85,14 +85,14 @@ function admin_active()
->whereNotNull('users_state.user_info') ->whereNotNull('users_state.user_info')
->whereNot('users_state.user_info', ''); ->whereNot('users_state.user_info', '');
}) })
->groupBy('users.id') ->groupBy('users.id');
->orderByDesc('shift_length')
->orderByDesc('name')
->limit($count);
if (config('enable_force_active')) { if (config('enable_force_active')) {
$query->orderByDesc('force_active'); $query->orderByDesc('force_active');
} }
$query
->orderByDesc('shift_length')
->orderByDesc('name')
->limit($count);
$users = $query->get(); $users = $query->get();
$user_nicks = []; $user_nicks = [];
@ -195,13 +195,13 @@ function admin_active()
->whereNotNull('users_state.user_info') ->whereNotNull('users_state.user_info')
->whereNot('users_state.user_info', ''); ->whereNot('users_state.user_info', '');
}) })
->groupBy('users.id') ->groupBy('users.id');
->orderByDesc('shift_length')
->orderByDesc('name');
if (config('enable_force_active')) { if (config('enable_force_active')) {
$query->orderByDesc('force_active'); $query->orderByDesc('force_active');
} }
$query
->orderByDesc('shift_length')
->orderByDesc('name');
if (!is_null($count)) { if (!is_null($count)) {
$query->limit($count); $query->limit($count);