3 Commits

Author SHA1 Message Date
Robert
c13606c2c1 Css für optinale aufgabe 1 2024-01-24 12:21:20 +01:00
Robert
91856073e1 Alles 2024-01-19 17:59:21 +01:00
Robert
15d9287b47 Alles bis auf paar sachen 2024-01-19 17:35:34 +01:00
7 changed files with 212 additions and 21 deletions

45
.idea/workspace.xml generated
View File

@@ -4,14 +4,10 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="6dcbe3e4-9d68-41d8-8c39-5cfbe5cd4a21" name="Changes" comment="Bewertungs model">
<list default="true" id="6dcbe3e4-9d68-41d8-8c39-5cfbe5cd4a21" name="Changes" comment="Alles">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/M6/emensamobile/app/Http/Controllers/MainController.php" beforeDir="false" afterPath="$PROJECT_DIR$/M6/emensamobile/app/Http/Controllers/MainController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/M6/emensamobile/app/Models/benutzer.php" beforeDir="false" afterPath="$PROJECT_DIR$/M6/emensamobile/app/Models/benutzer.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/M6/emensamobile/app/Models/bewertungen.php" beforeDir="false" afterPath="$PROJECT_DIR$/M6/emensamobile/app/Models/bewertungen.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/M6/emensamobile/resources/views/layouts/main_layout.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/M6/emensamobile/resources/views/layouts/main_layout.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/M6/emensamobile/public/css/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/M6/emensamobile/public/css/style.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/M6/emensamobile/resources/views/main/bewertung.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/M6/emensamobile/resources/views/main/bewertung.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/M6/emensamobile/resources/views/main/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/M6/emensamobile/resources/views/main/index.blade.php" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -68,7 +64,7 @@
&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/m6__robert&quot;,
&quot;last_opened_file_path&quot;: &quot;C:/Users/rober/Documents/GitHub/DBWT-Praktika/M6/emensamobile/public&quot;,
&quot;last_opened_file_path&quot;: &quot;C:/Users/rober/Documents/GitHub/DBWT-Praktika/M6/Dossier&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;,
@@ -85,11 +81,11 @@
}</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="C:\Users\rober\Documents\GitHub\DBWT-Praktika\M6\Dossier" />
<recent name="C:\Users\rober\Documents\GitHub\DBWT-Praktika\M6\emensamobile\public" />
<recent name="C:\Users\rober\Documents\GitHub\DBWT-Praktika\M6\emensamobile\resources\views" />
<recent name="C:\Users\rober\Documents\GitHub\DBWT-Praktika\M6\emensamobile\app\Models" />
<recent name="C:\Users\rober\Documents\GitHub\DBWT-Praktika\M6\emensamobile\resources\css" />
<recent name="C:\Users\rober\Documents\GitHub\DBWT-Praktika\M6\emensamobile\app\Http\Controllers" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="C:\Users\rober\Documents\GitHub\DBWT-Praktika\M6\emensamobile\app\Models\Anmeldung" />
@@ -116,7 +112,8 @@
<workItem from="1705492444098" duration="553000" />
<workItem from="1705493014644" duration="21207000" />
<workItem from="1705627589042" duration="2719000" />
<workItem from="1705630465063" duration="10294000" />
<workItem from="1705630465063" duration="13412000" />
<workItem from="1706091740788" duration="2624000" />
</task>
<task id="LOCAL-00001" summary="Webseite ohne Anmeldung läuft auf laravel">
<option name="closed" value="true" />
@@ -174,7 +171,31 @@
<option name="project" value="LOCAL" />
<updated>1705675225498</updated>
</task>
<option name="localTasksCounter" value="8" />
<task id="LOCAL-00008" summary="Alles bis auf paar sachen">
<option name="closed" value="true" />
<created>1705679416721</created>
<option name="number" value="00008" />
<option name="presentableId" value="LOCAL-00008" />
<option name="project" value="LOCAL" />
<updated>1705679416721</updated>
</task>
<task id="LOCAL-00009" summary="Alles bis auf paar sachen">
<option name="closed" value="true" />
<created>1705682140622</created>
<option name="number" value="00009" />
<option name="presentableId" value="LOCAL-00009" />
<option name="project" value="LOCAL" />
<updated>1705682140622</updated>
</task>
<task id="LOCAL-00010" summary="Alles">
<option name="closed" value="true" />
<created>1705683562748</created>
<option name="number" value="00010" />
<option name="presentableId" value="LOCAL-00010" />
<option name="project" value="LOCAL" />
<updated>1705683562748</updated>
</task>
<option name="localTasksCounter" value="11" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -187,6 +208,8 @@
<MESSAGE value="Aufgabe 1 ca 80%" />
<MESSAGE value="Aufgabe 1" />
<MESSAGE value="Bewertungs model" />
<option name="LAST_COMMIT_MESSAGE" value="Bewertungs model" />
<MESSAGE value="Alles bis auf paar sachen" />
<MESSAGE value="Alles" />
<option name="LAST_COMMIT_MESSAGE" value="Alles" />
</component>
</project>

114
M6/Dossier/ED 1 a).drawio Normal file
View File

@@ -0,0 +1,114 @@
<mxfile host="app.diagrams.net" modified="2024-01-17T16:40:46.603Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:121.0) Gecko/20100101 Firefox/121.0" etag="yOiPrTY5I7Bd3XpJF8Jn" version="22.1.21" type="device">
<diagram name="Seite-1" id="uZLJn0IZBSqR1Bpxcyc-">
<mxGraphModel dx="988" dy="540" 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="CqnDATPZ74Ucb4dWbnLU-7" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="CqnDATPZ74Ucb4dWbnLU-2" target="CqnDATPZ74Ucb4dWbnLU-4">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="CqnDATPZ74Ucb4dWbnLU-23" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="1" source="CqnDATPZ74Ucb4dWbnLU-2" target="CqnDATPZ74Ucb4dWbnLU-17">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="CqnDATPZ74Ucb4dWbnLU-32" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="CqnDATPZ74Ucb4dWbnLU-2" target="CqnDATPZ74Ucb4dWbnLU-31">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="CqnDATPZ74Ucb4dWbnLU-2" value="Benutzer" style="whiteSpace=wrap;html=1;align=center;" vertex="1" parent="1">
<mxGeometry x="150" y="530" width="100" height="40" as="geometry" />
</mxCell>
<mxCell id="CqnDATPZ74Ucb4dWbnLU-8" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="CqnDATPZ74Ucb4dWbnLU-4" target="CqnDATPZ74Ucb4dWbnLU-5">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="CqnDATPZ74Ucb4dWbnLU-4" value="erstellt" style="shape=rhombus;perimeter=rhombusPerimeter;whiteSpace=wrap;html=1;align=center;" vertex="1" parent="1">
<mxGeometry x="360" y="520" width="120" height="60" as="geometry" />
</mxCell>
<mxCell id="CqnDATPZ74Ucb4dWbnLU-19" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="CqnDATPZ74Ucb4dWbnLU-5" target="CqnDATPZ74Ucb4dWbnLU-18">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="CqnDATPZ74Ucb4dWbnLU-21" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="1" source="CqnDATPZ74Ucb4dWbnLU-5" target="CqnDATPZ74Ucb4dWbnLU-13">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="CqnDATPZ74Ucb4dWbnLU-22" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="1" source="CqnDATPZ74Ucb4dWbnLU-5" target="CqnDATPZ74Ucb4dWbnLU-15">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="CqnDATPZ74Ucb4dWbnLU-28" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="CqnDATPZ74Ucb4dWbnLU-5" target="CqnDATPZ74Ucb4dWbnLU-27">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="CqnDATPZ74Ucb4dWbnLU-29" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="CqnDATPZ74Ucb4dWbnLU-5" target="CqnDATPZ74Ucb4dWbnLU-25">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="CqnDATPZ74Ucb4dWbnLU-30" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="CqnDATPZ74Ucb4dWbnLU-5" target="CqnDATPZ74Ucb4dWbnLU-26">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="CqnDATPZ74Ucb4dWbnLU-39" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="CqnDATPZ74Ucb4dWbnLU-5" target="CqnDATPZ74Ucb4dWbnLU-38">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="CqnDATPZ74Ucb4dWbnLU-5" value="Bewertung" style="whiteSpace=wrap;html=1;align=center;" vertex="1" parent="1">
<mxGeometry x="590" y="530" width="100" height="40" as="geometry" />
</mxCell>
<mxCell id="CqnDATPZ74Ucb4dWbnLU-9" value="" style="endArrow=none;html=1;rounded=0;" edge="1" parent="1">
<mxGeometry relative="1" as="geometry">
<mxPoint x="500" y="550" as="sourcePoint" />
<mxPoint x="590" y="549.5" as="targetPoint" />
</mxGeometry>
</mxCell>
<mxCell id="CqnDATPZ74Ucb4dWbnLU-10" value="N" style="resizable=0;html=1;whiteSpace=wrap;align=right;verticalAlign=bottom;" connectable="0" vertex="1" parent="CqnDATPZ74Ucb4dWbnLU-9">
<mxGeometry x="1" relative="1" as="geometry" />
</mxCell>
<mxCell id="CqnDATPZ74Ucb4dWbnLU-11" value="" style="endArrow=none;html=1;rounded=0;" edge="1" parent="1">
<mxGeometry relative="1" as="geometry">
<mxPoint x="340" y="549.76" as="sourcePoint" />
<mxPoint x="260" y="549.76" as="targetPoint" />
<Array as="points">
<mxPoint x="320" y="549.76" />
</Array>
</mxGeometry>
</mxCell>
<mxCell id="CqnDATPZ74Ucb4dWbnLU-12" value="1" style="resizable=0;html=1;whiteSpace=wrap;align=right;verticalAlign=bottom;" connectable="0" vertex="1" parent="CqnDATPZ74Ucb4dWbnLU-11">
<mxGeometry x="1" relative="1" as="geometry" />
</mxCell>
<mxCell id="CqnDATPZ74Ucb4dWbnLU-13" value="Sterne" style="ellipse;whiteSpace=wrap;html=1;align=center;" vertex="1" parent="1">
<mxGeometry x="630" y="420" width="100" height="40" as="geometry" />
</mxCell>
<mxCell id="CqnDATPZ74Ucb4dWbnLU-15" value="&lt;div&gt;Erstellungs&lt;/div&gt;&lt;div&gt;zeitpunkt&lt;/div&gt;" style="ellipse;whiteSpace=wrap;html=1;align=center;" vertex="1" parent="1">
<mxGeometry x="500" y="420" width="100" height="40" as="geometry" />
</mxCell>
<mxCell id="CqnDATPZ74Ucb4dWbnLU-17" value="Benutzer ID" style="ellipse;whiteSpace=wrap;html=1;align=center;fontStyle=4;" vertex="1" parent="1">
<mxGeometry x="150" y="440" width="100" height="40" as="geometry" />
</mxCell>
<mxCell id="CqnDATPZ74Ucb4dWbnLU-18" value="Hervorgehoben" style="ellipse;whiteSpace=wrap;html=1;align=center;" vertex="1" parent="1">
<mxGeometry x="690" y="610" width="100" height="40" as="geometry" />
</mxCell>
<mxCell id="CqnDATPZ74Ucb4dWbnLU-25" value="&lt;div&gt;Gericht ID&lt;/div&gt;" style="ellipse;whiteSpace=wrap;html=1;align=center;" vertex="1" parent="1">
<mxGeometry x="500" y="610" width="100" height="40" as="geometry" />
</mxCell>
<mxCell id="CqnDATPZ74Ucb4dWbnLU-26" value="Benutzer ID" style="ellipse;whiteSpace=wrap;html=1;align=center;" vertex="1" parent="1">
<mxGeometry x="727" y="530" width="100" height="40" as="geometry" />
</mxCell>
<mxCell id="CqnDATPZ74Ucb4dWbnLU-27" value="Bemerkung" style="ellipse;whiteSpace=wrap;html=1;align=center;" vertex="1" parent="1">
<mxGeometry x="600" y="670" width="100" height="40" as="geometry" />
</mxCell>
<mxCell id="CqnDATPZ74Ucb4dWbnLU-33" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="CqnDATPZ74Ucb4dWbnLU-31">
<mxGeometry relative="1" as="geometry">
<mxPoint x="480" y="790" as="targetPoint" />
<Array as="points">
<mxPoint x="200" y="790" />
</Array>
</mxGeometry>
</mxCell>
<mxCell id="CqnDATPZ74Ucb4dWbnLU-31" value="admin" style="ellipse;whiteSpace=wrap;html=1;align=center;" vertex="1" parent="1">
<mxGeometry x="150" y="620" width="100" height="40" as="geometry" />
</mxCell>
<mxCell id="CqnDATPZ74Ucb4dWbnLU-36" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="1" source="CqnDATPZ74Ucb4dWbnLU-35" target="CqnDATPZ74Ucb4dWbnLU-18">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="CqnDATPZ74Ucb4dWbnLU-35" value="hervorheben" style="shape=rhombus;perimeter=rhombusPerimeter;whiteSpace=wrap;html=1;align=center;" vertex="1" parent="1">
<mxGeometry x="480" y="760" width="120" height="60" as="geometry" />
</mxCell>
<mxCell id="CqnDATPZ74Ucb4dWbnLU-38" value="Bewertungs ID" style="ellipse;whiteSpace=wrap;html=1;align=center;fontStyle=4;" vertex="1" parent="1">
<mxGeometry x="727" y="470" width="100" height="40" as="geometry" />
</mxCell>
</root>
</mxGraphModel>
</diagram>
</mxfile>

Binary file not shown.

After

Width:  |  Height:  |  Size: 44 KiB

View File

@@ -13,7 +13,11 @@ class bewertungen extends Model
use HasFactory;
function bewerten(int $ersteller, int $gericht, int $sterne, string $bemerkung){
$sql = "INSERT INTO bewertungen (ersteller_id,gericht_id,bemerkung,sterne,hervorgehoben) VALUES (".$ersteller. ",". $gericht.",\"". $bemerkung."\",".$sterne.",0);";
if($ersteller != session("benutzerid",0)||$sterne <0||$sterne>4||strlen($bemerkung)<4||strlen($bemerkung)>100){
return 0;
}
$sql = "INSERT INTO bewertungen (ersteller_id,gericht_id,bemerkung,sterne,hervorgehoben) VALUES (".mysqli_real_escape_string($ersteller). ",". mysqli_real_escape_string($gericht).",\"". mysqli_real_escape_string($bemerkung)."\",".mysqli_real_escape_string($sterne).",0);";
DB::insert($sql);

View File

@@ -2,6 +2,36 @@
font-family: Arial;
}
@media screen and (max-width: 600px) {
.bewertungen_mobile::after {
content: '\A' !important;
white-space: pre !important;
}
body{
background-color: #0a3622;
}
#form{
content: '\A';
white-space: pre;
}
#sterne{
content: '\A';
white-space: pre;
}
.grid {
display: grid;
grid-template-columns: auto auto auto !important;
}
.grid_bewertung {
display: grid;
grid-template-columns: 1fr!important;
}
}
.grid {
display: grid;
grid-template-columns: 200px auto 200px;
@@ -10,7 +40,7 @@
.grid_bewertung {
display: grid;
grid-template-columns: 200px 300px auto 200px;
grid-template-columns: repeat(4, 1fr);
}
img {
@@ -107,4 +137,11 @@ footer {
height: 300px;
}
.bewertung_hervorgehoben{
border-color: black;
border-width: 1px;
border-style: solid;
}

View File

@@ -54,20 +54,20 @@
?>
<div class="grid_bewertung">
<div>
<div class="leer">
</div>
<div>
<div class="image">
<img class="bewertung" src="{{$bildname}}" alt="Bild vom Gericht" width= "10" height="10">
</div>
<div>
<h1>{{$gericht->name}}</h1>
<form action="/bewertung_abschicken" method="post">
<div class="bewertungen_mobile">
<form id ="form" action="/bewertung_abschicken" method="post">
@method("post")
@csrf <!-- {{ csrf_field() }} -->
<label for="sterne">Sterne 1-4</label>
<label id="label1" for="sterne">Sterne 1-4</label>
<input id="sterne" name="sterne" type="number" placeholder="1-4" required maxlength="4">
<label for="Bemerkung">Bemerkung</label>
@@ -77,8 +77,9 @@
<button type="submit" >Bewerten</button>
</form>
</div>
</div>
<div>
<div class = leer>
</div>
</div>
@@ -95,7 +96,13 @@
$bewertungs_id = $row[3];
$hervorgehoben = $row[4];
$echo = "<h1>".$name."</h1> Sterne: ". $bewertungen." Bemerkung: ".$bemerkung;
$echo = "";
if($hervorgehoben){
$echo = "<div class=\"bewertung_hervorgehoben\"> ";
}
$echo .= "<h1>".$name."</h1> Sterne: ". $bewertungen." Bemerkung: ".$bemerkung;
if($admin){
if($hervorgehoben){
@@ -105,6 +112,10 @@
}
}
if($hervorgehoben){
$echo .= "</div>";
}
echo $echo;
}
?>

View File

@@ -118,6 +118,8 @@
@endsection
@section("bewertungen")
<h1>Meinungen unserer Gäste</h1>
@if(isset($bewertungen))
<?php
@@ -126,7 +128,7 @@
$bewertungen = $row[1];
$bemerkung = $row[2];
$echo = "<h1>".$name."</h1> Sterne: ". $bewertungen." Bemerkung: ".$bemerkung;
$echo = "<h3>".$name."</h3> Sterne: ". $bewertungen." Bemerkung: ".$bemerkung;