summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--www-ssl/admin/UserPicture.php1
-rwxr-xr-xwww-ssl/admin/room.php199
-rw-r--r--www-ssl/nonpublic/schichtplan.php42
3 files changed, 242 insertions, 0 deletions
diff --git a/www-ssl/admin/UserPicture.php b/www-ssl/admin/UserPicture.php
index 102d551d..25f8b54b 100644
--- a/www-ssl/admin/UserPicture.php
+++ b/www-ssl/admin/UserPicture.php
@@ -3,6 +3,7 @@ require_once ('../bootstrap.php');
$title = "UserPicture";
$header = "Verwaltung der User Picture";
+
include ("includes/header.php");
include ("includes/funktion_schichtplan_aray.php");
diff --git a/www-ssl/admin/room.php b/www-ssl/admin/room.php
new file mode 100755
index 00000000..4854acb6
--- /dev/null
+++ b/www-ssl/admin/room.php
@@ -0,0 +1,199 @@
+<?php
+$title = "R&auml;ume";
+$header = "Verwaltung der R&auml;ume";
+include ("../../includes/header.php");
+include ("../../includes/funktion_schichtplan_array.php");
+
+$Sql = "SELECT * FROM `Room` ORDER BY `Number`, `Name`";
+$Erg = mysql_query($Sql, $con);
+
+if( !IsSet($_GET["action"]) )
+{
+ echo "Hallo ".$_SESSION['Nick'].
+ ",<br>\nhier hast du die M&ouml;glichkeit, neue R&auml;ume f&uuml;r die Schichtpl&auml;ne einzutragen ".
+ "oder vorhandene abzu&auml;ndern:<br><br>\n";
+
+ echo "<a href=\"./room.php?action=new\">- Neuen Raum/Ort eintragen</a><br>\n";
+
+ echo "<table width=\"100%\" class=\"border\" cellpadding=\"2\" cellspacing=\"1\">\n";
+ echo "<tr class=\"contenttopic\">\n";
+
+ for( $i = 1; $i < mysql_num_fields($Erg); $i++ )
+ {
+ if( substr( mysql_field_name($Erg, $i), 0, 12) == "DEFAULT_EID_")
+ echo "\t<td> Anzahl ". $EngelTypeID[substr( mysql_field_name($Erg, $i), 12)]. "</td>";
+ else
+ echo "\t<td>". mysql_field_name($Erg, $i)."</td>";
+ }
+ echo "\t<td>&Auml;ndern</td>";
+ echo "</tr>";
+
+ for( $t = 0; $t < mysql_num_rows($Erg); $t++ )
+ {
+ echo "\t<tr class=\"content\">\n";
+ for ($j = 1; $j < mysql_num_fields($Erg); $j++)
+ {
+ echo "\t\t<td>".mysql_result($Erg, $t, $j)."</td>\n";
+ }
+ echo "\t\t<td><a href=\"./room.php?action=change&RID=".mysql_result($Erg, $t, "RID")."\">###</a></td>\n";
+ echo "\t</tr>\n";
+ } // ende Auflistung Raeume
+ echo "</table>";
+}
+else
+{
+
+UnSet($SQL);
+
+switch ($_GET["action"]) {
+
+case 'new':
+ echo "Neuen Raum einrichten: <br>";
+ echo "<form action=\"./room.php\" method=\"GET\">\n";
+ echo "<table>\n";
+
+ for( $Uj = 1; $Uj < mysql_num_fields($Erg); $Uj++ )
+ {
+ if( (mysql_field_name($Erg, $Uj) == "show") || (mysql_field_name($Erg, $Uj) == "FromPentabarf") )
+ {
+ echo "<tr><td>". mysql_field_name($Erg, $Uj). "</td>".
+ "<td>".
+ "<input type=\"radio\" name=\"". mysql_field_name($Erg, $Uj). "\" value=\"Y\">Yes".
+ "<input type=\"radio\" name=\"". mysql_field_name($Erg, $Uj). "\" value=\"N\">No".
+ "</td></tr>\n";
+ }
+ else
+ {
+ //sonderfall fuer Default Engel
+ if( substr( mysql_field_name($Erg, $Uj), 0, 12) == "DEFAULT_EID_")
+ $FeldName = "Anzahl ". $EngelTypeID[substr( mysql_field_name($Erg, $Uj), 12)];
+ else
+ $FeldName = mysql_field_name($Erg, $Uj);
+
+ echo "<td>$FeldName</td>".
+ "<td><input type=\"text\" size=\"40\" name=\"".mysql_field_name($Erg, $Uj)."\">";
+ echo "</td></tr>\n";
+ }
+ }
+ echo "</table>\n";
+ echo "<input type=\"hidden\" name=\"action\" value=\"newsave\">\n";
+ echo "<input type=\"submit\" value=\"sichern...\">\n";
+ echo "</form>";
+ break;
+
+case 'newsave':
+ $vars = $_GET;
+ $count = count($vars) - 1;
+ $vars = array_splice($vars, 0, $count);
+ $Keys = "";
+ $Values = "";
+ foreach($vars as $key => $value)
+ {
+ $Keys .= ", `$key`";
+ $Values .= ", '$value'";
+ }
+ $SQL = "INSERT INTO `Room` (". substr( $Keys, 2). ") VALUES (". substr( $Values, 2). ")";
+ SetHeaderGo2Back();
+ break;
+
+case 'change':
+ if (! IsSet($_GET["RID"]))
+ echo "Fehlerhafter Aufruf!";
+ else
+ {
+ $SQL2 = "SELECT * FROM `Room` WHERE `RID`='". $_GET["RID"]. "'";
+ $ERG = mysql_query($SQL2, $con);
+
+ if( mysql_num_rows( $ERG)>0)
+ {
+ echo "Raum ab&auml;ndern:\n";
+ echo "Hier kannst du eintragen, welche und wieviele Engel f&uuml;r den Raum zur Verf?gung stehen m&uuml;ssen.";
+ echo "<form action=\"./room.php\" method=\"GET\">\n";
+ echo "<table>\n";
+
+ for ($Uj = 1; $Uj < mysql_num_fields($ERG); $Uj++)
+ {
+ if( (mysql_field_name($ERG, $Uj) == "show") || (mysql_field_name($ERG, $Uj) == "FromPentabarf") )
+ {
+ echo "<tr><td>". mysql_field_name($Erg, $Uj). "</td>".
+ "<td>".
+ "<input type=\"radio\" name=\"e". mysql_field_name($ERG, $Uj).
+ "\" value=\"Y\"". (mysql_result($ERG, 0, $Uj)=='Y'? " checked":""). ">Yes".
+ "<input type=\"radio\" name=\"e". mysql_field_name($ERG, $Uj).
+ "\" value=\"N\"". (mysql_result($ERG, 0, $Uj)=='N'? " checked":""). ">No".
+ "</td></tr>\n";
+ }
+ else
+ {
+ if( substr( mysql_field_name($ERG, $Uj), 0, 12) == "DEFAULT_EID_")
+ //sonderfall fuer Default Engel
+ $FeldName = "Anzahl ". $EngelTypeID[substr( mysql_field_name($ERG, $Uj), 12)];
+ else
+ $FeldName = mysql_field_name($ERG, $Uj);
+ echo "<tr><td>$FeldName</td>".
+ "<td><input type=\"text\" size=\"40\" name=\"e".mysql_field_name($ERG, $Uj)."\" ".
+ "value=\"".mysql_result($ERG, 0, $Uj)."\">".
+ "</td></tr>\n";
+ }
+ }
+ echo "</table>\n";
+ echo "<input type=\"hidden\" name=\"eRID\" value=\"". $_GET["RID"]. "\">\n";
+ echo "<input type=\"hidden\" name=\"action\" value=\"changesave\">\n";
+ echo "<input type=\"submit\" value=\"sichern...\">\n";
+ echo "</form>";
+ echo "<form action=\"./room.php\" method=\"GET\">\n";
+ echo "<input type=\"hidden\" name=\"RID\" value=\"". $_GET["RID"]. "\">\n";
+ echo "<input type=\"hidden\" name=\"action\" value=\"delete\">\n";
+ echo "<input type=\"submit\" value=\"L&ouml;schen...\">";
+ echo "</form>";
+ }
+ else
+ echo "FEHLER: Room ID ". $_GET["RID"]. " nicht gefunden";
+ }
+ break;
+
+case 'changesave':
+ $sql="";
+ $vars = $_GET;
+ $count = count($vars) - 2;
+ $vars = array_splice($vars, 0, $count);
+ foreach($vars as $key => $value)
+ {
+ $keys = substr($key,1);
+ $sql .= ", `".$keys."`='".$value."' ";
+ }
+ $SQL = "UPDATE `Room` SET ". substr($sql, 2). " WHERE `RID`='". $_GET["eRID"]. "'";
+ SetHeaderGo2Back();
+ break;
+
+case 'delete':
+ if (IsSet($_GET["RID"])) {
+ $SQL="DELETE FROM `Room` WHERE `RID`='". $_GET["RID"]. "'";
+ } else {
+ echo "Fehlerhafter Aufruf";
+ }
+ SetHeaderGo2Back();
+ break;
+
+} //switch
+
+
+// Update ???
+
+if (IsSet($SQL)){
+// echo $SQL;
+ // hier muesste das SQL ausgefuehrt werden...
+ $Erg = db_query($SQL, "exec SQL");
+ if ($Erg == 1)
+ echo "&Auml;nderung wurde gesichert...<br>";
+ else
+ {
+ echo "Fehler beim speichern... bitte noch ein mal probieren :)";
+ echo "<br><br>".mysql_error( $con ). "<br>($SQL)<br>";
+ }
+} // Ende Update
+
+} //IF IsSet($action)
+
+include ("../../includes/footer.php");
+?>
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);
generated by cgit v1.2.3-54-g00ecf (git 2.45.0) at 2024-06-26 15:43:17 +0000