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

polished code and display of shiftview and used more icons

This commit is contained in:
Jan-Philipp Litza 2012-12-29 13:58:59 +01:00
parent 1867c88484
commit 7c7b2d3b54
10 changed files with 71 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/pages/admin_user.php
View File

@ -323,7 +323,7 @@ function admin_user() {
'Tshirt' => '<img src="pic/icons/' . ($angel['Tshirt'] == 1? 'tick' : 'cross') . '.png" alt="' . $angel['Tshirt'] . '">', 'Tshirt' => '<img src="pic/icons/' . ($angel['Tshirt'] == 1? 'tick' : 'cross') . '.png" alt="' . $angel['Tshirt'] . '">',
'Size' => $angel['Size'], 'Size' => $angel['Size'],
'lastLogIn' => date('d.m.&\n\b\s\p;H:i', $angel['lastLogIn']), 'lastLogIn' => date('d.m.&\n\b\s\p;H:i', $angel['lastLogIn']),
'edit' => '<a href="' . page_link_to("admin_user") . '&amp;id=' . $angel["UID"] . '"><img src="pic/icons/pencil.png" alt="' . Get_Text('Edit') . '" title="' . Get_Text('Edit') . '"></a>', 'edit' => img_button(page_link_to('admin_user') . '&id=' . $angel['UID'], 'pencil', 'edit'),
); );
} }
$angels = array_map('prepare_angel_table', $angels); $angels = array_map('prepare_angel_table', $angels);

9
includes/pages/admin_user_angeltypes.php
View File

@ -78,11 +78,12 @@ function admin_user_angeltypes() {
foreach ($user_angel_types_source as $user) { foreach ($user_angel_types_source as $user) {
if(in_array("admin_user", $privileges)) if(in_array("admin_user", $privileges))
$user['Nick'] = '<a href="' . page_link_to('admin_user') . '&id=' . $user['UID'] . '">' . $user['Nick'] . '</a>'; $user['Nick'] = '<a href="' . page_link_to('admin_user') . '&id=' . $user['UID'] . '">' . $user['Nick'] . '</a>';
$user['actions'] = '<a href="' . page_link_to('admin_user_angeltypes') . '&confirm=' . $user['id'] . '"><img src="pic/icons/tick.png" alt="confirm" title="confirm"></a>'; $user['actions'] = img_button(page_link_to('admin_user_angeltypes') . '&confirm=' . $user['id'], 'tick', 'confirm');
$user['actions'] .= '&nbsp;&nbsp;<a href="' . page_link_to('admin_user_angeltypes') . '&deny=' . $user['id'] . '"><img src="pic/icons/cross.png" alt="deny" title="deny"></a>'; $user['actions'] .= '&nbsp;&nbsp;';
$user['actions'] .= img_button(page_link_to('admin_user_angeltypes') . '&deny=' . $user['id'], 'cross', 'deny');
$users[] = $user; $users[] = $user;
} }
$content[] = '<h2>' . $angel_type['name'] . ' <small><a href="' . page_link_to('admin_user_angeltypes') . '&confirm_all=' . $angel_type['id'] . '"><img src="pic/icons/tick.png" alt="">confirm all</a> <a href="' . page_link_to('admin_user_angeltypes') . '&deny_all=' . $angel_type['id'] . '"><img src="pic/icons/cross.png" alt="">deny all</a></small></h2>' . table(array ( $content[] = '<h2>' . $angel_type['name'] . ' <small>' . 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') . '</small></h2>' . table(array (
'Nick' => "Nick", 'Nick' => "Nick",
'actions' => "" 'actions' => ""
), $users); ), $users);
@ -109,4 +110,4 @@ function admin_new_user_angeltypes() {
} }
return ""; return "";
} }
?> ?>

4
includes/pages/user_myshifts.php
View File

@ -97,9 +97,9 @@ function user_myshifts() {
$html .= '<td>' . $shift['Comment'] . '</td>'; $html .= '<td>' . $shift['Comment'] . '</td>';
$html .= '<td>'; $html .= '<td>';
if ($id == $user['UID']) if ($id == $user['UID'])
$html .= '<a href="' . page_link_to('user_myshifts') . '&edit=' . $shift['id'] . '">' . Get_Text('edit') . '</a>'; $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)) if (($shift['start'] - time() > $LETZTES_AUSTRAGEN * 3600) || in_array('user_shifts_admin', $privileges))
$html .= ' | <a href="' . page_link_to('user_myshifts') . (($id != $user['UID'])? '&id=' . $id : '') . '&cancel=' . $shift['id'] . '">' . Get_Text('sign_off') . '</a>'; $html .= img_button(page_link_to('user_myshifts') . (($id != $user['UID'])? '&id=' . $id : '') . '&cancel=' . $shift['id'], 'cross', 'sign_off');
$html .= '</td>'; $html .= '</td>';
$html .= '</tr>'; $html .= '</tr>';
} }

94
includes/pages/user_shifts.php
View File

@ -350,7 +350,7 @@ function view_user_shifts() {
FROM `Shifts` FROM `Shifts`
INNER JOIN `Room` USING (`RID`) 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` 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` 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']) . ") WHERE `Shifts`.`RID` IN (" . implode(',', $_SESSION['user_shifts']['rooms']) . ")
AND DATE(FROM_UNIXTIME(`start`)) IN ('" . implode("','", $_SESSION['user_shifts']['days']) . "') "; 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']) { if(count($_SESSION['user_shifts']['days'])==1 && $_SESSION['user_shifts']['new_style']) {
$myrooms=$rooms; $myrooms = $rooms;
foreach($myrooms as $k => $v) {
// delete un-selected rooms from array
foreach($myrooms as $k => $v)
if(array_search($v["id"],$_SESSION['user_shifts']['rooms'])===FALSE) if(array_search($v["id"],$_SESSION['user_shifts']['rooms'])===FALSE)
unset($myrooms[$k]); unset($myrooms[$k]);
}
$first=date("U",strtotime($_SESSION['user_shifts']['days'][0]." 00:00:00")); $first=date("U",strtotime($_SESSION['user_shifts']['days'][0]." 00:00:00"));
$last=date("U",strtotime($_SESSION['user_shifts']['days'][0]." 23:59:59")); $last=date("U",strtotime($_SESSION['user_shifts']['days'][0]." 23:59:59"));
$maxshow=24*4; $maxshow=24*4;
$block=array(); $block=array();
$todo=array(); $todo=array();
foreach($myrooms as $room) {
$rid=$room["id"]; // initialize $block array
$block[$rid] = array_fill(0, $maxshow, 0); foreach($myrooms as $room)
foreach($shifts as $shift) { $block[$room["id"]] = array_fill(0, $maxshow, 0);
if($shift["RID"]==$rid) {
// calculate number of parallel shifts in each timeslot for one room // calculate number of parallel shifts in each timeslot for each room
$blocks=($shift["end"]-$shift["start"])/(15*60); foreach($shifts as $shift) {
$firstblock=floor(($shift["start"]-$first)/(15*60)); $rid = $shift["RID"];
for($i=$firstblock;$i<$blocks+$firstblock && $i < $maxshow;$i++) { $blocks = ($shift["end"]-$shift["start"]) / (15*60);
$block[$rid][$i]++; $firstblock = floor(($shift["start"]-$first) / (15*60));
} for($i = $firstblock; $i < $blocks + $firstblock && $i < $maxshow; $i++)
} $block[$rid][$i]++;
}
} }
$shifts_table="<table id=\"shifts\"><thead><tr><th>-</th>";
foreach($myrooms as $room) { $shifts_table = "<table id=\"shifts\"><thead><tr><th>-</th>";
$rid=$room["id"]; 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]); $colspan = call_user_func_array('max', $block[$rid]);
if($colspan == 0) if($colspan == 0)
$colspan = 1; $colspan = 1;
$todo[$rid] = array_fill(0, $maxshow, $colspan); $todo[$rid] = array_fill(0, $maxshow, $colspan);
$shifts_table.="<th" . (($colspan > 1)? ' colspan="' . $colspan . '"' : '') . ">${room['name']}</th>\n"; $shifts_table.="<th" . (($colspan > 1)? ' colspan="' . $colspan . '"' : '') . ">${room['name']}</th>\n";
} }
unset($block, $blocks, $firstblock, $colspan, $key, $room);
$shifts_table.="</tr></thead><tbody>"; $shifts_table.="</tr></thead><tbody>";
for($i=0;$i<$maxshow;$i++) { for($i = 0; $i < $maxshow; $i++) {
$thistime=$first+($i*15*60); $thistime = $first + ($i*15*60);
if($thistime%(60*60)==0) { if($thistime%(60*60) == 0) {
$shifts_table.="<tr><th>".date("H:i",$thistime)."</th>"; $shifts_table .= "<tr><th>" . date("H:i",$thistime) . "</th>";
} else { } else {
$shifts_table.="<tr><th></th>"; $shifts_table .= "<tr><th></th>";
} }
foreach($myrooms as $room) { foreach($myrooms as $room) {
$rid=$room["id"]; $rid = $room["id"];
foreach($shifts as $shift) { foreach($shifts as $shift) {
if($shift["RID"]==$rid) { if($shift["RID"] == $rid) {
if(floor($shift["start"]/(15*60)) == $thistime/(15*60)) { if(floor($shift["start"]/(15*60)) == $thistime/(15*60)) {
$blocks=($shift["end"]-$shift["start"])/(15*60); $blocks = ($shift["end"]-$shift["start"])/(15*60);
if($blocks<1) $blocks=1; if($blocks < 1)
$blocks = 1;
// qqqqqq // qqqqqq
$is_free = false; $is_free = false;
$shifts_row = $shift['name']; $shifts_row = $shift['name'];
if (in_array('admin_shifts', $privileges)) if (in_array('admin_shifts', $privileges))
$shifts_row .= ' <a href="?p=user_shifts&amp;edit_shift=' . $shift['SID'] . '">[edit]</a> <a href="?p=user_shifts&amp;delete_shift=' . $shift['SID'] . '">[x]</a>'; $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.= '<br />'; $shifts_row .= '<br />';
$query = "SELECT `NeededAngelTypes`.`count`, `AngelTypes`.`id`, `AngelTypes`.`restricted`, `UserAngelTypes`.`confirm_user_id`, `AngelTypes`.`name`, `UserAngelTypes`.`user_id` $query = "SELECT `NeededAngelTypes`.`count`, `AngelTypes`.`id`, `AngelTypes`.`restricted`, `UserAngelTypes`.`confirm_user_id`, `AngelTypes`.`name`, `UserAngelTypes`.`user_id`
FROM `NeededAngelTypes` FROM `NeededAngelTypes`
JOIN `AngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `AngelTypes`.`id`) 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`"); $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 (); $entry_list = array ();
foreach ($entries as $entry) { foreach ($entries as $entry) {
if($entry['Gekommen']==1) if($entry['Gekommen'] == 1)
$style="font-weight:bold;"; $style="font-weight:bold;";
else else
$style="font-weight:normal;"; $style="font-weight:normal;";
@ -490,7 +501,7 @@ function view_user_shifts() {
// User shift admins may join anybody in every shift // User shift admins may join anybody in every shift
$user_may_join_shift |= in_array('user_shifts_admin', $privileges); $user_may_join_shift |= in_array('user_shifts_admin', $privileges);
if ($user_may_join_shift) if ($user_may_join_shift)
$entry_list[] = '<a href="' . page_link_to('user_shifts') . '&amp;shift_id=' . $shift['SID'] . '&amp;type_id=' . $angeltype['id'] . '">' . $inner_text . ' &raquo;</a>'; $entry_list[] = '<a href="' . page_link_to('user_shifts') . '&amp;shift_id=' . $shift['SID'] . '&amp;type_id=' . $angeltype['id'] . '">' . $inner_text . '&nbsp;&raquo;</a>';
else { else {
if(time() > $shift['start']) { if(time() > $shift['start']) {
$entry_list[] = $inner_text . ' (vorbei)'; $entry_list[] = $inner_text . ' (vorbei)';
@ -510,7 +521,7 @@ function view_user_shifts() {
$shifts_row .= '<br />'; $shifts_row .= '<br />';
} }
if (in_array('user_shifts_admin', $privileges)) { if (in_array('user_shifts_admin', $privileges)) {
$shifts_row .= '<a href="' . page_link_to('user_shifts') . '&amp;shift_id=' . $shift['SID'] . '&amp;type_id=' . $angeltype['id'] . '">Weitere Helfer eintragen &raquo;</a>'; $shifts_row .= '<a href="' . page_link_to('user_shifts') . '&amp;shift_id=' . $shift['SID'] . '&amp;type_id=' . $angeltype['id'] . '">Weitere Helfer eintragen&nbsp;&raquo;</a>';
} }
} }
$shifts_table.='<td rowspan="' . $blocks . '" class="' . ($is_free? 'free' : 'occupied') . '">'; $shifts_table.='<td rowspan="' . $blocks . '" class="' . ($is_free? 'free' : 'occupied') . '">';
@ -518,19 +529,19 @@ function view_user_shifts() {
$shifts_table.=$shifts_row; $shifts_table.=$shifts_row;
} }
$shifts_table.="</td>"; $shifts_table.="</td>";
for($j=0;$j<$blocks&& $i+$j < $maxshow;$j++) { for($j=0; $j < $blocks && $i+$j < $maxshow; $j++) {
$todo[$rid][$i+$j]--; $todo[$rid][$i+$j]--;
} }
} }
} }
} }
// fill up row with empty <td> // fill up row with empty <td>
while($todo[$rid][$i]--) while($todo[$rid][$i]-- > 0)
$shifts_table.='<td></td>'; $shifts_table .= '<td></td>';
} }
$shifts_table.="</tr>\n"; $shifts_table .= "</tr>\n";
} }
$shifts_table.='</tbody></table><script type="text/javascript">scrolltable(document.getElementById("shifts"))</script>'; $shifts_table .= '</tbody></table><script type="text/javascript">scrolltable(document.getElementById("shifts"))</script>';
// qqq // qqq
} else { } else {
$shifts_table = array(); $shifts_table = array();
@ -548,7 +559,7 @@ function view_user_shifts() {
); );
if (in_array('admin_shifts', $privileges)) if (in_array('admin_shifts', $privileges))
$shift_row['entries'] .= ' <a href="?p=user_shifts&amp;edit_shift=' . $shift['SID'] . '">[edit]</a> <a href="?p=user_shiftsamp;&delete_shift=' . $shift['SID'] . '">[x]</a>'; $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'] .= '<br />'; $shift_row['entries'] .= '<br />';
$is_free = false; $is_free = false;
$shift_has_special_needs = 0 < sql_num_query("SELECT `id` FROM `NeededAngelTypes` WHERE `shift_id` = " . $shift['SID']); $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 (); $entry_list = array ();
foreach ($entries as $entry) { foreach ($entries as $entry) {
if (in_array('user_shifts_admin', $privileges)) if (in_array('user_shifts_admin', $privileges))
$entry_list[] = '<a href="' . page_link_to('user_myshifts') . '&amp;id=' . $entry['UID'] . '">' . $entry['Nick'] . '</a> <a href="' . page_link_to('user_shifts') . '&amp;entry_id=' . $entry['id'] . '">[x]</a>'; $entry_list[] = '<a href="' . page_link_to('user_myshifts') . '&amp;id=' . $entry['UID'] . '">' . $entry['Nick'] . '</a> ' . img_button(page_link_to('user_shifts') . '&entry_id=' . $entry['id'], 'cross', 'delete');
else else
$entry_list[] = $entry['Nick']; $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']))) { if (($is_free && in_array(0, $_SESSION['user_shifts']['filled'])) || (!$is_free && in_array(1, $_SESSION['user_shifts']['filled']))) {
$shifts_table[] = $shift_row; $shifts_table[] = $shift_row;
$row_count++;
$ical_shifts[] = $shift; $ical_shifts[] = $shift;
} }
} }

10
includes/sys_lang.php
View File

@ -23,11 +23,13 @@ function Get_Text($TextID, $NoError = false) {
@ $Erg = mysql_query($SQL, $con); @ $Erg = mysql_query($SQL, $con);
if (mysql_num_rows($Erg) == 1) if (mysql_num_rows($Erg) == 1)
return (@ mysql_result($Erg, 0, "Text")); return mysql_result($Erg, 0, "Text");
elseif ($NoError && !$debug) return ""; elseif ($NoError && !$debug)
else { return "";
elseif ($debug)
return "Error Data, '$TextID' found " . mysql_num_rows($Erg) . "x"; return "Error Data, '$TextID' found " . mysql_num_rows($Erg) . "x";
} else
return $TextID;
} }
function Print_Text($TextID, $NoError = false) { function Print_Text($TextID, $NoError = false) {

5
includes/sys_template.php
View File

@ -233,4 +233,9 @@ function html_select_key($id, $name, $rows, $selected) {
$html .= '</select>'; $html .= '</select>';
return $html; return $html;
} }
function img_button($link, $icon, $text, $extra_text = '') {
$translation = empty($text)? '' : Get_Text($text);
return '<a href="' . htmlspecialchars($link) . '"><img src="pic/icons/' . htmlspecialchars($icon) . '.png" alt="' . $translation . '" ' . (empty($translation)? '' : 'title="' . $translation . '"') . '>' . (empty($extra_text)? '' : ' ' . $extra_text) . '</a>';
}
?> ?>

BIN
public/pic/icons/cross.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 655 B

After

Width:  |  Height:  |  Size: 638 B

BIN
public/pic/icons/lock.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 749 B

After

Width:  |  Height:  |  Size: 683 B

BIN
public/pic/icons/pencil.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 450 B

After

Width:  |  Height:  |  Size: 391 B

BIN
public/pic/icons/tick.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 537 B

After

Width:  |  Height:  |  Size: 535 B