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

fixes for last commit

This commit is contained in:
Jan-Philipp Litza 2012-12-27 22:49:10 +01:00
parent 13747c62fd
commit dd5ca95975
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
includes/pages/user_shifts.php
View File

@ -60,9 +60,9 @@ function user_shifts() {
// Benötigte Engeltypen vom Raum // Benötigte Engeltypen vom Raum
$needed_angel_types_source = sql_select("SELECT `AngelTypes`.*, `NeededAngelTypes`.`count` FROM `AngelTypes` LEFT JOIN `NeededAngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `AngelTypes`.`id` AND `NeededAngelTypes`.`room_id`=" . sql_escape($shift['RID']) . ") ORDER BY `AngelTypes`.`name`"); $needed_angel_types_source = sql_select("SELECT `AngelTypes`.*, `NeededAngelTypes`.`count` FROM `AngelTypes` LEFT JOIN `NeededAngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `AngelTypes`.`id` AND `NeededAngelTypes`.`room_id`=" . sql_escape($shift['RID']) . ") ORDER BY `AngelTypes`.`name`");
foreach ($needed_angel_types_source as $type) { foreach ($needed_angel_types_source as $type) {
if($type['count'] != "") if($type['count'] != "")
$needed_angel_types[$type['id']] =$type['count']; $needed_angel_types[$type['id']] =$type['count'];
} }
// Benötigte Engeltypen von der Schicht // Benötigte Engeltypen von der Schicht
$needed_angel_types_source = sql_select("SELECT `AngelTypes`.*, `NeededAngelTypes`.`count` FROM `AngelTypes` LEFT JOIN `NeededAngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `AngelTypes`.`id` AND `NeededAngelTypes`.`shift_id`=" . sql_escape($shift_id) . ") ORDER BY `AngelTypes`.`name`"); $needed_angel_types_source = sql_select("SELECT `AngelTypes`.*, `NeededAngelTypes`.`count` FROM `AngelTypes` LEFT JOIN `NeededAngelTypes` ON (`NeededAngelTypes`.`angel_type_id` = `AngelTypes`.`id` AND `NeededAngelTypes`.`shift_id`=" . sql_escape($shift_id) . ") ORDER BY `AngelTypes`.`name`");
@ -384,7 +384,7 @@ function view_user_shifts() {
} }
} }
} }
$shifts_table="<table id=\"shifts\" style=\"background-color: #fff\"><colgroup><col><col span=\"100\"></colgroup><thead><tr><th>-</th>"; $shifts_table="<table id=\"shifts\"><thead><tr><th>-</th>";
foreach($myrooms as $room) { foreach($myrooms as $room) {
$rid=$room["id"]; $rid=$room["id"];
$colspan=1; $colspan=1;

4
public/css/base.css
View File

@ -108,6 +108,10 @@ table {
display: block; display: block;
} }
#shifts {
background-color: #fff;
}
table.scrollable { table.scrollable {
max-width: 100%; max-width: 100%;
overflow-x: scroll; overflow-x: scroll;