Dossier

Merge
Merge branch 'dev/m5_safak' into dev/m5_robert
2023-12-22 19:26:08 +01:00 · 2023-12-22 19:07:54 +01:00 · 2023-12-22 18:58:07 +01:00 · 2023-12-21 13:51:10 +01:00
22 changed files with 1830 additions and 1571 deletions
--- a/.idea/dataSources/a1d1df29-b94a-4ad6-bd6f-a458b97a6c0c.xml
+++ b/.idea/dataSources/a1d1df29-b94a-4ad6-bd6f-a458b97a6c0c.xml
--- a/.idea/dataSources/a1d1df29-b94a-4ad6-bd6f-a458b97a6c0c/storage_v2/_src_/schema/emensawerbeseite.YLWk-w.meta
+++ b/.idea/dataSources/a1d1df29-b94a-4ad6-bd6f-a458b97a6c0c/storage_v2/_src_/schema/emensawerbeseite.YLWk-w.meta
@@ -1,2 +1,2 @@
 #n:emensawerbeseite
-!<md> [1700856041000, 0, null, null, -2147483648, -2147483648]
+!<md> [1703170405000, 0, null, null, -2147483648, -2147483648]
--- a/.idea/dataSources/a1d1df29-b94a-4ad6-bd6f-a458b97a6c0c/storage_v2/_src_/schema/emensawerbeseite.YLWk-w.zip
+++ b/.idea/dataSources/a1d1df29-b94a-4ad6-bd6f-a458b97a6c0c/storage_v2/_src_/schema/emensawerbeseite.YLWk-w.zip
--- a/.idea/shelf/Uncommitted_changes_before_Checkout_at_21_12_2023_11_23_[Changes]/shelved.patch
+++ b/.idea/shelf/Uncommitted_changes_before_Checkout_at_21_12_2023_11_23_[Changes]/shelved.patch
--- a/.idea/shelf/Uncommitted_changes_before_Checkout_at_21_12_2023_11_23__Changes_.xml
+++ b/.idea/shelf/Uncommitted_changes_before_Checkout_at_21_12_2023_11_23__Changes_.xml
@@ -0,0 +1,4 @@
+<changelist name="Uncommitted_changes_before_Checkout_at_21_12_2023_11_23_[Changes]" date="1703154212231" recycled="true" deleted="true">
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Checkout_at_21_12_2023_11_23_[Changes]/shelved.patch" />
+  <option name="DESCRIPTION" value="Uncommitted changes before Checkout at 21.12.2023 11:23 [Changes]" />
+</changelist>
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,18 +5,15 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="6dcbe3e4-9d68-41d8-8c39-5cfbe5cd4a21" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/M4/emensa/controllers/MainController.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/M4/emensa/models/gerichte_main.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/M4/emensa/public/css/style.css" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/M4/emensa/public/img/fh-logo.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/M4/emensa/public/img/mensa21.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/M4/emensa/views/layouts/main_layout.blade.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/M4/emensa/views/main/index.blade.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/dataSources/a1d1df29-b94a-4ad6-bd6f-a458b97a6c0c.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/a1d1df29-b94a-4ad6-bd6f-a458b97a6c0c.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/dataSources/a1d1df29-b94a-4ad6-bd6f-a458b97a6c0c/storage_v2/_src_/schema/emensawerbeseite.YLWk-w.meta" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/a1d1df29-b94a-4ad6-bd6f-a458b97a6c0c/storage_v2/_src_/schema/emensawerbeseite.YLWk-w.meta" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/M4/emensa/models/gerichte_self.php" beforeDir="false" afterPath="$PROJECT_DIR$/M4/emensa/models/gerichte_self.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/M4/emensa/routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/M4/emensa/routes/web.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/M4/emensa/storage/cache/.layouts.m4_7d_layout_ecc36cbad49aa38782cc08cc5e9ca6c7ae3590d0.bladec" beforeDir="false" afterPath="$PROJECT_DIR$/M4/emensa/storage/cache/.layouts.m4_7d_layout_ecc36cbad49aa38782cc08cc5e9ca6c7ae3590d0.bladec" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/M4/emensa/views/layouts/m4_7d_layout.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/M4/emensa/views/layouts/m4_7d_layout.blade.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/M5/Dossier/.$Aufgabe1.drawio.bkp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/M5/Dossier/.$Aufgabe1.drawio.dtmp" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/M5/Dossier/Aufgabe1.drawio" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/M5/Dossier/ERD M4-1-1.png" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/M5/emensa/routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/M5/emensa/routes/web.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/M5/emensa/storage/cache/main.index_b8ca93da07664813b96b9705f586eaa04a44db3c.bladec" beforeDir="false" afterPath="$PROJECT_DIR$/M5/emensa/storage/cache/main.index_b8ca93da07664813b96b9705f586eaa04a44db3c.bladec" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -29,7 +26,7 @@
  <component name="Git.Settings">
    <option name="RECENT_BRANCH_BY_REPOSITORY">
      <map>
-        <entry key="$PROJECT_DIR$" value="dev/m3_safak" />
+        <entry key="$PROJECT_DIR$" value="dev/m5_safak" />
      </map>
    </option>
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -47,28 +44,28 @@
    <option name="hideEmptyMiddlePackages" value="true" />
    <option name="showLibraryContents" value="true" />
  </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "WebServerToolWindowFactoryState": "false",
-    "database.data.extractors.current.export.id": "Comma-separated (CSV)_id",
-    "git-widget-placeholder": "dev/m4__robert",
-    "last_opened_file_path": "C:/Users/rober/Documents/GitHub/DBWT-Praktika/M4/emensa/public/img",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "settings.editor.selected.configurable": "preferences.pluginManager",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
+    &quot;database.data.extractors.current.export.id&quot;: &quot;Comma-separated (CSV)_id&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;dev/m5__robert&quot;,
+    &quot;last_opened_file_path&quot;: &quot;C:/Users/rober/Documents/GitHub/DBWT-Praktika/M4/emensa/public/img&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
  },
-  "keyToStringList": {
-    "DatabaseDriversLRU": [
-      "mariadb"
+  &quot;keyToStringList&quot;: {
+    &quot;DatabaseDriversLRU&quot;: [
+      &quot;mariadb&quot;
    ]
  }
-}]]></component>
+}</component>
  <component name="RecentsManager">
    <key name="CopyFile.RECENT_KEYS">
      <recent name="C:\Users\rober\Documents\GitHub\DBWT-Praktika\M4\emensa\public\img" />
@@ -85,6 +82,7 @@
      <updated>1700736495450</updated>
      <workItem from="1700736497007" duration="15223000" />
      <workItem from="1702027267170" duration="12429000" />
+      <workItem from="1703159060547" duration="6344000" />
    </task>
    <servers />
  </component>
--- a/M5/Dossier/.$Aufgabe1.drawio.bkp
+++ b/M5/Dossier/.$Aufgabe1.drawio.bkp
@@ -1,19 +0,0 @@
-<mxfile host="Electron" modified="2023-12-01T15:21:01.688Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/22.1.2 Chrome/114.0.5735.289 Electron/25.9.4 Safari/537.36" etag="78gUQK1TRnweegfurtHK" version="22.1.2" type="device">
-  <diagram name="Seite-1" id="jhCbnHoXzx65MXILfqUJ">
-    <mxGraphModel dx="1050" dy="725" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
-      <root>
-        <mxCell id="0" />
-        <mxCell id="1" parent="0" />
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-1" value="" style="rhombus;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-          <mxGeometry x="320" y="240" width="160" height="80" as="geometry" />
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-2" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-          <mxGeometry x="80" y="240" width="160" height="80" as="geometry" />
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-3" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
-          <mxGeometry x="560" y="240" width="160" height="80" as="geometry" />
-        </mxCell>
-      </root>
-    </mxGraphModel>
-  </diagram>
-</mxfile>
--- a/M5/Dossier/.$Aufgabe1.drawio.dtmp
+++ b/M5/Dossier/.$Aufgabe1.drawio.dtmp
@@ -1,91 +0,0 @@
-<mxfile host="Electron" modified="2023-12-02T22:05:22.197Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/22.1.2 Chrome/114.0.5735.289 Electron/25.9.4 Safari/537.36" etag="rtvPorWLK5CfuI4500ka" version="22.1.2" type="device">
-  <diagram name="Seite-1" id="jhCbnHoXzx65MXILfqUJ">
-    <mxGraphModel dx="1048" dy="722" grid="0" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
-      <root>
-        <mxCell id="0" />
-        <mxCell id="1" parent="0" />
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-1" value="erstellt" style="rhombus;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="320" y="240" width="160" height="80" as="geometry" />
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-2" value="Wunschgericht" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="560" y="240" width="160" height="80" as="geometry" />
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-3" value="Ersteller" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="80" y="240" width="160" height="80" as="geometry" />
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-4" value="Name" style="ellipse;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="560" y="140" width="80" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-5" value="Beschreibung" style="ellipse;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="680" y="140" width="80" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-6" value="Erstellungs-datum" style="ellipse;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="500" y="180" width="80" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-7" value="ID" style="ellipse;whiteSpace=wrap;html=1;fontStyle=4" parent="1" vertex="1">
-          <mxGeometry x="620" y="180" width="80" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-12" value="" style="endArrow=none;html=1;rounded=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="1" target="8l75yZ3mhxg1qXRySu_G-5" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="700" y="240" as="sourcePoint" />
-            <mxPoint x="750" y="190" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-13" value="" style="endArrow=none;html=1;rounded=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.621;entryY=0.005;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="8l75yZ3mhxg1qXRySu_G-7" target="8l75yZ3mhxg1qXRySu_G-2" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="730" y="280" as="sourcePoint" />
-            <mxPoint x="780" y="230" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-14" value="" style="endArrow=none;html=1;rounded=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="1" target="8l75yZ3mhxg1qXRySu_G-4" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="600" y="240" as="sourcePoint" />
-            <mxPoint x="628" y="154" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-15" value="" style="endArrow=none;html=1;rounded=0;entryX=1;entryY=1;entryDx=0;entryDy=0;exitX=0.15;exitY=0.003;exitDx=0;exitDy=0;exitPerimeter=0;" parent="1" source="8l75yZ3mhxg1qXRySu_G-2" target="8l75yZ3mhxg1qXRySu_G-6" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="610" y="250" as="sourcePoint" />
-            <mxPoint x="610" y="170" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-17" value="" style="endArrow=none;html=1;rounded=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="480" y="279.66" as="sourcePoint" />
-            <mxPoint x="560" y="279.66" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-18" value="Name" style="ellipse;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="80" y="160" width="80" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-19" value="&lt;u&gt;E-Mail&lt;/u&gt;" style="ellipse;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="170" y="160" width="80" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-20" value="" style="endArrow=none;html=1;rounded=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;exitX=0.25;exitY=0;exitDx=0;exitDy=0;" parent="1" source="8l75yZ3mhxg1qXRySu_G-3" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="100" y="260" as="sourcePoint" />
-            <mxPoint x="120" y="200" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-21" value="" style="endArrow=none;html=1;rounded=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;exitX=0.25;exitY=0;exitDx=0;exitDy=0;" parent="1" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="209.65999999999997" y="240" as="sourcePoint" />
-            <mxPoint x="209.65999999999997" y="200" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-22" value="N" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
-          <mxGeometry x="530" y="250" width="30" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-23" value="1" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
-          <mxGeometry x="240" y="250" width="30" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-24" value="" style="endArrow=none;html=1;rounded=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="240" y="280" as="sourcePoint" />
-            <mxPoint x="320" y="280" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-      </root>
-    </mxGraphModel>
-  </diagram>
-</mxfile>
--- a/M5/Dossier/AlterAndUpdate.txt
+++ b/M5/Dossier/AlterAndUpdate.txt
@@ -0,0 +1,15 @@
+ALTER TABLE gericht ADD bildname varchar(200)
+
+UPDATE gericht SET bildname = '01_bratkartoffel.jpg' WHERE id=1;
+UPDATE gericht SET bildname = '03_bratkartoffel.jpg' WHERE id=3;
+UPDATE gericht SET bildname = '04_tofu.jpg' WHERE id=4;
+UPDATE gericht SET bildname = '09_suppe.jpg' WHERE id=9;
+UPDATE gericht SET bildname = '06_lasagne.jpg' WHERE id=6;
+UPDATE gericht SET bildname = '10_forelle.jpg' WHERE id=10;
+UPDATE gericht SET bildname = '11_soup.jpg' WHERE id=11;
+UPDATE gericht SET bildname = '12_kassler.jpg' WHERE id=12;
+UPDATE gericht SET bildname = '13_reibekuchen.jpg' WHERE id=13;
+UPDATE gericht SET bildname = '15_pilze.jpg' WHERE id=15;
+UPDATE gericht SET bildname = '17_broetchen.jpg' WHERE id=17;
+UPDATE gericht SET bildname = '19_mousse.jpg' WHERE id=19;
+UPDATE gericht SET bildname = '20_suppe.jpg' WHERE id=20;
--- a/M5/Dossier/Aufgabe1.drawio
+++ b/M5/Dossier/Aufgabe1.drawio
@@ -1,91 +0,0 @@
-<mxfile host="Electron" modified="2023-12-02T22:05:19.234Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/22.1.2 Chrome/114.0.5735.289 Electron/25.9.4 Safari/537.36" etag="UqWXQEsGpaBe1QuKew26" version="22.1.2" type="device">
-  <diagram name="Seite-1" id="jhCbnHoXzx65MXILfqUJ">
-    <mxGraphModel dx="1048" dy="722" grid="0" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
-      <root>
-        <mxCell id="0" />
-        <mxCell id="1" parent="0" />
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-1" value="erstellt" style="rhombus;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="320" y="240" width="160" height="80" as="geometry" />
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-2" value="Wunschgericht" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="560" y="240" width="160" height="80" as="geometry" />
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-3" value="Ersteller" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="80" y="240" width="160" height="80" as="geometry" />
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-4" value="Name" style="ellipse;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="560" y="140" width="80" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-5" value="Beschreibung" style="ellipse;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="680" y="140" width="80" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-6" value="Erstellungs-datum" style="ellipse;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="500" y="180" width="80" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-7" value="ID" style="ellipse;whiteSpace=wrap;html=1;fontStyle=4" parent="1" vertex="1">
-          <mxGeometry x="620" y="180" width="80" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-12" value="" style="endArrow=none;html=1;rounded=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="1" target="8l75yZ3mhxg1qXRySu_G-5" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="700" y="240" as="sourcePoint" />
-            <mxPoint x="750" y="190" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-13" value="" style="endArrow=none;html=1;rounded=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.621;entryY=0.005;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="8l75yZ3mhxg1qXRySu_G-7" target="8l75yZ3mhxg1qXRySu_G-2" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="730" y="280" as="sourcePoint" />
-            <mxPoint x="780" y="230" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-14" value="" style="endArrow=none;html=1;rounded=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="1" target="8l75yZ3mhxg1qXRySu_G-4" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="600" y="240" as="sourcePoint" />
-            <mxPoint x="628" y="154" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-15" value="" style="endArrow=none;html=1;rounded=0;entryX=1;entryY=1;entryDx=0;entryDy=0;exitX=0.15;exitY=0.003;exitDx=0;exitDy=0;exitPerimeter=0;" parent="1" source="8l75yZ3mhxg1qXRySu_G-2" target="8l75yZ3mhxg1qXRySu_G-6" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="610" y="250" as="sourcePoint" />
-            <mxPoint x="610" y="170" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-17" value="" style="endArrow=none;html=1;rounded=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="480" y="279.66" as="sourcePoint" />
-            <mxPoint x="560" y="279.66" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-18" value="Name" style="ellipse;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="80" y="160" width="80" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-19" value="&lt;u&gt;E-Mail&lt;/u&gt;" style="ellipse;whiteSpace=wrap;html=1;" parent="1" vertex="1">
-          <mxGeometry x="170" y="160" width="80" height="40" as="geometry" />
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-20" value="" style="endArrow=none;html=1;rounded=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;exitX=0.25;exitY=0;exitDx=0;exitDy=0;" parent="1" source="8l75yZ3mhxg1qXRySu_G-3" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="100" y="260" as="sourcePoint" />
-            <mxPoint x="120" y="200" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-21" value="" style="endArrow=none;html=1;rounded=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;exitX=0.25;exitY=0;exitDx=0;exitDy=0;" parent="1" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="209.65999999999997" y="240" as="sourcePoint" />
-            <mxPoint x="209.65999999999997" y="200" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-22" value="N" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
-          <mxGeometry x="530" y="250" width="30" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-23" value="1" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
-          <mxGeometry x="240" y="250" width="30" height="30" as="geometry" />
-        </mxCell>
-        <mxCell id="8l75yZ3mhxg1qXRySu_G-24" value="" style="endArrow=none;html=1;rounded=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" edge="1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="240" y="280" as="sourcePoint" />
-            <mxPoint x="320" y="280" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-      </root>
-    </mxGraphModel>
-  </diagram>
-</mxfile>
--- a/M5/Dossier/ERD
+++ b/M5/Dossier/ERD
--- a/M5/Dossier/M4.md
+++ b/M5/Dossier/M4.md
@@ -1,153 +0,0 @@
-# Aufgabe 1
-> Dauer: 2 h
-## 1)
-![ERD](ERD M4-1-1.png)
-## 2) Datenbankentwurf in Relationenschreibweise
-```sql
-use emensawerbeseite;
-
-- Tabelle 'Ersteller' erstellen
-CREATE TABLE IF NOT EXISTS Ersteller (
-    EMail VARCHAR(255) PRIMARY KEY,
-    Name VARCHAR(255) DEFAULT 'anonym'
-);
-
-- Tabelle 'Wunschgericht' erstellen
-CREATE TABLE IF NOT EXISTS Wunschgericht (
-    ID INT AUTO_INCREMENT PRIMARY KEY,
-    Name VARCHAR(255) NOT NULL,
-    Beschreibung TEXT,
-    Erstellungsdatum DATE NOT NULL,
-    Ersteller_EMail VARCHAR(255) NOT NULL,
-    FOREIGN KEY (Ersteller_EMail) REFERENCES Ersteller(EMail)
-);
-```
-## 6)
-### a)
-````sql
-select * from wunschgericht order by Erstellungsdatum desc limit 5;
-````
-### b) 
-````sql
-- basierend auf M3 6) 4)
-select ersteller.Name,
-       count(Ersteller_EMail) as anzahl from wunschgericht, ersteller where ersteller.EMail = wunschgericht.Ersteller_EMail
-group by Ersteller_EMail
-order by anzahl desc ;
-````
---
-# Aufgabe 2
-> Dauer: 2h
-
-Bei der Übergabe von Daten in die DB müssen diese geprüft werden.
-Bei der Ausgabe von Daten aus der DB im HTML Code müssen diese Maskiert werden.
- ````php
-// wunschgericht.php
-// Zeile 33
-$sql_ersteller_exists = "SELECT * FROM ersteller WHERE EMail = '" .  $ersteller_email . "'";
-$sql_ersteller_exists = "SELECT * FROM ersteller WHERE EMail = '" . mysqli_real_escape_string($link, $ersteller_email) . "'";
-
-// Zeile 36
-$sql_ersteller = "INSERT INTO ersteller(EMail, Name) VALUES ('" . $ersteller_email . "','" . $ersteller_name . "')";
-$sql_ersteller = "INSERT INTO ersteller(EMail, Name) VALUES ('" . mysqli_real_escape_string($link, $ersteller_email) . "','" . mysqli_real_escape_string($link, $ersteller_name) . "')";
-
-// Zeile 42
-$sql = "INSERT INTO wunschgericht(Name, Beschreibung, Erstellungsdatum, Ersteller_EMail) VALUES ('" . $gericht_name . "','" . $gericht_beschreibung . "','". $date ."','" . $ersteller_email . "')";
-$sql = "INSERT INTO wunschgericht(Name, Beschreibung, Erstellungsdatum, Ersteller_EMail) VALUES ('" . mysqli_real_escape_string($link, $gericht_name) . "','" . mysqli_real_escape_string($link, $gericht_beschreibung) . "','".$date."','" . mysqli_real_escape_string($link, $ersteller_email) . "')";
-?>
-````
-
-````php
-// index.php
-// Zeile 43
-$sql_besucher = "UPDATE besucher_counter SET besucher =".$besucherCount;
-$sql_besucher = "UPDATE besucher_counter SET besucher =". mysqli_real_escape_string($link, $besucherCount);
-
-// Zeile 190
-$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 .= "<tr class=\"speisen\"><td>" . htmlspecialchars($row_gerichte['name']) . " <sup>" . htmlspecialchars($allergene) . "</sup></td><td>" . htmlspecialchars($preisintern) . "€</td><td>" . htmlspecialchars($preisextern) . "€</td><td>Kein Bild in der Datenbank </td></tr>";
-
-
-// Zeile 202
-$verwendete_allergene_string .= "<sup>".$row_allergen['code']."</sup> ". $row_allergen['name']. ", ";
-$verwendete_allergene_string .= "<sup>". htmlspecialchars($row_allergen['code']) ."</sup> ". htmlspecialchars($row_allergen['name']) . ", ";
-
-// Zeile 214f
-echo $besucherCount;
-echo $newletterCount;
-
-echo htmlspecialchars($besucherCount); 
-echo htmlspecialchars($newletterCount);
-            
-// Zeile 220
-echo $ausgabe["COUNT(id)"];
-echo htmlspecialchars($ausgabe["COUNT(id)"]);
-````
-Bei der Newsletteranmeldung sollte man sich auch ggf. überlegen, wie man die Eingaben prüft un zu vermeiden, das schadhafter Code gespeichert und später abgerufen wird.
-
-# Aufgabe 4
-> Dauer 1,5 h
-1. Eindeutigkeit für die Kombination aus Gericht und Kategorie sicherstellen
-    ````sql
-    ALTER TABLE gericht_hat_kategorie
-    ADD CONSTRAINT gericht_kategorie_unique UNIQUE (gericht_id, kategorie_id);
-    ````
-2. In der Tabelle gericht soll eine Abfrage nach Name beschleunigt werden.
-    ````sql
-    ALTER TABLE gericht
-    ADD INDEX idx_name (name);
-    ````
-3. Bei Löschung eines Gerichts sollen 
-   1) die zugehörigen Zuordnungen zu einer Kategorie sowie 
-    ````sql
-    ALTER TABLE gericht_hat_kategorie
-    DROP FOREIGN KEY gericht_hat_kategorie_ibfk_1,  -- (gericht_id) -> gericht(id)
-    ADD CONSTRAINT gericht_hat_kategorie_ibfk_1_new
-    FOREIGN KEY (gericht_id) REFERENCES gericht(id)
-    ON DELETE CASCADE;
-    ````
-   2) die zugehörigen Zuordnungen zu Allergenen automatisch mit gelöscht werden.
-   ````sql
-    ALTER TABLE gericht_hat_allergen
-    DROP FOREIGN KEY gericht_hat_allergen_ibfk_2, -- (gericht_id) -> gericht(id)
-    ADD CONSTRAINT gericht_hat_allergen_ibfk_2_new
-    FOREIGN KEY (gericht_id) REFERENCES gericht(id)
-    ON DELETE CASCADE;
-    ````
-4. Eine Kategorie kann nur dann gelöscht werden, wenn
-   1) dieser keine Gerichte zugeordnet sind und
-   ````sql
-    ALTER TABLE gericht_hat_kategorie
-    ADD CONSTRAINT fk_gericht_hat_kategorie_kategorie_id
-    FOREIGN KEY (kategorie_id) REFERENCES kategorie(id)
-    ON DELETE RESTRICT;
-    ````
-   2) diese keine Kindkategorien besitzt.
-    ````sql
-    ALTER TABLE kategorie
-   ADD CONSTRAINT fk_kategorie_eltern_id
-   FOREIGN KEY (eltern_id) REFERENCES kategorie(id)
-   ON DELETE RESTRICT;
-    ````
-5. Wird der Code eines Allergens verändert, so ändert sich dieser Code automatisch in den referenzierenden Datensätzen.
-    ````sql
-    ALTER TABLE gericht_hat_allergen
-    DROP FOREIGN KEY gericht_hat_allergen_ibfk_1, -- (code) -> allergen(code)
-    ADD CONSTRAINT gericht_hat_allergen_ibfk_1_new
-    FOREIGN KEY (code) REFERENCES allergen(code)
-    ON UPDATE CASCADE;
-    ````
-6. Eine Kombination aus ``gericht_id`` und ``kategorie_id`` in ``gericht_hat_kategorie`` soll als Primärschlüssel dienen.
-    ````sql
-    ALTER TABLE gericht_hat_kategorie
-    ADD PRIMARY KEY (gericht_id, kategorie_id);
-    ````
-
-# Aufgabe 6
-> Dauer 20 min
-
-# Aufgabe 7
-> Dauer 2,5 h
-
-# Aufgabe 8
-> Dauer 1 h
--- a/M5/Dossier/M5.pdf
+++ b/M5/Dossier/M5.pdf
--- a/M5/Dossier/M5_4.sql
+++ b/M5/Dossier/M5_4.sql
@@ -0,0 +1,10 @@
+#a)
+CREATE OR REPLACE VIEW view_suppengerichte AS select * from gericht WHERE name LIKE '%suppe%';
+
+#b)
+CREATE OR REPLACE VIEW view_anmeldungen AS select name,anzahlanmeldungen from benutzer ORDER BY anzahlanmeldungen DESC;
+
+#c)
+CREATE OR REPLACE VIEW view_kategoriegerichte_vegetarisch AS select gericht.name as gericht_name, vegetarisch, kategorie.name as katergorie_name
+                                                             from gericht, kategorie
+                                                             WHERE vegetarisch = 1 ;
--- a/M5/emensa/models/gerichte_main.php
+++ b/M5/emensa/models/gerichte_main.php
@@ -35,9 +35,18 @@ while ($row_gerichte = mysqli_fetch_assoc($result_sql_gerichte)) {
        $preisintern = number_format($row_gerichte['preisintern'], 2, ',', '.');
        $preisextern = number_format($row_gerichte['preisextern'], 2, ',', '.');

+        //Bildname
+
+        $bildname = $row_gerichte['bildname'];
+
+        if($bildname == Null){
+            $bildname = "00_image_missing.jpg";
+        }
+
+        $bildname = "/img/gerichte/" . $bildname;
        // Ausgabe des aktuellen Gerichts

-        $tabelle .= "<tr class=\"speisen\"><td>" . htmlspecialchars($row_gerichte['name']) . " <sup>" . htmlspecialchars($allergene) . "</sup></td><td>" . htmlspecialchars($preisintern) . "€</td><td>" . htmlspecialchars($preisextern) . "€</td><td>Kein Bild in der Datenbank </td></tr>";
+        $tabelle .= "<tr class=\"speisen\"><td>" . htmlspecialchars($row_gerichte['name']) . " <sup>" . htmlspecialchars($allergene) . "</sup></td><td>" . htmlspecialchars($preisintern) . "€</td><td>" . htmlspecialchars($preisextern) . "€</td><td> <img src=\"".$bildname ."\" alt =\"Bild vom Gericht\" width= \"10\" height=\"10\"> </td></tr>";
    }
    $tabelle .= "</table>";

--- a/M5/emensa/public/css/style.css
+++ b/M5/emensa/public/css/style.css
@@ -29,6 +29,11 @@ img {
    text-align: center;
 }

+.speisen img{
+    width: 100px;
+    height: 100px;
+}
+
 p {
    text-align: justify;
 }
--- a/M5/emensa/routes/web.php
+++ b/M5/emensa/routes/web.php
@@ -19,6 +19,11 @@ return array(
    '/m4' => 'ExampleController@m4_6a_queryparameter',
    '/m4_7b_kategorie' => 'ExampleController@m4_7b_kategorie',
    '/m4_7c_gerichte' => 'ExampleController@m4_7c_gerichte',
-    '/m4_7d' => 'ExampleController@m4_7d'
+    '/m4_7d' => 'ExampleController@m4_7d',

+
+    '/anmeldung' => 'AnmeldungController@start',
+    '/anmeldung_verifizieren' => 'AnmeldungController@anmeldung_verifizieren',
+    '/anmeldung_fehler' => 'AnmeldungController@check',
+    '/abmeldung' => 'AnmeldungController@abmelden'
 );
--- a/M5/emensa/storage/cache/layouts.main_layout_54314409e9b1b39431b6e14f05f203008160a8be.bladec
+++ b/M5/emensa/storage/cache/layouts.main_layout_54314409e9b1b39431b6e14f05f203008160a8be.bladec
@@ -0,0 +1,30 @@
+<!doctype html>
+<html class="no-js" lang="DE">
+<head>
+ <meta charset="utf-8">
+
+ <title><?php echo \htmlentities($title??'', ENT_QUOTES, 'UTF-8', false); ?></title>
+
+ <?php echo $this->yieldContent("header"); ?>
+
+ <!-- good developers check the markup ;) -->
+</head>
+<body>
+<?php echo $this->yieldContent("nav"); ?>
+<hr>
+<div class="grid">
+ <div></div>
+ <div>
+<?php echo $this->yieldContent("text"); ?>
+
+<?php echo $this->yieldContent("gerichte"); ?>
+ </div>
+ <div></div>
+</div>
+<footer>
+ <table class="fusszeile">
+ <?php echo $this->yieldContent("footer"); ?>
+ </table>
+</footer>
+</body>
+</html>
--- a/M5/emensa/storage/cache/m5_a1.anmeldung_01c45fd41d095952aa184fb3fc764d18878732cb.bladec
+++ b/M5/emensa/storage/cache/m5_a1.anmeldung_01c45fd41d095952aa184fb3fc764d18878732cb.bladec
@@ -0,0 +1,25 @@
+<?php $_shouldextend[1]=1; ?>
+
+<?php $this->startSection("main"); ?>
+
+ <form action="/anmeldung_verifizieren" method="post">
+
+ <label for="email">E-Mail</label>
+ <input id="email" name="email" type="email" placeholder="email" required maxlength="100">
+
+ <label for="passwort">Passwort</label>
+ <input id="passwort"  name="passwort" type="password" placeholder="passwort" required maxlength="200">
+
+ <button type="submit" >Anmelden</button>
+ </form>
+
+ <?php if(!isset($anmeldung)): ?> Bitte anmelden!
+ <?php elseif($anmeldung == 1): ?>
+ <?php echo \htmlentities(session_start()??'', ENT_QUOTES, 'UTF-8', false); ?>
+
+ Anmeldung erlaubt!
+ <?php else: ?> Es ist ein Fehler aufgetretten!
+ <?php endif; ?>
+
+<?php $this->stopSection(); ?>
+<?php if (isset($_shouldextend[1])) { echo $this->runChild("m5_a1.layout_anmeldung"); } ?>
--- a/M5/emensa/storage/cache/m5_a1.anmeldung_verifizieren_9871f7ed4c60110a1408ee88be08af7da169ae61.bladec
+++ b/M5/emensa/storage/cache/m5_a1.anmeldung_verifizieren_9871f7ed4c60110a1408ee88be08af7da169ae61.bladec
@@ -0,0 +1,51 @@
+<?php $_shouldextend[1]=1; ?>
+
+<?php $this->startSection("main"); ?>
+
+ <?php if($anmeldung == 1): ?>
+ <meta http-equiv="refresh" content="/"/>
+ <form id="form_ok" action="/"></form>
+
+ <script type="text/javascript">
+
+ function formAutoSubmit() {
+
+ var frm = document.getElementById("form_ok");
+
+ frm.submit();
+
+ }
+
+
+ window.onload = formAutoSubmit;
+
+ </script>
+ <?php else: ?>
+
+ <form method="post" id="auto_form" action="/anmeldung_fehler">
+ <input type="hidden" name="email" value=<?php echo \htmlentities($email??'', ENT_QUOTES, 'UTF-8', false); ?>>
+ <input type="hidden" name="passwort" value=<?php echo \htmlentities($passwort??'', ENT_QUOTES, 'UTF-8', false); ?>>
+ <input type="hidden" name="anmeldung" value=<?php echo \htmlentities($anmeldung??'', ENT_QUOTES, 'UTF-8', false); ?>>
+ </form>
+
+ <script type="text/javascript">
+
+ function formAutoSubmit() {
+
+ var frm = document.getElementById("auto_form");
+
+ frm.submit();
+
+ }
+
+ window.onload = formAutoSubmit;
+
+ </script>
+ <?php endif; ?>
+
+ <img src="https://upload.wikimedia.org/wikipedia/commons/b/b1/Loading_icon.gif?20151024034921" alt="loading">
+ <br>
+ Bitte warten!
+
+<?php $this->stopSection(); ?>
+<?php if (isset($_shouldextend[1])) { echo $this->runChild("m5_a1.layout_anmeldung"); } ?>
--- a/M5/emensa/storage/cache/m5_a1.layout_anmeldung_1d2201c8d2863f98b9f307af886814b8305ccb32.bladec
+++ b/M5/emensa/storage/cache/m5_a1.layout_anmeldung_1d2201c8d2863f98b9f307af886814b8305ccb32.bladec
@@ -0,0 +1,21 @@
+<!doctype html>
+<html class="no-js" lang="DE">
+<head>
+ <meta charset="utf-8">
+ <title>Layout-m5-a1</title>
+</head>
+<body>
+<header class="header_7d">
+ <?php echo $this->yieldContent("header"); ?>
+</header>
+
+<main class="main">
+ <?php echo $this->yieldContent("main"); ?>
+</main>
+
+<footer class="footer">
+ <?php echo $this->yieldContent("footer"); ?>
+</footer>
+
+</body>
+</html>
--- a/M5/emensa/storage/cache/main.index_b8ca93da07664813b96b9705f586eaa04a44db3c.bladec
+++ b/M5/emensa/storage/cache/main.index_b8ca93da07664813b96b9705f586eaa04a44db3c.bladec
@@ -0,0 +1,73 @@
+<?php $_shouldextend[1]=1; ?>
+
+<?php $this->startSection("header"); ?>
+ <link rel="stylesheet" href="/css/style.css">
+<?php $this->stopSection(); ?>
+
+<?php $this->startSection("nav"); ?>
+ <div class="grid">
+ <div>
+ <img src="/img/fh-logo.jpg" alt="FH-Logo">
+ </div>
+ <div>
+ <a href="#ankündigung">Ankündigung</a>
+ <a href="#speisen">Speisen</a>
+ <a href="#zahlen">Zahlen</a>
+ <a href="#kontakt">Kontakt</a>
+ <a href="#wichtig">Wichtig für uns</a>
+
+ </div>
+ <div>
+
+ <?php if(($_SESSION['login'] ?? NULL) == 0): ?>
+ <a href="/anmeldung">Anmelden</a>
+ <?php else: ?>
+ Angemeldet als:<br>
+ <div><?php echo \htmlentities($_SESSION['name']??'', ENT_QUOTES, 'UTF-8', false); ?></div>
+ <a href="/abmeldung">Abmelden</a>
+ <?php endif; ?>
+ </div>
+ </div>
+
+<?php $this->stopSection(); ?>
+
+<?php $this->startSection("text"); ?>
+
+ <img src="/img/mensa21.jpg" alt="Essen">
+ <h1 id="ankündigung">Bald gibt es auch Essen online ;)</h1>
+ <p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et
+ dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet
+ clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet,
+ consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat,
+ sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no
+ sea takimata sanctus est Lorem ipsum dolor sit amet.</p>
+ <h1 id="speisen">Köstlichkeiten die Sie erwarten</h1>
+
+<?php $this->stopSection(); ?>
+
+<?php $this->startSection("gerichte"); ?>
+
+ <?php if(isset($data['error'])): ?>
+ <h1>Es gab ein Problem mit der Datenbankverbindung</h1>
+ <p>Fehlermeldung</p>
+ <pre> <?php echo \htmlentities($data['beschreibung']??'', ENT_QUOTES, 'UTF-8', false); ?></pre>
+
+ <?php else: ?>
+ <?php
+ echo $data["gericht"];
+ echo $data["allergene"];
+?>
+ <?php endif; ?>
+
+<?php $this->stopSection(); ?>
+
+<?php $this->startSection("footer"); ?>
+
+ <tr>
+ <td>(c) E-Mensa GmbH</td>
+ <td>Şafak Hazinedar & Robert Joel</td>
+ <td><a href="">Impressum</a></td>
+ </tr>
+
+<?php $this->stopSection(); ?>
+<?php if (isset($_shouldextend[1])) { echo $this->runChild("layouts.main_layout", ['title' => "E-Mensa"]); } ?>
Author	SHA1	Message	Date
Robert	b3678c16b7	Dossier	2023-12-22 19:26:08 +01:00
Robert	40bdbf2c5a	Merge	2023-12-22 19:07:54 +01:00
Robert	561449690f	Merge branch 'dev/m5_safak' into dev/m5_robert	2023-12-22 18:58:07 +01:00
Robert	5fe2a22f9a	Aufgabe 2	2023-12-21 13:51:10 +01:00