From 4f220e30ce8d1a9df837fac8d9e02359b9b52a69 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Wed, 13 Jul 2011 15:17:15 +0200 Subject: #6 prepare for shift entries --- includes/pages/user_shifts.php | 80 ++++++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 38 deletions(-) (limited to 'includes') diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php index 979339c3..4616f6d0 100644 --- a/includes/pages/user_shifts.php +++ b/includes/pages/user_shifts.php @@ -1,49 +1,53 @@ 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`"); + $day_timestamp = DateTime :: createFromFormat("Y-m-d", $day)->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`"); - $shifts_table = ""; - 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`"); - if (count($angeltypes)) { - 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 (); - if ($angeltype['count'] - count($entries) > 0) - $entry_list[] = ''.($angeltype['count'] - count($entries)) . ' missing »'; - $shifts_table .= join(", ", $entry_list); - $shifts_table .= '
'; + $shifts_table = ""; + 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`"); + if (count($angeltypes)) { + 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 (); + if ($angeltype['count'] - count($entries) > 0) + $entry_list[] = '' . ($angeltype['count'] - count($entries)) . ' missing »'; + $shifts_table .= join(", ", $entry_list); + $shifts_table .= '
'; + } } + $shifts_table .= ''; } - $shifts_table .= ''; - } - return template_render('../templates/user_shifts.html', array ( - 'room_select' => make_room_select($rooms, $id, $day), - 'day_select' => make_day_select($days, $day, $id), - 'shifts_table' => $shifts_table - )); + return template_render('../templates/user_shifts.html', array ( + 'room_select' => make_room_select($rooms, $id, $day), + 'day_select' => make_day_select($days, $day, $id), + 'shifts_table' => $shifts_table + )); + } } function make_day_select($days, $day, $id) { -- cgit v1.2.3-54-g00ecf