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

add user_info to admin_active

This commit is contained in:
Xu 2024-01-01 21:41:31 +01:00 committed by Igor Scheller
parent 0239bf1988
commit 8cff7aa205
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
includes/pages/admin_active.php
View File

@ -3,6 +3,7 @@
use Engelsystem\Helpers\Carbon; use Engelsystem\Helpers\Carbon;
use Engelsystem\Models\User\State; use Engelsystem\Models\User\State;
use Engelsystem\Models\User\User; use Engelsystem\Models\User\User;
use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
use Illuminate\Database\Query\Builder; use Illuminate\Database\Query\Builder;
use Illuminate\Database\Query\JoinClause; use Illuminate\Database\Query\JoinClause;
use Engelsystem\Config\GoodieType; use Engelsystem\Config\GoodieType;
@ -78,6 +79,11 @@ function admin_active()
->leftJoin('shifts', 'shift_entries.shift_id', '=', 'shifts.id') ->leftJoin('shifts', 'shift_entries.shift_id', '=', 'shifts.id')
->leftJoin('users_state', 'users.id', '=', 'users_state.user_id') ->leftJoin('users_state', 'users.id', '=', 'users_state.user_id')
->where('users_state.arrived', '=', true) ->where('users_state.arrived', '=', true)
->orWhere(function (EloquentBuilder $userinfo) {
$userinfo->where('users_state.arrived', '=', false)
->whereNotNull('users_state.user_info')
->whereNot('users_state.user_info', '');
})
->groupBy('users.id') ->groupBy('users.id')
->orderByDesc('force_active') ->orderByDesc('force_active')
->orderByDesc('shift_length') ->orderByDesc('shift_length')
@ -180,6 +186,11 @@ function admin_active()
}) })
->leftJoin('users_state', 'users.id', '=', 'users_state.user_id') ->leftJoin('users_state', 'users.id', '=', 'users_state.user_id')
->where('users_state.arrived', '=', true) ->where('users_state.arrived', '=', true)
->orWhere(function (EloquentBuilder $userinfo) {
$userinfo->where('users_state.arrived', '=', false)
->whereNotNull('users_state.user_info')
->whereNot('users_state.user_info', '');
})
->groupBy('users.id') ->groupBy('users.id')
->orderByDesc('force_active') ->orderByDesc('force_active')
->orderByDesc('shift_length') ->orderByDesc('shift_length')
@ -216,6 +227,14 @@ function admin_active()
$userData = []; $userData = [];
$userData['no'] = count($matched_users) + 1; $userData['no'] = count($matched_users) + 1;
$userData['nick'] = User_Nick_render($usr) . User_Pronoun_render($usr); $userData['nick'] = User_Nick_render($usr) . User_Pronoun_render($usr);
if ($usr->state->user_info) {
$userData['nick'] .=
' <small><span class="bi bi-info-circle-fill text-info"'
. (auth()->can('user.info.show')
? (' data-bs-toggle="tooltip" title="' . htmlspecialchars($usr->state->user_info) . '"')
: '')
. '></span></small>';
}
if ($goodie_tshirt) { if ($goodie_tshirt) {
$userData['shirt_size'] = (isset($tshirt_sizes[$shirtSize]) ? $tshirt_sizes[$shirtSize] : ''); $userData['shirt_size'] = (isset($tshirt_sizes[$shirtSize]) ? $tshirt_sizes[$shirtSize] : '');
} }