iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#6 my shifts | cancel my shifts

This commit is contained in:
Philip Häusler 2011-07-19 19:12:36 +02:00
parent 32cdb6b0e1
commit 05410ba89a
4 changed files with 90 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
includes/pages/user_myshifts.php
View File

@ -1,7 +1,50 @@
<?php <?php
function user_myshifts() {
return "bla";
}
//
function user_myshifts() {
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
));
}
?> ?>

7
includes/pages/user_shifts.php
View File

@ -44,15 +44,14 @@ function user_shifts() {
} else } else
$user_id = $user['UID']; $user_id = $user['UID'];
// TODO: Kollisionserkennung, andere Schichten zur gleichen Uhrzeit darf der Engel auch nicht belegt haben... // 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'])); $entries = sql_select("SELECT * FROM `ShiftEntry` WHERE `SID`=" . sql_escape($shift['SID']));
foreach ($entries as $entry) foreach ($entries as $entry)
if ($entry['UID'] == $user_id) if ($entry['UID'] == $user_id)
return error("This angel does already have an entry for this shift."); return error("This angel does already have an entry for this shift.");
$comment = strip_request_item_nl($_REQUEST['comment']); $comment = strip_request_item_nl('comment');
sql_query("INSERT INTO `ShiftEntry` SET `UID`=" . sql_escape($user_id) . ", `TID`=" . sql_escape($type_id) . ", `SID`=" . sql_escape($shift_id)); 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>'; 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 = ""; $shifts_table = "";
$row_count = 0; $row_count = 0;
foreach ($shifts as $shift) { 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; $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`"); $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`");

4
public/css/base.css
View File

@ -222,3 +222,7 @@ tr:hover .hidden {
border: 1px solid #000; border: 1px solid #000;
box-shadow: 1px 1px 5px #888; box-shadow: 1px 1px 5px #888;
} }
.done {
text-decoration: line-through;
}

37
templates/user_myshifts.html Normal file
View File

@ -0,0 +1,37 @@
<p>
Hi,
<br/>
here are the shifts you have signed up for.
<br/>
Please try to arrive for your shift on time. <b>Be punctual!</b>
<br/>
Here you can remove yourself from a shift up to %h% hours before your shift is scheduled to begin.
</p>
%msg%
<table>
<thead>
<tr>
<th>
Day
</th>
<th>
Time
</th>
<th>
Location
</th>
<th>
Name
</th>
<th>
Comment
</th>
<th>
Action
</th>
</tr>
</thead>
<tbody>
%shifts%
</tbody>
</table>