From 69b98cf80ab52bd61cd6349832a33a6839013fcd Mon Sep 17 00:00:00 2001
From: Florian Pesth <fpesth@gmx.de>
Date: Tue, 6 Feb 2024 18:22:18 +0100
Subject: [PATCH] Fix DeleteDienst

---
 html/SQL.php     | 8 ++++----
 html/SQL_old.php | 1 -
 html/testPDO.php | 3 ++-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/html/SQL.php b/html/SQL.php
index 0d782a9..a018dca 100644
--- a/html/SQL.php
+++ b/html/SQL.php
@@ -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');
diff --git a/html/SQL_old.php b/html/SQL_old.php
index ff5c4a6..5a1fc1e 100644
--- a/html/SQL_old.php
+++ b/html/SQL_old.php
@@ -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";
diff --git a/html/testPDO.php b/html/testPDO.php
index d96f825..125f0c1 100644
--- a/html/testPDO.php
+++ b/html/testPDO.php
@@ -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();
 ?>