summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorPhilip Häusler <msquare@notrademark.de>2011-10-11 18:35:29 +0200
committerPhilip Häusler <msquare@notrademark.de>2011-10-11 18:35:29 +0200
commitb47b6ed7e421ae91c5dc7607d874479bfc0e9e4a (patch)
treebc1c1ce7f9570e485a8873f1624e9c6e7948b923 /includes
parent403c11047bf234c415b0aa7462d14bc758eedc04 (diff)
#5 begin edit shifts feature, simplified needed angels
Diffstat (limited to 'includes')
-rw-r--r--includes/pages/user_shifts.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php
index 4ebf6254..d0754d8b 100644
--- a/includes/pages/user_shifts.php
+++ b/includes/pages/user_shifts.php
@@ -33,10 +33,10 @@ function user_shifts() {
$room_array[$room['RID']] = $room['Name'];
// Engeltypen laden
- $types = sql_select("SELECT * FROM `AngelTypes` ORDER BY `Name`");
+ $types = sql_select("SELECT * FROM `NeededAngelTypes` JOIN `AngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `AngelTypes`.`TID`) WHERE `shift_id`=".sql_escape($shift_id)." ORDER BY `AngelTypes`.`Name`");
$needed_angel_types = array ();
foreach ($types as $type)
- $needed_angel_types[$type['TID']] = 0;
+ $needed_angel_types[$type['TID']] = $type['count'];
$name = $shift['name'];
$rid = $shift['RID'];
@@ -58,8 +58,6 @@ function user_shifts() {
'room_select' => $room_select,
'start' => date("Y-m-d H:i", $start),
'end' => date("Y-m-d H:i", $end),
- 'angelmode_location_selected' => $_REQUEST['angelmode'] == 'location' ? 'checked="checked"' : '',
- 'angelmode_manually_selected' => $_REQUEST['angelmode'] == 'manually' ? 'checked="checked"' : '',
'angel_types' => $angel_types
));
}