5balls
/
Bengelsystem
mirror of https://github.com/iridos/Bengelsystem.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix formatting errors

This commit is contained in:
Florian Pesth 2024-03-22 17:05:23 +01:00
parent 8abc400ef6
commit 9e9f346fda
10 changed files with 558 additions and 499 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
html/AdminDienste.php
View File

@ -171,7 +171,7 @@ $Leiter = "";
$Gruppe = ""; $Gruppe = "";
$HelferLevel = ""; $HelferLevel = "";
foreach ($zeilen as $zeile){ foreach ($zeilen as $zeile) {
if ($zeile['DienstID'] != $DienstID) { if ($zeile['DienstID'] != $DienstID) {
echo "<option value='" . $zeile['DienstID'] . "'>" . $zeile['Was'] . "</option>"; echo "<option value='" . $zeile['DienstID'] . "'>" . $zeile['Was'] . "</option>";
} else { } else {

2
html/AdminMeineSchichten.php
View File

@ -224,7 +224,7 @@ echo '<table class="commontable">';
foreach($schichten as $schicht) { foreach ($schichten as $schicht) {
//echo '<tr title="Details anzeigen" onclick="parent.DetailsSchichten.location.href=\'DetailsSchichten.php?InfoAlleSchichtID='.$schicht['SchichtID'].'#Info\';" >'; //echo '<tr title="Details anzeigen" onclick="parent.DetailsSchichten.location.href=\'DetailsSchichten.php?InfoAlleSchichtID='.$schicht['SchichtID'].'#Info\';" >';
echo '<tr title="Details anzeigen" onclick="window.location.href=\'DetailsSchichten.php?InfoAlleSchichtID=' . $schicht['SchichtID'] . '#Info\';" >'; echo '<tr title="Details anzeigen" onclick="window.location.href=\'DetailsSchichten.php?InfoAlleSchichtID=' . $schicht['SchichtID'] . '#Info\';" >';
echo "<td>" . $schicht['Was'] . "</td>"; echo "<td>" . $schicht['Was'] . "</td>";

2
html/ReadLog.php
View File

@ -30,7 +30,7 @@ require '_login.php';
$AdminID = $_SESSION["AdminID"]; $AdminID = $_SESSION["AdminID"];
$zeilen = Helferdaten($HelferID); $zeilen = Helferdaten($HelferID);
foreach ($zeilen as $zeile)) { foreach ($zeilen as $zeile) {
$HelferName = $zeile['Name']; $HelferName = $zeile['Name'];
$HelferIsAdmin = $zeile['Admin']; $HelferIsAdmin = $zeile['Admin'];
} }

258
html/SQL.php
View File

@ -2,7 +2,8 @@
require_once 'konfiguration.php'; require_once 'konfiguration.php';
class DB { class DB
{
private static $instance = null; private static $instance = null;
private static $pdo = null; private static $pdo = null;
private static $stmts = array(); private static $stmts = array();
@ -10,20 +11,20 @@ class DB {
private function __construct() private function __construct()
{ {
self::$pdo = new PDO( self::$pdo = new PDO(
MYSQL_DSN, MYSQL_DSN,
MYSQL_BENUTZER, MYSQL_BENUTZER,
MYSQL_KENNWORT, MYSQL_KENNWORT,
array(PDO::ATTR_ERRMODE => PDO::ERRMODE_WARNING) array(PDO::ATTR_ERRMODE => PDO::ERRMODE_WARNING)
); );
} }
public static function getInstance() public static function getInstance()
{ {
if(self::$instance == null){ if (self::$instance == null) {
self::$instance = new DB(); self::$instance = new DB();
if(DBTYPE === 'mariadb'){ if (DBTYPE === 'mariadb') {
// Set database to german (FIXME should be configurable) // Set database to german (FIXME should be configurable)
self::prepare(__METHOD__,"SET lc_time_names = 'de_DE'"); self::prepare(__METHOD__, "SET lc_time_names = 'de_DE'");
self::execute(__METHOD__); self::execute(__METHOD__);
} }
} }
@ -42,19 +43,19 @@ class DB {
public function fetch($method, $variant = '', int $mode = PDO::FETCH_BOTH, int $cursorOrientation = PDO::FETCH_ORI_NEXT, int $cursorOffset = 0) public function fetch($method, $variant = '', int $mode = PDO::FETCH_BOTH, int $cursorOrientation = PDO::FETCH_ORI_NEXT, int $cursorOffset = 0)
{ {
return self::$stmts[$method . "::" . $variant]->fetch($mode,$cursorOrientation,$cursorOffset); return self::$stmts[$method . "::" . $variant]->fetch($mode, $cursorOrientation, $cursorOffset);
} }
public function executeScript($method, $filename, $variant = '') public function executeScript($method, $filename, $variant = '')
{ {
$sqlFromFile = file_get_contents($filename); $sqlFromFile = file_get_contents($filename);
$sqlStatements = explode(";", $sqlFromFile); $sqlStatements = explode(";", $sqlFromFile);
$statementcounter = 0; $statementcounter = 0;
foreach($sqlStatements as $sqlStatement){ foreach ($sqlStatements as $sqlStatement) {
if(self::prepare($method, $sqlStatement.";", $variant) == false){ if (self::prepare($method, $sqlStatement . ";", $variant) == false) {
return array(); return array();
}; };
$retval[$statementcounter] = self::execute($method,array(),$variant); $retval[$statementcounter] = self::execute($method, array(), $variant);
if(!is_null(self::pdoErrorCode()) && self::pdoErrorCode() != '00000'){ if (!is_null(self::pdoErrorCode()) && self::pdoErrorCode() != '00000') {
return $retval; return $retval;
} }
$statementcounter++; $statementcounter++;
@ -101,9 +102,9 @@ function CreateHelfer($HelferName, $HelferEmail, $HelferHandy, $HelferPasswort,
$PasswortHash = password_hash($HelferPasswort, PASSWORD_DEFAULT); $PasswortHash = password_hash($HelferPasswort, PASSWORD_DEFAULT);
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"INSERT INTO Helfer(Name,Email,Handy,Status,BildFile,DoReport,Passwort,HelferLevel)". $db->prepare(__METHOD__, "INSERT INTO Helfer(Name,Email,Handy,Status,BildFile,DoReport,Passwort,HelferLevel)" .
" VALUES (:name,:email,:handy,:status,:bildfile,:doreport,:passwort,:helferlevel)"); " VALUES (:name,:email,:handy,:status,:bildfile,:doreport,:passwort,:helferlevel)");
$db_erg = $db->execute(__METHOD__,[ $db_erg = $db->execute(__METHOD__, [
"name" => $HelferName, "name" => $HelferName,
"email" => $HelferEmail, "email" => $HelferEmail,
"handy" => $HelferHandy, "handy" => $HelferHandy,
@ -123,8 +124,8 @@ function CreateHelfer($HelferName, $HelferEmail, $HelferHandy, $HelferPasswort,
function HelferIstVorhanden($Email) function HelferIstVorhanden($Email)
{ {
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"SELECT count(HelferID) AS Anzahl FROM Helfer WHERE Email = :email"); $db->prepare(__METHOD__, "SELECT count(HelferID) AS Anzahl FROM Helfer WHERE Email = :email");
$db->execute(__METHOD__,["email" => $Email]); $db->execute(__METHOD__, ["email" => $Email]);
$zeile = $db->fetchAll(__METHOD__); $zeile = $db->fetchAll(__METHOD__);
return $zeile[0]['Anzahl']; return $zeile[0]['Anzahl'];
} }
@ -136,8 +137,8 @@ function HelferLogin($HelferEmail, $HelferPasswort, $HelferStatus)
//echo "Test<br>"; //echo "Test<br>";
// Helfer Suchen // Helfer Suchen
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"SELECT HelferID,Admin,Name,Passwort,HelferLevel FROM Helfer WHERE Email=:email"); $db->prepare(__METHOD__, "SELECT HelferID,Admin,Name,Passwort,HelferLevel FROM Helfer WHERE Email=:email");
$db_erg = $db->execute(__METHOD__,["email" => $HelferEmail]); $db_erg = $db->execute(__METHOD__, ["email" => $HelferEmail]);
if (!is_null($db->errorCode(__METHOD__)) && $db->errorCode(__METHOD__) != '00000') { if (!is_null($db->errorCode(__METHOD__)) && $db->errorCode(__METHOD__) != '00000') {
echo "Login ungueltige Abfrage"; echo "Login ungueltige Abfrage";
die('Ungueltige Abfrage: ' . $db->errorInfo(__METHOD__)[2]); die('Ungueltige Abfrage: ' . $db->errorInfo(__METHOD__)[2]);
@ -167,7 +168,7 @@ function HelferLogin($HelferEmail, $HelferPasswort, $HelferStatus)
function HelferListe() function HelferListe()
{ {
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"SELECT HelferID,Name FROM Helfer"); $db->prepare(__METHOD__, "SELECT HelferID,Name FROM Helfer");
$db_erg = $db->execute(__METHOD__); $db_erg = $db->execute(__METHOD__);
$db->onErrorDie(__METHOD__); $db->onErrorDie(__METHOD__);
$helfer = $db->fetchAll(__METHOD__); $helfer = $db->fetchAll(__METHOD__);
@ -178,8 +179,8 @@ function HelferListe()
function Helferdaten($HelferID) function Helferdaten($HelferID)
{ {
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"SELECT * FROM Helfer Where HelferID = :helferid"); $db->prepare(__METHOD__, "SELECT * FROM Helfer Where HelferID = :helferid");
$db_erg = $db->execute(__METHOD__,["helferid" => $HelferID]); $db_erg = $db->execute(__METHOD__, ["helferid" => $HelferID]);
$db->onErrorDie(__METHOD__); $db->onErrorDie(__METHOD__);
$helferdaten = $db->fetchAll(__METHOD__); $helferdaten = $db->fetchAll(__METHOD__);
return $helferdaten; return $helferdaten;
@ -190,30 +191,30 @@ function Helferdaten($HelferID)
function HelferdatenAendern($HelferName, $HelferEmail, $HelferHandy, $HelferNewPasswort, $HelferID, $HelferIsAdmin = -1, $AdminID = 0) function HelferdatenAendern($HelferName, $HelferEmail, $HelferHandy, $HelferNewPasswort, $HelferID, $HelferIsAdmin = -1, $AdminID = 0)
{ {
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"UPDATE Helfer SET Name=:name,Email=:email,Handy=:handy Where HelferId=:id",'password_empty'); $db->prepare(__METHOD__, "UPDATE Helfer SET Name=:name,Email=:email,Handy=:handy Where HelferId=:id", 'password_empty');
$db->prepare(__METHOD__,"UPDATE Helfer SET Name=:name,Email=:email,Handy=:handy,Admin=:admin Where HelferId=:id",'password_empty_admin'); $db->prepare(__METHOD__, "UPDATE Helfer SET Name=:name,Email=:email,Handy=:handy,Admin=:admin Where HelferId=:id", 'password_empty_admin');
$db->prepare(__METHOD__,"UPDATE Helfer SET Name=:name,Email=:email,Handy=:handy,Passwort=:passwort Where HelferId=:id",'password_given'); $db->prepare(__METHOD__, "UPDATE Helfer SET Name=:name,Email=:email,Handy=:handy,Passwort=:passwort Where HelferId=:id", 'password_given');
$db->prepare(__METHOD__,"UPDATE Helfer SET Name=:name,Email=:email,Handy=:handy,Passwort=:passwort,Admin=:admin Where HelferId=:id",'password_given_admin'); $db->prepare(__METHOD__, "UPDATE Helfer SET Name=:name,Email=:email,Handy=:handy,Passwort=:passwort,Admin=:admin Where HelferId=:id", 'password_given_admin');
if ($HelferNewPasswort == "") { if ($HelferNewPasswort == "") {
//$sql = "UPDATE Helfer SET Name='$HelferName',Email='$HelferEmail',Handy='$HelferHandy' ".($HelferIsAdmin!=-1)?',Admin='$HelferIsAdmin.':'." Where HelferId=".$HelferID; //$sql = "UPDATE Helfer SET Name='$HelferName',Email='$HelferEmail',Handy='$HelferHandy' ".($HelferIsAdmin!=-1)?',Admin='$HelferIsAdmin.':'." Where HelferId=".$HelferID;
if ($HelferIsAdmin == -1) { if ($HelferIsAdmin == -1) {
$db_erg = $db->execute(__METHOD__,[ $db_erg = $db->execute(__METHOD__, [
"name" => $HelferName, "name" => $HelferName,
"email" => $HelferEmail, "email" => $HelferEmail,
"handy" => $HelferHandy, "handy" => $HelferHandy,
"id" => $HelferID "id" => $HelferID
],'password_empty'); ], 'password_empty');
$db->onErrorDie(__METHOD__,'password_empty'); $db->onErrorDie(__METHOD__, 'password_empty');
} else { } else {
$db_erg = $db->execute(__METHOD__,[ $db_erg = $db->execute(__METHOD__, [
"name" => $HelferName, "name" => $HelferName,
"email" => $HelferEmail, "email" => $HelferEmail,
"handy" => $HelferHandy, "handy" => $HelferHandy,
"admin" => $HelferIsAdmin, "admin" => $HelferIsAdmin,
"id" => $HelferID "id" => $HelferID
],'password_empty_admin'); ], 'password_empty_admin');
$db->onErrorDie(__METHOD__,'password_empty_admin'); $db->onErrorDie(__METHOD__, 'password_empty_admin');
} }
echo "<li>Helferdaten geändert</li>"; echo "<li>Helferdaten geändert</li>";
if ($AdminID != 0) { if ($AdminID != 0) {
@ -225,23 +226,23 @@ function HelferdatenAendern($HelferName, $HelferEmail, $HelferHandy, $HelferNewP
$HelferNewPasswort = "€" . $HelferNewPasswort . "ß"; $HelferNewPasswort = "€" . $HelferNewPasswort . "ß";
$PasswortHash = password_hash($HelferNewPasswort, PASSWORD_DEFAULT); $PasswortHash = password_hash($HelferNewPasswort, PASSWORD_DEFAULT);
if ($HelferIsAdmin == -1) { if ($HelferIsAdmin == -1) {
$db_erg = $db->execute(__METHOD__,[ $db_erg = $db->execute(__METHOD__, [
"name" => $HelferName, "name" => $HelferName,
"email" => $HelferEmail, "email" => $HelferEmail,
"handy" => $HelferHandy, "handy" => $HelferHandy,
"passwort" => $PasswortHash, "passwort" => $PasswortHash,
"id" => $HelferID "id" => $HelferID
],'password_given'); ], 'password_given');
$db->onErrorDie(__METHOD__, 'password_given'); $db->onErrorDie(__METHOD__, 'password_given');
} else { } else {
$db_erg = $db->execute(__METHOD__,[ $db_erg = $db->execute(__METHOD__, [
"name" => $HelferName, "name" => $HelferName,
"email" => $HelferEmail, "email" => $HelferEmail,
"handy" => $HelferHandy, "handy" => $HelferHandy,
"passwort" => $PasswortHash, "passwort" => $PasswortHash,
"admin" => $HelferIsAdmin, "admin" => $HelferIsAdmin,
"id" => $HelferID "id" => $HelferID
],'password_given_admin'); ], 'password_given_admin');
$db->onErrorDie(__METHOD__, 'password_given_admin'); $db->onErrorDie(__METHOD__, 'password_given_admin');
} }
//echo $sql; //echo $sql;
@ -260,17 +261,17 @@ function HelferdatenAendern($HelferName, $HelferEmail, $HelferHandy, $HelferNewP
function AlleSchichten($Sort, $HelferLevel = 1) function AlleSchichten($Sort, $HelferLevel = 1)
{ {
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"select SchichtID,Was,DATE_FORMAT(Von,'%a %H:%i') AS Ab,DATE_FORMAT(Bis,'%a %H:%i') AS Bis,C AS Ist,DATE_FORMAT(Von,'%W %d %M') As Tag, Soll from Dienst,SchichtUebersicht where Dienst.DienstID=SchichtUebersicht.DienstID and Dienst.Helferlevel=:helferlevel order by Von",'sort_by_von'); $db->prepare(__METHOD__, "select SchichtID,Was,DATE_FORMAT(Von,'%a %H:%i') AS Ab,DATE_FORMAT(Bis,'%a %H:%i') AS Bis,C AS Ist,DATE_FORMAT(Von,'%W %d %M') As Tag, Soll from Dienst,SchichtUebersicht where Dienst.DienstID=SchichtUebersicht.DienstID and Dienst.Helferlevel=:helferlevel order by Von", 'sort_by_von');
$db->prepare(__METHOD__,"select SchichtID,Was,DATE_FORMAT(Von,'%a %H:%i') AS Ab,DATE_FORMAT(Bis,'%a %H:%i') AS Bis,C AS Ist,DATE_FORMAT(Von,'%W %d %M') As Tag, Soll from Dienst,SchichtUebersicht where Dienst.DienstID=SchichtUebersicht.DienstID and Dienst.Helferlevel=:helferlevel order by Was,Von",'sort_by_was_von'); $db->prepare(__METHOD__, "select SchichtID,Was,DATE_FORMAT(Von,'%a %H:%i') AS Ab,DATE_FORMAT(Bis,'%a %H:%i') AS Bis,C AS Ist,DATE_FORMAT(Von,'%W %d %M') As Tag, Soll from Dienst,SchichtUebersicht where Dienst.DienstID=SchichtUebersicht.DienstID and Dienst.Helferlevel=:helferlevel order by Was,Von", 'sort_by_was_von');
if ($Sort == '1') { if ($Sort == '1') {
$db_erg = $db->execute(__METHOD__,["helferlevel" => $HelferLevel],'sort_by_von'); $db_erg = $db->execute(__METHOD__, ["helferlevel" => $HelferLevel], 'sort_by_von');
$db->onErrorDie(__METHOD__,'sort_by_von'); $db->onErrorDie(__METHOD__, 'sort_by_von');
$schichten = $db->fetchAll(__METHOD__,'sort_by_von'); $schichten = $db->fetchAll(__METHOD__, 'sort_by_von');
} else { } else {
$db_erg = $db->execute(__METHOD__,["helferlevel" => $HelferLevel],'sort_by_was_von'); $db_erg = $db->execute(__METHOD__, ["helferlevel" => $HelferLevel], 'sort_by_was_von');
$db->onErrorDie(__METHOD__,'sort_by_was_von'); $db->onErrorDie(__METHOD__, 'sort_by_was_von');
$schichten = $db->fetchAll(__METHOD__,'sort_by_was_von'); $schichten = $db->fetchAll(__METHOD__, 'sort_by_was_von');
} }
return $schichten; return $schichten;
@ -282,8 +283,8 @@ function AlleSchichtenCount($HelferLevel = 1)
//$sql = "select SUM(Soll) As Anzahl from SchichtUebersicht where HelferLevel=$HelferLevel"; //$sql = "select SUM(Soll) As Anzahl from SchichtUebersicht where HelferLevel=$HelferLevel";
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"select Sum(Soll) as Anzahl, HelferLevel from SchichtUebersicht,Dienst Where SchichtUebersicht.DienstID=Dienst.DienstID and HelferLevel=:helferlevel"); $db->prepare(__METHOD__, "select Sum(Soll) as Anzahl, HelferLevel from SchichtUebersicht,Dienst Where SchichtUebersicht.DienstID=Dienst.DienstID and HelferLevel=:helferlevel");
$db_erg = $db->execute(__METHOD__,["helferlevel" => $HelferLevel]); $db_erg = $db->execute(__METHOD__, ["helferlevel" => $HelferLevel]);
$db->onErrorDie(__METHOD__); $db->onErrorDie(__METHOD__);
$zeile = $db->fetchAll(__METHOD__); $zeile = $db->fetchAll(__METHOD__);
return $zeile[0]['Anzahl']; return $zeile[0]['Anzahl'];
@ -293,8 +294,8 @@ function AlleSchichtenCount($HelferLevel = 1)
function AlleBelegteSchichtenCount($HelferLevel = 1) function AlleBelegteSchichtenCount($HelferLevel = 1)
{ {
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"select Count(HelferID) As Anzahl from EinzelSchicht,Schicht,Dienst Where EinzelSchicht.SchichtID=Schicht.SchichtID and Schicht.DienstID=Dienst.DienstID and HelferLevel=:helferlevel"); $db->prepare(__METHOD__, "select Count(HelferID) As Anzahl from EinzelSchicht,Schicht,Dienst Where EinzelSchicht.SchichtID=Schicht.SchichtID and Schicht.DienstID=Dienst.DienstID and HelferLevel=:helferlevel");
$db_erg = $db->execute(__METHOD__,["helferlevel" => $HelferLevel]); $db_erg = $db->execute(__METHOD__, ["helferlevel" => $HelferLevel]);
$db->onErrorDie(__METHOD__); $db->onErrorDie(__METHOD__);
$zeile = $db->fetchAll(__METHOD__); $zeile = $db->fetchAll(__METHOD__);
return $zeile[0]['Anzahl']; return $zeile[0]['Anzahl'];
@ -307,25 +308,24 @@ function AlleSchichtenImZeitbereich($Von, $Bis, $HelferLevel = 1)
// SchichtID, Was, Ab, Bis, Ist, Tag, Soll - Ist und Soll sind die HelferStunden // SchichtID, Was, Ab, Bis, Ist, Tag, Soll - Ist und Soll sind die HelferStunden
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"select SchichtID,Was,DATE_FORMAT(Von,'%a %H:%i') AS Ab,DATE_FORMAT(Bis,'%a %H:%i') AS Bis,C AS Ist,DATE_FORMAT(Von,'%W %d %M') As Tag, Soll from Dienst,SchichtUebersicht where Von >= :von and Von < :bis and Dienst.DienstID=SchichtUebersicht.DienstID order by Was,Von",'helferlevel_not_set'); $db->prepare(__METHOD__, "select SchichtID,Was,DATE_FORMAT(Von,'%a %H:%i') AS Ab,DATE_FORMAT(Bis,'%a %H:%i') AS Bis,C AS Ist,DATE_FORMAT(Von,'%W %d %M') As Tag, Soll from Dienst,SchichtUebersicht where Von >= :von and Von < :bis and Dienst.DienstID=SchichtUebersicht.DienstID order by Was,Von", 'helferlevel_not_set');
$db->prepare(__METHOD__,"select SchichtID,Was,DATE_FORMAT(Von,'%a %H:%i') AS Ab,DATE_FORMAT(Bis,'%a %H:%i') AS Bis,C AS Ist,DATE_FORMAT(Von,'%W %d %M') As Tag, Soll from Dienst,SchichtUebersicht where Von >= :von and Von < :bis and Dienst.DienstID=SchichtUebersicht.DienstID and Dienst.HelferLevel=:helferlevel order by Was,Von",'helferlevel_set'); $db->prepare(__METHOD__, "select SchichtID,Was,DATE_FORMAT(Von,'%a %H:%i') AS Ab,DATE_FORMAT(Bis,'%a %H:%i') AS Bis,C AS Ist,DATE_FORMAT(Von,'%W %d %M') As Tag, Soll from Dienst,SchichtUebersicht where Von >= :von and Von < :bis and Dienst.DienstID=SchichtUebersicht.DienstID and Dienst.HelferLevel=:helferlevel order by Was,Von", 'helferlevel_set');
if ($HelferLevel == -1) { if ($HelferLevel == -1) {
$db_erg = $db->execute(__METHOD__,[ $db_erg = $db->execute(__METHOD__, [
"von" => $Von, "von" => $Von,
"bis" => $Bis "bis" => $Bis
],'helferlevel_not_set'); ], 'helferlevel_not_set');
$db->onErrorDie(__METHOD__,'helferlevel_not_set'); $db->onErrorDie(__METHOD__, 'helferlevel_not_set');
$zeilen = $db->fetchAll(__METHOD__,'helferlevel_not_set'); $zeilen = $db->fetchAll(__METHOD__, 'helferlevel_not_set');
} } else {
else { $db_erg = $db->execute(__METHOD__, [
$db_erg = $db->execute(__METHOD__,[
"von" => $Von, "von" => $Von,
"bis" => $Bis, "bis" => $Bis,
"helferlevel" => $HelferLevel "helferlevel" => $HelferLevel
],'helferlevel_set'); ], 'helferlevel_set');
$db->onErrorDie(__METHOD__,'helferlevel_set'); $db->onErrorDie(__METHOD__, 'helferlevel_set');
$zeilen = $db->fetchAll(__METHOD__,'helferlevel_set'); $zeilen = $db->fetchAll(__METHOD__, 'helferlevel_set');
} }
return $zeilen; return $zeilen;
} }
@ -334,8 +334,8 @@ function AlleSchichtenImZeitbereich($Von, $Bis, $HelferLevel = 1)
function AlleSchichtenEinesHelfers($HelferID) function AlleSchichtenEinesHelfers($HelferID)
{ {
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"select EinzelSchicht.SchichtID ,EinzelSchichtID,Was,DATE_FORMAT(Von,'%a %H:%i') AS Ab,DATE_FORMAT(Bis,'%a %H:%i') AS Bis FROM EinzelSchicht,Schicht,Dienst where EinzelSchicht.SchichtID=Schicht.SchichtID and Schicht.DienstID = Dienst.DienstID and HelferID=:helferid order by Von"); $db->prepare(__METHOD__, "select EinzelSchicht.SchichtID ,EinzelSchichtID,Was,DATE_FORMAT(Von,'%a %H:%i') AS Ab,DATE_FORMAT(Bis,'%a %H:%i') AS Bis FROM EinzelSchicht,Schicht,Dienst where EinzelSchicht.SchichtID=Schicht.SchichtID and Schicht.DienstID = Dienst.DienstID and HelferID=:helferid order by Von");
$db_erg = $db->execute(__METHOD__,["helferid" => $HelferID]); $db_erg = $db->execute(__METHOD__, ["helferid" => $HelferID]);
$db->onErrorDie(__METHOD__); $db->onErrorDie(__METHOD__);
$zeilen = $db->fetchAll(__METHOD__); $zeilen = $db->fetchAll(__METHOD__);
return $zeilen; return $zeilen;
@ -346,10 +346,10 @@ function HelferLoeschen($HelferID, $AdminID)
{ {
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"Delete from Helfer where HelferID=:id"); $db->prepare(__METHOD__, "Delete from Helfer where HelferID=:id");
$helfer = Helferdaten($HelferID); $helfer = Helferdaten($HelferID);
if(count($helfer) == 1){ if (count($helfer) == 1) {
$HelferName = $helfer[0]['Name']; $HelferName = $helfer[0]['Name'];
} }
@ -357,7 +357,7 @@ function HelferLoeschen($HelferID, $AdminID)
$AnzahlHelferschichten = count($schichten); $AnzahlHelferschichten = count($schichten);
if ($AnzahlHelferschichten == 0) { if ($AnzahlHelferschichten == 0) {
$db_erg = $db->execute(__METHOD__,["id" => $HelferID]); $db_erg = $db->execute(__METHOD__, ["id" => $HelferID]);
if (! $db_erg) { if (! $db_erg) {
echo "Helfer $HelferName konnte nicht gelöscht werden<br>"; echo "Helfer $HelferName konnte nicht gelöscht werden<br>";
return -2; return -2;
@ -377,8 +377,8 @@ function SchichtIdArrayEinesHelfers($HelferID)
{ {
// Array, um Zeilen mit von mir belegten Schichten in der Schichtuebersicht einfaerben zu koennenn // Array, um Zeilen mit von mir belegten Schichten in der Schichtuebersicht einfaerben zu koennenn
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"SELECT SchichtID FROM EinzelSchicht WHERE HelferID = :id"); $db->prepare(__METHOD__, "SELECT SchichtID FROM EinzelSchicht WHERE HelferID = :id");
$db_erg = $db->execute(__METHOD__,["id" => $HelferID]); $db_erg = $db->execute(__METHOD__, ["id" => $HelferID]);
$schichtIDs = array(); $schichtIDs = array();
while ($zeile = $db->fetch(__METHOD__)) { while ($zeile = $db->fetch(__METHOD__)) {
@ -392,11 +392,11 @@ function AlleSchichtenEinesHelfersVonJetzt($HelferID)
{ {
// TODO: fix GETDATE() array to string conversion // TODO: fix GETDATE() array to string conversion
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"select EinzelSchicht.SchichtID ,EinzelSchichtID,Was,DATE_FORMAT(Von,'%a %H:%i') AS Ab,DATE_FORMAT(Bis,'%a %H:%i') AS Bis FROM EinzelSchicht,Schicht,Dienst where EinzelSchicht.SchichtID=Schicht.SchichtID and Schicht.DienstID = Dienst.DienstID and HelferID=:id and Bis>:bis order by Von"); $db->prepare(__METHOD__, "select EinzelSchicht.SchichtID ,EinzelSchichtID,Was,DATE_FORMAT(Von,'%a %H:%i') AS Ab,DATE_FORMAT(Bis,'%a %H:%i') AS Bis FROM EinzelSchicht,Schicht,Dienst where EinzelSchicht.SchichtID=Schicht.SchichtID and Schicht.DienstID = Dienst.DienstID and HelferID=:id and Bis>:bis order by Von");
//$sql = "select EinzelSchicht.SchichtID ,EinzelSchichtID,Was,DATE_FORMAT(Von,'%a %H:%i') AS Ab,DATE_FORMAT(Bis,'%a %H:%i') AS Bis FROM EinzelSchicht,Schicht,Dienst where EinzelSchicht.SchichtID=Schicht.SchichtID and Schicht.DienstID = Dienst.DienstID and HelferID=".$HelferID." and Bis>'2023-05-20' order by Von"; //$sql = "select EinzelSchicht.SchichtID ,EinzelSchichtID,Was,DATE_FORMAT(Von,'%a %H:%i') AS Ab,DATE_FORMAT(Bis,'%a %H:%i') AS Bis FROM EinzelSchicht,Schicht,Dienst where EinzelSchicht.SchichtID=Schicht.SchichtID and Schicht.DienstID = Dienst.DienstID and HelferID=".$HelferID." and Bis>'2023-05-20' order by Von";
$db_erg = $db->execute(__METHOD__,[ $db_erg = $db->execute(__METHOD__, [
"id" => $HelferID, "id" => $HelferID,
"bis" => date("Y-m-d H:i:s") "bis" => date("Y-m-d H:i:s")
]); ]);
@ -412,9 +412,9 @@ function SchichtenSummeEinesHelfers($HelferID)
//$sql = "select count Schicht.Dauer as Anzahl FROM EinzelSchicht,Schicht,Dienst where EinzelSchicht.SchichtID=Schicht.SchichtID and Schicht.DienstID = Dienst.DienstID and HelferID=".$HelferID." order by Von"; //$sql = "select count Schicht.Dauer as Anzahl FROM EinzelSchicht,Schicht,Dienst where EinzelSchicht.SchichtID=Schicht.SchichtID and Schicht.DienstID = Dienst.DienstID and HelferID=".$HelferID." order by Von";
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"select count(*) as Anzahl, SUM(TIME_TO_SEC(Schicht.Dauer)) as Dauer FROM EinzelSchicht,Schicht,Dienst where EinzelSchicht.SchichtID=Schicht.SchichtID and Schicht.DienstID = Dienst.DienstID and HelferID=:helferid"); $db->prepare(__METHOD__, "select count(*) as Anzahl, SUM(TIME_TO_SEC(Schicht.Dauer)) as Dauer FROM EinzelSchicht,Schicht,Dienst where EinzelSchicht.SchichtID=Schicht.SchichtID and Schicht.DienstID = Dienst.DienstID and HelferID=:helferid");
//echo $sql; //echo $sql;
$db_erg = $db->execute(__METHOD__,["helferid" => $HelferID]); $db_erg = $db->execute(__METHOD__, ["helferid" => $HelferID]);
$db->onErrorDie(__METHOD__); $db->onErrorDie(__METHOD__);
$zeilen = $db->fetchAll(__METHOD__); $zeilen = $db->fetchAll(__METHOD__);
@ -426,7 +426,7 @@ function LogSchichtEingabe($HelferID, $SchichtId, $EinzelSchichtId, $Aktion, $Ad
{ {
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"SELECT Schicht.Von, Schicht.Bis, Dienst.Was, Helfer.Name $db->prepare(__METHOD__, "SELECT Schicht.Von, Schicht.Bis, Dienst.Was, Helfer.Name
FROM EinzelSchicht FROM EinzelSchicht
JOIN Schicht ON EinzelSchicht.SchichtID = Schicht.SchichtID JOIN Schicht ON EinzelSchicht.SchichtID = Schicht.SchichtID
JOIN Dienst ON Schicht.DienstID = Dienst.DienstID JOIN Dienst ON Schicht.DienstID = Dienst.DienstID
@ -435,7 +435,7 @@ function LogSchichtEingabe($HelferID, $SchichtId, $EinzelSchichtId, $Aktion, $Ad
AND ( Schicht.SchichtID = :schichtid OR EinzelSchicht.EinzelSchichtID = :einzelschichtid) AND ( Schicht.SchichtID = :schichtid OR EinzelSchicht.EinzelSchichtID = :einzelschichtid)
"); ");
//error_log(date('Y-m-d H:i') . " " . $sql ."\n",3,LOGFILE); //error_log(date('Y-m-d H:i') . " " . $sql ."\n",3,LOGFILE);
$db_erg = $db->execute(__METHOD__,[ $db_erg = $db->execute(__METHOD__, [
"helferid" => $HelferID, "helferid" => $HelferID,
"schichtid" => $SchichtId, "schichtid" => $SchichtId,
"einzelschichtid" => $EinzelSchichtId "einzelschichtid" => $EinzelSchichtId
@ -467,27 +467,27 @@ function HelferSchichtZuweisen($HelferID, $SchichtId, $AdminID = 0)
{ {
// Abfrage, ob bereits eine Einzelschicht in der selben Schicht vom Helfer existiert // Abfrage, ob bereits eine Einzelschicht in der selben Schicht vom Helfer existiert
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"SELECT EinzelSchichtID from EinzelSchicht WHERE SchichtID=:schichtid and HelferID=:helferid",'einzelschicht_exists'); $db->prepare(__METHOD__, "SELECT EinzelSchichtID from EinzelSchicht WHERE SchichtID=:schichtid and HelferID=:helferid", 'einzelschicht_exists');
$db->prepare(__METHOD__,"INSERT INTO EinzelSchicht(SchichtID,HelferID) VALUES (:schichtid,:helferid)",'new_einzelschicht'); $db->prepare(__METHOD__, "INSERT INTO EinzelSchicht(SchichtID,HelferID) VALUES (:schichtid,:helferid)", 'new_einzelschicht');
$db_erg = $db->execute(__METHOD__,[ $db_erg = $db->execute(__METHOD__, [
"schichtid" => $SchichtId, "schichtid" => $SchichtId,
"helferid" => $HelferID "helferid" => $HelferID
],'einzelschicht_exists'); ], 'einzelschicht_exists');
if($db->fetch(__METHOD__,'einzelschicht_exists')){ if ($db->fetch(__METHOD__, 'einzelschicht_exists')) {
echo "HelferSchichtZuweisen: Schicht existiert bereits!"; echo "HelferSchichtZuweisen: Schicht existiert bereits!";
return false; return false;
} }
// Helfer Schicht zuweisen // Helfer Schicht zuweisen
//echo '<script> console.log("Schicht zuweiweisen: '.$sql.'")</script>'; //echo '<script> console.log("Schicht zuweiweisen: '.$sql.'")</script>';
$db_erg = $db->execute(__METHOD__,[ $db_erg = $db->execute(__METHOD__, [
"schichtid" => $SchichtId, "schichtid" => $SchichtId,
"helferid" => $HelferID "helferid" => $HelferID
],'new_einzelschicht'); ], 'new_einzelschicht');
$db->onErrorDie(__METHOD__,'new_einzelschicht'); $db->onErrorDie(__METHOD__, 'new_einzelschicht');
LogSchichtEingabe($HelferID, $SchichtId, -1, "eingetragen", $AdminID); LogSchichtEingabe($HelferID, $SchichtId, -1, "eingetragen", $AdminID);
@ -502,10 +502,10 @@ function HelferVonSchichtLoeschen($HelferID, $EinzelSchichtID, $AdminID = 0)
// Lösche Einzelschicht // Lösche Einzelschicht
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"Delete From EinzelSchicht Where EinzelSchichtID = :id"); $db->prepare(__METHOD__, "Delete From EinzelSchicht Where EinzelSchichtID = :id");
//echo $sql; //echo $sql;
$db_erg = $db->execute(__METHOD__,["id" => $EinzelSchichtID]); $db_erg = $db->execute(__METHOD__, ["id" => $EinzelSchichtID]);
return $db_erg; return $db_erg;
} }
@ -518,9 +518,9 @@ function HelferVonSchichtLoeschen_SchichtID($HelferID, $SchichtID, $AdminID = 0)
// Lösche Einzelschicht // Lösche Einzelschicht
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"Delete From EinzelSchicht Where SchichtID = :schichtid and HelferID = :helferid limit 1;"); $db->prepare(__METHOD__, "Delete From EinzelSchicht Where SchichtID = :schichtid and HelferID = :helferid limit 1;");
//echo $sql; //echo $sql;
$db_erg = $db->execute(__METHOD__,[ $db_erg = $db->execute(__METHOD__, [
"schichtid" => $SchichtID, "schichtid" => $SchichtID,
"helferid" => $HelferID "helferid" => $HelferID
]); ]);
@ -532,10 +532,10 @@ function HelferVonSchichtLoeschen_SchichtID($HelferID, $SchichtID, $AdminID = 0)
function DetailSchicht($InfoSchichtID) function DetailSchicht($InfoSchichtID)
{ {
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"select Was,Wo,Info,Name,Handy,Email,DATE_FORMAT(Dauer,'%H:%i') AS Dauer FROM Dienst,Schicht,Helfer where Dienst.DienstID=Schicht.DienstID AND Helfer.HelferID=Dienst.Leiter And SchichtID=:id"); $db->prepare(__METHOD__, "select Was,Wo,Info,Name,Handy,Email,DATE_FORMAT(Dauer,'%H:%i') AS Dauer FROM Dienst,Schicht,Helfer where Dienst.DienstID=Schicht.DienstID AND Helfer.HelferID=Dienst.Leiter And SchichtID=:id");
//echo $sql; //echo $sql;
$db_erg = $db->execute(__METHOD__,["id" => $InfoSchichtID]); $db_erg = $db->execute(__METHOD__, ["id" => $InfoSchichtID]);
$db->onErrorDie(__METHOD__); $db->onErrorDie(__METHOD__);
@ -547,10 +547,10 @@ function DetailSchicht($InfoSchichtID)
function BeteiligteHelfer($InfoSchichtID) function BeteiligteHelfer($InfoSchichtID)
{ {
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"select Helfer.HelferID,Name,Handy FROM EinzelSchicht,Helfer where EinzelSchicht.HelferID=Helfer.HelferID And SchichtID=:id"); $db->prepare(__METHOD__, "select Helfer.HelferID,Name,Handy FROM EinzelSchicht,Helfer where EinzelSchicht.HelferID=Helfer.HelferID And SchichtID=:id");
$db_erg = $db->execute(__METHOD__,["id" => $InfoSchichtID]); $db_erg = $db->execute(__METHOD__, ["id" => $InfoSchichtID]);
$db->onErrorDie(__METHOD__); $db->onErrorDie(__METHOD__);
$zeile = $db->fetchAll(__METHOD__); $zeile = $db->fetchAll(__METHOD__);
return $zeile; return $zeile;
} }
@ -559,7 +559,7 @@ function BeteiligteHelfer($InfoSchichtID)
function GetDienste() function GetDienste()
{ {
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"SELECT DienstID, Was, Wo, Info, Leiter, ElternDienstID, HelferLevel FROM Dienst order By Was"); $db->prepare(__METHOD__, "SELECT DienstID, Was, Wo, Info, Leiter, ElternDienstID, HelferLevel FROM Dienst order By Was");
$db_erg = $db->execute(__METHOD__); $db_erg = $db->execute(__METHOD__);
$db->onErrorDie(__METHOD__); $db->onErrorDie(__METHOD__);
$dienste = $db->fetchAll(__METHOD__); $dienste = $db->fetchAll(__METHOD__);
@ -570,8 +570,8 @@ function GetDienste()
function GetDiensteChilds($DienstID) function GetDiensteChilds($DienstID)
{ {
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"SELECT DienstID, Was, Wo, Info, Leiter FROM Dienst where ElternDienstID=:id order by Was"); $db->prepare(__METHOD__, "SELECT DienstID, Was, Wo, Info, Leiter FROM Dienst where ElternDienstID=:id order by Was");
$db_erg = $db->execute(__METHOD__,["id" => $DienstID]); $db_erg = $db->execute(__METHOD__, ["id" => $DienstID]);
$db->onErrorDie(__METHOD__); $db->onErrorDie(__METHOD__);
$dienste = $db->fetchAll(__METHOD__); $dienste = $db->fetchAll(__METHOD__);
return $dienste; return $dienste;
@ -581,9 +581,9 @@ function GetDiensteChilds($DienstID)
function ChangeDienst($DienstID, $Was, $Wo, $Info, $Leiter, $Gruppe, $HelferLevel) function ChangeDienst($DienstID, $Was, $Wo, $Info, $Leiter, $Gruppe, $HelferLevel)
{ {
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"UPDATE Dienst SET Was=:was, Wo=:wo, Info=:info, Leiter=:leiter, ElternDienstID=:elterndienstid where DienstID=:dienstid"); $db->prepare(__METHOD__, "UPDATE Dienst SET Was=:was, Wo=:wo, Info=:info, Leiter=:leiter, ElternDienstID=:elterndienstid where DienstID=:dienstid");
$db_erg = $db->execute(__METHOD__,[ $db_erg = $db->execute(__METHOD__, [
"was" => $Was, "was" => $Was,
"wo" => $Wo, "wo" => $Wo,
"info" => $Info, "info" => $Info,
@ -599,8 +599,8 @@ function ChangeDienst($DienstID, $Was, $Wo, $Info, $Leiter, $Gruppe, $HelferLeve
function NewDienst($Was, $Wo, $Info, $Leiter, $Gruppe, $HelferLevel) function NewDienst($Was, $Wo, $Info, $Leiter, $Gruppe, $HelferLevel)
{ {
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"INSERT INTO Dienst (Was, Wo, Info, Leiter, ElternDienstID, HelferLevel) values (:was,:wo,:info,:leiter,:elterndienstid,:helferlevel)"); $db->prepare(__METHOD__, "INSERT INTO Dienst (Was, Wo, Info, Leiter, ElternDienstID, HelferLevel) values (:was,:wo,:info,:leiter,:elterndienstid,:helferlevel)");
$db_erg = $db->execute(__METHOD__,[ $db_erg = $db->execute(__METHOD__, [
"was" => $Was, "was" => $Was,
"wo" => $Wo, "wo" => $Wo,
"info" => $Info, "info" => $Info,
@ -609,7 +609,7 @@ function NewDienst($Was, $Wo, $Info, $Leiter, $Gruppe, $HelferLevel)
"helferlevel" => $HelferLevel "helferlevel" => $HelferLevel
]); ]);
if (!is_null($db->errorCode(__METHOD__)) && $db->errorCode(__METHOD__) != '00000'){ if (!is_null($db->errorCode(__METHOD__)) && $db->errorCode(__METHOD__) != '00000') {
$err = $db->errorInfo(__METHOD__)[2]; $err = $db->errorInfo(__METHOD__)[2];
error_log(date('Y-m-d H:i') . " NeueSchicht: Schicht konnte nicht angelegt werden Grund: $err \n", 3, LOGFILE); error_log(date('Y-m-d H:i') . " NeueSchicht: Schicht konnte nicht angelegt werden Grund: $err \n", 3, LOGFILE);
die('Ungueltige Abfrage: ' . $err); die('Ungueltige Abfrage: ' . $err);
@ -626,17 +626,17 @@ function DeleteDienst($DienstID, $Rekursiv)
} else { } else {
// Pruefen ob noch Schichten eingetragen sind // Pruefen ob noch Schichten eingetragen sind
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"SELECT SchichtID FROM Schicht where DienstID=:id",'check_schicht'); $db->prepare(__METHOD__, "SELECT SchichtID FROM Schicht where DienstID=:id", 'check_schicht');
$db->prepare(__METHOD__,"DELETE FROM Dienst where DienstID=:id",'delete_dienst'); $db->prepare(__METHOD__, "DELETE FROM Dienst where DienstID=:id", 'delete_dienst');
$db_erg = $db->execute(__METHOD__,['id' => $DienstID],'check_schicht');
$db->onErrorDie(__METHOD__,'check_schicht'); $db_erg = $db->execute(__METHOD__, ['id' => $DienstID], 'check_schicht');
if (!$db->fetch(__METHOD__,'check_schicht')){ $db->onErrorDie(__METHOD__, 'check_schicht');
if (!$db->fetch(__METHOD__, 'check_schicht')) {
// Eintrag löschen // Eintrag löschen
$db_erg = $db->execute(__METHOD__,['id' => $DienstID],'delete_dienst'); $db_erg = $db->execute(__METHOD__, ['id' => $DienstID], 'delete_dienst');
$db->onErrorDie(__METHOD__,'delete_dienst'); $db->onErrorDie(__METHOD__, 'delete_dienst');
return true; return true;
} else { } else {
return false; return false;
@ -648,13 +648,13 @@ function DeleteDienst($DienstID, $Rekursiv)
function GetDiensteForDay($helferlevel, $datestring) function GetDiensteForDay($helferlevel, $datestring)
{ {
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"SELECT DienstId, Was, Wo, Info FROM Dienst INNER JOIN Schicht USING (DienstID) WHERE HelferLevel=" . $helferlevel . " GROUP BY DienstId HAVING MIN(Von)<:date1 AND MAX(Bis)>:date2 ORDER BY MIN(Von) ASC;"); $db->prepare(__METHOD__, "SELECT DienstId, Was, Wo, Info FROM Dienst INNER JOIN Schicht USING (DienstID) WHERE HelferLevel=" . $helferlevel . " GROUP BY DienstId HAVING MIN(Von)<:date1 AND MAX(Bis)>:date2 ORDER BY MIN(Von) ASC;");
$unixtime = strtotime($datestring); $unixtime = strtotime($datestring);
$date1 = $date1 =
$date2 = date('Y-m-d', $unixtime); $date2 = date('Y-m-d', $unixtime);
$db_erg = $db->execute(__METHOD__,[ $db_erg = $db->execute(__METHOD__, [
'date1' => date('Y-m-d', $unixtime + 24 * 60 * 60), 'date1' => date('Y-m-d', $unixtime + 24 * 60 * 60),
'date2' => date('Y-m-d', $unixtime) 'date2' => date('Y-m-d', $unixtime)
]); ]);
@ -667,9 +667,9 @@ function GetDiensteForDay($helferlevel, $datestring)
function GetSchichtenForDienstForDay($DienstID, $datestring) function GetSchichtenForDienstForDay($DienstID, $datestring)
{ {
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"select Von, Bis, Soll, Name, Handy from Schicht left join EinzelSchicht using (SchichtId) left join Helfer using (HelferId) where DienstId=:id and Von<:von and Bis>:bis order by Von;"); $db->prepare(__METHOD__, "select Von, Bis, Soll, Name, Handy from Schicht left join EinzelSchicht using (SchichtId) left join Helfer using (HelferId) where DienstId=:id and Von<:von and Bis>:bis order by Von;");
$unixtime = strtotime($datestring); $unixtime = strtotime($datestring);
$db_erg = $db->execute(__METHOD__,[ $db_erg = $db->execute(__METHOD__, [
'id' => $DienstID, 'id' => $DienstID,
'von' => date('Y-m-d', $unixtime + 24 * 60 * 60), 'von' => date('Y-m-d', $unixtime + 24 * 60 * 60),
'bis' => date('Y-m-d', $unixtime) 'bis' => date('Y-m-d', $unixtime)
@ -684,8 +684,8 @@ function GetSchichtenEinesDienstes($DienstID)
{ {
//$sql = "SELECT SchichtID,Von,Bis,Soll,DATE_FORMAT(Von,'%a %H:%i') AS TagVon FROM Schicht where DienstID=".$DienstID; //$sql = "SELECT SchichtID,Von,Bis,Soll,DATE_FORMAT(Von,'%a %H:%i') AS TagVon FROM Schicht where DienstID=".$DienstID;
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"SELECT SchichtID,Von,Bis,Soll,DATE_FORMAT(Von,'%a %H:%i') AS TagVon, DATE_FORMAT(Von,'%H:%i') AS ZeitVon, DATE_FORMAT(Bis,'%H:%i') AS ZeitBis, DATE_FORMAT(Dauer,'%H:%i') AS Dauer FROM Schicht where DienstID=:id"); $db->prepare(__METHOD__, "SELECT SchichtID,Von,Bis,Soll,DATE_FORMAT(Von,'%a %H:%i') AS TagVon, DATE_FORMAT(Von,'%H:%i') AS ZeitVon, DATE_FORMAT(Bis,'%H:%i') AS ZeitBis, DATE_FORMAT(Dauer,'%H:%i') AS Dauer FROM Schicht where DienstID=:id");
$db_erg = $db->execute(__METHOD__,['id' => $DienstID]); $db_erg = $db->execute(__METHOD__, ['id' => $DienstID]);
$db->onErrorDie(__METHOD__); $db->onErrorDie(__METHOD__);
$schichten = $db->fetchAll(__METHOD__); $schichten = $db->fetchAll(__METHOD__);
return $schichten; return $schichten;
@ -695,9 +695,9 @@ function GetSchichtenEinesDienstes($DienstID)
function ChangeSchicht($SchichtID, $Von, $Bis, $Soll, $Dauer) function ChangeSchicht($SchichtID, $Von, $Bis, $Soll, $Dauer)
{ {
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"UPDATE Schicht SET Von=:von, Bis=:bis, Soll=:soll, Dauer=:dauer where SchichtID=:id"); $db->prepare(__METHOD__, "UPDATE Schicht SET Von=:von, Bis=:bis, Soll=:soll, Dauer=:dauer where SchichtID=:id");
$db_erg = $db->execute(__METHOD__,[ $db_erg = $db->execute(__METHOD__, [
'von' => $Von, 'von' => $Von,
'bis' => $Bis, 'bis' => $Bis,
'soll' => $Soll, 'soll' => $Soll,
@ -725,9 +725,9 @@ function NewSchicht($DienstID, $Von, $Bis, $Soll, $Dauer)
} }
*/ */
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"INSERT INTO Schicht (DienstID, Von, Bis, Soll, Dauer) values (:id,:von,:bis,:soll,:dauer)"); $db->prepare(__METHOD__, "INSERT INTO Schicht (DienstID, Von, Bis, Soll, Dauer) values (:id,:von,:bis,:soll,:dauer)");
$db_erg = $db->execute(__METHOD__,[ $db_erg = $db->execute(__METHOD__, [
'id' => $DienstID, 'id' => $DienstID,
'von' => $Von, 'von' => $Von,
'bis' => $Bis, 'bis' => $Bis,
@ -751,21 +751,21 @@ function NewSchicht($DienstID, $Von, $Bis, $Soll, $Dauer)
function DeleteSchicht($SchichtID, $Rekursiv) function DeleteSchicht($SchichtID, $Rekursiv)
{ {
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"SELECT Name FROM EinzelSchicht,Helfer where SchichtID=:id and Helfer.HelferID=EinzelSchicht.HelferID",'check_einzelschicht'); $db->prepare(__METHOD__, "SELECT Name FROM EinzelSchicht,Helfer where SchichtID=:id and Helfer.HelferID=EinzelSchicht.HelferID", 'check_einzelschicht');
$db->prepare(__METHOD__,"DELETE FROM Schicht where SchichtID=:id",'delete_einzelschicht'); $db->prepare(__METHOD__, "DELETE FROM Schicht where SchichtID=:id", 'delete_einzelschicht');
if ($Rekursiv) { if ($Rekursiv) {
return false; return false;
} else { } else {
// Pruefen ob noch Helfer auf der Schicht eingetragen sind // Pruefen ob noch Helfer auf der Schicht eingetragen sind
$db_erg = $db->execute(__METHOD__,["id" => $SchichtID ],'check_einzelschicht'); $db_erg = $db->execute(__METHOD__, ["id" => $SchichtID ], 'check_einzelschicht');
$db->onErrorDie(__METHOD__,'check_einzelschicht'); $db->onErrorDie(__METHOD__, 'check_einzelschicht');
if (!$db->fetch(__METHOD__,'check_einzelschicht')) { if (!$db->fetch(__METHOD__, 'check_einzelschicht')) {
// Eintrag löschen // Eintrag löschen
$db_erg = $db->execute(__METHOD__,["id" => $SchichtID ],'delete_einzelschicht'); $db_erg = $db->execute(__METHOD__, ["id" => $SchichtID ], 'delete_einzelschicht');
$db->onErrorDie(__METHOD__,'delete_einzelschicht'); $db->onErrorDie(__METHOD__, 'delete_einzelschicht');
return true; return true;
} else { } else {
return false; return false;
@ -780,7 +780,7 @@ function AlleHelferSchichtenUebersicht()
$sql = "select Helfer.HelferID as AliasHelferID,Helfer.HelferLevel,Name,Email,Handy,Was,SUM(Dauer)/10000 as Dauer from Helfer,EinzelSchicht INNER JOIN Schicht INNER JOIN Dienst where Helfer.HelferID=EinzelSchicht.HelferID and EinzelSchicht.SchichtID=Schicht.SchichtID and Schicht.DienstID=Dienst.DienstID group by Helfer.HelferID,Was"; $sql = "select Helfer.HelferID as AliasHelferID,Helfer.HelferLevel,Name,Email,Handy,Was,SUM(Dauer)/10000 as Dauer from Helfer,EinzelSchicht INNER JOIN Schicht INNER JOIN Dienst where Helfer.HelferID=EinzelSchicht.HelferID and EinzelSchicht.SchichtID=Schicht.SchichtID and Schicht.DienstID=Dienst.DienstID group by Helfer.HelferID,Was";
$sql = $sql . " UNION ALL "; $sql = $sql . " UNION ALL ";
$sql = $sql . "select Helfer.HelferID as AliasHelferID,Helfer.HelferLevel,Name,Email,Handy,'-' as Was,0 as Dauer from Helfer,EinzelSchicht where not exists(select 1 from EinzelSchicht where Helfer.HelferID=EinzelSchicht.HelferID)"; $sql = $sql . "select Helfer.HelferID as AliasHelferID,Helfer.HelferLevel,Name,Email,Handy,'-' as Was,0 as Dauer from Helfer,EinzelSchicht where not exists(select 1 from EinzelSchicht where Helfer.HelferID=EinzelSchicht.HelferID)";
$db->prepare(__METHOD__,$sql); $db->prepare(__METHOD__, $sql);
$db_erg = $db->execute(__METHOD__); $db_erg = $db->execute(__METHOD__);
$db->onErrorDie(__METHOD__); $db->onErrorDie(__METHOD__);
@ -792,7 +792,7 @@ function AlleHelferSchichtenUebersicht()
function DatenbankAufDeutsch() function DatenbankAufDeutsch()
{ {
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"SET lc_time_names = 'de_DE'"); $db->prepare(__METHOD__, "SET lc_time_names = 'de_DE'");
$db_erg = $db->execute(__METHOD__); $db_erg = $db->execute(__METHOD__);
$db->onErrorDie(__METHOD__); $db->onErrorDie(__METHOD__);
} }
@ -801,7 +801,7 @@ function DatenbankAufDeutsch()
function LastInsertId() function LastInsertId()
{ {
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"SELECT LAST_INSERT_ID()"); $db->prepare(__METHOD__, "SELECT LAST_INSERT_ID()");
$db_erg = $db->execute(__METHOD__); $db_erg = $db->execute(__METHOD__);
$db->onErrorDie(__METHOD__); $db->onErrorDie(__METHOD__);
@ -813,7 +813,7 @@ function LastInsertId()
function HelferLevel() function HelferLevel()
{ {
$db = DB::getInstance(); $db = DB::getInstance();
$db->prepare(__METHOD__,"select HelferLevel,HelferLevelBeschreibung from HelferLevel"); $db->prepare(__METHOD__, "select HelferLevel,HelferLevelBeschreibung from HelferLevel");
$db_erg = $db->execute(__METHOD__); $db_erg = $db->execute(__METHOD__);
$db->onErrorDie(__METHOD__); $db->onErrorDie(__METHOD__);

33
html/SQL_old.php
View File

@ -1,4 +1,5 @@
<?php <?php
namespace old; namespace old;
require_once 'konfiguration.php'; require_once 'konfiguration.php';
@ -92,7 +93,7 @@ function HelferListe($db_link)
die('Unueltige Abfrage: ' . mysqli_error($db_link)); die('Unueltige Abfrage: ' . mysqli_error($db_link));
} }
while($zeilen[] = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)); while ($zeilen[] = mysqli_fetch_array($db_erg, MYSQLI_ASSOC));
array_pop($zeilen); array_pop($zeilen);
return $zeilen; return $zeilen;
} }
@ -111,7 +112,7 @@ function Helferdaten($db_link, $HelferID)
die('Ungueltige Abfrage: ' . mysqli_error($db_link)); die('Ungueltige Abfrage: ' . mysqli_error($db_link));
} }
while($zeilen[] = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)); while ($zeilen[] = mysqli_fetch_array($db_erg, MYSQLI_ASSOC));
array_pop($zeilen); array_pop($zeilen);
return $zeilen; return $zeilen;
} }
@ -191,7 +192,7 @@ function AlleSchichten($db_link, $Sort, $HelferLevel = 1)
die('Ungueltige Abfrage: ' . mysqli_error($db_link)); die('Ungueltige Abfrage: ' . mysqli_error($db_link));
} }
while($zeilen[] = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)); while ($zeilen[] = mysqli_fetch_array($db_erg, MYSQLI_ASSOC));
array_pop($zeilen); array_pop($zeilen);
return $zeilen; return $zeilen;
} }
@ -256,7 +257,7 @@ function AlleSchichtenImZeitbereich($db_link, $Von, $Bis, $HelferLevel = 1)
} }
while($zeilen[] = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)); while ($zeilen[] = mysqli_fetch_array($db_erg, MYSQLI_ASSOC));
array_pop($zeilen); array_pop($zeilen);
return $zeilen; return $zeilen;
} }
@ -278,7 +279,7 @@ function AlleSchichtenEinesHelfers($db_link, $HelferID)
} }
while($zeilen[] = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)); while ($zeilen[] = mysqli_fetch_array($db_erg, MYSQLI_ASSOC));
array_pop($zeilen); array_pop($zeilen);
return $zeilen; return $zeilen;
} }
@ -290,7 +291,7 @@ function HelferLoeschen($db_link, $HelferID, $AdminID)
$helfer = Helferdaten($db_link, $HelferID); $helfer = Helferdaten($db_link, $HelferID);
if(count($helfer) == 1){ if (count($helfer) == 1) {
$HelferName = $helfer[0]['Name']; $HelferName = $helfer[0]['Name'];
} }
@ -350,7 +351,7 @@ function AlleSchichtenEinesHelfersVonJetzt($db_link, $HelferID)
die('Ungueltige Abfrage: ' . mysqli_error($db_link)); die('Ungueltige Abfrage: ' . mysqli_error($db_link));
} }
while($zeilen[] = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)); while ($zeilen[] = mysqli_fetch_array($db_erg, MYSQLI_ASSOC));
array_pop($zeilen); array_pop($zeilen);
return $zeilen; return $zeilen;
} }
@ -373,7 +374,7 @@ function SchichtenSummeEinesHelfers($db_link, $HelferID)
} }
while($zeilen[] = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)); while ($zeilen[] = mysqli_fetch_array($db_erg, MYSQLI_ASSOC));
array_pop($zeilen); array_pop($zeilen);
return $zeilen; return $zeilen;
} }
@ -524,7 +525,7 @@ function BeteiligteHelfer($db_link, $InfoSchichtID)
die('Ungueltige Abfrage: ' . mysqli_error($db_link)); die('Ungueltige Abfrage: ' . mysqli_error($db_link));
} }
while($zeilen[] = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)); while ($zeilen[] = mysqli_fetch_array($db_erg, MYSQLI_ASSOC));
array_pop($zeilen); array_pop($zeilen);
return $zeilen; return $zeilen;
} }
@ -537,7 +538,7 @@ function GetDienste($db_link)
echo "GetDienste ungueltige Abfrage"; echo "GetDienste ungueltige Abfrage";
die('Ungueltige Abfrage: ' . mysqli_error($db_link)); die('Ungueltige Abfrage: ' . mysqli_error($db_link));
} }
while($zeilen[] = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)); while ($zeilen[] = mysqli_fetch_array($db_erg, MYSQLI_ASSOC));
array_pop($zeilen); array_pop($zeilen);
return $zeilen; return $zeilen;
} }
@ -552,7 +553,7 @@ function GetDiensteChilds($db_link, $DienstID)
echo "GetDienste ungueltige Abfrage"; echo "GetDienste ungueltige Abfrage";
die('Ungueltige Abfrage: ' . mysqli_error($db_link)); die('Ungueltige Abfrage: ' . mysqli_error($db_link));
} }
while($zeilen[] = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)); while ($zeilen[] = mysqli_fetch_array($db_erg, MYSQLI_ASSOC));
array_pop($zeilen); array_pop($zeilen);
return $zeilen; return $zeilen;
} }
@ -649,7 +650,7 @@ function GetDiensteForDay($db_link, $helferlevel, $datestring)
die('Ungueltige Abfrage: ' . mysqli_error($db_link)); die('Ungueltige Abfrage: ' . mysqli_error($db_link));
} }
while($zeilen[] = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)); while ($zeilen[] = mysqli_fetch_array($db_erg, MYSQLI_ASSOC));
array_pop($zeilen); array_pop($zeilen);
return $zeilen; return $zeilen;
} }
@ -665,7 +666,7 @@ function GetSchichtenForDienstForDay($db_link, $DienstID, $datestring)
echo "GetDienste ungueltige Abfrage"; echo "GetDienste ungueltige Abfrage";
die('Ungueltige Abfrage: ' . mysqli_error($db_link)); die('Ungueltige Abfrage: ' . mysqli_error($db_link));
} }
while($zeilen[] = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)); while ($zeilen[] = mysqli_fetch_array($db_erg, MYSQLI_ASSOC));
array_pop($zeilen); array_pop($zeilen);
return $zeilen; return $zeilen;
} }
@ -684,7 +685,7 @@ function GetSchichtenEinesDienstes($db_link, $DienstID)
echo $sql; echo $sql;
die('Ungueltige Abfrage: ' . mysqli_error($db_link)); die('Ungueltige Abfrage: ' . mysqli_error($db_link));
} }
while($zeilen[] = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)); while ($zeilen[] = mysqli_fetch_array($db_erg, MYSQLI_ASSOC));
array_pop($zeilen); array_pop($zeilen);
return $zeilen; return $zeilen;
} }
@ -784,7 +785,7 @@ function AlleHelferSchichtenUebersicht($db_link)
echo "AlleHelferSchichtenUebersicht ungueltige Abfrage"; echo "AlleHelferSchichtenUebersicht ungueltige Abfrage";
die('Ungueltige Abfrage: ' . mysqli_error($db_link)); die('Ungueltige Abfrage: ' . mysqli_error($db_link));
} }
while($zeilen[] = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)); while ($zeilen[] = mysqli_fetch_array($db_erg, MYSQLI_ASSOC));
array_pop($zeilen); array_pop($zeilen);
return $zeilen; return $zeilen;
} }
@ -824,7 +825,7 @@ function HelferLevel($db_link)
die('Ungueltige Abfrage: ' . mysqli_error($db_link)); die('Ungueltige Abfrage: ' . mysqli_error($db_link));
} }
while($zeilen[] = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)); while ($zeilen[] = mysqli_fetch_array($db_erg, MYSQLI_ASSOC));
array_pop($zeilen); array_pop($zeilen);
return $zeilen; return $zeilen;
} }

80
html/Setup.php
View File

@ -4,7 +4,7 @@ require_once("Wizard.php");
$wizard = new Wizard("../setupWizard.json"); $wizard = new Wizard("../setupWizard.json");
$wizard->addCode('basedata',function($storedvariables){ $wizard->addCode('basedata', function ($storedvariables) {
$basedata['eventname'] = $_POST['eventname']; $basedata['eventname'] = $_POST['eventname'];
$basedata['startdate'] = $_POST['startdate']; $basedata['startdate'] = $_POST['startdate'];
$basedata['duration'] = $_POST['duration']; $basedata['duration'] = $_POST['duration'];
@ -18,12 +18,12 @@ $wizard->addCode('basedata',function($storedvariables){
return $basedata; return $basedata;
}); });
$wizard->addCode('selectdatabase',function($storedvariables){ $wizard->addCode('selectdatabase', function ($storedvariables) {
$selectdatabase['databasetype'] = $_POST['databasetype']; $selectdatabase['databasetype'] = $_POST['databasetype'];
return $selectdatabase; return $selectdatabase;
}); });
$wizard->addCode('enterlogindata',function($storedvariables){ $wizard->addCode('enterlogindata', function ($storedvariables) {
$logindata['host'] = $_POST['host']; $logindata['host'] = $_POST['host'];
$logindata['user'] = $_POST['user']; $logindata['user'] = $_POST['user'];
$logindata['password'] = $_POST['password']; $logindata['password'] = $_POST['password'];
@ -31,84 +31,78 @@ $wizard->addCode('enterlogindata',function($storedvariables){
return $logindata; return $logindata;
}); });
$wizard->addCode('createdatabase',function($storedvariables){ $wizard->addCode('createdatabase', function ($storedvariables) {
$conf_file = fopen("../bengelsystem_konfiguration.php", "w"); $conf_file = fopen("../bengelsystem_konfiguration.php", "w");
fwrite($conf_file, "<?php\n"); fwrite($conf_file, "<?php\n");
if($storedvariables['selectdatabase']['databasetype'] == 'SQLite'){ if ($storedvariables['selectdatabase']['databasetype'] == 'SQLite') {
fwrite($conf_file, "define( 'MYSQL_DSN', 'sqlite:". realpath("..") . "/helferdb.sqlite3' );\n"); fwrite($conf_file, "define( 'MYSQL_DSN', 'sqlite:" . realpath("..") . "/helferdb.sqlite3' );\n");
fwrite($conf_file, "define( 'MYSQL_HOST', '' );\n"); fwrite($conf_file, "define( 'MYSQL_HOST', '' );\n");
fwrite($conf_file, "define( 'MYSQL_BENUTZER', '' );\n"); fwrite($conf_file, "define( 'MYSQL_BENUTZER', '' );\n");
fwrite($conf_file, "define( 'MYSQL_KENNWORT', '' );\n"); fwrite($conf_file, "define( 'MYSQL_KENNWORT', '' );\n");
fwrite($conf_file, "define( 'MYSQL_DATENBANK', '' );\n"); fwrite($conf_file, "define( 'MYSQL_DATENBANK', '' );\n");
fwrite($conf_file, "define( 'DBTYPE', 'sqlite');\n"); fwrite($conf_file, "define( 'DBTYPE', 'sqlite');\n");
} elseif ($storedvariables['selectdatabase']['databasetype'] == 'MariaDB'){ } elseif ($storedvariables['selectdatabase']['databasetype'] == 'MariaDB') {
fwrite($conf_file, "define( 'MYSQL_DSN', 'mysql:host=" . $storedvariables['enterlogindata']['host'] . ";dbname=". $storedvariables['enterlogindata']['dbname'] . ";charset=utf8mb4' );\n"); fwrite($conf_file, "define( 'MYSQL_DSN', 'mysql:host=" . $storedvariables['enterlogindata']['host'] . ";dbname=" . $storedvariables['enterlogindata']['dbname'] . ";charset=utf8mb4' );\n");
fwrite($conf_file, "define( 'MYSQL_HOST', '".$storedvariables['enterlogindata']['host']."' );\n"); fwrite($conf_file, "define( 'MYSQL_HOST', '" . $storedvariables['enterlogindata']['host'] . "' );\n");
fwrite($conf_file, "define( 'MYSQL_BENUTZER', '".$storedvariables['enterlogindata']['user']."' );\n"); fwrite($conf_file, "define( 'MYSQL_BENUTZER', '" . $storedvariables['enterlogindata']['user'] . "' );\n");
fwrite($conf_file, "define( 'MYSQL_KENNWORT', '".$storedvariables['enterlogindata']['password']."' );\n"); fwrite($conf_file, "define( 'MYSQL_KENNWORT', '" . $storedvariables['enterlogindata']['password'] . "' );\n");
fwrite($conf_file, "define( 'MYSQL_DATENBANK', '".$storedvariables['enterlogindata']['dbname']."' );\n"); fwrite($conf_file, "define( 'MYSQL_DATENBANK', '" . $storedvariables['enterlogindata']['dbname'] . "' );\n");
fwrite($conf_file, "define( 'DBTYPE', 'mariadb');\n"); fwrite($conf_file, "define( 'DBTYPE', 'mariadb');\n");
} }
fwrite($conf_file, "define( 'LOGFILE', '".$storedvariables['basedata']['logfile']."' );\n"); fwrite($conf_file, "define( 'LOGFILE', '" . $storedvariables['basedata']['logfile'] . "' );\n");
fwrite($conf_file, "define( 'EVENTNAME', '".$storedvariables['basedata']['eventname']."' );\n"); fwrite($conf_file, "define( 'EVENTNAME', '" . $storedvariables['basedata']['eventname'] . "' );\n");
fwrite($conf_file, "define( 'INFORMATIONS_URL', '".$storedvariables['basedata']['infourl']."' );\n"); fwrite($conf_file, "define( 'INFORMATIONS_URL', '" . $storedvariables['basedata']['infourl'] . "' );\n");
fwrite($conf_file, "define( 'SECRET_KEY', '".$storedvariables['basedata']['secretkey']."' );\n"); fwrite($conf_file, "define( 'SECRET_KEY', '" . $storedvariables['basedata']['secretkey'] . "' );\n");
fwrite($conf_file, "define( 'SECRET_VERIFICATION', '".$storedvariables['basedata']['secretverification']."' );\n"); fwrite($conf_file, "define( 'SECRET_VERIFICATION', '" . $storedvariables['basedata']['secretverification'] . "' );\n");
fwrite($conf_file, "define( 'URLPREFIX', '".$storedvariables['basedata']['urlprefix']."' );\n"); fwrite($conf_file, "define( 'URLPREFIX', '" . $storedvariables['basedata']['urlprefix'] . "' );\n");
fwrite($conf_file, "define( 'TAGE_DAUER', '".$storedvariables['basedata']['duration']."' );\n"); fwrite($conf_file, "define( 'TAGE_DAUER', '" . $storedvariables['basedata']['duration'] . "' );\n");
fwrite($conf_file, "date_default_timezone_set('".$storedvariables['basedata']['timezone']."');\n"); fwrite($conf_file, "date_default_timezone_set('" . $storedvariables['basedata']['timezone'] . "');\n");
fwrite($conf_file, "setlocale(LC_TIME, \"".$storedvariables['basedata']['locale']."\");\n"); fwrite($conf_file, "setlocale(LC_TIME, \"" . $storedvariables['basedata']['locale'] . "\");\n");
fwrite($conf_file, "\$start_date = new DateTimeImmutable(\"".$storedvariables['basedata']['startdate']."\");\n"); fwrite($conf_file, "\$start_date = new DateTimeImmutable(\"" . $storedvariables['basedata']['startdate'] . "\");\n");
fwrite($conf_file, "\$secret_key = SECRET_KEY;\n"); fwrite($conf_file, "\$secret_key = SECRET_KEY;\n");
fwrite($conf_file, "\$secret_verification = SECRET_VERIFICATION;\n"); fwrite($conf_file, "\$secret_verification = SECRET_VERIFICATION;\n");
fwrite($conf_file, "\$urlprefix = URLPREFIX;\n"); fwrite($conf_file, "\$urlprefix = URLPREFIX;\n");
fwrite($conf_file, "?>"); fwrite($conf_file, "?>");
// Test configuration: // Test configuration:
require_once("SQL.php"); require_once("SQL.php");
try{ try {
$db = DB::getInstance(); $db = DB::getInstance();
} catch (PDOException $exception) {
echo "<p>Fehler beim Verbindungsversuch mit der Datenbank: \"" . $exception->getMessage() . "\"</p>";
} }
catch( PDOException $exception ) { if (!is_null($db->pdoErrorCode()) && $db->pdoErrorCode() != '00000') {
echo "<p>Fehler beim Verbindungsversuch mit der Datenbank: \"".$exception->getMessage( )."\"</p>"; echo "<p>Fehler " . $db->pdoErrorCode() . " beim Verbindungsversuch mit der Datenbank: \"" . $db->pdoErrorInfo()[2] . "\"</p>";
}
if(!is_null($db->pdoErrorCode()) && $db->pdoErrorCode() != '00000'){
echo "<p>Fehler ".$db->pdoErrorCode()." beim Verbindungsversuch mit der Datenbank: \"".$db->pdoErrorInfo()[2]."\"</p>";
$_POST['step'] = 'createdatabase'; $_POST['step'] = 'createdatabase';
} else { } else {
echo "<p>Erfolgreich mit der Datenbank verbunden!</p>"; echo "<p>Erfolgreich mit der Datenbank verbunden!</p>";
} }
}); });
$wizard->addCode('createdatabasetables',function($storedvariables){ $wizard->addCode('createdatabasetables', function ($storedvariables) {
require_once("SQL.php"); require_once("SQL.php");
try{ try {
$db = DB::getInstance(); $db = DB::getInstance();
} catch (PDOException $exception) {
echo "<p>Fehler beim Verbindungsversuch mit der Datenbank: \"" . $exception->getMessage() . "\"</p>";
} }
catch( PDOException $exception ) { if (!is_null($db->pdoErrorCode()) && $db->pdoErrorCode() != '00000') {
echo "<p>Fehler beim Verbindungsversuch mit der Datenbank: \"".$exception->getMessage( )."\"</p>"; echo "<p>Fehler " . $db->pdoErrorCode() . " beim Verbindungsversuch mit der Datenbank: \"" . $db->pdoErrorInfo()[2] . "\"</p>";
}
if(!is_null($db->pdoErrorCode()) && $db->pdoErrorCode() != '00000'){
echo "<p>Fehler ".$db->pdoErrorCode()." beim Verbindungsversuch mit der Datenbank: \"".$db->pdoErrorInfo()[2]."\"</p>";
$_POST['step'] = 'createdatabase'; $_POST['step'] = 'createdatabase';
} else { } else {
echo "<p>Erfolgreich mit der Datenbank verbunden!</p>"; echo "<p>Erfolgreich mit der Datenbank verbunden!</p>";
} }
if($storedvariables['selectdatabase']['databasetype'] == 'SQLite'){ if ($storedvariables['selectdatabase']['databasetype'] == 'SQLite') {
$dbscript = "../helferdb_structure_sqlite.sql"; $dbscript = "../helferdb_structure_sqlite.sql";
} elseif ($storedvariables['selectdatabase']['databasetype'] == 'MariaDB'){ } elseif ($storedvariables['selectdatabase']['databasetype'] == 'MariaDB') {
$dbscript = "../helferdb_structure_mariadb.sql"; $dbscript = "../helferdb_structure_mariadb.sql";
} }
$statementsReturnvalues = $db->executeScript(__METHOD__, $dbscript); $statementsReturnvalues = $db->executeScript(__METHOD__, $dbscript);
if(!is_null($db->pdoErrorCode()) && $db->pdoErrorCode() != '00000'){ if (!is_null($db->pdoErrorCode()) && $db->pdoErrorCode() != '00000') {
echo "<p>Fehler ".$db->pdoErrorCode()." bei Statement Nr. ".sizeof($statementsReturnvalues)." beim Versuch Tabellen anzulegen: \"".$db->pdoErrorInfo()[2]."\"</p>"; echo "<p>Fehler " . $db->pdoErrorCode() . " bei Statement Nr. " . sizeof($statementsReturnvalues) . " beim Versuch Tabellen anzulegen: \"" . $db->pdoErrorInfo()[2] . "\"</p>";
$_POST['step'] = 'createdatabase'; $_POST['step'] = 'createdatabase';
} else { } else {
echo "<p>Datenbanktabellen wurden erfolgreich angelegt!</p>"; echo "<p>Datenbanktabellen wurden erfolgreich angelegt!</p>";
} }
}); });
$wizard->renderPHP(); $wizard->renderPHP();
?>

2
html/Userdaten.php
View File

@ -67,7 +67,7 @@ if (isset($_POST['change'])) {
$zeilen = Helferdaten($HelferID); $zeilen = Helferdaten($HelferID);
foreach ($zeilen as $zeile)) { foreach ($zeilen as $zeile) {
$HelferName = $zeile['Name']; $HelferName = $zeile['Name'];
$HelferEmail = $zeile['Email']; $HelferEmail = $zeile['Email'];
$HelferHandy = $zeile['Handy']; $HelferHandy = $zeile['Handy'];

127
html/Wizard.php
View File

@ -1,81 +1,84 @@
<?php <?php
class WizardStep { class WizardStep
{
public $page = ""; public $page = "";
public array $redirects = array(); public array $redirects = array();
public string $warning = ""; public string $warning = "";
public $code = null; public $code = null;
public function __construct($step){ public function __construct($step)
if(isset($step['page'])){ {
if (isset($step['page'])) {
$this->page = $step['page']; $this->page = $step['page'];
} }
if(isset($step['redirects'])){ if (isset($step['redirects'])) {
$this->redirects = $step['redirects']; $this->redirects = $step['redirects'];
} }
} }
public function setCurrentStep(){ public function setCurrentStep()
if(!empty($this->redirects)){ {
foreach($this->redirects as $redirect){ if (!empty($this->redirects)) {
if(isset($redirect['==']) && isset($redirect['id'])){ foreach ($this->redirects as $redirect) {
foreach($redirect['=='] as $key => $value){ if (isset($redirect['==']) && isset($redirect['id'])) {
if(isset($_POST[$key]) && $_POST[$key] == $value){ foreach ($redirect['=='] as $key => $value) {
if (isset($_POST[$key]) && $_POST[$key] == $value) {
$_POST['step'] = $redirect['id']; $_POST['step'] = $redirect['id'];
if(isset($redirect['warning'])){ if (isset($redirect['warning'])) {
$this->warning = $redirect['warning']; $this->warning = $redirect['warning'];
} }
return; return;
} }
} }
} }
if(isset($redirect['!=']) && isset($redirect['id'])){ if (isset($redirect['!=']) && isset($redirect['id'])) {
foreach($redirect['!='] as $key => $value){ foreach ($redirect['!='] as $key => $value) {
if(isset($_POST[$key]) && $_POST[$key] != $value){ if (isset($_POST[$key]) && $_POST[$key] != $value) {
$_POST['step'] = $redirect['id']; $_POST['step'] = $redirect['id'];
if(isset($redirect['warning'])){ if (isset($redirect['warning'])) {
$this->warning = $redirect['warning']; $this->warning = $redirect['warning'];
} }
return; return;
} }
} }
} }
if(isset($redirect['>']) && isset($redirect['id'])){ if (isset($redirect['>']) && isset($redirect['id'])) {
foreach($redirect['>'] as $key => $value){ foreach ($redirect['>'] as $key => $value) {
if(isset($_POST[$key]) && $_POST[$key] > $value){ if (isset($_POST[$key]) && $_POST[$key] > $value) {
$_POST['step'] = $redirect['id']; $_POST['step'] = $redirect['id'];
if(isset($redirect['warning'])){ if (isset($redirect['warning'])) {
$this->warning = $redirect['warning']; $this->warning = $redirect['warning'];
} }
return; return;
} }
} }
} }
if(isset($redirect['<']) && isset($redirect['id'])){ if (isset($redirect['<']) && isset($redirect['id'])) {
foreach($redirect['<'] as $key => $value){ foreach ($redirect['<'] as $key => $value) {
if(isset($_POST[$key]) && $_POST[$key] < $value){ if (isset($_POST[$key]) && $_POST[$key] < $value) {
$_POST['step'] = $redirect['id']; $_POST['step'] = $redirect['id'];
if(isset($redirect['warning'])){ if (isset($redirect['warning'])) {
$this->warning = $redirect['warning']; $this->warning = $redirect['warning'];
} }
return; return;
} }
} }
} }
if(isset($redirect['>=']) && isset($redirect['id'])){ if (isset($redirect['>=']) && isset($redirect['id'])) {
foreach($redirect['>='] as $key => $value){ foreach ($redirect['>='] as $key => $value) {
if(isset($_POST[$key]) && $_POST[$key] >= $value){ if (isset($_POST[$key]) && $_POST[$key] >= $value) {
$_POST['step'] = $redirect['id']; $_POST['step'] = $redirect['id'];
if(isset($redirect['warning'])){ if (isset($redirect['warning'])) {
$this->warning = $redirect['warning']; $this->warning = $redirect['warning'];
} }
return; return;
} }
} }
} }
if(isset($redirect['<=']) && isset($redirect['id'])){ if (isset($redirect['<=']) && isset($redirect['id'])) {
foreach($redirect['<='] as $key => $value){ foreach ($redirect['<='] as $key => $value) {
if(isset($_POST[$key]) && $_POST[$key] <= $value){ if (isset($_POST[$key]) && $_POST[$key] <= $value) {
$_POST['step'] = $redirect['id']; $_POST['step'] = $redirect['id'];
if(isset($redirect['warning'])){ if (isset($redirect['warning'])) {
$this->warning = $redirect['warning']; $this->warning = $redirect['warning'];
} }
return; return;
@ -85,84 +88,86 @@ class WizardStep {
} }
} }
} }
public function setCode(callable $function){ public function setCode(callable $function)
{
$this->code = $function; $this->code = $function;
} }
} }
class Wizard { class Wizard
{
private string $header = ""; private string $header = "";
private string $firststep = ""; private string $firststep = "";
private array $steps = array(); private array $steps = array();
private string $footer = ""; private string $footer = "";
private array $storedvariables = array(); private array $storedvariables = array();
public function __construct($json_file = '../wizard.json'){ public function __construct($json_file = '../wizard.json')
{
$stepsArray = json_decode(file_get_contents($json_file), true); $stepsArray = json_decode(file_get_contents($json_file), true);
$this->header = $stepsArray['header']; $this->header = $stepsArray['header'];
$this->firststep = $stepsArray['firststep']; $this->firststep = $stepsArray['firststep'];
foreach($stepsArray['steps'] as $step){ foreach ($stepsArray['steps'] as $step) {
$this->steps[$step['id']] = new WizardStep($step); $this->steps[$step['id']] = new WizardStep($step);
} }
$this->footer = $stepsArray['footer']; $this->footer = $stepsArray['footer'];
if(isset($_POST['storedvariables'])){ if (isset($_POST['storedvariables'])) {
$this->storedvariables = json_decode($_POST['storedvariables'],JSON_FORCE_OBJECT); $this->storedvariables = json_decode($_POST['storedvariables'], JSON_FORCE_OBJECT);
} }
} }
public function renderPHP(){ public function renderPHP()
{
echo $this->header; echo $this->header;
if(isset($_POST['stepfrom'])){ if (isset($_POST['stepfrom'])) {
$this->steps[$_POST['stepfrom']]->setCurrentStep(); $this->steps[$_POST['stepfrom']]->setCurrentStep();
if(isset($_POST['step']) && ($_POST['step'] != $_POST['stepfrom'])){ if (isset($_POST['step']) && ($_POST['step'] != $_POST['stepfrom'])) {
if(!is_null($this->steps[$_POST['stepfrom']]->code)){ if (!is_null($this->steps[$_POST['stepfrom']]->code)) {
$this->storedvariables[$_POST['stepfrom']] = call_user_func($this->steps[$_POST['stepfrom']]->code, $this->storedvariables); $this->storedvariables[$_POST['stepfrom']] = call_user_func($this->steps[$_POST['stepfrom']]->code, $this->storedvariables);
} }
} }
} }
if(!isset($_POST['step'])){ if (!isset($_POST['step'])) {
$_POST['step'] = $this->firststep; $_POST['step'] = $this->firststep;
} }
// If warning not set this does not add anything to the page: // If warning not set this does not add anything to the page:
echo $this->steps[$_POST['step']]->warning; echo $this->steps[$_POST['step']]->warning;
$pagedom = new DOMDocument(); $pagedom = new DOMDocument();
$pageval = $this->steps[$_POST['step']]->page; $pageval = $this->steps[$_POST['step']]->page;
if(is_array($pageval)){ if (is_array($pageval)) {
$page = "\xEF\xBB\xBF"; $page = "\xEF\xBB\xBF";
foreach($pageval as $pagepart){ foreach ($pageval as $pagepart) {
foreach($pagepart as $element => $content){ foreach ($pagepart as $element => $content) {
if($element == 'text'){ if ($element == 'text') {
$page.=$content; $page .= $content;
} } elseif ($element == 'variable') {
elseif($element == 'variable'){
$tmpcontent = $this->storedvariables; $tmpcontent = $this->storedvariables;
foreach(explode('/',$content) as $pathpart){ foreach (explode('/', $content) as $pathpart) {
$tmpcontent = $tmpcontent[$pathpart]; $tmpcontent = $tmpcontent[$pathpart];
} }
$page.=$tmpcontent; $page .= $tmpcontent;
} }
} }
} }
} } else {
else{ $page = "\xEF\xBB\xBF" . $pageval;
$page = "\xEF\xBB\xBF".$pageval;
} }
libxml_use_internal_errors(true); libxml_use_internal_errors(true);
$pagedom->loadHTML($page); $pagedom->loadHTML($page);
foreach (libxml_get_errors() as $error) { foreach (libxml_get_errors() as $error) {
echo "<p>Error when parsing html for step \"".$_POST['step']."\":".$error->line." ".$error->column." ".$error->message."</p>"; echo "<p>Error when parsing html for step \"" . $_POST['step'] . "\":" . $error->line . " " . $error->column . " " . $error->message . "</p>";
} }
$forms = $pagedom->getElementsByTagName('form'); $forms = $pagedom->getElementsByTagName('form');
foreach($forms as $form){ foreach ($forms as $form) {
$input = $pagedom->createElement('input'); $input = $pagedom->createElement('input');
$input->setAttribute('type','hidden'); $input->setAttribute('type', 'hidden');
$input->setAttribute('name','storedvariables'); $input->setAttribute('name', 'storedvariables');
$input->setAttribute('value',json_encode($this->storedvariables,JSON_FORCE_OBJECT)); $input->setAttribute('value', json_encode($this->storedvariables, JSON_FORCE_OBJECT));
$form->appendChild($input); $form->appendChild($input);
} }
echo $pagedom->saveHTML(); echo $pagedom->saveHTML();
echo $this->footer; echo $this->footer;
} }
public function addCode($stepid, $function){ public function addCode($stepid, $function)
{
$this->steps[$stepid]->setCode($function); $this->steps[$stepid]->setCode($function);
} }
} }
?>

4
html/index.php
View File

@ -66,7 +66,9 @@ $iCount = 0;
foreach ($schichten as $zeile) { foreach ($schichten as $zeile) {
echo "<li>" . $zeile['Ab'] . " " . $zeile['Was'] . "</li>"; echo "<li>" . $zeile['Ab'] . " " . $zeile['Was'] . "</li>";
$iCount++; $iCount++;
if(iCount>2) break; if (iCount > 2) {
break;
}
} }
?> ?>

547
html/testPDO.php
View File

@ -1,94 +1,103 @@
<?php <?php
session_start(); session_start();
require_once 'SQL_old.php'; require_once 'SQL_old.php';
require_once 'SQL.php'; require_once 'SQL.php';
// ok // ok
function TestCreateHelfer(){ function TestCreateHelfer()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old = old\CreateHelfer($dbl, "Max Mustermann", "max@example.com", "+49123-45", "hola234"); $erg_old = old\CreateHelfer($dbl, "Max Mustermann", "max@example.com", "+49123-45", "hola234");
$erg_new = CreateHelfer("Max Mustermann", "max2@example.com", "+49123-45", "hola234"); $erg_new = CreateHelfer("Max Mustermann", "max2@example.com", "+49123-45", "hola234");
if((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)){ if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old CreateHelfer returns '".var_export($erg_old, true)."'"; echo "Old CreateHelfer returns '" . var_export($erg_old, true) . "'";
echo "New CreateHelfer returns '".var_export($erg_new, true)."'"; echo "New CreateHelfer returns '" . var_export($erg_new, true) . "'";
} else {
echo "CreateHelfer ok\n";
} }
else echo "CreateHelfer ok\n";
} }
// ok // ok
function TestHelferIstVorhanden(){ function TestHelferIstVorhanden()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old = old\HelferIstVorhanden($dbl, "max@example.com"); $erg_old = old\HelferIstVorhanden($dbl, "max@example.com");
$erg_new = HelferIstVorhanden("max@example.com"); $erg_new = HelferIstVorhanden("max@example.com");
if((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)){ if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old HelferIstVorhanden returns '".var_export($erg_old, true)."'"; echo "Old HelferIstVorhanden returns '" . var_export($erg_old, true) . "'";
echo "New HelferIstVorhanden returns '".var_export($erg_new, true)."'"; echo "New HelferIstVorhanden returns '" . var_export($erg_new, true) . "'";
} else {
echo "HelferIstVorhanden ok\n";
} }
else echo "HelferIstVorhanden ok\n";
} }
// ok // ok
function TestHelferLogin(){ function TestHelferLogin()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old = old\HelferLogin($dbl, "max@example.com", "hola234", 0); $erg_old = old\HelferLogin($dbl, "max@example.com", "hola234", 0);
$erg_old_session = $_SESSION; $erg_old_session = $_SESSION;
$_SESSION = null; $_SESSION = null;
$erg_new = HelferLogin("max@example.com", "hola234", 0); $erg_new = HelferLogin("max@example.com", "hola234", 0);
$erg_new_session = $_SESSION; $erg_new_session = $_SESSION;
$_SESSION = null; $_SESSION = null;
$erg_old_wrong = old\HelferLogin($dbl, "max@example.com", "hola235", 0); $erg_old_wrong = old\HelferLogin($dbl, "max@example.com", "hola235", 0);
$erg_old_session_wrong = $_SESSION; $erg_old_session_wrong = $_SESSION;
$_SESSION = null; $_SESSION = null;
$erg_new_wrong = HelferLogin("max@example.com", "hola235", 0); $erg_new_wrong = HelferLogin("max@example.com", "hola235", 0);
$erg_new_session_wrong = $_SESSION; $erg_new_session_wrong = $_SESSION;
if((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)){ if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old HelferLogin returns '".var_export($erg_old, true)."'"; echo "Old HelferLogin returns '" . var_export($erg_old, true) . "'";
echo "New HelferLogin returns '".var_export($erg_new, true)."'"; echo "New HelferLogin returns '" . var_export($erg_new, true) . "'";
} elseif ((gettype($erg_old_session) != gettype($erg_new_session)) || ($erg_old_session != $erg_new_session)) {
echo "Old HelferLogin session returns '" . var_export($erg_old_session, true) . "'";
echo "New HelferLogin session returns '" . var_export($erg_new_session, true) . "'";
} elseif ((gettype($erg_old_wrong) != gettype($erg_new_wrong)) || ($erg_old_wrong != $erg_new_wrong)) {
echo "Old HelferLogin wrong returns '" . var_export($erg_old_wrong, true) . "'";
echo "New HelferLogin wrong returns '" . var_export($erg_new_wrong, true) . "'";
} elseif ((gettype($erg_old_session_wrong) != gettype($erg_new_session_wrong)) || ($erg_old_session_wrong != $erg_new_session_wrong)) {
echo "Old HelferLogin session wrong returns '" . var_export($erg_old_session_wrong, true) . "'";
echo "New HelferLogin session wrong returns '" . var_export($erg_new_session_wrong, true) . "'";
} else {
echo "HelferLogin ok\n";
} }
else if((gettype($erg_old_session) != gettype($erg_new_session)) || ($erg_old_session != $erg_new_session)){
echo "Old HelferLogin session returns '".var_export($erg_old_session, true)."'";
echo "New HelferLogin session returns '".var_export($erg_new_session, true)."'";
}
else if((gettype($erg_old_wrong) != gettype($erg_new_wrong)) || ($erg_old_wrong != $erg_new_wrong)){
echo "Old HelferLogin wrong returns '".var_export($erg_old_wrong, true)."'";
echo "New HelferLogin wrong returns '".var_export($erg_new_wrong, true)."'";
}
else if((gettype($erg_old_session_wrong) != gettype($erg_new_session_wrong)) || ($erg_old_session_wrong != $erg_new_session_wrong)){
echo "Old HelferLogin session wrong returns '".var_export($erg_old_session_wrong, true)."'";
echo "New HelferLogin session wrong returns '".var_export($erg_new_session_wrong, true)."'";
}
else echo "HelferLogin ok\n";
} }
// ok // ok
function TestHelferListe(){ function TestHelferListe()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old = old\HelferListe($dbl); $erg_old = old\HelferListe($dbl);
$erg_new = HelferListe(); $erg_new = HelferListe();
if((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)){ if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old HelferListe returns '".var_export($erg_old, true)."'"; echo "Old HelferListe returns '" . var_export($erg_old, true) . "'";
echo "New HelferListe returns '".var_export($erg_new, true)."'"; echo "New HelferListe returns '" . var_export($erg_new, true) . "'";
} else {
echo "HelferListe ok\n";
} }
else echo "HelferListe ok\n";
} }
// ok // ok
function TestHelferdaten(){ function TestHelferdaten()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
HelferLogin("max@example.com", "hola234", 0); HelferLogin("max@example.com", "hola234", 0);
$erg_old = old\Helferdaten($dbl,$_SESSION["HelferID"]); $erg_old = old\Helferdaten($dbl, $_SESSION["HelferID"]);
$erg_new = Helferdaten($_SESSION["HelferID"]); $erg_new = Helferdaten($_SESSION["HelferID"]);
if((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)){ if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old Helferdaten returns '".var_export($erg_old, true)."'"; echo "Old Helferdaten returns '" . var_export($erg_old, true) . "'";
echo "New Helferdaten returns '".var_export($erg_new, true)."'"; echo "New Helferdaten returns '" . var_export($erg_new, true) . "'";
} else {
echo "Helferdaten ok\n";
} }
else echo "Helferdaten ok\n";
} }
// ok // ok
function TestHelferdatenAendern(){ function TestHelferdatenAendern()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
HelferLogin("max@example.com", "hola234", 0); HelferLogin("max@example.com", "hola234", 0);
$cases = array( $cases = array(
# Case 1 HelferNewPasswort Empty, HelferIsAdmin == -1 # Case 1 HelferNewPasswort Empty, HelferIsAdmin == -1
1 => array( 1 => array(
@ -136,7 +145,7 @@ function TestHelferdatenAendern(){
), ),
); );
foreach($cases as $casenumber => $case){ foreach ($cases as $casenumber => $case) {
ob_start(); ob_start();
$erg_old = old\HelferdatenAendern($dbl, $case["HelferName"], $case["HelferEmail"], $case["HelferHandy"], $case["HelferNewPasswort"], $case["HelferID"], $case["HelferLevel"], $case["HelferIsAdmin"], $case["AdminID"]); $erg_old = old\HelferdatenAendern($dbl, $case["HelferName"], $case["HelferEmail"], $case["HelferHandy"], $case["HelferNewPasswort"], $case["HelferID"], $case["HelferLevel"], $case["HelferIsAdmin"], $case["AdminID"]);
$erg_ob_old = ob_get_contents(); $erg_ob_old = ob_get_contents();
@ -145,172 +154,186 @@ function TestHelferdatenAendern(){
$erg_new = HelferdatenAendern($case["HelferName"], $case["HelferEmail"], $case["HelferHandy"], $case["HelferNewPasswort"], $case["HelferID"], $case["HelferLevel"], $case["HelferIsAdmin"], $case["AdminID"]); $erg_new = HelferdatenAendern($case["HelferName"], $case["HelferEmail"], $case["HelferHandy"], $case["HelferNewPasswort"], $case["HelferID"], $case["HelferLevel"], $case["HelferIsAdmin"], $case["AdminID"]);
$erg_ob_new = ob_get_contents(); $erg_ob_new = ob_get_contents();
ob_end_clean(); ob_end_clean();
if((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)){ if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old HelferdatenAendern case number ".$casenumber." returns '".var_export($erg_old, true)."'\n"; echo "Old HelferdatenAendern case number " . $casenumber . " returns '" . var_export($erg_old, true) . "'\n";
echo "New HelferdatenAendern case number ".$casenumber." returns '".var_export($erg_new, true)."'\n"; echo "New HelferdatenAendern case number " . $casenumber . " returns '" . var_export($erg_new, true) . "'\n";
} elseif ($erg_ob_old != $erg_ob_new) {
echo "Old HelferdatenAendern case number " . $casenumber . " ob returns '" . $erg_ob_old . "'\n";
echo "New HelferdatenAendern case number " . $casenumber . " ob returns '" . $erg_ob_new . "'\n";
} else {
echo "HelferdatenAendern case number " . $casenumber . " ok\n";
} }
else if($erg_ob_old != $erg_ob_new){
echo "Old HelferdatenAendern case number ".$casenumber." ob returns '".$erg_ob_old."'\n";
echo "New HelferdatenAendern case number ".$casenumber." ob returns '".$erg_ob_new."'\n";
}
else echo "HelferdatenAendern case number ".$casenumber." ok\n";
} }
} }
// ok // ok
function TestAlleSchichten(){ function TestAlleSchichten()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old = old\AlleSchichten($dbl, 1, 2); $erg_old = old\AlleSchichten($dbl, 1, 2);
$erg_new = AlleSchichten(1, 2); $erg_new = AlleSchichten(1, 2);
if((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)){ if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old AlleSchichten returns".var_export($erg_old, true)."\n"; echo "Old AlleSchichten returns" . var_export($erg_old, true) . "\n";
echo "New AlleSchichten returns '".var_export($erg_new, true)."'\n"; echo "New AlleSchichten returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "AlleSchichten ok\n";
} }
else echo "AlleSchichten ok\n";
} }
// ok // ok
function TestAlleSchichtenCount(){ function TestAlleSchichtenCount()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old = old\AlleSchichtenCount($dbl, 2); $erg_old = old\AlleSchichtenCount($dbl, 2);
$erg_new = AlleSchichtenCount(2); $erg_new = AlleSchichtenCount(2);
if((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)){ if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old AlleSchichtenCount returns".var_export($erg_old, true)."\n"; echo "Old AlleSchichtenCount returns" . var_export($erg_old, true) . "\n";
echo "New AlleSchichtenCount returns '".var_export($erg_new, true)."'\n"; echo "New AlleSchichtenCount returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "AlleSchichtenCount ok\n";
} }
else echo "AlleSchichtenCount ok\n";
} }
// ok // ok
function TestAlleBelegteSchichtenCount(){ function TestAlleBelegteSchichtenCount()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old = old\AlleBelegteSchichtenCount($dbl, 2); $erg_old = old\AlleBelegteSchichtenCount($dbl, 2);
$erg_new = AlleBelegteSchichtenCount(2); $erg_new = AlleBelegteSchichtenCount(2);
if((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)){ if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old AlleBelegteSchichtenCount returns".var_export($erg_old, true)."\n"; echo "Old AlleBelegteSchichtenCount returns" . var_export($erg_old, true) . "\n";
echo "New AlleBelegteSchichtenCount returns '".var_export($erg_new, true)."'\n"; echo "New AlleBelegteSchichtenCount returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "AlleBelegteSchichtenCount ok\n";
} }
else echo "AlleBelegteSchichtenCount ok\n";
} }
// ok // ok
function TestAlleSchichtenImZeitbereich(){ function TestAlleSchichtenImZeitbereich()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old = old\AlleSchichtenImZeitbereich($dbl, "2024-02-01", "2024-03-01", 2); $erg_old = old\AlleSchichtenImZeitbereich($dbl, "2024-02-01", "2024-03-01", 2);
$erg_new = AlleSchichtenImZeitbereich("2024-02-01", "2024-03-01", 2); $erg_new = AlleSchichtenImZeitbereich("2024-02-01", "2024-03-01", 2);
if((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)){ if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old AlleSchichtenImZeitbereich returns".var_export($erg_old, true)."\n"; echo "Old AlleSchichtenImZeitbereich returns" . var_export($erg_old, true) . "\n";
echo "New AlleSchichtenImZeitbereich returns '".var_export($erg_new, true)."'\n"; echo "New AlleSchichtenImZeitbereich returns '" . var_export($erg_new, true) . "'\n";
} }
$erg_old = old\AlleSchichtenImZeitbereich($dbl, "2024-03-01", "2024-04-01", 2); $erg_old = old\AlleSchichtenImZeitbereich($dbl, "2024-03-01", "2024-04-01", 2);
$erg_new = AlleSchichtenImZeitbereich("2024-03-01", "2024-04-01", 2); $erg_new = AlleSchichtenImZeitbereich("2024-03-01", "2024-04-01", 2);
if((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)){ if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old AlleSchichtenImZeitbereich returns".var_export($erg_old, true)."\n"; echo "Old AlleSchichtenImZeitbereich returns" . var_export($erg_old, true) . "\n";
echo "New AlleSchichtenImZeitbereich returns '".var_export($erg_new, true)."'\n"; echo "New AlleSchichtenImZeitbereich returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "AlleSchichtenImZeitbereich ok\n";
} }
else echo "AlleSchichtenImZeitbereich ok\n";
} }
// ok // ok
function TestAlleSchichtenEinesHelfers(){ function TestAlleSchichtenEinesHelfers()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
HelferLogin("max2@example.com", "hola234", 0); HelferLogin("max2@example.com", "hola234", 0);
$helfer = $_SESSION; $helfer = $_SESSION;
$erg_old = old\AlleSchichtenEinesHelfers($dbl,$helfer['HelferID']); $erg_old = old\AlleSchichtenEinesHelfers($dbl, $helfer['HelferID']);
$erg_new = AlleSchichtenEinesHelfers($helfer['HelferID']); $erg_new = AlleSchichtenEinesHelfers($helfer['HelferID']);
if((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)){ if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old AlleSchichtenEinesHelfers returns".var_export($erg_old, true)."\n"; echo "Old AlleSchichtenEinesHelfers returns" . var_export($erg_old, true) . "\n";
echo "New AlleSchichtenEinesHelfers returns '".var_export($erg_new, true)."'\n"; echo "New AlleSchichtenEinesHelfers returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "AlleSchichtenEinesHelfers ok\n";
} }
else echo "AlleSchichtenEinesHelfers ok\n";
} }
// ok // ok
function TestHelferLoeschen(){ function TestHelferLoeschen()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
HelferLogin("max2@example.com", "hola234", 0); HelferLogin("max2@example.com", "hola234", 0);
$helfer1 = $_SESSION; $helfer1 = $_SESSION;
HelferLogin("max3@example.com", "hola531", 0); HelferLogin("max3@example.com", "hola531", 0);
$helfer2 = $_SESSION; $helfer2 = $_SESSION;
ob_start(); ob_start();
$erg_old1 = old\HelferLoeschen($dbl, $helfer1['HelferID'],0); $erg_old1 = old\HelferLoeschen($dbl, $helfer1['HelferID'], 0);
$erg_new1 = HelferLoeschen($helfer2['HelferID'],0); $erg_new1 = HelferLoeschen($helfer2['HelferID'], 0);
$schichten = AlleSchichtenEinesHelfers($helfer1['HelferID']); $schichten = AlleSchichtenEinesHelfers($helfer1['HelferID']);
foreach($schichten as $schicht) foreach ($schichten as $schicht) {
{
HelferVonSchichtLoeschen($helfer1['HelferID'], $schicht['EinzelSchichtID']); HelferVonSchichtLoeschen($helfer1['HelferID'], $schicht['EinzelSchichtID']);
} }
$schichten = AlleSchichtenEinesHelfers($helfer2['HelferID']); $schichten = AlleSchichtenEinesHelfers($helfer2['HelferID']);
foreach($schichten as $schicht) foreach ($schichten as $schicht) {
{
HelferVonSchichtLoeschen($helfer2['HelferID'], $schicht['EinzelSchichtID']); HelferVonSchichtLoeschen($helfer2['HelferID'], $schicht['EinzelSchichtID']);
} }
$erg_old2 = old\HelferLoeschen($dbl, $helfer1['HelferID'],0); $erg_old2 = old\HelferLoeschen($dbl, $helfer1['HelferID'], 0);
$erg_new2 = HelferLoeschen($helfer2['HelferID'],0); $erg_new2 = HelferLoeschen($helfer2['HelferID'], 0);
ob_end_clean(); ob_end_clean();
if((gettype($erg_old1) != gettype($erg_new1)) || ($erg_old1 != $erg_new1)){ if ((gettype($erg_old1) != gettype($erg_new1)) || ($erg_old1 != $erg_new1)) {
echo "Old HelferLoeschen returns".var_export($erg_old1, true)."\n"; echo "Old HelferLoeschen returns" . var_export($erg_old1, true) . "\n";
echo "New HelferLoeschen returns '".var_export($erg_new1, true)."'\n"; echo "New HelferLoeschen returns '" . var_export($erg_new1, true) . "'\n";
} elseif ((gettype($erg_old2) != gettype($erg_new2)) || ($erg_old2 != $erg_new2)) {
echo "Old HelferLoeschen returns" . var_export($erg_old2, true) . "\n";
echo "New HelferLoeschen returns '" . var_export($erg_new2, true) . "'\n";
} else {
echo "HelferLoeschen ok\n";
} }
else if((gettype($erg_old2) != gettype($erg_new2)) || ($erg_old2 != $erg_new2)){
echo "Old HelferLoeschen returns".var_export($erg_old2, true)."\n";
echo "New HelferLoeschen returns '".var_export($erg_new2, true)."'\n";
}
else echo "HelferLoeschen ok\n";
} }
// ok // ok
function TestSchichtIdArrayEinesHelfers(){ function TestSchichtIdArrayEinesHelfers()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
HelferLogin("max2@example.com", "hola234", 0); HelferLogin("max2@example.com", "hola234", 0);
$helfer = $_SESSION; $helfer = $_SESSION;
$erg_old = old\SchichtIdArrayEinesHelfers($dbl, $helfer['HelferID']); $erg_old = old\SchichtIdArrayEinesHelfers($dbl, $helfer['HelferID']);
$erg_new = SchichtIdArrayEinesHelfers($helfer['HelferID']); $erg_new = SchichtIdArrayEinesHelfers($helfer['HelferID']);
if((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)){ if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old SchichtIdArrayEinesHelfers returns".var_export($erg_old, true)."\n"; echo "Old SchichtIdArrayEinesHelfers returns" . var_export($erg_old, true) . "\n";
echo "New SchichtIdArrayEinesHelfers returns '".var_export($erg_new, true)."'\n"; echo "New SchichtIdArrayEinesHelfers returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "SchichtIdArrayEinesHelfers ok\n";
} }
else echo "SchichtIdArrayEinesHelfers ok\n";
} }
// ok // ok
function TestAlleSchichtenEinesHelfersVonJetzt(){ function TestAlleSchichtenEinesHelfersVonJetzt()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
HelferLogin("max2@example.com", "hola234", 0); HelferLogin("max2@example.com", "hola234", 0);
$helfer = $_SESSION; $helfer = $_SESSION;
$dienste = GetDienste(); $dienste = GetDienste();
NewSchicht($dienste[0]["DienstID"], date('Y-m-d H:i',time()+60*60*24), date('Y-m-d H:i',time()+60*60*24+60*60*1.5), 2, "01:30"); NewSchicht($dienste[0]["DienstID"], date('Y-m-d H:i', time() + 60 * 60 * 24), date('Y-m-d H:i', time() + 60 * 60 * 24 + 60 * 60 * 1.5), 2, "01:30");
$schichten = GetSchichtenEinesDienstes($dienste[0]["DienstID"]); $schichten = GetSchichtenEinesDienstes($dienste[0]["DienstID"]);
HelferSchichtZuweisen($helfer['HelferID'], $schichten[2]['SchichtID'],0); HelferSchichtZuweisen($helfer['HelferID'], $schichten[2]['SchichtID'], 0);
$erg_old = old\AlleSchichtenEinesHelfersVonJetzt($dbl, $helfer['HelferID']); $erg_old = old\AlleSchichtenEinesHelfersVonJetzt($dbl, $helfer['HelferID']);
$erg_new = AlleSchichtenEinesHelfersVonJetzt($helfer['HelferID']); $erg_new = AlleSchichtenEinesHelfersVonJetzt($helfer['HelferID']);
if((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)){ if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old AlleSchichtenEinesHelfersVonJetzt returns".var_export($erg_old, true)."\n"; echo "Old AlleSchichtenEinesHelfersVonJetzt returns" . var_export($erg_old, true) . "\n";
echo "New AlleSchichtenEinesHelfersVonJetzt returns '".var_export($erg_new, true)."'\n"; echo "New AlleSchichtenEinesHelfersVonJetzt returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "AlleSchichtenEinesHelfersVonJetzt ok\n";
} }
else echo "AlleSchichtenEinesHelfersVonJetzt ok\n";
} }
// ok // ok
function TestSchichtenSummeEinesHelfers(){ function TestSchichtenSummeEinesHelfers()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
HelferLogin("max2@example.com", "hola234", 0); HelferLogin("max2@example.com", "hola234", 0);
$helfer = $_SESSION; $helfer = $_SESSION;
$erg_old = old\SchichtenSummeEinesHelfers($dbl, $helfer['HelferID']); $erg_old = old\SchichtenSummeEinesHelfers($dbl, $helfer['HelferID']);
$erg_new = SchichtenSummeEinesHelfers($helfer['HelferID']); $erg_new = SchichtenSummeEinesHelfers($helfer['HelferID']);
if((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)){ if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old SchichtenSummeEinesHelfers returns".var_export($erg_old, true)."\n"; echo "Old SchichtenSummeEinesHelfers returns" . var_export($erg_old, true) . "\n";
echo "New SchichtenSummeEinesHelfers returns '".var_export($erg_new, true)."'\n"; echo "New SchichtenSummeEinesHelfers returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "SchichtenSummeEinesHelfers ok\n";
} }
else echo "SchichtenSummeEinesHelfers ok\n";
} }
// ok (looked at log file afterwards) // ok (looked at log file afterwards)
function TestLogSchichtEingabe(){ function TestLogSchichtEingabe()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
HelferLogin("max2@example.com", "hola234", 0); HelferLogin("max2@example.com", "hola234", 0);
$helfer = $_SESSION; $helfer = $_SESSION;
$dienste = GetDienste(); $dienste = GetDienste();
$schichten = GetSchichtenEinesDienstes($dienste[0]["DienstID"]); $schichten = GetSchichtenEinesDienstes($dienste[0]["DienstID"]);
@ -320,240 +343,268 @@ function TestLogSchichtEingabe(){
} }
// ok // ok
function TestHelferSchichtZuweisen(){ function TestHelferSchichtZuweisen()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
HelferLogin("max2@example.com", "hola234", 0); HelferLogin("max2@example.com", "hola234", 0);
$helfer1 = $_SESSION; $helfer1 = $_SESSION;
HelferLogin("max3@example.com", "hola531", 0); HelferLogin("max3@example.com", "hola531", 0);
$helfer2 = $_SESSION; $helfer2 = $_SESSION;
$dienste = GetDienste(); $dienste = GetDienste();
$schichten = GetSchichtenEinesDienstes($dienste[0]["DienstID"]); $schichten = GetSchichtenEinesDienstes($dienste[0]["DienstID"]);
$erg_old = old\HelferSchichtZuweisen($dbl, $helfer1['HelferID'], $schichten[0]['SchichtID'],0); $erg_old = old\HelferSchichtZuweisen($dbl, $helfer1['HelferID'], $schichten[0]['SchichtID'], 0);
$erg_new = HelferSchichtZuweisen($helfer2['HelferID'], $schichten[0]['SchichtID'],0); $erg_new = HelferSchichtZuweisen($helfer2['HelferID'], $schichten[0]['SchichtID'], 0);
if((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)){ if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old HelferSchichtZuweisen returns".var_export($erg_old, true)."\n"; echo "Old HelferSchichtZuweisen returns" . var_export($erg_old, true) . "\n";
echo "New HelferSchichtZuweisen returns '".var_export($erg_new, true)."'\n"; echo "New HelferSchichtZuweisen returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "HelferSchichtZuweisen ok\n";
} }
else echo "HelferSchichtZuweisen ok\n";
} }
// ok // ok
function TestHelferVonSchichtLoeschen(){ function TestHelferVonSchichtLoeschen()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
HelferLogin("max2@example.com", "hola234", 0); HelferLogin("max2@example.com", "hola234", 0);
$helfer1 = $_SESSION; $helfer1 = $_SESSION;
$schichten1 = AlleSchichtenEinesHelfers($helfer1['HelferID']); $schichten1 = AlleSchichtenEinesHelfers($helfer1['HelferID']);
HelferLogin("max3@example.com", "hola531", 0); HelferLogin("max3@example.com", "hola531", 0);
$helfer2 = $_SESSION; $helfer2 = $_SESSION;
$schichten2 = AlleSchichtenEinesHelfers($helfer2['HelferID']); $schichten2 = AlleSchichtenEinesHelfers($helfer2['HelferID']);
$erg_old = old\HelferVonSchichtLoeschen($dbl, $helfer1['HelferID'], $schichten1[0]['EinzelSchichtID']); $erg_old = old\HelferVonSchichtLoeschen($dbl, $helfer1['HelferID'], $schichten1[0]['EinzelSchichtID']);
$erg_new = HelferVonSchichtLoeschen($helfer2['HelferID'], $schichten2[0]['EinzelSchichtID']); $erg_new = HelferVonSchichtLoeschen($helfer2['HelferID'], $schichten2[0]['EinzelSchichtID']);
if((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)){ if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old HelferVonSchichtLoeschen returns".var_export($erg_old, true)."\n"; echo "Old HelferVonSchichtLoeschen returns" . var_export($erg_old, true) . "\n";
echo "New HelferVonSchichtLoeschen returns '".var_export($erg_new, true)."'\n"; echo "New HelferVonSchichtLoeschen returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "HelferVonSchichtLoeschen ok\n";
} }
else echo "HelferVonSchichtLoeschen ok\n";
} }
// ok // ok
function TestHelferVonSchichtLoeschen_SchichtID(){ function TestHelferVonSchichtLoeschen_SchichtID()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$schichten = AlleSchichten(1, 2); $schichten = AlleSchichten(1, 2);
HelferLogin("max2@example.com", "hola234", 0); HelferLogin("max2@example.com", "hola234", 0);
$helfer1 = $_SESSION; $helfer1 = $_SESSION;
HelferSchichtZuweisen($helfer1['HelferID'], $schichten[1]['SchichtID'],0); HelferSchichtZuweisen($helfer1['HelferID'], $schichten[1]['SchichtID'], 0);
HelferLogin("max3@example.com", "hola531", 0); HelferLogin("max3@example.com", "hola531", 0);
$helfer2 = $_SESSION; $helfer2 = $_SESSION;
HelferSchichtZuweisen($helfer2['HelferID'], $schichten[1]['SchichtID'],0); HelferSchichtZuweisen($helfer2['HelferID'], $schichten[1]['SchichtID'], 0);
$erg_old = old\HelferVonSchichtLoeschen_SchichtID($dbl,$helfer1['HelferID'], $schichten[1]['SchichtID']); $erg_old = old\HelferVonSchichtLoeschen_SchichtID($dbl, $helfer1['HelferID'], $schichten[1]['SchichtID']);
$erg_new = HelferVonSchichtLoeschen_SchichtID($helfer2['HelferID'], $schichten[1]['SchichtID']); $erg_new = HelferVonSchichtLoeschen_SchichtID($helfer2['HelferID'], $schichten[1]['SchichtID']);
if((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)){ if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old HelferVonSchichtLoeschen_SchichtID returns".var_export($erg_old, true)."\n"; echo "Old HelferVonSchichtLoeschen_SchichtID returns" . var_export($erg_old, true) . "\n";
echo "New HelferVonSchichtLoeschen_SchichtID returns '".var_export($erg_new, true)."'\n"; echo "New HelferVonSchichtLoeschen_SchichtID returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "HelferVonSchichtLoeschen_SchichtID ok\n";
} }
else echo "HelferVonSchichtLoeschen_SchichtID ok\n";
} }
// ok // ok
function TestDetailSchicht(){ function TestDetailSchicht()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
HelferLogin("max2@example.com", "hola234", 0); HelferLogin("max2@example.com", "hola234", 0);
$helfer = $_SESSION; $helfer = $_SESSION;
$schichten = AlleSchichtenEinesHelfers($helfer['HelferID']); $schichten = AlleSchichtenEinesHelfers($helfer['HelferID']);
$erg_old = old\DetailSchicht($dbl, $schichten[0]['SchichtID']); $erg_old = old\DetailSchicht($dbl, $schichten[0]['SchichtID']);
$erg_new = DetailSchicht($schichten[0]['SchichtID']); $erg_new = DetailSchicht($schichten[0]['SchichtID']);
if((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)){ if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old DetailSchicht returns".var_export($erg_old, true)."\n"; echo "Old DetailSchicht returns" . var_export($erg_old, true) . "\n";
echo "New DetailSchicht returns '".var_export($erg_new, true)."'\n"; echo "New DetailSchicht returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "DetailSchicht ok\n";
} }
else echo "DetailSchicht ok\n";
} }
// ok // ok
function TestBeteiligteHelfer(){ function TestBeteiligteHelfer()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
HelferLogin("max2@example.com", "hola234", 0); HelferLogin("max2@example.com", "hola234", 0);
$helfer = $_SESSION; $helfer = $_SESSION;
$schichten = AlleSchichtenEinesHelfers($helfer['HelferID']); $schichten = AlleSchichtenEinesHelfers($helfer['HelferID']);
$erg_old = old\BeteiligteHelfer($dbl, $schichten[0]['SchichtID']); $erg_old = old\BeteiligteHelfer($dbl, $schichten[0]['SchichtID']);
$erg_new = BeteiligteHelfer($schichten[0]['SchichtID']); $erg_new = BeteiligteHelfer($schichten[0]['SchichtID']);
if((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)){ if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old BeteiligteHelfer returns".var_export($erg_old, true)."\n"; echo "Old BeteiligteHelfer returns" . var_export($erg_old, true) . "\n";
echo "New BeteiligteHelfer returns '".var_export($erg_new, true)."'\n"; echo "New BeteiligteHelfer returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "BeteiligteHelfer ok\n";
} }
else echo "BeteiligteHelfer ok\n";
} }
// ok // ok
function TestGetDienste(){ function TestGetDienste()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old = old\GetDienste($dbl); $erg_old = old\GetDienste($dbl);
$erg_new = GetDienste(); $erg_new = GetDienste();
if((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)){ if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old GetDienste returns".var_export($erg_old, true)."\n"; echo "Old GetDienste returns" . var_export($erg_old, true) . "\n";
echo "New GetDienste returns '".var_export($erg_new, true)."'\n"; echo "New GetDienste returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "GetDienste ok\n";
} }
else echo "GetDienste ok\n";
} }
// ok // ok
function TestGetDiensteChilds(){ function TestGetDiensteChilds()
{
$dienste = GetDienste(); $dienste = GetDienste();
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old_empty = old\GetDiensteChilds($dbl, $dienste[1]["DienstID"]); $erg_old_empty = old\GetDiensteChilds($dbl, $dienste[1]["DienstID"]);
$erg_new_empty = GetDiensteChilds($dienste[1]["DienstID"]); $erg_new_empty = GetDiensteChilds($dienste[1]["DienstID"]);
$erg_old_child = old\GetDiensteChilds($dbl, $dienste[0]["DienstID"]); $erg_old_child = old\GetDiensteChilds($dbl, $dienste[0]["DienstID"]);
$erg_new_child = GetDiensteChilds($dienste[0]["DienstID"]); $erg_new_child = GetDiensteChilds($dienste[0]["DienstID"]);
if((gettype($erg_old_empty) != gettype($erg_new_empty)) || ($erg_old_empty != $erg_new_empty)){ if ((gettype($erg_old_empty) != gettype($erg_new_empty)) || ($erg_old_empty != $erg_new_empty)) {
echo "Old GetDiensteChilds empty returns".var_export($erg_old_empty, true)."\n"; echo "Old GetDiensteChilds empty returns" . var_export($erg_old_empty, true) . "\n";
echo "New GetDiensteChilds empty returns '".var_export($erg_new_empty, true)."'\n"; echo "New GetDiensteChilds empty returns '" . var_export($erg_new_empty, true) . "'\n";
} elseif ((gettype($erg_old_child) != gettype($erg_new_child)) || ($erg_old_child != $erg_new_child)) {
echo "Old GetDiensteChilds child returns" . var_export($erg_old_child, true) . "\n";
echo "New GetDiensteChilds child returns '" . var_export($erg_new_child, true) . "'\n";
} else {
echo "GetDiensteChilds ok\n";
} }
else if((gettype($erg_old_child) != gettype($erg_new_child)) || ($erg_old_child != $erg_new_child)){
echo "Old GetDiensteChilds child returns".var_export($erg_old_child, true)."\n";
echo "New GetDiensteChilds child returns '".var_export($erg_new_child, true)."'\n";
}
else echo "GetDiensteChilds ok\n";
} }
// ok // ok
function TestChangeDienst(){ function TestChangeDienst()
{
$dienste = GetDienste(); $dienste = GetDienste();
HelferLogin("max3@example.com", "hola531", 0); HelferLogin("max3@example.com", "hola531", 0);
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old = old\ChangeDienst($dbl, $dienste[0]["DienstID"], "Frühstück", "Foyer", "SChnibbeln", $_SESSION["HelferID"], 0, $_SESSION["HelferLevel"]); $erg_old = old\ChangeDienst($dbl, $dienste[0]["DienstID"], "Frühstück", "Foyer", "SChnibbeln", $_SESSION["HelferID"], 0, $_SESSION["HelferLevel"]);
$erg_new = ChangeDienst($dienste[1]["DienstID"], "Frühstück", "Foyer", "SChnibbeln", $_SESSION["HelferID"], $dienste[0]["DienstID"], $_SESSION["HelferLevel"]); $erg_new = ChangeDienst($dienste[1]["DienstID"], "Frühstück", "Foyer", "SChnibbeln", $_SESSION["HelferID"], $dienste[0]["DienstID"], $_SESSION["HelferLevel"]);
if((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)){ if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old ChangeDienst returns".var_export($erg_old, true)."\n"; echo "Old ChangeDienst returns" . var_export($erg_old, true) . "\n";
echo "New ChangeDienst returns '".var_export($erg_new, true)."'\n"; echo "New ChangeDienst returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "ChangeDienst ok\n";
} }
else echo "ChangeDienst ok\n";
} }
// ok // ok
function TestNewDienst(){ function TestNewDienst()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
HelferLogin("max3@example.com", "hola531", 0); HelferLogin("max3@example.com", "hola531", 0);
$erg_old = old\NewDienst($dbl, "egal", "Badgekontrolle", "Turnhalle", "Nur Jongleure mit Badge durchlassen", $_SESSION["HelferID"], 0, $_SESSION["HelferLevel"]); $erg_old = old\NewDienst($dbl, "egal", "Badgekontrolle", "Turnhalle", "Nur Jongleure mit Badge durchlassen", $_SESSION["HelferID"], 0, $_SESSION["HelferLevel"]);
$erg_new = NewDienst("Badgekontrolle", "Turnhalle", "Nur Jongleure mit Badge durchlassen", $_SESSION["HelferID"], 0, $_SESSION["HelferLevel"]); $erg_new = NewDienst("Badgekontrolle", "Turnhalle", "Nur Jongleure mit Badge durchlassen", $_SESSION["HelferID"], 0, $_SESSION["HelferLevel"]);
if((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)){ if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old NewDienst returns".var_export($erg_old, true)."\n"; echo "Old NewDienst returns" . var_export($erg_old, true) . "\n";
echo "New NewDienst returns '".var_export($erg_new, true)."'\n"; echo "New NewDienst returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "NewDienst ok\n";
} }
else echo "NewDienst ok\n";
} }
// ok // ok
function TestDeleteDienst(){ function TestDeleteDienst()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$dienste = GetDienste(); $dienste = GetDienste();
$erg_old = old\DeleteDienst($dbl, $dienste[0]["DienstID"], false); $erg_old = old\DeleteDienst($dbl, $dienste[0]["DienstID"], false);
$erg_new = DeleteDienst($dienste[1]["DienstID"], false); $erg_new = DeleteDienst($dienste[1]["DienstID"], false);
if((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)){ if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old DeleteDienst returns".var_export($erg_old, true)."\n"; echo "Old DeleteDienst returns" . var_export($erg_old, true) . "\n";
echo "New DeleteDienst returns '".var_export($erg_new, true)."'\n"; echo "New DeleteDienst returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "DeleteDienst ok\n";
} }
else echo "DeleteDienst ok\n";
} }
// ok // ok
function TestGetDiensteForDay(){ function TestGetDiensteForDay()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old = old\GetDiensteForDay($dbl, 2, "2024-02-16"); $erg_old = old\GetDiensteForDay($dbl, 2, "2024-02-16");
$erg_new = GetDiensteForDay(2, "2024-02-16"); $erg_new = GetDiensteForDay(2, "2024-02-16");
if((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)){ if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old GetDiensteForDay returns".var_export($erg_old, true)."\n"; echo "Old GetDiensteForDay returns" . var_export($erg_old, true) . "\n";
echo "New GetDiensteForDay returns '".var_export($erg_new, true)."'\n"; echo "New GetDiensteForDay returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "GetDiensteForDay ok\n";
} }
else echo "GetDiensteForDay ok\n";
} }
// ok // ok
function TestGetSchichtenForDienstForDay(){ function TestGetSchichtenForDienstForDay()
{
$dienste = GetDienste(); $dienste = GetDienste();
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old_good = old\GetSchichtenForDienstForDay($dbl, $dienste[0]["DienstID"], "2024-02-16"); $erg_old_good = old\GetSchichtenForDienstForDay($dbl, $dienste[0]["DienstID"], "2024-02-16");
$erg_new_good = GetSchichtenForDienstForDay($dienste[0]["DienstID"], "2024-02-16"); $erg_new_good = GetSchichtenForDienstForDay($dienste[0]["DienstID"], "2024-02-16");
$erg_old_bad = old\GetSchichtenForDienstForDay($dbl, $dienste[0]["DienstID"], "2024-02-15"); $erg_old_bad = old\GetSchichtenForDienstForDay($dbl, $dienste[0]["DienstID"], "2024-02-15");
$erg_new_bad = GetSchichtenForDienstForDay($dienste[0]["DienstID"], "2024-02-15"); $erg_new_bad = GetSchichtenForDienstForDay($dienste[0]["DienstID"], "2024-02-15");
if((gettype($erg_old_good) != gettype($erg_new_good)) || ($erg_old_good != $erg_new_good)){ if ((gettype($erg_old_good) != gettype($erg_new_good)) || ($erg_old_good != $erg_new_good)) {
echo "Old GetSchichtenForDienstForDay returns".var_export($erg_old_good, true)."\n"; echo "Old GetSchichtenForDienstForDay returns" . var_export($erg_old_good, true) . "\n";
echo "New GetSchichtenForDienstForDay returns '".var_export($erg_new_good, true)."'\n"; echo "New GetSchichtenForDienstForDay returns '" . var_export($erg_new_good, true) . "'\n";
} elseif ((gettype($erg_old_bad) != gettype($erg_new_bad)) || ($erg_old_bad != $erg_new_bad)) {
echo "Old GetSchichtenForDienstForDay returns" . var_export($erg_old_bad, true) . "\n";
echo "New GetSchichtenForDienstForDay returns '" . var_export($erg_new_bad, true) . "'\n";
} else {
echo "GetSchichtenForDienstForDay ok\n";
} }
else if((gettype($erg_old_bad) != gettype($erg_new_bad)) || ($erg_old_bad != $erg_new_bad)){
echo "Old GetSchichtenForDienstForDay returns".var_export($erg_old_bad, true)."\n";
echo "New GetSchichtenForDienstForDay returns '".var_export($erg_new_bad, true)."'\n";
}
else echo "GetSchichtenForDienstForDay ok\n";
} }
// ok // ok
function TestGetSchichtenEinesDienstes(){ function TestGetSchichtenEinesDienstes()
{
$dienste = GetDienste(); $dienste = GetDienste();
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old_good = old\GetSchichtenEinesDienstes($dbl, $dienste[0]["DienstID"]); $erg_old_good = old\GetSchichtenEinesDienstes($dbl, $dienste[0]["DienstID"]);
$erg_new_good = GetSchichtenEinesDienstes($dienste[0]["DienstID"]); $erg_new_good = GetSchichtenEinesDienstes($dienste[0]["DienstID"]);
$erg_old_bad = old\GetSchichtenEinesDienstes($dbl, 0); $erg_old_bad = old\GetSchichtenEinesDienstes($dbl, 0);
$erg_new_bad = GetSchichtenEinesDienstes(0); $erg_new_bad = GetSchichtenEinesDienstes(0);
if((gettype($erg_old_good) != gettype($erg_new_good)) || ($erg_old_good != $erg_new_good)){ if ((gettype($erg_old_good) != gettype($erg_new_good)) || ($erg_old_good != $erg_new_good)) {
echo "Old GetSchichtenEinesDienstes returns".var_export($erg_old_good, true)."\n"; echo "Old GetSchichtenEinesDienstes returns" . var_export($erg_old_good, true) . "\n";
echo "New GetSchichtenEinesDienstes returns '".var_export($erg_new_good, true)."'\n"; echo "New GetSchichtenEinesDienstes returns '" . var_export($erg_new_good, true) . "'\n";
} elseif ((gettype($erg_old_bad) != gettype($erg_new_bad)) || ($erg_old_bad != $erg_new_bad)) {
echo "Old GetSchichtenEinesDienstes returns" . var_export($erg_old_bad, true) . "\n";
echo "New GetSchichtenEinesDienstes returns '" . var_export($erg_new_bad, true) . "'\n";
} else {
echo "GetSchichtenEinesDienstes ok\n";
} }
else if((gettype($erg_old_bad) != gettype($erg_new_bad)) || ($erg_old_bad != $erg_new_bad)){
echo "Old GetSchichtenEinesDienstes returns".var_export($erg_old_bad, true)."\n";
echo "New GetSchichtenEinesDienstes returns '".var_export($erg_new_bad, true)."'\n";
}
else echo "GetSchichtenEinesDienstes ok\n";
} }
// ok // ok
function TestChangeSchicht(){ function TestChangeSchicht()
{
$dienste = GetDienste(); $dienste = GetDienste();
$schichten = GetSchichtenEinesDienstes($dienste[0]["DienstID"]); $schichten = GetSchichtenEinesDienstes($dienste[0]["DienstID"]);
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old = old\ChangeSchicht($dbl, $schichten[0]["SchichtID"], "2024-02-16T09:00", "2024-02-16T10:30", 1, "01:00"); $erg_old = old\ChangeSchicht($dbl, $schichten[0]["SchichtID"], "2024-02-16T09:00", "2024-02-16T10:30", 1, "01:00");
$erg_new = ChangeSchicht($schichten[1]["SchichtID"], "2024-02-16T10:30", "2024-02-16T12:00", 1, "01:00"); $erg_new = ChangeSchicht($schichten[1]["SchichtID"], "2024-02-16T10:30", "2024-02-16T12:00", 1, "01:00");
if((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)){ if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old ChangeSchicht returns".var_export($erg_old, true)."\n"; echo "Old ChangeSchicht returns" . var_export($erg_old, true) . "\n";
echo "New ChangeSchicht returns '".var_export($erg_new, true)."'\n"; echo "New ChangeSchicht returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "ChangeSchicht ok\n";
} }
else echo "ChangeSchicht ok\n";
} }
// ok // ok
function TestNewSchicht(){ function TestNewSchicht()
{
$dienste = GetDienste(); $dienste = GetDienste();
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old = old\NewSchicht($dbl, $dienste[0]["DienstID"], "2024-02-15T09:00", "2024-02-15T10:30", 2, "01:30"); $erg_old = old\NewSchicht($dbl, $dienste[0]["DienstID"], "2024-02-15T09:00", "2024-02-15T10:30", 2, "01:30");
$erg_new = NewSchicht($dienste[0]["DienstID"], "2024-02-15T10:30", "2024-02-15T12:00", 2, "01:30"); $erg_new = NewSchicht($dienste[0]["DienstID"], "2024-02-15T10:30", "2024-02-15T12:00", 2, "01:30");
if((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)){ if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old NewSchicht returns".var_export($erg_old, true)."\n"; echo "Old NewSchicht returns" . var_export($erg_old, true) . "\n";
echo "New NewSchicht returns '".var_export($erg_new, true)."'\n"; echo "New NewSchicht returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "NewSchicht ok\n";
} }
else echo "NewSchicht ok\n";
} }
// ok // ok
function TestDeleteSchicht(){ function TestDeleteSchicht()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$dienste = GetDienste(); $dienste = GetDienste();
NewSchicht($dienste[0]["DienstID"], "2024-02-17T10:30", "2024-02-17T12:00", 2, "01:30"); NewSchicht($dienste[0]["DienstID"], "2024-02-17T10:30", "2024-02-17T12:00", 2, "01:30");
@ -561,27 +612,31 @@ function TestDeleteSchicht(){
$schichten = GetSchichtenEinesDienstes($dienste[0]["DienstID"]); $schichten = GetSchichtenEinesDienstes($dienste[0]["DienstID"]);
$erg_old = old\DeleteSchicht($dbl, $schichten[4]["SchichtID"], false); $erg_old = old\DeleteSchicht($dbl, $schichten[4]["SchichtID"], false);
$erg_new = DeleteSchicht($schichten[5]["SchichtID"], false); $erg_new = DeleteSchicht($schichten[5]["SchichtID"], false);
if((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)){ if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old DeleteSchicht returns".var_export($erg_old, true)."\n"; echo "Old DeleteSchicht returns" . var_export($erg_old, true) . "\n";
echo "New DeleteSchicht returns '".var_export($erg_new, true)."'\n"; echo "New DeleteSchicht returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "DeleteSchicht ok\n";
} }
else echo "DeleteSchicht ok\n";
} }
// ok // ok
function TestAlleHelferSchichtenUebersicht(){ function TestAlleHelferSchichtenUebersicht()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old = old\AlleHelferSchichtenUebersicht($dbl); $erg_old = old\AlleHelferSchichtenUebersicht($dbl);
$erg_new = AlleHelferSchichtenUebersicht(); $erg_new = AlleHelferSchichtenUebersicht();
if((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)){ if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old AlleHelferSchichtenUebersicht returns".var_export($erg_old, true)."\n"; echo "Old AlleHelferSchichtenUebersicht returns" . var_export($erg_old, true) . "\n";
echo "New AlleHelferSchichtenUebersicht returns '".var_export($erg_new, true)."'\n"; echo "New AlleHelferSchichtenUebersicht returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "AlleHelferSchichtenUebersicht ok\n";
} }
else echo "AlleHelferSchichtenUebersicht ok\n";
} }
// ok // ok
function TestDatenbankAufDeutsch(){ function TestDatenbankAufDeutsch()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
old\DatenbankAufDeutsch($dbl); old\DatenbankAufDeutsch($dbl);
DatenbankAufDeutsch(); DatenbankAufDeutsch();
@ -589,7 +644,8 @@ function TestDatenbankAufDeutsch(){
} }
// ok, checked by hand (will be different for both connections) // ok, checked by hand (will be different for both connections)
function TestLastInsertId(){ function TestLastInsertId()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$dienste = GetDienste(); $dienste = GetDienste();
Old\NewSchicht($dbl, $dienste[0]["DienstID"], "2024-02-17T10:30", "2024-02-17T12:00", 2, "01:30"); Old\NewSchicht($dbl, $dienste[0]["DienstID"], "2024-02-17T10:30", "2024-02-17T12:00", 2, "01:30");
@ -599,15 +655,17 @@ function TestLastInsertId(){
} }
// ok // ok
function TestHelferLevel(){ function TestHelferLevel()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old = old\HelferLevel($dbl); $erg_old = old\HelferLevel($dbl);
$erg_new = HelferLevel(); $erg_new = HelferLevel();
if((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)){ if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old HelferLevel returns".var_export($erg_old, true)."\n"; echo "Old HelferLevel returns" . var_export($erg_old, true) . "\n";
echo "New HelferLevel returns '".var_export($erg_new, true)."'\n"; echo "New HelferLevel returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "HelferLevel ok\n";
} }
else echo "HelferLevel ok\n";
} }
TestCreateHelfer(); TestCreateHelfer();
@ -648,4 +706,3 @@ TestHelferLevel();
TestHelferVonSchichtLoeschen_SchichtID(); TestHelferVonSchichtLoeschen_SchichtID();
TestDeleteSchicht(); TestDeleteSchicht();
TestHelferLoeschen(); TestHelferLoeschen();
?>