diff options
Diffstat (limited to 'includes/pages')
| -rw-r--r-- | includes/pages/admin_active.php | 42 | ||||
| -rw-r--r-- | includes/pages/user_shifts.php | 16 |
2 files changed, 32 insertions, 26 deletions
diff --git a/includes/pages/admin_active.php b/includes/pages/admin_active.php index 576cdc49..2616de6c 100644 --- a/includes/pages/admin_active.php +++ b/includes/pages/admin_active.php @@ -58,7 +58,10 @@ function admin_active() SELECT `User`.*, COUNT(`ShiftEntry`.`id`) AS `shift_count`, - %s AS `shift_length` + (%s + ( + SELECT COALESCE(SUM(`work_hours`) * 3600, 0) FROM `UserWorkLog` WHERE `user_id`=`User`.`UID` + AND `work_timestamp` < %s + )) AS `shift_length` FROM `User` LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID` LEFT JOIN `Shifts` ON `ShiftEntry`.`SID` = `Shifts`.`SID` @@ -69,6 +72,7 @@ function admin_active() %s ', $shift_sum_formula, + time(), $limit )); $user_nicks = []; @@ -140,7 +144,10 @@ function admin_active() SELECT `User`.*, COUNT(`ShiftEntry`.`id`) AS `shift_count`, - %s AS `shift_length` + (%s + ( + SELECT COALESCE(SUM(`work_hours`) * 3600, 0) FROM `UserWorkLog` WHERE `user_id`=`User`.`UID` + AND `work_timestamp` < %s + )) AS `shift_length` FROM `User` LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID` LEFT JOIN `Shifts` ON `ShiftEntry`.`SID` = `Shifts`.`SID` ' . ($show_all_shifts ? '' : 'AND (`Shifts`.`end` < ' . time() . " OR `Shifts`.`end` IS NULL)") . ' @@ -150,6 +157,7 @@ function admin_active() %s ', $shift_sum_formula, + time(), $limit )); $matched_users = []; @@ -174,7 +182,7 @@ function admin_active() $usr['nick'] = User_Nick_render($usr); $usr['shirt_size'] = $tshirt_sizes[$usr['Size']]; $usr['work_time'] = round($usr['shift_length'] / 60) - . ' min (' . round($usr['shift_length'] / 3600) . ' h)'; + . ' min (' . sprintf('%.2f', $usr['shift_length'] / 3600) . ' h)'; $usr['active'] = glyph_bool($usr['Aktiv'] == 1); $usr['force_active'] = glyph_bool($usr['force_active'] == 1); $usr['tshirt'] = glyph_bool($usr['Tshirt'] == 1); @@ -192,22 +200,26 @@ function admin_active() . _('set active') . '</a>'; } - if ($usr['Aktiv'] == 1 && $usr['Tshirt'] == 0) { + if ($usr['Aktiv'] == 1) { $parametersRemove = [ 'not_active' => $usr['UID'], 'search' => $search, ]; + if ($show_all_shifts) { + $parametersRemove['show_all_shifts'] = 1; + } + $actions[] = '<a href="' . page_link_to('admin_active', $parametersRemove) . '">' + . _('remove active') + . '</a>'; + } + if ($usr['Tshirt'] == 0) { $parametersShirt = [ 'tshirt' => $usr['UID'], 'search' => $search, ]; if ($show_all_shifts) { - $parametersRemove['show_all_shifts'] = 1; $parametersShirt['show_all_shifts'] = 1; } - $actions[] = '<a href="' . page_link_to('admin_active', $parametersRemove) . '">' - . _('remove active') - . '</a>'; $actions[] = '<a href="' . page_link_to('admin_active', $parametersShirt) . '">' . _('got t-shirt') . '</a>'; @@ -233,12 +245,6 @@ function admin_active() $shirt_statistics = []; foreach (array_keys($tshirt_sizes) as $size) { if (!empty($size)) { - $sc = DB::selectOne( - 'SELECT count(*) FROM `User` WHERE `Size`=? AND `Gekommen`=1', - [$size] - ); - $sc = array_shift($sc); - $gc = DB::selectOne( 'SELECT count(*) FROM `User` WHERE `Size`=? AND `Tshirt`=1', [$size] @@ -247,19 +253,16 @@ function admin_active() $shirt_statistics[] = [ 'size' => $size, - 'needed' => (int)$sc, 'given' => (int)$gc ]; } } - $shirtCount = DB::selectOne('SELECT count(*) FROM `User` WHERE `Tshirt`=1'); - $shirtCount = array_shift($shirtCount); + $shirtCount = User_tshirts_count(); $shirt_statistics[] = [ 'size' => '<b>' . _('Sum') . '</b>', - 'needed' => '<b>' . User_arrived_count() . '</b>', - 'given' => '<b>' . (int)$shirtCount . '</b>' + 'given' => '<b>' . $shirtCount . '</b>' ]; return page_with_title(admin_active_title(), [ @@ -286,7 +289,6 @@ function admin_active() '<h2>' . _('Shirt statistics') . '</h2>', table([ 'size' => _('Size'), - 'needed' => _('Needed shirts'), 'given' => _('Given shirts') ], $shirt_statistics) ]); diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php index 0be4aa67..81b405b1 100644 --- a/includes/pages/user_shifts.php +++ b/includes/pages/user_shifts.php @@ -313,11 +313,19 @@ function get_ids_from_array($array) */ function make_select($items, $selected, $name, $title = null, $additionalButtons = []) { + $html = ''; $htmlItems = []; if (isset($title)) { - $htmlItems[] = '<h4>' . $title . '</h4>' . "\n"; + $html .= '<h4>' . $title . '</h4>' . "\n"; } + $buttons = []; + $buttons[] = button('javascript: checkAll(\'selection_' . $name . '\', true)', _('All')); + $buttons[] = button('javascript: checkAll(\'selection_' . $name . '\', false)', _('None')); + $buttons = array_merge($buttons, $additionalButtons); + + $html .= buttons($buttons); + foreach ($items as $i) { $htmlItems[] = '<div class="checkbox">' . '<label><input type="checkbox" name="' . $name . '[]" value="' . $i['id'] . '" ' @@ -326,13 +334,9 @@ function make_select($items, $selected, $name, $title = null, $additionalButtons . (!isset($i['enabled']) || $i['enabled'] ? '' : glyph('lock')) . '</div><br />'; } - $html = '<div id="selection_' . $name . '" class="selection ' . $name . '">' . "\n"; + $html .= '<div id="selection_' . $name . '" class="selection ' . $name . '">' . "\n"; $html .= implode("\n", $htmlItems); - $buttons = []; - $buttons[] = button('javascript: checkAll(\'selection_' . $name . '\', true)', _('All')); - $buttons[] = button('javascript: checkAll(\'selection_' . $name . '\', false)', _('None')); - $buttons = array_merge($buttons, $additionalButtons); $html .= buttons($buttons); $html .= '</div>' . "\n"; |