Merge branch 'main' of https://git.bib.de/PBBFA23AHR/kurs-app

Controller/AdminController.php

@@ -1,66 +0,0 @@
-<?php
-	
-namespace Blog\Controller;
-
-use Blog\Model\AdminModel;
-
-class AdminController
-{
-    protected $view;
-    private $db;
-    private $validData = array();
-    private $errors = array();
-    private $labels = array(
-    "name" => "Name*", 
-    "preis" => "€ Preis*",  
-    "dauer" => "Dauer* (Stunden)",
-    "rabatt" => "Rabatt", 
-    "kategorie" => "Kategorie",
-    "|" => "", 
-    "stadt" => "Stadt*", 
-    "strasse" => "Straße und Nummer*", 
-    "plz" => "PLZ*",
-    "|" => "",
-    "beschreibung" => "Beschreibung");	
-    
-    
-    public function __construct($view) 
-    {
-        $this->db = new AdminModel();
-        $this->view = $view;
-    }
-     
-    public function showAdminForm()
-    {
-        $this->view->setVars([
-            'labels' => $this->labels,
-            'validData' => $this->validData,
-            'errors' => $this->errors
-        ]);
-    }
-
-    public function showConfirmation()
-    {
-
-    }
-
-    public function validateForm(){
-        foreach ($this->labels as $index => $value) {
-            if (strpos($value, "*") !== false && (!isset($_POST[$index]) || empty($_POST[$index]))) {
-                $this->errors[$index] = "Bitte " . $value . " eingeben";
-            } else {
-                $this->validData[$index] = $_POST[$index] === '' ? null : $_POST[$index];
-            }       
-        }
-        if (count($this->errors) > 0) {
-            $this->view->setDoMethodName("showAdminForm");
-            $this->showAdminForm();
-        } else {
-            if ($this->db->writeNewCourse($this->validData, $_SESSION["user_id"])) {
-                $this->view->setDoMethodName("showConfirmation");
-                $this->showConfirmation();
-            }
-        }
-    }
-}
-?>

Controller/UserController.php

@@ -32,6 +32,21 @@ class UserController{
         'password' => 'Passwort*',
     ];
 
+    private $kursValidData = array();
+    private $kursErrors = array();
+    private $kursLabels = array(
+    "name" => "Name*", 
+    "preis" => "€ Preis*",  
+    "dauer" => "Dauer* (Stunden)",
+    "rabatt" => "Rabatt", 
+    "kategorie" => "Kategorie",
+    "1" => "|", 
+    "stadt" => "Stadt*", 
+    "strasse" => "Straße und Nummer*", 
+    "plz" => "PLZ*",
+    "2" => "|",
+    "beschreibung" => "Beschreibung");	
+
     public function __construct($view){
         $this->db = new UserModel();
         $this->view = $view;
@@ -99,6 +114,28 @@ class UserController{
         }
     }
 
+    public function validateKursForm(){
+        foreach ($this->kursLabels as $index => $value) {
+            if($value === "|") continue;
+            if (strpos($value, "*") !== false && (!isset($_POST[$index]) || empty($_POST[$index]))) {
+                $this->kursErrors[$index] = "Bitte " . $value . " eingeben";
+            } else {
+                $this->kursValidData[$index] = $_POST[$index] === '' ? null : $_POST[$index];
+            }       
+        }
+        if (count($this->errors) > 0) {
+            $this->view->setDoMethodName("showUserAccountPage");
+            $this->showUserAccountPage();
+        } else {
+            if ($this->db->writeNewCourse($this->kursValidData, $_SESSION["user_id"])) {
+                $this->view->setDoMethodName("showNewKursConfirmation");
+                $this->showConfirmation();
+            }
+        }
+    }
+
+    public function showConfirmation(){}
+
     public function showUserLoginConfirmation(){
         $userId = $this->getCurrentUserId();
         $user = null;
@@ -172,7 +209,11 @@ class UserController{
     }
 
     public function showUserAccountPage (){
-        
+        $this->view->setVars([
+            'labels' => $this->kursLabels,
+            'errors' => $this->kursErrors,
+            'validData' => $this->kursValidData
+        ]);
     }
 
     public function showUserDeleteConfirmation(){

Model/AdminModel.php

@@ -1,81 +0,0 @@
-<?php
-
-namespace Blog\Model;
-
-use PDOException;
-
-class AdminModel extends Database
-{
-    private function writeNewAddress($values) {
-        $guid = $this->createUUID();
-
-        $sql = "INSERT INTO ort (`id`, `stadt`, `strasse`, `plz`) VALUES (
-            :guid, :stadt, :strasse, :plz);";
-
-        $pdo = $this->linkDB();
-
-        try {
-            $sth = $pdo->prepare($sql);
-            $sth->execute(array(":guid" => $guid,
-                ":stadt" => $values["stadt"],
-                ":strasse" => $values["strasse"],
-                ":plz" => $values["plz"],
-            ));
-            return $guid;
-        } catch (PDOException $e) {
-            new \Blog\Library\ErrorMsg("Fehler beim Schreiben der Daten.", $e); 
-            die;
-        }
-    }
-
-    public function writeNewCourse($values, $kursleiterId)
-    {
-        // Bleibt übrig wenn Adresse erstellt wird aber Kurs nicht weil Error
-        $addressId = $this->writeNewAddress($values);
-
-        $guid = $this->createUUID();
-
-        $sql = "INSERT INTO kurs (`id`, `name`, `preis`, `dauer`, `rabatt`, `kategorie`, `beschreibung`, `kurseleiter`, `ort_id`) VALUES (
-            :guid, :name, :preis, :dauer, :rabatt, :kategorie, :beschreibung, :kurseleiter, :ort_id);";
-
-        $pdo = $this->linkDB();
-
-        try {
-            $sth = $pdo->prepare($sql);
-            $sth->execute(array(":guid" => $guid,
-                ":name" => $values["name"],
-                ":preis" => $values["preis"],
-                ":dauer" => $values["dauer"],
-                ":rabatt" => $values["rabatt"],
-                ":kategorie" => $values["kategorie"],
-                ":beschreibung" => $values["beschreibung"],
-                ":kurseleiter" => $kursleiterId,
-                "ort_id" => $addressId
-            ));
-        } catch (PDOException $e) {
-            new \Blog\Library\ErrorMsg("Fehler beim Schreiben der Daten.", $e); 
-            die;
-        }
-                
-        return true;
-    }
-
-    public function getMyCourses() {
-        $sql = "SELECT k.id, k.name, k.preis, k.dauer, k.rabatt, k.kategorie, k.beschreibung, o.stadt, o.strasse, o.plz, b.note, b.kommentar
-                FROM kurs AS k
-                JOIN ort AS o ON o.id = k.ort_id
-                LEFT JOIN bewertungen AS b ON b.kurs_id = k.id
-                ORDER BY k.name;";
-
-        $pdo = $this->linkDB();
-
-        try {
-            $sth = $pdo->prepare($sql);
-            $sth->execute();
-            return $sth->fetchAll(\PDO::FETCH_ASSOC);
-        } catch (PDOException $e) {
-            new \Blog\Library\ErrorMsg("Fehler beim Lesen der Daten.", $e); 
-            die;
-        }
-    }
-}

Model/UserModel.php

@@ -102,4 +102,76 @@ class UserModel extends Database
 
     }
 
+    private function writeNewAddress($values) {
+        $guid = $this->createUUID();
+
+        $sql = "INSERT INTO ort (`id`, `stadt`, `strasse`, `plz`) VALUES (
+            :guid, :stadt, :strasse, :plz);";
+
+        $pdo = $this->linkDB();
+
+        try {
+            $sth = $pdo->prepare($sql);
+            $sth->execute(array(":guid" => $guid,
+                ":stadt" => $values["stadt"],
+                ":strasse" => $values["strasse"],
+                ":plz" => $values["plz"],
+            ));
+            return $guid;
+        } catch (PDOException $e) {
+            new \Blog\Library\ErrorMsg("Fehler beim Schreiben der Daten.", $e); 
+            die;
+        }
+    }
+
+    public function writeNewCourse($values, $kursleiterId)
+    {
+        // Bleibt übrig wenn Adresse erstellt wird aber Kurs nicht weil Error
+        $addressId = $this->writeNewAddress($values);
+
+        $guid = $this->createUUID();
+
+        $sql = "INSERT INTO kurs (`id`, `name`, `preis`, `dauer`, `rabatt`, `kategorie`, `beschreibung`, `kurseleiter`, `ort_id`) VALUES (
+            :guid, :name, :preis, :dauer, :rabatt, :kategorie, :beschreibung, :kurseleiter, :ort_id);";
+
+        $pdo = $this->linkDB();
+
+        try {
+            $sth = $pdo->prepare($sql);
+            $sth->execute(array(":guid" => $guid,
+                ":name" => $values["name"],
+                ":preis" => $values["preis"],
+                ":dauer" => $values["dauer"],
+                ":rabatt" => $values["rabatt"],
+                ":kategorie" => $values["kategorie"],
+                ":beschreibung" => $values["beschreibung"],
+                ":kurseleiter" => $kursleiterId,
+                "ort_id" => $addressId
+            ));
+        } catch (PDOException $e) {
+            new \Blog\Library\ErrorMsg("Fehler beim Schreiben der Daten.", $e); 
+            die;
+        }
+                
+        return true;
+    }
+
+    public function getMyCourses() {
+        $sql = "SELECT k.id, k.name, k.preis, k.dauer, k.rabatt, k.kategorie, k.beschreibung, o.stadt, o.strasse, o.plz, b.note, b.kommentar
+                FROM kurs AS k
+                JOIN ort AS o ON o.id = k.ort_id
+                LEFT JOIN bewertungen AS b ON b.kurs_id = k.id
+                ORDER BY k.name;";
+
+        $pdo = $this->linkDB();
+
+        try {
+            $sth = $pdo->prepare($sql);
+            $sth->execute();
+            return $sth->fetchAll(\PDO::FETCH_ASSOC);
+        } catch (PDOException $e) {
+            new \Blog\Library\ErrorMsg("Fehler beim Lesen der Daten.", $e); 
+            die;
+        }
+    }
 }

Views/User/showAdminForm.phtml

@@ -1,7 +1,3 @@
-<?php
-include dirname(__DIR__).'/header.phtml';
-?>    
-
 <h2>Neuer Kurs</h2>
 <form method="post">
 <?php
@@ -30,25 +26,25 @@ function createInputField($label, $name, $errors, $validData, $type = 'input') {
 }
     echo '<div style="margin-top: 32px;" class="form-grid-3">';
     foreach ($labels as $name => $label) {
-        if($name === "|") {
+        if($label === "|") {
             echo '</div>';
             echo '<div style="margin-top: 32px;" class="form-grid-3">';
         } else {
             echo createInputField($label, $name, $errors, $validData, $type = $name === 'beschreibung' ? 'textarea' : 'input');
         }
-    }
+    }   
     echo '</div>';
 ?>
-    <input type="hidden" name="controller" value="admin">       
+    <input type="hidden" name="controller" value="user">       
-    <input type="hidden" name="do" value="validateForm">
+    <input type="hidden" name="do" value="validateKursForm">
     <div class="form-grid-3" style="margin-top: 16px;">
         <input style="grid-column: 3;" type="submit" name="submit" value="Absenden">
     </div>
 </form>
 
 <?php
-$adminModel = new \Blog\Model\AdminModel();
+$userModel = new \Blog\Model\UserModel();
-$courses = $adminModel->getMyCourses();
+$courses = $userModel->getMyCourses();
 $doc = new DOMDocument('1.0', 'UTF-8');
 
 if (!empty($courses)) {
@@ -95,5 +91,3 @@ if (!empty($courses)) {
     echo '<p>Keine Kurse gefunden.</p>';
 }
 ?>
-
-<?php include dirname(__DIR__).'/footer.phtml'; ?>

Views/User/showUserAccountPage.phtml

@@ -30,5 +30,13 @@
                 </div>
             </div>
         </div>
+        <?php
+            if(isset($_SESSION["user_id"]) && $_SESSION["user_id"] != null) {
+                include dirname(__DIR__).'/User/showAdminForm.phtml';
+            }
+        ?>
     </div>
-</article>
+</article>
+
+
+<?php include dirname(__DIR__).'/footer.phtml'; ?>

Views/header.phtml

@@ -20,21 +20,12 @@
             <div style="column-gap: 8px;" class="d-flex-between">
                 <div style="column-gap: 8px;" class="d-flex-between">
                     <?php if (isset($_SESSION['user_id']) && $_SESSION['user_id'] !== null): ?>
-                        <?php if($_SESSION['user_role'] == 'leiter'): ?>
-                        <a style="column-gap: 16px;" class="btn" href="?controller=Admin&do=showAdminForm">
-                            <?php echo ($_SESSION['vorname'] ?? "") . " " . ($_SESSION['name'] ?? "") . ", " . ($_SESSION['user_role']) ?>
-                            <span class="btn btn-user">
-                                <span class="material-icons">person</span>
-                            </span>
-                        </a>
-                        <?php else: ?>
                         <a style="column-gap: 16px;" class="btn" href="?controller=User&do=showUserAccountPage">
                             <?php echo ($_SESSION['vorname'] ?? "") . " " . ($_SESSION['name'] ?? "") . ", " . ($_SESSION['user_role']) ?>
                             <span class="btn btn-user">
                                 <span class="material-icons">person</span>
                             </span>
                         </a>
-                        <?php endif; ?>
                     <?php else: ?>
                         <a class="btn" href="?controller=User&do=showUserLoginForm">Anmeldung</a>
                         <a class="btn btn-primary" href="?controller=User&do=showUserRegisterForm">Registration</a>