diff options
| -rw-r--r-- | includes/pages/user_shifts.php | 233 | ||||
| -rw-r--r-- | public/css/theme0.css | 9 | ||||
| -rw-r--r-- | public/css/theme1.css | 9 | ||||
| -rw-r--r-- | public/css/theme2.css | 9 | ||||
| -rw-r--r-- | themes/base.less | 12 |
5 files changed, 158 insertions, 114 deletions
diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php index eecd1fc3..242d83af 100644 --- a/includes/pages/user_shifts.php +++ b/includes/pages/user_shifts.php @@ -6,25 +6,25 @@ function shifts_title() { function user_shifts() { global $user, $privileges, $max_freeloadable_shifts; - + if (User_is_freeloader($user)) redirect(page_link_to('user_myshifts')); - + // Löschen einzelner Schicht-Einträge (Also Belegung einer Schicht von Engeln) durch Admins if (isset($_REQUEST['entry_id']) && in_array('user_shifts_admin', $privileges)) { if (isset($_REQUEST['entry_id']) && test_request_int('entry_id')) $entry_id = $_REQUEST['entry_id']; else redirect(page_link_to('user_shifts')); - + $shift_entry_source = sql_select("SELECT `User`.`Nick`, `ShiftEntry`.`Comment`, `ShiftEntry`.`UID`, `Shifts`.*, `Room`.`Name`, `AngelTypes`.`name` as `angel_type` FROM `ShiftEntry` JOIN `User` ON (`User`.`UID`=`ShiftEntry`.`UID`) JOIN `AngelTypes` ON (`ShiftEntry`.`TID` = `AngelTypes`.`id`) JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID`) JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) WHERE `ShiftEntry`.`id`=" . sql_escape($entry_id) . " LIMIT 1"); if (count($shift_entry_source) > 0) { $shift_entry_source = $shift_entry_source[0]; - + $result = ShiftEntry_delete($entry_id); if ($result === false) engelsystem_error('Unable to delete shift entry.'); - + engelsystem_log("Deleted " . User_Nick_render($shift_entry_source) . "'s shift: " . $shift_entry_source['name'] . " at " . $shift_entry_source['Name'] . " from " . date("y-m-d H:i", $shift_entry_source['start']) . " to " . date("y-m-d H:i", $shift_entry_source['end']) . " as " . $shift_entry_source['angel_type']); success(_("Shift entry deleted.")); } else @@ -34,27 +34,27 @@ function user_shifts() { elseif (isset($_REQUEST['edit_shift']) && in_array('admin_shifts', $privileges)) { $msg = ""; $ok = true; - + if (isset($_REQUEST['edit_shift']) && test_request_int('edit_shift')) $shift_id = $_REQUEST['edit_shift']; else redirect(page_link_to('user_shifts')); - + /* * if (sql_num_query("SELECT * FROM `ShiftEntry` WHERE `SID`=" . sql_escape($shift_id) . " LIMIT 1") > 0) { error("Du kannst nur Schichten bearbeiten, bei denen niemand eingetragen ist."); redirect(page_link_to('user_shift')); } */ - + $shift = sql_select("SELECT * FROM `Shifts` JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) WHERE `SID`=" . sql_escape($shift_id) . " LIMIT 1"); if (count($shift) == 0) redirect(page_link_to('user_shifts')); $shift = $shift[0]; - + // Locations laden $rooms = sql_select("SELECT * FROM `Room` WHERE `show`='Y' ORDER BY `Name`"); $room_array = array(); foreach ($rooms as $room) $room_array[$room['RID']] = $room['Name']; - + // Engeltypen laden $types = sql_select("SELECT * FROM `AngelTypes` ORDER BY `name`"); $angel_types = array(); @@ -63,30 +63,30 @@ function user_shifts() { $angel_types[$type['id']] = $type; $needed_angel_types[$type['id']] = 0; } - + // Benötigte Engeltypen vom Raum $needed_angel_types_source = sql_select("SELECT `AngelTypes`.*, `NeededAngelTypes`.`count` FROM `AngelTypes` LEFT JOIN `NeededAngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `AngelTypes`.`id` AND `NeededAngelTypes`.`room_id`=" . sql_escape($shift['RID']) . ") ORDER BY `AngelTypes`.`name`"); foreach ($needed_angel_types_source as $type) { if ($type['count'] != "") $needed_angel_types[$type['id']] = $type['count']; } - + // Benötigte Engeltypen von der Schicht $needed_angel_types_source = sql_select("SELECT `AngelTypes`.*, `NeededAngelTypes`.`count` FROM `AngelTypes` LEFT JOIN `NeededAngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `AngelTypes`.`id` AND `NeededAngelTypes`.`shift_id`=" . sql_escape($shift_id) . ") ORDER BY `AngelTypes`.`name`"); foreach ($needed_angel_types_source as $type) { if ($type['count'] != "") $needed_angel_types[$type['id']] = $type['count']; } - + $name = $shift['name']; $rid = $shift['RID']; $start = $shift['start']; $end = $shift['end']; - + if (isset($_REQUEST['submit'])) { // Name/Bezeichnung der Schicht, darf leer sein $name = strip_request_item('name'); - + // Auswahl der sichtbaren Locations für die Schichten if (isset($_REQUEST['rid']) && preg_match("/^[0-9]+$/", $_REQUEST['rid']) && isset($room_array[$_REQUEST['rid']])) $rid = $_REQUEST['rid']; @@ -95,26 +95,26 @@ function user_shifts() { $rid = $rooms[0]['RID']; $msg .= error(_("Please select a room."), true); } - + if (isset($_REQUEST['start']) && $tmp = DateTime::createFromFormat("Y-m-d H:i", trim($_REQUEST['start']))) $start = $tmp->getTimestamp(); else { $ok = false; $msg .= error(_("Please enter a valid starting time for the shifts."), true); } - + if (isset($_REQUEST['end']) && $tmp = DateTime::createFromFormat("Y-m-d H:i", trim($_REQUEST['end']))) $end = $tmp->getTimestamp(); else { $ok = false; $msg .= error(_("Please enter a valid ending time for the shifts."), true); } - + if ($start >= $end) { $ok = false; $msg .= error(_("The ending time has to be after the starting time."), true); } - + foreach ($needed_angel_types_source as $type) { if (isset($_REQUEST['type_' . $type['id']]) && preg_match("/^[0-9]+$/", trim($_REQUEST['type_' . $type['id']]))) { $needed_angel_types[$type['id']] = trim($_REQUEST['type_' . $type['id']]); @@ -123,7 +123,7 @@ function user_shifts() { $msg .= error(sprintf(_("Please check your input for needed angels of type %s."), $type['name']), true); } } - + if ($ok) { $shift['name'] = $name; $shift['RID'] = $rid; @@ -138,19 +138,19 @@ function user_shifts() { sql_query("INSERT INTO `NeededAngelTypes` SET `shift_id`=" . sql_escape($shift_id) . ", `angel_type_id`=" . sql_escape($type_id) . ", `count`=" . sql_escape($count)); $needed_angel_types_info[] = $angel_types[$type_id]['name'] . ": " . $count; } - + engelsystem_log("Updated shift '" . $name . "' from " . date("y-m-d H:i", $start) . " to " . date("y-m-d H:i", $end) . " with angel types " . join(", ", $needed_angel_types_info)); success(_("Shift updated.")); redirect(page_link_to('user_shifts')); } } - + $room_select = html_select_key('rid', 'rid', $room_array, $rid); - + $angel_types = ""; foreach ($types as $type) $angel_types .= form_spinner('type_' . $type['id'], $type['name'], $needed_angel_types[$type['id']]); - + return page_with_title(shifts_title(), array( msg(), '<noscript>' . info(_("This page is much more comfortable with javascript."), true) . '</noscript>', @@ -161,8 +161,8 @@ function user_shifts() { form_text('end', _("End:"), date("Y-m-d H:i", $end)), '<h2>' . _("Needed angels") . '</h2>', $angel_types, - form_submit('submit', _("Save")) - )) + form_submit('submit', _("Save")) + )) )); } // Schicht komplett löschen (nur für admins/user mit user_shifts_admin privileg) elseif (isset($_REQUEST['delete_shift']) && in_array('user_shifts_admin', $privileges)) { @@ -170,64 +170,64 @@ function user_shifts() { $shift_id = $_REQUEST['delete_shift']; else redirect(page_link_to('user_shifts')); - + $shift = sql_select("SELECT * FROM `Shifts` JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) WHERE `SID`=" . sql_escape($shift_id) . " LIMIT 1"); if (count($shift) == 0) redirect(page_link_to('user_shifts')); $shift = $shift[0]; - + // Schicht löschen bestätigt if (isset($_REQUEST['delete'])) { $result = Shift_delete($shift_id); if ($result === false) engelsystem_error('Unable to delete shift.'); - + engelsystem_log("Deleted shift " . $shift['name'] . " from " . date("y-m-d H:i", $shift['start']) . " to " . date("y-m-d H:i", $shift['end'])); success(_("Shift deleted.")); redirect(page_link_to('user_shifts')); } - + return page_with_title(shifts_title(), array( error(sprintf(_("Do you want to delete the shift %s from %s to %s?"), $shift['name'], date("Y-m-d H:i", $shift['start']), date("H:i", $shift['end'])), true), - '<a class="button" href="?p=user_shifts&delete_shift=' . $shift_id . '&delete">' . _("delete") . '</a>' + '<a class="button" href="?p=user_shifts&delete_shift=' . $shift_id . '&delete">' . _("delete") . '</a>' )); } elseif (isset($_REQUEST['shift_id'])) { if (isset($_REQUEST['shift_id']) && preg_match("/^[0-9]*$/", $_REQUEST['shift_id'])) $shift_id = $_REQUEST['shift_id']; else redirect(page_link_to('user_shifts')); - + $shift = sql_select("SELECT * FROM `Shifts` JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) WHERE `SID`=" . sql_escape($shift_id) . " LIMIT 1"); if (count($shift) == 0) redirect(page_link_to('user_shifts')); $shift = $shift[0]; - + if (isset($_REQUEST['type_id']) && preg_match("/^[0-9]*$/", $_REQUEST['type_id'])) $type_id = $_REQUEST['type_id']; else redirect(page_link_to('user_shifts')); - + // Schicht läuft schon, Eintragen für Engel nicht mehr möglich if (! in_array('user_shifts_admin', $privileges) && time() > $shift['start']) { error(_("This shift is running now or ended already. Please contact a dispatcher to join the shift.")); redirect(page_link_to('user_shifts')); } - + // Another shift the user is signed up for collides with this one if (! in_array('user_shifts_admin', $privileges) && sql_num_query("SELECT `Shifts`.`SID` FROM `Shifts` INNER JOIN `ShiftEntry` ON (`Shifts`.`SID` = `ShiftEntry`.`SID` AND `ShiftEntry`.`UID` = " . sql_escape($user['UID']) . ") WHERE `start` < '" . sql_escape($shift['end']) . "' AND `end` > '" . sql_escape($shift['start']) . "'") > 0) { error(_("You already subscribed to shift in the same timeslot. Please contact a dispatcher to join the shift.")); redirect(page_link_to('user_shifts')); } - + if (in_array('user_shifts_admin', $privileges)) $type = sql_select("SELECT * FROM `AngelTypes` WHERE `id`=" . sql_escape($type_id) . " LIMIT 1"); else $type = sql_select("SELECT * FROM `UserAngelTypes` JOIN `AngelTypes` ON (`UserAngelTypes`.`angeltype_id` = `AngelTypes`.`id`) WHERE `AngelTypes`.`id` = " . sql_escape($type_id) . " AND (`AngelTypes`.`restricted` = 0 OR (`UserAngelTypes`.`user_id` = " . sql_escape($user['UID']) . " AND NOT `UserAngelTypes`.`confirm_user_id` IS NULL)) LIMIT 1"); - + if (count($type) == 0) redirect(page_link_to('user_shifts')); $type = $type[0]; - + if (isset($_REQUEST['submit'])) { $selected_type_id = $type_id; if (in_array('user_shifts_admin', $privileges)) { @@ -235,25 +235,25 @@ function user_shifts() { $user_id = $_REQUEST['user_id']; else $user_id = $user['UID']; - + if (sql_num_query("SELECT * FROM `User` WHERE `UID`=" . sql_escape($user_id) . " LIMIT 1") == 0) redirect(page_link_to('user_shifts')); - + if (isset($_REQUEST['angeltype_id']) && test_request_int('angeltype_id') && sql_num_query("SELECT * FROM `AngelTypes` WHERE `id`=" . sql_escape($_REQUEST['angeltype_id']) . " LIMIT 1") > 0) $selected_type_id = $_REQUEST['angeltype_id']; } else $user_id = $user['UID']; - + if (sql_num_query("SELECT * FROM `ShiftEntry` WHERE `SID`='" . sql_escape($shift['SID']) . "' AND `UID` = '" . sql_escape($user_id) . "'")) return error("This angel does already have an entry for this shift.", true); - + $freeloaded = $shift['freeloaded']; $freeload_comment = $shift['freeload_comment']; if (in_array("user_shifts_admin", $privileges)) { $freeloaded = isset($_REQUEST['freeloaded']); $freeload_comment = strip_request_item_nl('freeload_comment'); } - + $comment = strip_request_item_nl('comment'); $result = ShiftEntry_create(array( 'SID' => $shift_id, @@ -261,28 +261,28 @@ function user_shifts() { 'UID' => $user_id, 'Comment' => $comment, 'freeloaded' => $freeloaded, - 'freeload_comment' => $freeload_comment + 'freeload_comment' => $freeload_comment )); if ($result === false) engelsystem_error('Unable to create shift entry.'); - + if ($type['restricted'] == 0 && sql_num_query("SELECT * FROM `UserAngelTypes` INNER JOIN `AngelTypes` ON `AngelTypes`.`id` = `UserAngelTypes`.`angeltype_id` WHERE `angeltype_id` = '" . sql_escape($selected_type_id) . "' AND `user_id` = '" . sql_escape($user_id) . "' ") == 0) sql_query("INSERT INTO `UserAngelTypes` (`user_id`, `angeltype_id`) VALUES ('" . sql_escape($user_id) . "', '" . sql_escape($selected_type_id) . "')"); - + $user_source = User($user_id); engelsystem_log("User " . User_Nick_render($user_source) . " signed up for shift " . $shift['name'] . " from " . date("y-m-d H:i", $shift['start']) . " to " . date("y-m-d H:i", $shift['end'])); success(_("You are subscribed. Thank you!") . ' <a href="' . page_link_to('user_myshifts') . '">' . _("My shifts") . ' »</a>'); redirect(page_link_to('user_shifts')); } - + if (in_array('user_shifts_admin', $privileges)) { $users = sql_select("SELECT *, (SELECT count(*) FROM `ShiftEntry` WHERE `freeloaded`=1 AND `ShiftEntry`.`UID`=`User`.`UID`) AS `freeloaded` FROM `User` ORDER BY `Nick`"); $users_select = array(); - + foreach ($users as $usr) $users_select[$usr['UID']] = $usr['Nick'] . ($usr['freeloaded'] == 0 ? "" : " (" . _("Freeloader") . ")"); $user_text = html_select_key('user_id', 'user_id', $users_select, $user['UID']); - + $angeltypes_source = sql_select("SELECT * FROM `AngelTypes` ORDER BY `name`"); $angeltypes = array(); foreach ($angeltypes_source as $angeltype) @@ -292,7 +292,7 @@ function user_shifts() { $user_text = User_Nick_render($user); $angeltyppe_select = $type['name']; } - + return ShiftEntry_edit_view($user_text, date("Y-m-d H:i", $shift['start']) . ' – ' . date('Y-m-d H:i', $shift['end']) . ' (' . shift_length($shift) . ')', $shift['Name'], $shift['name'], $angeltyppe_select, "", false, null, in_array('user_shifts_admin', $privileges)); } else { return view_user_shifts(); @@ -302,22 +302,22 @@ function user_shifts() { function view_user_shifts() { global $user, $privileges; global $ical_shifts; - + $ical_shifts = array(); $days = sql_select_single_col("SELECT DISTINCT DATE(FROM_UNIXTIME(`start`)) AS `id`, DATE(FROM_UNIXTIME(`start`)) AS `name` FROM `Shifts` ORDER BY `start`"); - + if (count($days) == 0) { error(_("The administration has not configured any shifts yet.")); redirect('?'); } - + $rooms = sql_select("SELECT `RID` AS `id`, `Name` AS `name` FROM `Room` WHERE `show`='Y' ORDER BY `Name`"); - + if (count($rooms) == 0) { error(_("The administration has not configured any rooms yet.")); redirect('?'); } - + if (in_array('user_shifts_admin', $privileges)) $types = sql_select("SELECT `id`, `name` FROM `AngelTypes` ORDER BY `AngelTypes`.`name`"); else @@ -327,32 +327,32 @@ function view_user_shifts() { $filled = array( array( 'id' => '1', - 'name' => _('occupied') + 'name' => _('occupied') ), array( 'id' => '0', - 'name' => _('free') - ) + 'name' => _('free') + ) ); - + if (count($types) == 0) { error(_("The administration has not configured any angeltypes yet - or you are not subscribed to any angeltype.")); redirect('?'); } - + if (! isset($_SESSION['user_shifts'])) $_SESSION['user_shifts'] = array(); - + if (! isset($_SESSION['user_shifts']['filled'])) { $_SESSION['user_shifts']['filled'] = array( - 0 + 0 ); } - + foreach (array( 'rooms', 'types', - 'filled' + 'filled' ) as $key) { if (isset($_REQUEST[$key])) { $filtered = array_filter($_REQUEST[$key], 'is_numeric'); @@ -363,7 +363,7 @@ function view_user_shifts() { if (! isset($_SESSION['user_shifts'][$key])) $_SESSION['user_shifts'][$key] = array_map('get_ids_from_array', $$key); } - + if (isset($_REQUEST['rooms'])) { if (isset($_REQUEST['new_style'])) $_SESSION['user_shifts']['new_style'] = true; @@ -374,7 +374,7 @@ function view_user_shifts() { $_SESSION['user_shifts']['new_style'] = true; foreach (array( 'start', - 'end' + 'end' ) as $key) { if (isset($_REQUEST[$key . '_day']) && in_array($_REQUEST[$key . '_day'], $days)) $_SESSION['user_shifts'][$key . '_day'] = $_REQUEST[$key . '_day']; @@ -391,24 +391,24 @@ function view_user_shifts() { $_SESSION['user_shifts']['end_day'] = $_SESSION['user_shifts']['start_day']; if ($_SESSION['user_shifts']['start_day'] == $_SESSION['user_shifts']['end_day'] && $_SESSION['user_shifts']['start_time'] >= $_SESSION['user_shifts']['end_time']) $_SESSION['user_shifts']['end_time'] = '23:59'; - + if (isset($_SESSION['user_shifts']['start_day'])) { $starttime = DateTime::createFromFormat("Y-m-d H:i", $_SESSION['user_shifts']['start_day'] . $_SESSION['user_shifts']['start_time']); $starttime = $starttime->getTimestamp(); } else $starttime = now(); - + if (isset($_SESSION['user_shifts']['end_day'])) { $endtime = DateTime::createFromFormat("Y-m-d H:i", $_SESSION['user_shifts']['end_day'] . $_SESSION['user_shifts']['end_time']); $endtime = $endtime->getTimestamp(); } else $endtime = now() + 24 * 60 * 60; - + if (! isset($_SESSION['user_shifts']['rooms']) || count($_SESSION['user_shifts']['rooms']) == 0) $_SESSION['user_shifts']['rooms'] = array( - 0 + 0 ); - + $SQL = "SELECT DISTINCT `Shifts`.*, `Room`.`Name` as `room_name`, nat2.`special_needs` > 0 AS 'has_special_needs' FROM `Shifts` INNER JOIN `Room` USING (`RID`) @@ -436,7 +436,7 @@ function view_user_shifts() { foreach ($ownshifts_source as $ownshift) $ownshifts[$ownshift['SID']] = $ownshift; unset($ownshifts_source); - + $shifts_table = ""; // qqqq /* @@ -448,7 +448,7 @@ function view_user_shifts() { $block = array(); $todo = array(); $myrooms = $rooms; - + // delete un-selected rooms from array foreach ($myrooms as $k => $v) { if (array_search($v["id"], $_SESSION['user_shifts']['rooms']) === FALSE) @@ -456,7 +456,7 @@ function view_user_shifts() { // initialize $block array $block[$v["id"]] = array_fill(0, $maxshow, 0); } - + // calculate number of parallel shifts in each timeslot for each room foreach ($shifts as $k => $shift) { $rid = $shift["RID"]; @@ -466,8 +466,8 @@ function view_user_shifts() { $block[$rid][$i] ++; $shifts[$k]['own'] = in_array($shift['SID'], array_keys($ownshifts)); } - - $shifts_table = '<table id="shifts" class="table scrollable"><thead><tr><th>-</th>'; + + $shifts_table = '<div class="shifts-table"><table id="shifts" class="table scrollable"><thead><tr><th>-</th>'; foreach ($myrooms as $key => $room) { $rid = $room["id"]; if (array_sum($block[$rid]) == 0) { @@ -483,15 +483,20 @@ function view_user_shifts() { $shifts_table .= "<th" . (($colspan > 1) ? ' colspan="' . $colspan . '"' : '') . ">${room['name']}</th>\n"; } unset($block, $blocks, $firstblock, $colspan, $key, $room); - + $shifts_table .= "</tr></thead><tbody>"; for ($i = 0; $i < $maxshow; $i ++) { $thistime = $first + ($i * 15 * 60); - $shifts_table .= "<tr><th>"; - if ($thistime % (24 * 60 * 60) == 23 * 60 * 60 && $endtime - $starttime > 24 * 60 * 60) - $shifts_table .= date('y-m-d<b\r>H:i', $thistime); - elseif ($thistime % (60 * 60) == 0) + if ($thistime % (24 * 60 * 60) == 23 * 60 * 60 && $endtime - $starttime > 24 * 60 * 60) { + $shifts_table .= "<tr class=\"row-day\"><th class=\"row-header\">"; + $shifts_table .= date('y-m-d<b\r />H:i', $thistime); + } + elseif ($thistime % (60 * 60) == 0) { + $shifts_table .= "<tr class=\"row-hour\"><th>"; $shifts_table .= date("H:i", $thistime); + } else { + $shifts_table .= "<tr><th>"; + } $shifts_table .= "</th>"; foreach ($myrooms as $room) { $rid = $room["id"]; @@ -501,7 +506,7 @@ function view_user_shifts() { $blocks = ($shift["end"] - $shift["start"]) / (15 * 60); if ($blocks < 1) $blocks = 1; - + $collides = in_array($shift['SID'], array_keys($ownshifts)); if (! $collides) foreach ($ownshifts as $ownshift) { @@ -513,14 +518,14 @@ function view_user_shifts() { break; } } - + // qqqqqq $is_free = false; $shifts_row = $shift['name']; if (in_array('admin_shifts', $privileges)) $shifts_row .= ' ' . table_buttons(array( button(page_link_to('user_shifts') . '&edit_shift=' . $shift['SID'], glyph('edit'), 'btn-xs'), - button(page_link_to('user_shifts') . '&delete_shift=' . $shift['SID'], glyph('trash'), 'btn-xs') + button(page_link_to('user_shifts') . '&delete_shift=' . $shift['SID'], glyph('trash'), 'btn-xs') )); $shifts_row .= '<br />'; $query = "SELECT `NeededAngelTypes`.`count`, `AngelTypes`.`id`, `AngelTypes`.`restricted`, `UserAngelTypes`.`confirm_user_id`, `AngelTypes`.`name`, `UserAngelTypes`.`user_id` @@ -538,7 +543,7 @@ function view_user_shifts() { $query .= " AND `angel_type_id` IN (" . implode(',', $_SESSION['user_shifts']['types']) . ") "; $query .= " ORDER BY `AngelTypes`.`name`"; $angeltypes = sql_select($query); - + if (count($angeltypes) > 0) { foreach ($angeltypes as $angeltype) { $entries = sql_select("SELECT * FROM `ShiftEntry` JOIN `User` ON (`ShiftEntry`.`UID` = `User`.`UID`) WHERE `SID`=" . sql_escape($shift['SID']) . " AND `TID`=" . sql_escape($angeltype['id']) . " ORDER BY `Nick`"); @@ -555,7 +560,7 @@ function view_user_shifts() { } if (in_array('user_shifts_admin', $privileges)) $entry_list[] = "<span style=\"$style\">" . User_Nick_render($entry) . ' ' . table_buttons(array( - button(page_link_to('user_shifts') . '&entry_id=' . $entry['id'], glyph('trash'), 'btn-xs') + button(page_link_to('user_shifts') . '&entry_id=' . $entry['id'], glyph('trash'), 'btn-xs') )) . '</span>'; else $entry_list[] = "<span style=\"$style\">" . User_Nick_render($entry) . "</span>"; @@ -564,20 +569,20 @@ function view_user_shifts() { $inner_text = sprintf(ngettext("%d helper needed", "%d helpers needed", $angeltype['count'] - count($entries)), $angeltype['count'] - count($entries)); // is the shift still running or alternatively is the user shift admin? $user_may_join_shift = true; - + // you cannot join if user alread joined a parallel or this shift $user_may_join_shift &= ! $collides; - + // you cannot join if user is not of this angel type $user_may_join_shift &= isset($angeltype['user_id']); - + // you cannot join if you are not confirmed if ($angeltype['restricted'] == 1 && isset($angeltype['user_id'])) $user_may_join_shift &= isset($angeltype['confirm_user_id']); - + // you can only join if the shift is in future or running $user_may_join_shift &= time() < $shift['start']; - + // User shift admins may join anybody in every shift $user_may_join_shift |= in_array('user_shifts_admin', $privileges); if ($user_may_join_shift) @@ -592,11 +597,11 @@ function view_user_shifts() { else $entry_list[] = $inner_text . ' <a href="' . page_link_to('user_settings') . '#angel_types_anchor">(Werde ' . $angeltype['name'] . ')</a>'; } - + unset($inner_text); $is_free = true; } - + $shifts_row .= '<b>' . $angeltype['name'] . ':</b> '; $shifts_row .= join(", ", $entry_list); $shifts_row .= '<br />'; @@ -628,7 +633,7 @@ function view_user_shifts() { } $shifts_table .= "</tr>\n"; } - $shifts_table .= '</tbody></table><script type="text/javascript">document.getElementById("shifts").style.maxHeight = (window.innerHeight - 100) + "px";</script>'; + $shifts_table .= '</tbody></table></div>'; // qqq } else { $shifts_table = array(); @@ -639,16 +644,16 @@ function view_user_shifts() { $info[] = date("H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']); if (count($_SESSION['user_shifts']['rooms']) > 1) $info[] = $shift['room_name']; - + $shift_row = array( 'info' => join('<br />', $info), - 'entries' => $shift['name'] + 'entries' => $shift['name'] ); - + if (in_array('admin_shifts', $privileges)) $shift_row['info'] .= ' ' . table_buttons(array( button(page_link_to('user_shifts') . '&edit_shift=' . $shift['SID'], glyph('edit'), 'btn-xs'), - button(page_link_to('user_shifts') . '&delete_shift=' . $shift['SID'], glyph('trash'), 'btn-xs') + button(page_link_to('user_shifts') . '&delete_shift=' . $shift['SID'], glyph('trash'), 'btn-xs') )); $shift_row['entries'] .= '<br />'; $is_free = false; @@ -669,7 +674,7 @@ function view_user_shifts() { $angeltypes = sql_select($query); 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) { $entries = sql_select("SELECT * FROM `ShiftEntry` JOIN `User` ON (`ShiftEntry`.`UID` = `User`.`UID`) WHERE `SID`=" . sql_escape($shift['SID']) . " AND `TID`=" . sql_escape($angeltype['id']) . " ORDER BY `Nick`"); $entry_list = array(); @@ -677,7 +682,7 @@ function view_user_shifts() { foreach ($entries as $entry) { if (in_array('user_shifts_admin', $privileges)) $member = User_Nick_render($entry) . ' ' . table_buttons(array( - button(page_link_to('user_shifts') . '&entry_id=' . $entry['id'], glyph('trash'), 'btn-xs') + button(page_link_to('user_shifts') . '&entry_id=' . $entry['id'], glyph('trash'), 'btn-xs') )); else $member = User_Nick_render($entry); @@ -693,20 +698,20 @@ function view_user_shifts() { $inner_text = sprintf(ngettext("%d helper needed", "%d helpers needed", $angeltype['count'] - count($entries) + $freeloader), $angeltype['count'] - count($entries) + $freeloader); // is the shift still running or alternatively is the user shift admin? $user_may_join_shift = true; - + /* you cannot join if user already joined this shift */ $user_may_join_shift &= ! $my_shift; - + // you cannot join if user is not of this angel type $user_may_join_shift &= isset($angeltype['user_id']); - + // you cannot join if you are not confirmed if ($angeltype['restricted'] == 1 && isset($angeltype['user_id'])) $user_may_join_shift &= isset($angeltype['confirm_user_id']); - + // you can only join if the shift is in future or running $user_may_join_shift &= time() < $shift['start']; - + // User shift admins may join anybody in every shift $user_may_join_shift |= in_array('user_shifts_admin', $privileges); if ($user_may_join_shift) @@ -720,11 +725,11 @@ function view_user_shifts() { $entry_list[] = $inner_text . ' <a href="' . page_link_to('user_settings') . '#angel_types_anchor">(Werde ' . $angeltype['name'] . ')</a>'; } } - + unset($inner_text); $is_free = true; } - + $shift_row['entries'] .= '<b>' . $angeltype['name'] . ':</b> '; $shift_row['entries'] .= join(", ", $entry_list); $shift_row['entries'] .= '<br />'; @@ -739,13 +744,13 @@ function view_user_shifts() { } $shifts_table = table(array( 'info' => _("Time") . "/" . _("Room"), - 'entries' => _("Entries") + 'entries' => _("Entries") ), $shifts_table); } - + if ($user['api_key'] == "") User_reset_api_key($user); - + return page(array( '<div class="col-md-12">', msg(), @@ -762,9 +767,9 @@ function view_user_shifts() { 'new_style_checkbox' => '<label><input type="checkbox" name="new_style" value="1" ' . ($_SESSION['user_shifts']['new_style'] ? ' checked' : '') . '> ' . _("Use new style if possible") . '</label>', 'shifts_table' => msg() . $shifts_table, 'ical_text' => '<h2>' . _("iCal export") . '</h2><p>' . sprintf(_("Export of shown shifts. <a href=\"%s\">iCal format</a> or <a href=\"%s\">JSON format</a> available (please keep secret, otherwise <a href=\"%s\">reset the api key</a>)."), page_link_to_absolute('ical') . '&key=' . $user['api_key'], page_link_to_absolute('shifts_json_export') . '&key=' . $user['api_key'], page_link_to('user_myshifts') . '&reset') . '</p>', - 'filter' => _("Filter") + 'filter' => _("Filter") )), - '</div>' + '</div>' )); } @@ -790,14 +795,14 @@ function make_select($items, $selected, $name, $title = null) { $html_items = array(); if (isset($title)) $html_items[] = '<h4>' . $title . '</h4>' . "\n"; - + foreach ($items as $i) $html_items[] = '<div class="checkbox"><label><input type="checkbox" name="' . $name . '[]" value="' . $i['id'] . '"' . (in_array($i['id'], $selected) ? ' checked="checked"' : '') . '> ' . $i['name'] . '</label>' . (! isset($i['enabled']) || $i['enabled'] ? '' : glyph("lock")) . '</div><br />'; $html = '<div id="selection_' . $name . '" class="selection ' . $name . '">' . "\n"; $html .= implode("\n", $html_items); $html .= buttons(array( button("javascript: check_all('selection_" . $name . "')", _("All"), ""), - button("javascript: uncheck_all('selection_" . $name . "')", _("None"), "") + button("javascript: uncheck_all('selection_" . $name . "')", _("None"), "") )); $html .= '</div>' . "\n"; return $html; diff --git a/public/css/theme0.css b/public/css/theme0.css index bc9079fe..101f1e7a 100644 --- a/public/css/theme0.css +++ b/public/css/theme0.css @@ -6328,6 +6328,15 @@ a#shifts td.collides:hover { #shifts td.own { border: 1px solid #777777; } +.shifts-table { + overflow-x: scroll; +} +.row-day { + border-top: 2px solid #777777; +} +.row-header { + min-width: 90px; +} .space-top { margin-top: 15px; } diff --git a/public/css/theme1.css b/public/css/theme1.css index 833b60e7..a0c9e1a6 100644 --- a/public/css/theme1.css +++ b/public/css/theme1.css @@ -6351,6 +6351,15 @@ a#shifts td.collides:hover { #shifts td.own { border: 1px solid #888888; } +.shifts-table { + overflow-x: scroll; +} +.row-day { + border-top: 2px solid #888888; +} +.row-header { + min-width: 90px; +} .space-top { margin-top: 15px; } diff --git a/public/css/theme2.css b/public/css/theme2.css index d7502096..957a09ae 100644 --- a/public/css/theme2.css +++ b/public/css/theme2.css @@ -6328,6 +6328,15 @@ a#shifts td.collides:hover { #shifts td.own { border: 1px solid #777777; } +.shifts-table { + overflow-x: scroll; +} +.row-day { + border-top: 2px solid #777777; +} +.row-header { + min-width: 90px; +} .space-top { margin-top: 15px; } diff --git a/themes/base.less b/themes/base.less index 9cba002c..99c7cfc5 100644 --- a/themes/base.less +++ b/themes/base.less @@ -30,6 +30,18 @@ body { } } +.shifts-table { + overflow-x: scroll; +} + +.row-day { + border-top: 2px solid @gray-light; +} + +.row-header { + min-width: 90px; +} + .space-top { margin-top: 15px; } |