diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/pages/admin_arrive.php | 12 | ||||
| -rw-r--r-- | includes/pages/user_settings.php | 2 | ||||
| -rw-r--r-- | includes/view/User_view.php | 5 |
3 files changed, 9 insertions, 10 deletions
diff --git a/includes/pages/admin_arrive.php b/includes/pages/admin_arrive.php index f06c2c55..40b8bf44 100644 --- a/includes/pages/admin_arrive.php +++ b/includes/pages/admin_arrive.php @@ -29,9 +29,8 @@ function admin_arrive() $user_source = User::find($user_id); if ($user_source) { $user_source->state->arrived = false; + $user_source->state->arrival_date = null; $user_source->state->save(); - $user_source->personalData->arrival_date = null; - $user_source->personalData->save(); engelsystem_log('User set to not arrived: ' . User_Nick_render($user_source)); success(__('Reset done. Angel has not arrived.')); @@ -44,8 +43,7 @@ function admin_arrive() $user_source = User::find($user_id); if ($user_source) { $user_source->state->arrived = true; - $user_source->state->save(); - $user_source->personalData->arrival_date = new Carbon\Carbon(); + $user_source->state->arrival_date = new Carbon\Carbon(); $user_source->personalData->save(); engelsystem_log('User set has arrived: ' . User_Nick_render($user_source)); @@ -89,7 +87,7 @@ function admin_arrive() $usr['rendered_planned_departure_date'] = '-'; } $usr['rendered_planned_arrival_date'] = $usr->personalData->planned_arrival_date->format('Y-m-d'); - $usr['rendered_arrival_date'] = $usr->personalData->arrival_date ? $usr->personalData->arrival_date->format('Y-m-d') : '-'; + $usr['rendered_arrival_date'] = $usr->state->arrival_date ? $usr->state->arrival_date->format('Y-m-d') : '-'; $usr['arrived'] = $usr->state->arrived ? __('yes') : ''; $usr['actions'] = $usr->state->arrived == 1 ? '<a href="' . page_link_to( @@ -101,8 +99,8 @@ function admin_arrive() ['arrived' => $usr->id, 'search' => $search] ) . '">' . __('arrived') . '</a>'; - if ($usr->personalData->arrival_date) { - $day = $usr->personalData->arrival_date->format('Y-m-d'); + if ($usr->state->arrival_date) { + $day = $usr->state->arrival_date->format('Y-m-d'); if (!isset($arrival_count_at_day[$day])) { $arrival_count_at_day[$day] = 0; } diff --git a/includes/pages/user_settings.php b/includes/pages/user_settings.php index fbcd8baf..bc97099e 100644 --- a/includes/pages/user_settings.php +++ b/includes/pages/user_settings.php @@ -57,7 +57,7 @@ function user_settings_main($user_source, $enable_tshirt_size, $tshirt_sizes) if ($request->has('planned_departure_date')) { $tmp = parse_date('Y-m-d H:i', $request->input('planned_departure_date') . ' 00:00'); - $result = User_validate_planned_departure_date($user_source->personalData->arrival_date->getTimestamp(), $tmp); + $result = User_validate_planned_departure_date($user_source->state->arrival_date->getTimestamp(), $tmp); $user_source->personalData->planned_departure_date = Carbon::createFromTimestamp($result->getValue()); if (!$result->isValid()) { $valid = false; diff --git a/includes/view/User_view.php b/includes/view/User_view.php index bcf9aff7..cfafaeb1 100644 --- a/includes/view/User_view.php +++ b/includes/view/User_view.php @@ -25,6 +25,7 @@ function User_settings_view( $tshirt_sizes ) { $personalData = $user_source->personalData; + $state = $user_source->state; return page_with_title(settings_title(), [ msg(), div('row', [ @@ -38,7 +39,7 @@ function User_settings_view( form_date( 'planned_arrival_date', __('Planned date of arrival') . ' ' . entry_required(), - $personalData->arrival_date ? $personalData->arrival_date->getTimestamp() : '', + $state->arrival_date ? $state->arrival_date->getTimestamp() : '', $buildup_start_date, $teardown_end_date ), @@ -726,7 +727,7 @@ function User_view_state_admin($freeloader, $user_source) $state[] = '<span class="text-success">' . glyph('home') . sprintf( __('Arrived at %s'), - $user_source->personalData->arrival_date ? $user_source->personalData->arrival_date->format('Y-m-d') : '' + $user_source->state->arrival_date ? $user_source->state->arrival_date->format('Y-m-d') : '' ) . '</span>'; |