summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorPhilip Häusler <msquare@notrademark.de>2011-07-19 19:12:36 +0200
committerPhilip Häusler <msquare@notrademark.de>2011-07-19 19:12:36 +0200
commit05410ba89afa6ed6dd669528e25c578480e3a67f (patch)
tree216df60effc21671bf7740f2ed2bd9cf1b525bfb /includes
parent32cdb6b0e1d905360f2824444339273f111aff0b (diff)
#6 my shifts | cancel my shifts
Diffstat (limited to 'includes')
-rw-r--r--includes/pages/user_myshifts.php47
-rw-r--r--includes/pages/user_shifts.php7
2 files changed, 48 insertions, 6 deletions
diff --git a/includes/pages/user_myshifts.php b/includes/pages/user_myshifts.php
index 669d927c..88d78254 100644
--- a/includes/pages/user_myshifts.php
+++ b/includes/pages/user_myshifts.php
@@ -1,7 +1,50 @@
<?php
+
+//
function user_myshifts() {
- return "bla";
-}
+ global $LETZTES_AUSTRAGEN;
+ global $user, $privileges;
+ $msg = "";
+ if (isset ($_REQUEST['cancel']) && preg_match("/^[0-9]*$/", $_REQUEST['cancel'])) {
+ $id = $_REQUEST['cancel'];
+ $shift = sql_select("SELECT * FROM `ShiftEntry` WHERE `id`=" . sql_escape($id) . " LIMIT 1");
+ if (count($shift) > 0) {
+ $shift = $shift[0];
+ if (($shift['start'] - time() < $LETZTES_AUSTRAGEN * 60) || in_array('user_shifts_admin', $privileges)) {
+ sql_query("DELETE FROM `ShiftEntry` WHERE `id`=" . sql_escape($id) . " LIMIT 1");
+ $msg = success("Your shift has been canceled successfully.");
+ } else
+ $msg = error("It's too late to cancel this shift.'");
+ } else
+ header("Location: " . page_link_to('user_myshifts'));
+ }
+ $shifts = sql_select("SELECT * FROM `ShiftEntry` JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID`) JOIN `Room` ON (`Shifts`.`RID` = `Room`.`RID`) WHERE `UID`=" . sql_escape($user['UID'])." ORDER BY `start`");
+ $html = "";
+ foreach ($shifts as $shift) {
+ if (time() > $shift['end'])
+ $html .= '<tr class="done">';
+ else
+ $html .= '<tr>';
+ $html .= '<td>' . date("Y-m-d", $shift['start']) . '</td>';
+ $html .= '<td>' . date("H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']) . '</td>';
+ $html .= '<td>' . $shift['Name'] . '</td>';
+ $html .= '<td>' . $shift['name'] . '</td>';
+ $html .= '<td>' . $shift['Comment'] . '</td>';
+ if ($shift['start'] - time() > $LETZTES_AUSTRAGEN * 60)
+ $html .= '<td><a href="' . page_link_to('user_myshifts') . '&cancel=' . $shift['id'] . '">Cancel</a></td>';
+ else
+ $html .= '<td></td>';
+ $html .= '</tr>';
+ }
+ if ($html == "")
+ $html = '<tr><td>None...</td><td></td><td></td><td></td><td></td><td>Go to <a href="' . page_link_to('user_shifts') . '">Shifts</a> to sign up for a shift.</td></tr>';
+
+ return template_render('../templates/user_myshifts.html', array (
+ 'h' => $LETZTES_AUSTRAGEN,
+ 'shifts' => $html,
+ 'msg' => $msg
+ ));
+}
?> \ No newline at end of file
diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php
index 597b652a..64fcbac5 100644
--- a/includes/pages/user_shifts.php
+++ b/includes/pages/user_shifts.php
@@ -44,15 +44,14 @@ function user_shifts() {
} else
$user_id = $user['UID'];
-
// TODO: Kollisionserkennung, andere Schichten zur gleichen Uhrzeit darf der Engel auch nicht belegt haben...
$entries = sql_select("SELECT * FROM `ShiftEntry` WHERE `SID`=" . sql_escape($shift['SID']));
foreach ($entries as $entry)
if ($entry['UID'] == $user_id)
return error("This angel does already have an entry for this shift.");
- $comment = strip_request_item_nl($_REQUEST['comment']);
- sql_query("INSERT INTO `ShiftEntry` SET `UID`=" . sql_escape($user_id) . ", `TID`=" . sql_escape($type_id) . ", `SID`=" . sql_escape($shift_id));
+ $comment = strip_request_item_nl('comment');
+ sql_query("INSERT INTO `ShiftEntry` SET `Comment`='" . sql_escape($comment) . "', `UID`=" . sql_escape($user_id) . ", `TID`=" . sql_escape($type_id) . ", `SID`=" . sql_escape($shift_id));
return success("Now it's your shift. Thank you!") . '<a href="' . page_link_to('user_myshifts') . '">View my shifts &raquo;</a>';
}
@@ -96,7 +95,7 @@ function user_shifts() {
$shifts_table = "";
$row_count = 0;
foreach ($shifts as $shift) {
- $shift_row = '<tr><td>' . date(($id == 0 ? "Y-m-d " : "") . "H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']) .($id == 0 ? "<br />".$shift['Name'] : ""). '</td><td>' . $shift['name'] . '<br />';
+ $shift_row = '<tr><td>' . date(($id == 0 ? "Y-m-d " : "") . "H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']) . ($id == 0 ? "<br />" . $shift['Name'] : "") . '</td><td>' . $shift['name'] . '<br />';
$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`");