GetDiensteChilds
This commit is contained in:
parent
1083046769
commit
8ab9a9dd46
15
html/SQL.php
15
html/SQL.php
|
|
@ -88,6 +88,7 @@ class DB {
|
|||
}
|
||||
}
|
||||
|
||||
// ok
|
||||
function CreateHelfer($HelferName, $HelferEmail, $HelferHandy, $HelferPasswort, $HelferLevel = 1)
|
||||
{
|
||||
// Neuen Helfer anlegen
|
||||
|
|
@ -112,6 +113,7 @@ function CreateHelfer($HelferName, $HelferEmail, $HelferHandy, $HelferPasswort,
|
|||
return $db_erg;
|
||||
}
|
||||
|
||||
// ok
|
||||
// testet fuer urllogin, ob Helfer bereits existiert
|
||||
function HelferIstVorhanden($Email)
|
||||
{
|
||||
|
|
@ -123,6 +125,7 @@ function HelferIstVorhanden($Email)
|
|||
return $zeile[0]['Anzahl'];
|
||||
}
|
||||
|
||||
// ok
|
||||
//TODO: pruefen, ob Helfer bereits eingeloggt
|
||||
function HelferLogin($HelferEmail, $HelferPasswort, $HelferStatus)
|
||||
{
|
||||
|
|
@ -154,6 +157,7 @@ function HelferLogin($HelferEmail, $HelferPasswort, $HelferStatus)
|
|||
}
|
||||
}
|
||||
|
||||
// ok
|
||||
// Liste der Helfer fuer Admin-Seite
|
||||
//TODO: HelferLevel
|
||||
function HelferListe()
|
||||
|
|
@ -166,7 +170,7 @@ function HelferListe()
|
|||
return $helfer;
|
||||
}
|
||||
|
||||
|
||||
// ok
|
||||
function Helferdaten($HelferID)
|
||||
{
|
||||
$db = DB::getInstance();
|
||||
|
|
@ -178,7 +182,7 @@ function Helferdaten($HelferID)
|
|||
}
|
||||
|
||||
|
||||
|
||||
// ok
|
||||
function HelferdatenAendern($HelferName, $HelferEmail, $HelferHandy, $HelferNewPasswort, $HelferID, $HelferIsAdmin = -1, $AdminID = 0)
|
||||
{
|
||||
$db = DB::getInstance();
|
||||
|
|
@ -532,6 +536,7 @@ function BeteiligteHelfer($InfoSchichtID)
|
|||
return $db_erg;
|
||||
}
|
||||
|
||||
// ok
|
||||
function GetDienste()
|
||||
{
|
||||
$db = DB::getInstance();
|
||||
|
|
@ -548,9 +553,11 @@ function GetDiensteChilds($DienstID)
|
|||
$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->onErrorDie(__METHOD__);
|
||||
return $db_erg;
|
||||
$dienste = $db->fetchAll(__METHOD__);
|
||||
return $dienste;
|
||||
}
|
||||
|
||||
// ok
|
||||
function ChangeDienst($DienstID, $Was, $Wo, $Info, $Leiter, $Gruppe, $HelferLevel)
|
||||
{
|
||||
$db = DB::getInstance();
|
||||
|
|
@ -568,6 +575,7 @@ function ChangeDienst($DienstID, $Was, $Wo, $Info, $Leiter, $Gruppe, $HelferLeve
|
|||
$db->onErrorDie(__METHOD__);
|
||||
}
|
||||
|
||||
// ok
|
||||
function NewDienst($Was, $Wo, $Info, $Leiter, $Gruppe, $HelferLevel)
|
||||
{
|
||||
$db = DB::getInstance();
|
||||
|
|
@ -590,6 +598,7 @@ function NewDienst($Was, $Wo, $Info, $Leiter, $Gruppe, $HelferLevel)
|
|||
}
|
||||
}
|
||||
|
||||
// ok
|
||||
function DeleteDienst($DienstID, $Rekursiv)
|
||||
{
|
||||
if ($Rekursiv) {
|
||||
|
|
|
|||
|
|
@ -546,7 +546,9 @@ function GetDiensteChilds($db_link, $DienstID)
|
|||
echo "GetDienste ungueltige Abfrage";
|
||||
die('Ungueltige Abfrage: ' . mysqli_error($db_link));
|
||||
}
|
||||
return $db_erg;
|
||||
while($zeilen[] = mysqli_fetch_array($db_erg, MYSQLI_ASSOC));
|
||||
array_pop($zeilen);
|
||||
return $zeilen;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -329,14 +329,21 @@ function TestGetDienste(){
|
|||
}
|
||||
|
||||
function TestGetDiensteChilds(){
|
||||
$dienste = GetDienste();
|
||||
$dbl = old\ConnectDB();
|
||||
$erg_old = old\GetDiensteChilds($dbl, $DienstID);
|
||||
$erg_new = GetDiensteChilds($DienstID);
|
||||
if((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)){
|
||||
echo "Old GetDiensteChilds returns".var_export($erg_old, true)."\n";
|
||||
echo "New GetDiensteChilds returns '".var_export($erg_new, true)."'\n";
|
||||
$erg_old_empty = old\GetDiensteChilds($dbl, $dienste[1]["DienstID"]);
|
||||
$erg_new_empty = GetDiensteChilds($dienste[1]["DienstID"]);
|
||||
$erg_old_child = old\GetDiensteChilds($dbl, $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)){
|
||||
echo "Old GetDiensteChilds empty returns".var_export($erg_old_empty, true)."\n";
|
||||
echo "New GetDiensteChilds empty returns '".var_export($erg_new_empty, true)."'\n";
|
||||
}
|
||||
else echo "GetDiensteChilds ok";
|
||||
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";
|
||||
}
|
||||
|
||||
function TestChangeDienst(){
|
||||
|
|
@ -344,12 +351,12 @@ function TestChangeDienst(){
|
|||
HelferLogin("max3@example.com", "hola531", 0);
|
||||
$dbl = old\ConnectDB();
|
||||
$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"], 0, $_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)){
|
||||
echo "Old ChangeDienst returns".var_export($erg_old, true)."\n";
|
||||
echo "New ChangeDienst returns '".var_export($erg_new, true)."'\n";
|
||||
}
|
||||
else echo "ChangeDienst ok";
|
||||
else echo "ChangeDienst ok\n";
|
||||
}
|
||||
|
||||
function TestNewDienst(){
|
||||
|
|
@ -509,4 +516,5 @@ TestGetDienste();
|
|||
TestDeleteDienst();
|
||||
TestNewDienst();
|
||||
TestChangeDienst();
|
||||
TestGetDiensteChilds();
|
||||
?>
|
||||
|
|
|
|||
Loading…
Reference in New Issue