M3 kleinere Anpassungen während Abgabe

2023-11-29 18:41:06 +01:00
3 changed files with 14 additions and 8 deletions
--- a/M3/Werbeseite/index.php
+++ b/M3/Werbeseite/index.php
@@ -21,7 +21,7 @@ $newletterCount = 0;
 $link = mysqli_connect(
 "127.0.0.1", // Host der Datenbank
 "root", // Benutzername zur Anmeldung
-"admin", // Passwort
+"wm#32", // Passwort
 "emensawerbeseite" // Auswahl der Datenbanken (bzw. des Schemas)
 );

@@ -223,7 +223,6 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
        }

    </style>
-
 </head>
 <body>
 <div class="grid">
@@ -261,36 +260,43 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {

            $tabelle = "<table class=\"speisen\"><tr class=\"speisen\"> <td>Gerichte</td><td>Preis intern</td><td>Preis extern</td><td>Bild</td></tr>";

-            $verwendete_allergene = [];
+            $verwendete_allergene_code = [];
            $verwendete_allergene_string = "";

            while ($row_gerichte = mysqli_fetch_assoc($result_sql_gerichte)) {

+                // Abfrage der vorhandenen Allergene im aktuellen Gericht
+
                $sql_gericht_hat_allergene = "SELECT * FROM gericht_hat_allergen WHERE gericht_id=" . $row_gerichte['id'];
                $result_sql_gericht_hat_allergene = mysqli_query($link, $sql_gericht_hat_allergene);
                $allergene = "";
                while ($row_allergene = mysqli_fetch_assoc($result_sql_gericht_hat_allergene)) {
                    $allergene .= $row_allergene['code'] . ", ";

-                    if (!in_array($row_allergene['code'], $verwendete_allergene)) {
-                        $verwendete_allergene[] = $row_allergene['code'];
+                    if (!in_array($row_allergene['code'], $verwendete_allergene_code)) {
+                        $verwendete_allergene_code[] = $row_allergene['code'];
                    }
                }

+                // Preise in EUR
+
                $preisintern = number_format($row_gerichte['preisintern'], 2, ',', '.');
                $preisextern = number_format($row_gerichte['preisextern'], 2, ',', '.');

+                // Ausgabe des aktuellen Gerichts
+
                $tabelle .= "<tr class=\"speisen\"><td>" . $row_gerichte['name'] . " <sup>" . $allergene . "</sup></td><td>" . $preisintern . "€</td><td>" . $preisextern . "€</td><td>Kein Bild in der Datenbank </td></tr>";
            }
            $tabelle .= "</table>";
            echo $tabelle;

+            // Abfrage der Allergen Code und Name

            $sql_allergen = "SELECT code, name FROM allergen";
            $result_sql_allergen = mysqli_query($link, $sql_allergen);

            while ($row_allergen = mysqli_fetch_assoc($result_sql_allergen)){
-                if (in_array($row_allergen['code'], $verwendete_allergene)){
+                if (in_array($row_allergen['code'], $verwendete_allergene_code)){
                    $verwendete_allergene_string .= "<sup>".$row_allergen['code']."</sup> ". $row_allergen['name']. ", ";
                }
            }
--- a/M3/Werbeseite/newletter.txt
+++ b/M3/Werbeseite/newletter.txt
@@ -1 +1 @@
-1
+2
--- a/M3/Werbeseite/subscriptions.json
+++ b/M3/Werbeseite/subscriptions.json
@@ -1 +1 @@
-[{"name":"Max","email":"max@gmail.com","language":"deutsch","terms":"on"},{"name":"Max","email":"max@gmail.com","language":"deutsch","terms":"on"},{"name":"Max","email":"max@gmail.com","language":"deutsch","terms":"on"},{"name":"Max","email":"max@gmail.com","language":"deutsch","terms":"on"},{"name":"Ro","email":"robert-joel@web.de","language":"deutsch","terms":"on"},{"name":"Robert","email":"robert-joel@web.de","language":"deutsch","terms":"on"}]
+[{"name":"Max","email":"max@gmail.com","language":"deutsch","terms":"on"},{"name":"Max","email":"max@gmail.com","language":"deutsch","terms":"on"},{"name":"Max","email":"max@gmail.com","language":"deutsch","terms":"on"},{"name":"Max","email":"max@gmail.com","language":"deutsch","terms":"on"},{"name":"Ro","email":"robert-joel@web.de","language":"deutsch","terms":"on"},{"name":"Robert","email":"robert-joel@web.de","language":"deutsch","terms":"on"},{"name":"Max","email":"max@gmail.com","language":"deutsch","terms":"on"}]