Merge
This commit is contained in:
2626
.idea/dataSources/a1d1df29-b94a-4ad6-bd6f-a458b97a6c0c.xml
generated
2626
.idea/dataSources/a1d1df29-b94a-4ad6-bd6f-a458b97a6c0c.xml
generated
File diff suppressed because it is too large
Load Diff
@@ -1,2 +1,2 @@
|
||||
#n:emensawerbeseite
|
||||
!<md> [1703158749000, 0, null, null, -2147483648, -2147483648]
|
||||
!<md> [1703170405000, 0, null, null, -2147483648, -2147483648]
|
||||
|
||||
Binary file not shown.
11
.idea/workspace.xml
generated
11
.idea/workspace.xml
generated
@@ -7,10 +7,13 @@
|
||||
<list default="true" id="6dcbe3e4-9d68-41d8-8c39-5cfbe5cd4a21" name="Changes" comment="">
|
||||
<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/shelf/Uncommitted_changes_before_rebase__Changes_.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_rebase__Changes_.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/M5/emensa/models/gerichte_main.php" beforeDir="false" afterPath="$PROJECT_DIR$/M5/emensa/models/gerichte_main.php" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/M5/emensa/public/css/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/M5/emensa/public/css/style.css" 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" />
|
||||
@@ -79,7 +82,7 @@
|
||||
<updated>1700736495450</updated>
|
||||
<workItem from="1700736497007" duration="15223000" />
|
||||
<workItem from="1702027267170" duration="12429000" />
|
||||
<workItem from="1703159060547" duration="1572000" />
|
||||
<workItem from="1703159060547" duration="6344000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
|
||||
@@ -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>
|
||||
@@ -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="<u>E-Mail</u>" 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>
|
||||
15
M5/Dossier/AlterAndUpdate.txt
Normal file
15
M5/Dossier/AlterAndUpdate.txt
Normal file
@@ -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;
|
||||
@@ -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="<u>E-Mail</u>" 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>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 56 KiB |
10
M5/Dossier/M5_4.sql
Normal file
10
M5/Dossier/M5_4.sql
Normal file
@@ -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 ;
|
||||
@@ -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'
|
||||
);
|
||||
25
M5/emensa/storage/cache/m5_a1.anmeldung_01c45fd41d095952aa184fb3fc764d18878732cb.bladec
vendored
Normal file
25
M5/emensa/storage/cache/m5_a1.anmeldung_01c45fd41d095952aa184fb3fc764d18878732cb.bladec
vendored
Normal file
@@ -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"); } ?>
|
||||
@@ -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"); } ?>
|
||||
21
M5/emensa/storage/cache/m5_a1.layout_anmeldung_1d2201c8d2863f98b9f307af886814b8305ccb32.bladec
vendored
Normal file
21
M5/emensa/storage/cache/m5_a1.layout_anmeldung_1d2201c8d2863f98b9f307af886814b8305ccb32.bladec
vendored
Normal file
@@ -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>
|
||||
@@ -17,7 +17,18 @@
|
||||
<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"); ?>
|
||||
|
||||
Reference in New Issue
Block a user