diff --git a/includes/pages/admin_user.php b/includes/pages/admin_user.php index 94e90a24..180e7371 100644 --- a/includes/pages/admin_user.php +++ b/includes/pages/admin_user.php @@ -323,7 +323,7 @@ function admin_user() { 'Tshirt' => '' . $angel['Tshirt'] . '', 'Size' => $angel['Size'], 'lastLogIn' => date('d.m.&\n\b\s\p;H:i', $angel['lastLogIn']), - 'edit' => '' . Get_Text('Edit') . '', + 'edit' => img_button(page_link_to('admin_user') . '&id=' . $angel['UID'], 'pencil', 'edit'), ); } $angels = array_map('prepare_angel_table', $angels); diff --git a/includes/pages/admin_user_angeltypes.php b/includes/pages/admin_user_angeltypes.php index 2f7a511e..b77a9129 100644 --- a/includes/pages/admin_user_angeltypes.php +++ b/includes/pages/admin_user_angeltypes.php @@ -78,11 +78,12 @@ function admin_user_angeltypes() { foreach ($user_angel_types_source as $user) { if(in_array("admin_user", $privileges)) $user['Nick'] = '' . $user['Nick'] . ''; - $user['actions'] = 'confirm'; - $user['actions'] .= '  deny'; + $user['actions'] = img_button(page_link_to('admin_user_angeltypes') . '&confirm=' . $user['id'], 'tick', 'confirm'); + $user['actions'] .= '  '; + $user['actions'] .= img_button(page_link_to('admin_user_angeltypes') . '&deny=' . $user['id'], 'cross', 'deny'); $users[] = $user; } - $content[] = '

' . $angel_type['name'] . ' confirm all deny all

' . table(array ( + $content[] = '

' . $angel_type['name'] . ' ' . img_button(page_link_to('admin_user_angeltypes') . '&confirm_all=' . $angel_type['id'], 'tick', '', 'confirm all') . ' ' . img_button(page_link_to('admin_user_angeltypes') . '&deny_all=' . $angel_type['id'], 'cross', '', 'deny all') . '

' . table(array ( 'Nick' => "Nick", 'actions' => "" ), $users); @@ -109,4 +110,4 @@ function admin_new_user_angeltypes() { } return ""; } -?> \ No newline at end of file +?> diff --git a/includes/pages/user_myshifts.php b/includes/pages/user_myshifts.php index 353eac56..007a1681 100644 --- a/includes/pages/user_myshifts.php +++ b/includes/pages/user_myshifts.php @@ -97,9 +97,9 @@ function user_myshifts() { $html .= '' . $shift['Comment'] . ''; $html .= ''; if ($id == $user['UID']) - $html .= '' . Get_Text('edit') . ''; + $html .= img_button(page_link_to('user_myshifts') . '&edit=' . $shift['id'], 'pencil', 'edit'); if (($shift['start'] - time() > $LETZTES_AUSTRAGEN * 3600) || in_array('user_shifts_admin', $privileges)) - $html .= ' | ' . Get_Text('sign_off') . ''; + $html .= img_button(page_link_to('user_myshifts') . (($id != $user['UID'])? '&id=' . $id : '') . '&cancel=' . $shift['id'], 'cross', 'sign_off'); $html .= ''; $html .= ''; } diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php index c26ad668..7db94247 100644 --- a/includes/pages/user_shifts.php +++ b/includes/pages/user_shifts.php @@ -350,7 +350,7 @@ function view_user_shifts() { FROM `Shifts` INNER JOIN `Room` USING (`RID`) LEFT JOIN (SELECT COUNT(*) AS special_needs , nat3.`shift_id` FROM `NeededAngelTypes` AS nat3 WHERE `shift_id` IS NOT NULL GROUP BY nat3.`shift_id`) AS nat2 ON nat2.`shift_id` = `Shifts`.`SID` - INNER JOIN `NeededAngelTypes` AS nat ON nat.`count` != 0 AND ((nat2.`special_needs` > 0 AND nat.`shift_id` = `Shifts`.`SID`) OR ((nat2.`special_needs` = 0 OR nat2.`special_needs` IS NULL) AND nat.`room_id` = `RID`)) + INNER JOIN `NeededAngelTypes` AS nat ON nat.`count` != 0 AND nat.`angel_type_id` IN (" . implode(',', $_SESSION['user_shifts']['types']) . ") AND ((nat2.`special_needs` > 0 AND nat.`shift_id` = `Shifts`.`SID`) OR ((nat2.`special_needs` = 0 OR nat2.`special_needs` IS NULL) AND nat.`room_id` = `RID`)) LEFT JOIN (SELECT se.`SID`, se.`TID`, COUNT(*) as count FROM `ShiftEntry` AS se GROUP BY se.`SID`, se.`TID`) AS entries ON entries.`SID` = `Shifts`.`SID` AND entries.`TID` = nat.`angel_type_id` WHERE `Shifts`.`RID` IN (" . implode(',', $_SESSION['user_shifts']['rooms']) . ") AND DATE(FROM_UNIXTIME(`start`)) IN ('" . implode("','", $_SESSION['user_shifts']['days']) . "') "; @@ -384,60 +384,71 @@ function view_user_shifts() { ) */ if(count($_SESSION['user_shifts']['days'])==1 && $_SESSION['user_shifts']['new_style']) { - $myrooms=$rooms; - foreach($myrooms as $k => $v) { + $myrooms = $rooms; + + // delete un-selected rooms from array + foreach($myrooms as $k => $v) if(array_search($v["id"],$_SESSION['user_shifts']['rooms'])===FALSE) unset($myrooms[$k]); - } + $first=date("U",strtotime($_SESSION['user_shifts']['days'][0]." 00:00:00")); $last=date("U",strtotime($_SESSION['user_shifts']['days'][0]." 23:59:59")); $maxshow=24*4; $block=array(); $todo=array(); - foreach($myrooms as $room) { - $rid=$room["id"]; - $block[$rid] = array_fill(0, $maxshow, 0); - foreach($shifts as $shift) { - if($shift["RID"]==$rid) { - // calculate number of parallel shifts in each timeslot for one room - $blocks=($shift["end"]-$shift["start"])/(15*60); - $firstblock=floor(($shift["start"]-$first)/(15*60)); - for($i=$firstblock;$i<$blocks+$firstblock && $i < $maxshow;$i++) { - $block[$rid][$i]++; - } - } - } + + // initialize $block array + foreach($myrooms as $room) + $block[$room["id"]] = array_fill(0, $maxshow, 0); + + // calculate number of parallel shifts in each timeslot for each room + foreach($shifts as $shift) { + $rid = $shift["RID"]; + $blocks = ($shift["end"]-$shift["start"]) / (15*60); + $firstblock = floor(($shift["start"]-$first) / (15*60)); + for($i = $firstblock; $i < $blocks + $firstblock && $i < $maxshow; $i++) + $block[$rid][$i]++; } - $shifts_table=""; - foreach($myrooms as $room) { - $rid=$room["id"]; + + $shifts_table = "
-
"; + foreach($myrooms as $key => $room) { + $rid = $room["id"]; + if(array_sum($block[$rid]) == 0) { + // do not display columns without entries + unset($block[$rid]); + unset($myrooms[$key]); + continue; + } $colspan = call_user_func_array('max', $block[$rid]); if($colspan == 0) $colspan = 1; $todo[$rid] = array_fill(0, $maxshow, $colspan); $shifts_table.=" 1)? ' colspan="' . $colspan . '"' : '') . ">${room['name']}\n"; } + unset($block, $blocks, $firstblock, $colspan, $key, $room); + $shifts_table.=""; - for($i=0;$i<$maxshow;$i++) { - $thistime=$first+($i*15*60); - if($thistime%(60*60)==0) { - $shifts_table.=""; + for($i = 0; $i < $maxshow; $i++) { + $thistime = $first + ($i*15*60); + if($thistime%(60*60) == 0) { + $shifts_table .= ""; } else { - $shifts_table.=""; + $shifts_table .= ""; } foreach($myrooms as $room) { - $rid=$room["id"]; + $rid = $room["id"]; foreach($shifts as $shift) { - if($shift["RID"]==$rid) { + if($shift["RID"] == $rid) { if(floor($shift["start"]/(15*60)) == $thistime/(15*60)) { - $blocks=($shift["end"]-$shift["start"])/(15*60); - if($blocks<1) $blocks=1; + $blocks = ($shift["end"]-$shift["start"])/(15*60); + if($blocks < 1) + $blocks = 1; // qqqqqq $is_free = false; $shifts_row = $shift['name']; if (in_array('admin_shifts', $privileges)) - $shifts_row .= ' [edit][x]'; - $shifts_row.= '
'; + $shifts_row .= ' ' . img_button('?p=user_shifts&edit_shift=' . $shift['SID'], 'pencil', 'edit') . img_button('?p=user_shifts&delete_shift=' . $shift['SID'], 'cross', 'delete'); + $shifts_row .= '
'; $query = "SELECT `NeededAngelTypes`.`count`, `AngelTypes`.`id`, `AngelTypes`.`restricted`, `UserAngelTypes`.`confirm_user_id`, `AngelTypes`.`name`, `UserAngelTypes`.`user_id` FROM `NeededAngelTypes` JOIN `AngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `AngelTypes`.`id`) @@ -460,7 +471,7 @@ function view_user_shifts() { $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 (); foreach ($entries as $entry) { - if($entry['Gekommen']==1) + if($entry['Gekommen'] == 1) $style="font-weight:bold;"; else $style="font-weight:normal;"; @@ -490,7 +501,7 @@ function view_user_shifts() { // User shift admins may join anybody in every shift $user_may_join_shift |= in_array('user_shifts_admin', $privileges); if ($user_may_join_shift) - $entry_list[] = '' . $inner_text . ' »'; + $entry_list[] = '' . $inner_text . ' »'; else { if(time() > $shift['start']) { $entry_list[] = $inner_text . ' (vorbei)'; @@ -510,7 +521,7 @@ function view_user_shifts() { $shifts_row .= '
'; } if (in_array('user_shifts_admin', $privileges)) { - $shifts_row .= 'Weitere Helfer eintragen »'; + $shifts_row .= 'Weitere Helfer eintragen »'; } } $shifts_table.='"; - for($j=0;$j<$blocks&& $i+$j < $maxshow;$j++) { + for($j=0; $j < $blocks && $i+$j < $maxshow; $j++) { $todo[$rid][$i+$j]--; } } } } // fill up row with empty '; + while($todo[$rid][$i]-- > 0) + $shifts_table .= ''; } - $shifts_table.="\n"; + $shifts_table .= "\n"; } - $shifts_table.='
-
".date("H:i",$thistime)."
" . date("H:i",$thistime) . "
'; @@ -518,19 +529,19 @@ function view_user_shifts() { $shifts_table.=$shifts_row; } $shifts_table.=" - while($todo[$rid][$i]--) - $shifts_table.='
'; + $shifts_table .= ''; // qqq } else { $shifts_table = array(); @@ -548,7 +559,7 @@ function view_user_shifts() { ); if (in_array('admin_shifts', $privileges)) - $shift_row['entries'] .= ' [edit] [x]'; + $shift_row['info'] .= ' ' . img_button('?p=user_shifts&edit_shift=' . $shift['SID'], 'pencil', 'edit') . img_button('?p=user_shifts&delete_shift=' . $shift['SID'], 'cross', 'delete'); $shift_row['entries'] .= '
'; $is_free = false; $shift_has_special_needs = 0 < sql_num_query("SELECT `id` FROM `NeededAngelTypes` WHERE `shift_id` = " . $shift['SID']); @@ -573,7 +584,7 @@ function view_user_shifts() { $entry_list = array (); foreach ($entries as $entry) { if (in_array('user_shifts_admin', $privileges)) - $entry_list[] = '' . $entry['Nick'] . ' [x]'; + $entry_list[] = '' . $entry['Nick'] . ' ' . img_button(page_link_to('user_shifts') . '&entry_id=' . $entry['id'], 'cross', 'delete'); else $entry_list[] = $entry['Nick']; } @@ -623,7 +634,6 @@ function view_user_shifts() { } if (($is_free && in_array(0, $_SESSION['user_shifts']['filled'])) || (!$is_free && in_array(1, $_SESSION['user_shifts']['filled']))) { $shifts_table[] = $shift_row; - $row_count++; $ical_shifts[] = $shift; } } diff --git a/includes/sys_lang.php b/includes/sys_lang.php index 40abf754..3a043614 100644 --- a/includes/sys_lang.php +++ b/includes/sys_lang.php @@ -23,11 +23,13 @@ function Get_Text($TextID, $NoError = false) { @ $Erg = mysql_query($SQL, $con); if (mysql_num_rows($Erg) == 1) - return (@ mysql_result($Erg, 0, "Text")); - elseif ($NoError && !$debug) return ""; - else { + return mysql_result($Erg, 0, "Text"); + elseif ($NoError && !$debug) + return ""; + elseif ($debug) return "Error Data, '$TextID' found " . mysql_num_rows($Erg) . "x"; - } + else + return $TextID; } function Print_Text($TextID, $NoError = false) { diff --git a/includes/sys_template.php b/includes/sys_template.php index 0f030e86..a120bb2d 100644 --- a/includes/sys_template.php +++ b/includes/sys_template.php @@ -233,4 +233,9 @@ function html_select_key($id, $name, $rows, $selected) { $html .= ''; return $html; } + +function img_button($link, $icon, $text, $extra_text = '') { + $translation = empty($text)? '' : Get_Text($text); + return '' . $translation . '' . (empty($extra_text)? '' : ' ' . $extra_text) . ''; +} ?> diff --git a/public/pic/icons/cross.png b/public/pic/icons/cross.png index 1514d51a..9447309a 100644 Binary files a/public/pic/icons/cross.png and b/public/pic/icons/cross.png differ diff --git a/public/pic/icons/lock.png b/public/pic/icons/lock.png index 2ebc4f6f..c75f88b6 100644 Binary files a/public/pic/icons/lock.png and b/public/pic/icons/lock.png differ diff --git a/public/pic/icons/pencil.png b/public/pic/icons/pencil.png index 0bfecd50..de7a9b6b 100644 Binary files a/public/pic/icons/pencil.png and b/public/pic/icons/pencil.png differ diff --git a/public/pic/icons/tick.png b/public/pic/icons/tick.png index a9925a06..5a75e2f4 100644 Binary files a/public/pic/icons/tick.png and b/public/pic/icons/tick.png differ