Merge pull request 'Testing' (#16) from Testing into main

Reviewed-on: #16

Controller/BenutzerController.php

@@ -18,6 +18,18 @@ class BenutzerController
         $this->db = new BenutzerModel();
     }
 
+    public function getBenutzer() {
+        $result = $this->db->selectBenutzer();
+        if (isset($_GET["name"])) {
+            if ($result)
+                $result = $result[0];
+            else
+                $result = false;
+        }
+
+        return json_encode($result);
+    }
+
     // Updated einen Benutzer
     public function updateBenutzer($elternId, $data)
     {
@@ -36,6 +48,21 @@ class BenutzerController
         return json_encode($data);
     }
 
+
+    public function nextId()
+    {
+        $result = $this->db->nextId();
+
+        return json_encode($result);
+    }
+
+    public function anmeldeVersuch()
+    {
+        $result = $this->db->anmeldeVersuch();
+
+        return json_encode($result);
+    }
+
 }
 
 ?>

Controller/KindController.php

@@ -48,7 +48,7 @@ class KindController
     {
         $result = $this->db->deleteKind($kindId);
 
-        return $result;
+        return json_encode($result);
     }
 
 }

Controller/TagesplanController.php

@@ -33,5 +33,11 @@ class TagesplanController
         $result = $this->db->deleteTagesplan($id);
         return json_encode($result);
     }
+
+    public function getGerichteOnTag()
+    {
+        $result = $this->db->getGerichteOnTag();
+        return json_encode($result);
+    }
 }
 ?>

Model/BenutzerModel.php

@@ -9,6 +9,37 @@ use ppb\Library\Msg;
 
 class BenutzerModel extends Database
 {
+    public function selectBenutzer()
+    {
+        $pdo = $this->linkDB();
+
+        $params = array();
+
+        $sql = "SELECT * FROM Benutzerkonto";
+
+        if(isset($_GET["name"])){
+            $params[":name"] = $_GET["name"];
+            $sql .= " WHERE name = :name";
+        }
+
+        //Ausführen des SQL befehls
+        try {
+            $stmt = $pdo->prepare($sql);
+            $stmt->execute($params);
+        } catch (\PDOException $e) {
+            echo $e;
+            return false;
+        }
+        $result = $stmt->fetchAll(\PDO::FETCH_ASSOC);
+
+        
+        //Die Datensätze werden nummeriert
+        foreach ($result as $key => $row) {
+            $result[$key]["id"] += 0;
+        }
+
+        return $result;
+    }
 
 
     /**
@@ -86,6 +117,7 @@ class BenutzerModel extends Database
             $stmt = $pdo->prepare($sql);
             $stmt->execute($params);
         } catch (\PDOException $e) {
+            echo "Faulty Sql? " . $sql;
             return false;
         }
 
@@ -94,7 +126,54 @@ class BenutzerModel extends Database
         return $result;
     }
 
+    public function nextId()
+    {
 
+        $pdo = $this->linkDB();
+
+        $sql = "SELECT `auto_increment` FROM INFORMATION_SCHEMA.TABLES WHERE table_name = 'Benutzerkonto'; ";
+
+        try {
+            $stmt = $pdo->prepare($sql);
+            $stmt->execute();
+        } catch (\PDOException $e) {
+            echo "Faulty Sql? " . $sql;
+            return false;
+        }
+
+        $result = $stmt->fetchALL(\PDO::FETCH_ASSOC);
+
+        return $result;
+
+    }
+
+    public function anmeldeVersuch()
+    {
+
+        $pdo = $this->linkDB();
+
+        $params = array();
+
+        $params[":Benutzername"] = $_GET["Benutzername"];
+        $params[":passwort"] = $_GET["passwort"];
+
+        $sql = "SELECT * FROM Benutzerkonto WHERE name = :Benutzername AND passwort = :passwort";
+
+        try {
+            $stmt = $pdo->prepare($sql);
+            $stmt->execute($params);
+        } catch (\PDOException $e) {
+            return false;
+        }
+
+        $result = $stmt->fetchALL(\PDO::FETCH_ASSOC);
+
+        if (count($result) > 0)
+            return true;
+        else
+            return false;
+
+    }
 }
 
 ?>

Model/TagesplanModel.php

@@ -65,5 +65,28 @@ class TagesplanModel extends Database
             return false;
         }
     }
+
+    public function getGerichteOnTag()
+    {
+
+        $pdo = $this->linkDB();
+
+        $datum = $_GET["datum"];
+
+        $sql = "SELECT Gericht.id, Gericht.name, Gericht.preis, Gericht.beschreibung FROM Gericht LEFT JOIN GibtsAm ON Gericht.id = GibtsAm.gid LEFT JOIN Tagesplan ON GibtsAm.tid = Tagesplan.id WHERE Tagesplan.datum = '$datum'";
+
+        try {
+            $stmt = $pdo->prepare($sql);
+            $stmt->execute();
+        } catch (\PDOException $e) {
+            echo $sql . " This do be faulty";
+            return false;
+        }
+
+        $result = $stmt->fetchAll(\PDO::FETCH_ASSOC);
+
+        return $result;
+
+    }
 }
 ?>

restAPI.php

@@ -14,72 +14,76 @@
    
    file_get_contents('php://input') die übergebenen json-Strings (für PUT/POST-Requests) 
 */
-     spl_autoload_register(function ($className) {
+spl_autoload_register(function ($className) {
-        if (substr($className, 0, 4) !== 'ppb\\') { return; }
+    if (substr($className, 0, 4) !== 'ppb\\') {
-
+        return;
-        $fileName = __DIR__.'/'.str_replace('\\', DIRECTORY_SEPARATOR, substr($className, 4)).'.php';
-
-        if (file_exists($fileName)) { include $fileName; }
-    });    
-   
-    $endpoint = explode('/', trim($_SERVER['PATH_INFO'],'/'));
-    $data = json_decode(file_get_contents('php://input'), true);
- 
-    $controllerName = $endpoint[0];
-    $endpoint2 = isset($endpoint[1]) ? $endpoint[1] : false;
-    $id = false;
-    $alias = false;
- 
-    if ($endpoint2) {
-        if (preg_match('/^[0-9]+$/', $endpoint2)) {
-            $id = $endpoint2;
-        } else {
-            $alias = $endpoint2;
-        }
     }
 
-    $controllerClassName = 'ppb\\Controller\\'.ucfirst($controllerName). 'Controller';
+    $fileName = __DIR__ . '/' . str_replace('\\', DIRECTORY_SEPARATOR, substr($className, 4)) . '.php';
 
-    if ($_SERVER['REQUEST_METHOD'] == "DELETE") {
+    if (file_exists($fileName)) {
-        $methodName = "delete" . ucfirst($controllerName);
+        include $fileName;
-    } else if ($_SERVER['REQUEST_METHOD'] == "PUT") {
-        $methodName = "update" . ucfirst($controllerName);
-    } else if ($_SERVER['REQUEST_METHOD'] == "POST") {
-        $methodName = "write" . ucfirst($controllerName);
-    } else if ($_SERVER['REQUEST_METHOD'] == "GET") {
-        if ($alias) {
-            $methodName = $alias;				
-        } else {
-            $methodName = "get" . ucfirst($controllerName);
-        } 
     }
+});
 
-    if (method_exists($controllerClassName, $methodName)) {
+$endpoint = explode('/', trim($_SERVER['PATH_INFO'], '/'));
+$data = json_decode(file_get_contents('php://input'), true);
 
-		header('Content-Type: application/json');
+$controllerName = $endpoint[0];
+$endpoint2 = isset($endpoint[1]) ? $endpoint[1] : false;
+$id = false;
+$alias = false;
 
-        $controller = new $controllerClassName();
+if ($endpoint2) {
-        //GET
+    if (preg_match('/^[0-9]+$/', $endpoint2)) {
-		if ($_SERVER['REQUEST_METHOD'] == "GET") {
+        $id = $endpoint2;
+    } else {
+        $alias = $endpoint2;
+    }
+}
 
-            echo $controller->$methodName($id);
+$controllerClassName = 'ppb\\Controller\\' . ucfirst($controllerName) . 'Controller';
 
-        } else 
+if ($_SERVER['REQUEST_METHOD'] == "DELETE") {
-		//POST	
+    $methodName = "delete" . ucfirst($controllerName);
-		if ($_SERVER['REQUEST_METHOD'] == "POST"){
+} else if ($_SERVER['REQUEST_METHOD'] == "PUT") {
+    $methodName = "update" . ucfirst($controllerName);
+} else if ($_SERVER['REQUEST_METHOD'] == "POST") {
+    $methodName = "write" . ucfirst($controllerName);
+} else if ($_SERVER['REQUEST_METHOD'] == "GET") {
+    if ($alias) {
+        $methodName = $alias;
+    } else {
+        $methodName = "get" . ucfirst($controllerName);
+    }
+}
+
+if (method_exists($controllerClassName, $methodName)) {
+
+    header('Content-Type: application/json');
+
+    $controller = new $controllerClassName();
+    //GET
+    if ($_SERVER['REQUEST_METHOD'] == "GET") {
+
+        echo $controller->$methodName($id);
+
+    } else
+        //POST	
+        if ($_SERVER['REQUEST_METHOD'] == "POST") {
             echo $controller->$methodName($data);
         } else
-		//DELETE	
+            //DELETE	
-		if ($_SERVER['REQUEST_METHOD'] == "DELETE"){
+            if ($_SERVER['REQUEST_METHOD'] == "DELETE") {
-            echo $controller->$methodName($id);    
+                echo $controller->$methodName($id);
-        } else 
+            } else
-		//PUT
+            //PUT
-		{   
+            {
-            echo $controller->$methodName($id, $data);
+                echo $controller->$methodName($id, $data);
-        }
+            }
-    } else {
+} else {
-        //http_response_code(404);
+    //http_response_code(404);
-        new \ppb\Library\Msg(true, 'Page not found: '.$controllerClassName.'::'.$methodName); 
+    new \ppb\Library\Msg(true, 'Page not found: ' . $controllerClassName . '::' . $methodName);
 
-    }
+}
 ?>