diff options
author | msquare <msquare@notrademark.de> | 2019-12-27 19:47:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-27 19:47:52 +0100 |
commit | 0cab703c941e96d03072364c2082605f18245b5a (patch) | |
tree | 44ea0e2f23db7fa5a12bc5b971c56d773ed58c9f /includes/pages/admin_arrive.php | |
parent | 537179df66b1245f034e9bedeff7d74cbc6a7f5c (diff) | |
parent | e1471248fe8f8a4fc6edef28fe702245c2fde48d (diff) |
Merge pull request #705 from MyIgel/pronoun
User: Add pronoun statement
Diffstat (limited to 'includes/pages/admin_arrive.php')
-rw-r--r-- | includes/pages/admin_arrive.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/pages/admin_arrive.php b/includes/pages/admin_arrive.php index 312fd6dc..d6d7ad48 100644 --- a/includes/pages/admin_arrive.php +++ b/includes/pages/admin_arrive.php @@ -64,7 +64,7 @@ function admin_arrive() } /** @var User[] $users */ - $users = User::query()->orderBy('name')->get(); + $users = User::with('personalData')->orderBy('name')->get(); $arrival_count_at_day = []; $planned_arrival_count_at_day = []; $planned_departure_count_at_day = []; @@ -91,7 +91,7 @@ function admin_arrive() } } - $usr->name = User_Nick_render($usr); + $usr->name = User_Nick_render($usr) . User_Pronoun_render($usr); $plannedDepartureDate = $usr->personalData->planned_departure_date; $arrivalDate = $usr->state->arrival_date; $plannedArrivalDate = $usr->personalData->planned_arrival_date; |