From 9c6133347354d8655e428134ff84a8a6ddc5fa93 Mon Sep 17 00:00:00 2001 From: S170H <64917343+S170H@users.noreply.github.com> Date: Wed, 29 Nov 2023 18:41:06 +0100 Subject: [PATCH] =?UTF-8?q?M3=20kleinere=20Anpassungen=20w=C3=A4hrend=20Ab?= =?UTF-8?q?gabe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- M3/Werbeseite/index.php | 18 ++++++++++++------ M3/Werbeseite/newletter.txt | 2 +- M3/Werbeseite/subscriptions.json | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/M3/Werbeseite/index.php b/M3/Werbeseite/index.php index 20afe7f..ca89893 100644 --- 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') { } -
@@ -261,36 +260,43 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') { $tabelle = ""; - $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 .= ""; } $tabelle .= "
GerichtePreis internPreis externBild
" . $row_gerichte['name'] . " " . $allergene . "" . $preisintern . "€" . $preisextern . "€Kein Bild in der Datenbank
"; 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 .= "".$row_allergen['code']." ". $row_allergen['name']. ", "; } } diff --git a/M3/Werbeseite/newletter.txt b/M3/Werbeseite/newletter.txt index 56a6051..d8263ee 100644 --- a/M3/Werbeseite/newletter.txt +++ b/M3/Werbeseite/newletter.txt @@ -1 +1 @@ -1 \ No newline at end of file +2 \ No newline at end of file diff --git a/M3/Werbeseite/subscriptions.json b/M3/Werbeseite/subscriptions.json index e0a7643..42700c3 100644 --- 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"}] \ No newline at end of file +[{"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"}] \ No newline at end of file