From 4ee429a27b423188b64fc581b4356fe50de2f1d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20H=C3=A4usler?= Date: Thu, 14 Jul 2011 20:57:02 +0200 Subject: [PATCH] #6, shift registration and shift entry administration --- includes/pages/user_shifts.php | 90 ++++++++++++++++++++++++++-------- 1 file changed, 69 insertions(+), 21 deletions(-) diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php index cb1a8641..a2ce5f77 100644 --- a/includes/pages/user_shifts.php +++ b/includes/pages/user_shifts.php @@ -1,8 +1,16 @@ View my shifts »'; } + if (in_array('user_shifts_admin', $privileges)) { + $users = sql_select("SELECT * FROM `User` ORDER BY `Nick`"); + $users_select = array (); + foreach ($users as $usr) + $users_select[$usr['UID']] = $usr['Nick']; + $user_text = html_select_key('user_id', $users_select, $user['UID']); + } else + $user_text = $user['Nick']; + return template_render('../templates/user_shifts_add.html', array ( 'date' => date("Y-m-d H:i", $shift['start']) . ', ' . date("H:i", $shift['end'] - $shift['start']) . 'h', 'title' => $shift['name'], 'location' => $shift['Name'], - 'angel' => $user['Nick'], + 'angel' => $user_text, 'type' => $type['Name'] )); } else { @@ -42,43 +76,53 @@ function user_shifts() { foreach ($shifts as $shift) $days[] = date("Y-m-d", $shift['start']); $days = array_unique($days); - if (count($days) == 0) - return "None"; $day = $days[0]; if (isset ($_REQUEST['day'])) $day = $_REQUEST['day']; $rooms = sql_select("SELECT * FROM `Room` WHERE `show`='Y' ORDER BY `Name`"); - if (count($rooms) == 0) - return "None"; - $id = $rooms[0]['RID']; + $id = 0; if (isset ($_REQUEST['room_id']) && preg_match("/^[0-9]*$/", $_REQUEST['room_id'])) $id = $_REQUEST['room_id']; $day_timestamp = DateTime :: createFromFormat("Y-m-d-Hi", $day . "-0000")->getTimestamp(); - $shifts = sql_select("SELECT * FROM `Shifts` WHERE `RID`=" . sql_escape($id) . " AND `start` >= " . sql_escape($day_timestamp) . " AND `start` < " . sql_escape($day_timestamp +24 * 60 * 60) . " ORDER BY `start`"); + + if ($id == 0) + $shifts = sql_select("SELECT * FROM `Shifts` JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) ORDER BY `start`"); + else + $shifts = sql_select("SELECT * FROM `Shifts` WHERE `RID`=" . sql_escape($id) . " AND `start` >= " . sql_escape($day_timestamp) . " AND `start` < " . sql_escape($day_timestamp +24 * 60 * 60) . " ORDER BY `start`"); $shifts_table = ""; + $row_count = 0; foreach ($shifts as $shift) { - $shifts_table .= '' . date("H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']) . '' . $shift['name'] . '
'; - $angeltypes = sql_select("SELECT * FROM `RoomAngelTypes` JOIN `AngelTypes` ON (`RoomAngelTypes`.`angel_type_id` = `AngelTypes`.`TID`) WHERE `room_id`=" . sql_escape($id) . " AND `count` > 0 ORDER BY `AngelTypes`.`Name`"); + $shift_row = '' . date(($id == 0 ? "Y-m-d " : "") . "H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']) .($id == 0 ? "
".$shift['Name'] : ""). '' . $shift['name'] . '
'; + $show_shift = false; + $angeltypes = sql_select("SELECT * FROM `RoomAngelTypes` JOIN `AngelTypes` ON (`RoomAngelTypes`.`angel_type_id` = `AngelTypes`.`TID`) WHERE `room_id`=" . sql_escape($shift['RID']) . " AND `count` > 0 ORDER BY `AngelTypes`.`Name`"); + if (count($angeltypes) > 0) { $my_shift = sql_num_query("SELECT * FROM `ShiftEntry` WHERE `SID`=" . sql_escape($shift['SID']) . " AND `UID`=" . sql_escape($user['UID']) . " LIMIT 1") > 0; foreach ($angeltypes as $angeltype) { - $shifts_table .= '' . $angeltype['Name'] . ': '; $entries = sql_select("SELECT * FROM `ShiftEntry` JOIN `User` ON (`ShiftEntry`.`UID` = `User`.`UID`) WHERE `SID`=" . sql_escape($shift['SID']) . " AND `TID`=" . sql_escape($angeltype['TID']) . " ORDER BY `Nick`"); $entry_list = array (); - foreach ($entries as $entry) - $entry_list[] = $entry['Nick']; - if ($angeltype['count'] - count($entries) > 0) - if (!$my_shift || in_array('user_shift_admin', $privileges)) - $entry_list[] = '' . ($angeltype['count'] - count($entries)) . ' angel missing »'; + foreach ($entries as $entry) { + if (in_array('user_shifts_admin', $privileges)) + $entry_list[] = $entry['Nick'] . ' [x]'; else + $entry_list[] = $entry['Nick']; + } + if ($angeltype['count'] - count($entries) > 0) + if (!$my_shift || in_array('user_shifts_admin', $privileges)) { + $entry_list[] = '' . ($angeltype['count'] - count($entries)) . ' angel' . ($angeltype['count'] - count($entries) != 1 ? 's' : '') . ' missing »'; + $show_shift = true; + } else $entry_list[] = ($angeltype['count'] - count($entries)) . ' angel missing'; - $shifts_table .= join(", ", $entry_list); - $shifts_table .= '
'; + + $shift_row .= '' . $angeltype['Name'] . ': '; + $shift_row .= join(", ", $entry_list); + $shift_row .= '
'; } } - $shifts_table .= ''; + if ($id != 0 || ($show_shift && $row_count++ < 15)) + $shifts_table .= $shift_row . ''; } return template_render('../templates/user_shifts.html', array ( @@ -92,7 +136,7 @@ function user_shifts() { function make_day_select($days, $day, $id) { $html = array (); foreach ($days as $d) { - if ($day == $d) + if ($day == $d && $id != 0) $html[] = '' . $d . ''; else $html[] = '' . $d . ''; @@ -108,6 +152,10 @@ function make_room_select($rooms, $id, $day) { else $html[] = '' . $room['Name'] . ''; } + if ($id == 0) + $html[] = 'Next 15 free shifts'; + else + $html[] = 'Next 15 free shifts'; return join(' | ', $html); } ?> \ No newline at end of file