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

link to edit page and shift mates on myshifts page

This commit is contained in:
Philip Häusler 2012-12-28 20:55:13 +01:00
parent da14940813
commit 7044c07c00
4 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
includes/pages/admin_angel_types.php
View File

@ -86,11 +86,11 @@ function admin_angel_types() {
return page(array ( return page(array (
buttons(array ( buttons(array (
button(page_link_to('admin_angel_types'), "Back", 'back') button(page_link_to('admin_angel_types'), "Back", 'cancel')
)), )),
sprintf("Do you want to delete angel type %s?", $name), sprintf("Do you want to delete angel type %s?", $name),
buttons(array ( buttons(array (
button(page_link_to('admin_angel_types') . '&show=delete&id=' . $id . '&ack', "Delete", 'delete') button(page_link_to('admin_angel_types') . '&show=delete&id=' . $id . '&ack', "Delete", 'ok')
)) ))
)); ));
} else } else

21
includes/pages/user_myshifts.php
View File

@ -15,8 +15,11 @@ function user_myshifts() {
list ($shifts_user) = sql_select("SELECT * FROM `User` WHERE `UID`=" . sql_escape($id) . " LIMIT 1"); list ($shifts_user) = sql_select("SELECT * FROM `User` WHERE `UID`=" . sql_escape($id) . " LIMIT 1");
if ($id != $user['UID']) if ($id != $user['UID']) {
$msg .= info(sprintf("You are viewing %s's shifts.", $shifts_user['Nick']), true); $msg .= info(sprintf("You are viewing %s's shifts.", $shifts_user['Nick']), true);
if(in_array('admin_user', $privileges))
$msg .= buttons(array(button(page_link_to('admin_user') . '&id=' . $shifts_user['UID'], "Edit " . $shifts_user['Nick'], 'edit')));
}
if (isset ($_REQUEST['reset'])) { if (isset ($_REQUEST['reset'])) {
if ($_REQUEST['reset'] == "ack") { if ($_REQUEST['reset'] == "ack") {
@ -76,7 +79,21 @@ function user_myshifts() {
$html .= '<td>' . date("Y-m-d", $shift['start']) . '</td>'; $html .= '<td>' . date("Y-m-d", $shift['start']) . '</td>';
$html .= '<td>' . date("H:i", $shift['start']) . ' - ' . date("H:i", $shift['end']) . '</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['name'] . '</td>'; $html .= '<td>' . $shift['name'];
$needed_angel_types_source = sql_select("SELECT DISTINCT `AngelTypes`.* FROM `ShiftEntry` JOIN `AngelTypes` ON `ShiftEntry`.`TID`=`AngelTypes`.`id` WHERE `ShiftEntry`.`SID`=" . sql_escape($shift['SID']) . " ORDER BY `AngelTypes`.`name`");
foreach($needed_angel_types_source as $needed_angel_type) {
$html .= '<br><b>' . $needed_angel_type['name'] . ':</b> ';
$users_source = sql_select("SELECT `User`.* FROM `ShiftEntry` JOIN `User` ON `ShiftEntry`.`UID`=`User`.`UID` WHERE `ShiftEntry`.`SID`=" . sql_escape($shift['SID']) . " AND `ShiftEntry`.`TID`=" . sql_escape($needed_angel_type['id']));
$shift_entries = array();
foreach($users_source as $user_source) {
$shift_entries[] = $user_source['Nick'];
}
$html .= join(", ", $shift_entries);
}
$html .= '</td>';
$html .= '<td>' . $shift['Comment'] . '</td>'; $html .= '<td>' . $shift['Comment'] . '</td>';
$html .= '<td>'; $html .= '<td>';
if ($id == $user['UID']) if ($id == $user['UID'])

14
public/css/base.css
View File

@ -350,6 +350,20 @@ tr:hover .hidden {
background: #fff; background: #fff;
} }
.button.edit {
background: url('../pic/icons/pencil.png') 2px 2px no-repeat;
padding-left: 20px;
}
.button.ok {
background: url('../pic/icons/tick.png') 2px 2px no-repeat;
padding-left: 20px;
}
.button.cancel {
background: url('../pic/icons/cross.png') 2px 2px no-repeat;
padding-left: 20px;
}
.form { .form {
border: 1px solid #888; border: 1px solid #888;

2
templates/user_myshifts.html
View File

@ -15,7 +15,7 @@
Ort Ort
</th> </th>
<th> <th>
Name Name &amp; Kollegen
</th> </th>
<th> <th>
Kommentar Kommentar