Fix DeleteDienst
This commit is contained in:
parent
cc10bd088f
commit
69b98cf80a
|
|
@ -597,14 +597,14 @@ function DeleteDienst($DienstID, $Rekursiv)
|
|||
} else {
|
||||
// Pruefen ob noch Schichten eingetragen sind
|
||||
$db = DB::getInstance();
|
||||
$db->prepare(__METHOD__,"SELECT SchichtID FROM Schicht where DienstID=:id",'check_dienst');
|
||||
$db->prepare(__METHOD__,"SELECT SchichtID FROM Schicht where DienstID=:id",'check_schicht');
|
||||
$db->prepare(__METHOD__,"DELETE FROM Dienst where DienstID=:id",'delete_dienst');
|
||||
|
||||
$db_erg = $db->execute(__METHOD__,['id' => $DienstID],'check_dienst');
|
||||
$db_erg = $db->execute(__METHOD__,['id' => $DienstID],'check_schicht');
|
||||
|
||||
$db->onErrorDie(__METHOD__,'check_dienst');
|
||||
$db->onErrorDie(__METHOD__,'check_schicht');
|
||||
|
||||
if ($db->fetch(__METHOD__,'check_dienst')) {
|
||||
if (!$db->fetch(__METHOD__,'check_schicht')){
|
||||
// Eintrag löschen
|
||||
$db_erg = $db->execute(__METHOD__,['id' => $DienstID],'delete_dienst');
|
||||
$db->onErrorDie(__METHOD__,'delete_dienst');
|
||||
|
|
|
|||
|
|
@ -616,7 +616,6 @@ function DeleteDienst($db_link, $DienstID, $Rekursiv)
|
|||
// Eintrag löschen
|
||||
$sql = "DELETE FROM Dienst where DienstID=" . $DienstID;
|
||||
|
||||
echo $sql;
|
||||
$db_erg = mysqli_query($db_link, $sql);
|
||||
if (! $db_erg) {
|
||||
echo "Fehler DeleteDienst";
|
||||
|
|
|
|||
|
|
@ -371,7 +371,7 @@ function TestDeleteDienst(){
|
|||
echo "Old DeleteDienst returns".var_export($erg_old, true)."\n";
|
||||
echo "New DeleteDienst returns '".var_export($erg_new, true)."'\n";
|
||||
}
|
||||
else echo "DeleteDienst ok";
|
||||
else echo "DeleteDienst ok\n";
|
||||
}
|
||||
|
||||
function TestGetDiensteForDay(){
|
||||
|
|
@ -505,4 +505,5 @@ TestHelferdatenAendern();
|
|||
TestNewDienst();
|
||||
TestGetDienste();
|
||||
TestDeleteDienst();
|
||||
TestNewDienst();
|
||||
?>
|
||||
|
|
|
|||
Loading…
Reference in New Issue