diff options
Diffstat (limited to 'www-ssl/nonpublic/schichtplan.php')
| -rw-r--r-- | www-ssl/nonpublic/schichtplan.php | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/www-ssl/nonpublic/schichtplan.php b/www-ssl/nonpublic/schichtplan.php index 766d6996..2b9038a3 100644 --- a/www-ssl/nonpublic/schichtplan.php +++ b/www-ssl/nonpublic/schichtplan.php @@ -20,10 +20,18 @@ if (isset ($_GET["raum"])) { } } +<<<<<<< HEAD +include ("../../includes/header.php"); +include ("../../includes/funktionen.php"); +include ("../../includes/funktion_schichtplan.php"); +include ("../../includes/funktion_schichtplan_array.php"); +?> +======= include ("includes/header.php"); include ("includes/funktionen.php"); include ("includes/funktion_schichtplan.php"); include ("includes/funktion_schichtplan_aray.php"); +>>>>>>> spezial_includes_camp echo Get_Text("Hello") . $_SESSION['Nick'] . ",<br />" . Get_Text("pub_schicht_beschreibung") . "<br /><br />"; @@ -69,7 +77,18 @@ if (!isset ($raum)) { // Ausgabe wenn kein Raum Ausgew�hlt: echo Get_Text("pub_schicht_auswahl_raeume") . "<br /><br />\n"; +<<<<<<< HEAD + +if ( !isset($raum) ) +{ + // Ausgabe wenn kein Raum Ausgew�hlt: + echo Get_Text("pub_schicht_auswahl_raeume"). "<br><br>\n"; + + if( isset($Room)) + { +======= if (isset ($Room)) { +>>>>>>> spezial_includes_camp echo "<form action=\"./schichtplan.php\" method=\"GET\">\n"; foreach ($Room as $RoomEntry) { echo "\t<li><input type=\"checkbox\" name=\"raum_" . $RoomEntry["RID"] . "\" value=\"" . $RoomEntry["RID"] . " \">"; @@ -90,6 +109,19 @@ if (!isset ($raum)) { echo Get_Text("pub_schicht_EmptyShifts") . "\n"; // zeit die naesten freien schichten +<<<<<<< HEAD + showEmptyShifts(); +} +else +{ // Wenn einraum Ausgew�hlt ist: + if( $raum == -1 ) + echo Get_Text("pub_schicht_Anzeige_1").$ausdatum.":<br><br>"; + elseif( substr( $raum, 0, 1) == ";" ) + echo Get_Text("pub_schicht_Anzeige_1").$ausdatum.":<br><br>"; + else + echo Get_Text("pub_schicht_Anzeige_1"). $ausdatum. + Get_Text("pub_schicht_Anzeige_2"). $RoomID[$raum]. "<br><br>"; +======= showEmptyShifts(); } else { // Wenn einraum Ausgew�hlt ist: if ($raum == -1) @@ -98,6 +130,7 @@ if (!isset ($raum)) { else echo Get_Text("pub_schicht_Anzeige_1") . $ausdatum . Get_Text("pub_schicht_Anzeige_2") . $RoomID[$raum] . "<br /><br />"; +>>>>>>> spezial_includes_camp ShowSwitchDay(); @@ -106,11 +139,20 @@ if (!isset ($raum)) { echo "\t\t<td>start</td>\n"; //Ausgabe Spalten �berschrift +<<<<<<< HEAD + if( $raum == -1 ) + { + if( isset($Room)) + foreach( $Room as $RoomEntry ) + if (SummRoomShifts($RoomEntry["RID"]) > 0) + echo "\t\t<th>". $RoomEntry["Name"]. "</th>\n"; +======= if ($raum == -1) { if (isset ($Room)) foreach ($Room as $RoomEntry) if (SummRoomShifts($RoomEntry["RID"]) > 0) echo "\t\t<th>" . $RoomEntry["Name"] . "</th>\n"; +>>>>>>> spezial_includes_camp } elseif (substr($raum, 0, 1) == ";") { $words = preg_split("/;/", $raum); |