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

Merge pull request #627 from MyIgel/users-sort-planned-dates 

Users overview: Order by planned arrival/departure dates
This commit is contained in:
msquare 2019-07-25 18:54:53 +02:00 committed by GitHub
parent 54536d146c af580389c1
commit f3468e3880
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/controller/users_controller.php
View File

@ -277,6 +277,8 @@ function users_list_controller()
'active', 'active',
'force_active', 'force_active',
'got_shirt', 'got_shirt',
'planned_arrival_date',
'planned_departure_date',
'last_login_at', 'last_login_at',
])) { ])) {
$order_by = $request->input('OrderBy'); $order_by = $request->input('OrderBy');

32
includes/view/User_view.php
View File

@ -232,6 +232,10 @@ function Users_view(
$u['force_active'] = glyph_bool($user->state->force_active); $u['force_active'] = glyph_bool($user->state->force_active);
$u['got_shirt'] = glyph_bool($user->state->got_shirt); $u['got_shirt'] = glyph_bool($user->state->got_shirt);
$u['shirt_size'] = $user->personalData->shirt_size; $u['shirt_size'] = $user->personalData->shirt_size;
$u['arrival_date'] = $user->personalData->planned_arrival_date
? $user->personalData->planned_arrival_date->format(__('Y-m-d')) : '';
$u['departure_date'] = $user->personalData->planned_departure_date
? $user->personalData->planned_departure_date->format(__('Y-m-d')) : '';
$u['last_login_at'] = $user->last_login_at ? $user->last_login_at->format(__('m/d/Y h:i a')) : ''; $u['last_login_at'] = $user->last_login_at ? $user->last_login_at->format(__('m/d/Y h:i a')) : '';
$u['actions'] = table_buttons([ $u['actions'] = table_buttons([
button_glyph(page_link_to('admin_user', ['id' => $user->id]), 'edit', 'btn-xs') button_glyph(page_link_to('admin_user', ['id' => $user->id]), 'edit', 'btn-xs')
@ -255,19 +259,21 @@ function Users_view(
button(page_link_to('register'), glyph('plus') . __('New user')) button(page_link_to('register'), glyph('plus') . __('New user'))
]), ]),
table([ table([
'name' => Users_table_header_link('name', __('Nick'), $order_by), 'name' => Users_table_header_link('name', __('Nick'), $order_by),
'first_name' => Users_table_header_link('first_name', __('Prename'), $order_by), 'first_name' => Users_table_header_link('first_name', __('Prename'), $order_by),
'last_name' => Users_table_header_link('last_name', __('Name'), $order_by), 'last_name' => Users_table_header_link('last_name', __('Name'), $order_by),
'dect' => Users_table_header_link('dect', __('DECT'), $order_by), 'dect' => Users_table_header_link('dect', __('DECT'), $order_by),
'arrived' => Users_table_header_link('arrived', __('Arrived'), $order_by), 'arrived' => Users_table_header_link('arrived', __('Arrived'), $order_by),
'got_voucher' => Users_table_header_link('got_voucher', __('Voucher'), $order_by), 'got_voucher' => Users_table_header_link('got_voucher', __('Voucher'), $order_by),
'freeloads' => __('Freeloads'), 'freeloads' => __('Freeloads'),
'active' => Users_table_header_link('active', __('Active'), $order_by), 'active' => Users_table_header_link('active', __('Active'), $order_by),
'force_active' => Users_table_header_link('force_active', __('Forced'), $order_by), 'force_active' => Users_table_header_link('force_active', __('Forced'), $order_by),
'got_shirt' => Users_table_header_link('got_shirt', __('T-Shirt'), $order_by), 'got_shirt' => Users_table_header_link('got_shirt', __('T-Shirt'), $order_by),
'shirt_size' => Users_table_header_link('shirt_size', __('Size'), $order_by), 'shirt_size' => Users_table_header_link('shirt_size', __('Size'), $order_by),
'last_login_at' => Users_table_header_link('last_login_at', __('Last login'), $order_by), 'arrival_date' => Users_table_header_link('planned_arrival_date', __('Planned arrival'), $order_by),
'actions' => '' 'departure_date' => Users_table_header_link('planned_departure_date', __('Planned departure'), $order_by),
'last_login_at' => Users_table_header_link('last_login_at', __('Last login'), $order_by),
'actions' => ''
], $usersList) ], $usersList)
]); ]);
} }