From 0e2b2573420cf318fc2cbd605b987adf7c2b60c1 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Sun, 24 Aug 2014 15:49:46 +0200 Subject: begin to refactor user shift state --- includes/view/User_view.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'includes/view') diff --git a/includes/view/User_view.php b/includes/view/User_view.php index 1824a1c4..e5405835 100644 --- a/includes/view/User_view.php +++ b/includes/view/User_view.php @@ -19,7 +19,7 @@ $tshirt_sizes = array( 'XL-G' => "XL Girl" ); -function User_shift_mode_render($shift_mode) { +function User_shift_state_render($user) { if ($shift_mode == 0) return '' . _("Free") . ''; if ($shift_mode > 8 * 3600) @@ -30,7 +30,7 @@ function User_shift_mode_render($shift_mode) { return '' . _("Current shift ends in") . ''; } -function User_view($user_source, $admin_user_privilege, $freeloader, $user_shift_mode, $user_angeltypes, $user_groups, $shifts, $its_me) { +function User_view($user_source, $admin_user_privilege, $freeloader, $user_angeltypes, $user_groups, $shifts, $its_me) { global $LETZTES_AUSTRAGEN, $privileges; $user_name = htmlspecialchars($user_source['Vorname']) . " " . htmlspecialchars($user_source['Name']); @@ -106,7 +106,7 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_shift div('col-md-3', array( '

' . _("User state") . '

', ($admin_user_privilege && $freeloader) ? ' ' . _("Freeloader") . '
' : '', - $user_source['Gekommen'] ? User_shift_mode_render($user_shift_mode) . '
' : '', + $user_source['Gekommen'] ? User_shift_state_render($user_source) . '
' : '', ($user_source['Gekommen'] ? ' ' . _("Arrived") . '' : '' . _("Not arrived") . ''), ($user_source['Gekommen'] && $admin_user_privilege && $user_source['Aktiv']) ? ' ' . _("Active") . '' : '', ($user_source['Gekommen'] && $admin_user_privilege && $user_source['Tshirt']) ? ' ' . _("T-Shirt") . '' : '' -- cgit v1.2.3-54-g00ecf