Aufgabe 1
This commit is contained in:
28
.idea/workspace.xml
generated
28
.idea/workspace.xml
generated
@@ -4,18 +4,12 @@
|
|||||||
<option name="autoReloadType" value="SELECTIVE" />
|
<option name="autoReloadType" value="SELECTIVE" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="6dcbe3e4-9d68-41d8-8c39-5cfbe5cd4a21" name="Changes" comment="Abmeldung gefixt">
|
<list default="true" id="6dcbe3e4-9d68-41d8-8c39-5cfbe5cd4a21" name="Changes" comment="Aufgabe 1 ca 80%">
|
||||||
<change afterPath="$PROJECT_DIR$/M6/emensamobile/resources/views/main/bewertung.blade.php" afterDir="false" />
|
<change afterPath="$PROJECT_DIR$/M6/Dossier/m6_1.sql" 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 afterPath="$PROJECT_DIR$/M6/emensamobile/resources/views/main/meine_bewertungen.blade.php" 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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/M6/emensamobile/app/Http/Controllers/AnmeldungController.php" beforeDir="false" afterPath="$PROJECT_DIR$/M6/emensamobile/app/Http/Controllers/AnmeldungController.php" 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/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/Gerichte.php" beforeDir="false" afterPath="$PROJECT_DIR$/M6/emensamobile/app/Models/Gerichte.php" 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/app/Models/benutzer.php" beforeDir="false" afterPath="$PROJECT_DIR$/M6/emensamobile/app/Models/benutzer.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/m5_a1/anmeldung_verifizieren.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/M6/emensamobile/resources/views/m5_a1/anmeldung_verifizieren.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" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/M6/emensamobile/routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/M6/emensamobile/routes/web.php" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/M6/emensamobile/routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/M6/emensamobile/routes/web.php" afterDir="false" />
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
@@ -121,6 +115,7 @@
|
|||||||
<workItem from="1705492444098" duration="553000" />
|
<workItem from="1705492444098" duration="553000" />
|
||||||
<workItem from="1705493014644" duration="21207000" />
|
<workItem from="1705493014644" duration="21207000" />
|
||||||
<workItem from="1705627589042" duration="2719000" />
|
<workItem from="1705627589042" duration="2719000" />
|
||||||
|
<workItem from="1705630465063" duration="4764000" />
|
||||||
</task>
|
</task>
|
||||||
<task id="LOCAL-00001" summary="Webseite ohne Anmeldung läuft auf laravel">
|
<task id="LOCAL-00001" summary="Webseite ohne Anmeldung läuft auf laravel">
|
||||||
<option name="closed" value="true" />
|
<option name="closed" value="true" />
|
||||||
@@ -154,7 +149,15 @@
|
|||||||
<option name="project" value="LOCAL" />
|
<option name="project" value="LOCAL" />
|
||||||
<updated>1705501770457</updated>
|
<updated>1705501770457</updated>
|
||||||
</task>
|
</task>
|
||||||
<option name="localTasksCounter" value="5" />
|
<task id="LOCAL-00005" summary="Aufgabe 1 ca 80%">
|
||||||
|
<option name="closed" value="true" />
|
||||||
|
<created>1705630515269</created>
|
||||||
|
<option name="number" value="00005" />
|
||||||
|
<option name="presentableId" value="LOCAL-00005" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1705630515269</updated>
|
||||||
|
</task>
|
||||||
|
<option name="localTasksCounter" value="6" />
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="TypeScriptGeneratedFilesManager">
|
<component name="TypeScriptGeneratedFilesManager">
|
||||||
@@ -164,6 +167,7 @@
|
|||||||
<MESSAGE value="Webseite ohne Anmeldung läuft auf laravel" />
|
<MESSAGE value="Webseite ohne Anmeldung läuft auf laravel" />
|
||||||
<MESSAGE value="Anmeldung läuft" />
|
<MESSAGE value="Anmeldung läuft" />
|
||||||
<MESSAGE value="Abmeldung gefixt" />
|
<MESSAGE value="Abmeldung gefixt" />
|
||||||
<option name="LAST_COMMIT_MESSAGE" value="Abmeldung gefixt" />
|
<MESSAGE value="Aufgabe 1 ca 80%" />
|
||||||
|
<option name="LAST_COMMIT_MESSAGE" value="Aufgabe 1 ca 80%" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
13
M6/Dossier/m6_1.sql
Normal file
13
M6/Dossier/m6_1.sql
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
CREATE OR REPLACE TABLE Bewertungen(
|
||||||
|
id int8 AUTO_INCREMENT PRIMARY KEY,
|
||||||
|
ersteller_id int8,
|
||||||
|
gericht_id int8,
|
||||||
|
erstellungsdatum DATE NOT NULL default (now()),
|
||||||
|
bemerkung TEXT,
|
||||||
|
sterne INT,
|
||||||
|
hervorgehoben BOOL,
|
||||||
|
CONSTRAINT ersteller_id
|
||||||
|
FOREIGN KEY (ersteller_id) REFERENCES benutzer(id) ON UPDATE CASCADE,
|
||||||
|
CONSTRAINT gericht_id
|
||||||
|
FOREIGN KEY (gericht_id) REFERENCES gericht(id) ON UPDATE CASCADE
|
||||||
|
);
|
||||||
@@ -41,21 +41,26 @@ class MainController extends BaseController
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if($rd->isMethod("get")){
|
if($rd->isMethod("get")) {
|
||||||
$data = $rd;
|
$data = $rd;
|
||||||
|
|
||||||
$gericht = new Gerichte();
|
if ($data["gerichtid"] != null) {
|
||||||
$g = $gericht->db_gericht_bewertung($data["gerichtid"]);
|
|
||||||
|
|
||||||
return view('main.bewertung', [
|
$gericht = new Gerichte();
|
||||||
"gericht" => $g,
|
$g = $gericht->db_gericht_bewertung($data["gerichtid"]);
|
||||||
"data" => $data,
|
|
||||||
'url' => 'http' . (isset($_SERVER['HTTPS']) ? 's' : '') . '://' . "{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}"
|
return view('main.bewertung', [
|
||||||
]);
|
"gericht" => $g,
|
||||||
|
"data" => $data,
|
||||||
|
'url' => 'http' . (isset($_SERVER['HTTPS']) ? 's' : '') . '://' . "{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}"
|
||||||
|
]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
$b = new bewertungen();
|
||||||
|
$bewertungen = $b->bewertungen();
|
||||||
|
|
||||||
return view('main.bewertung', [
|
return view('main.bewertung', [
|
||||||
|
"bewertungen" => $bewertungen,
|
||||||
'url' => 'http' . (isset($_SERVER['HTTPS']) ? 's' : '') . '://' . "{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}"
|
'url' => 'http' . (isset($_SERVER['HTTPS']) ? 's' : '') . '://' . "{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}"
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
@@ -74,8 +79,47 @@ class MainController extends BaseController
|
|||||||
$b = new bewertungen();
|
$b = new bewertungen();
|
||||||
$check = $b->bewerten($benutzer,$id,$sterne, $bemerkung);
|
$check = $b->bewerten($benutzer,$id,$sterne, $bemerkung);
|
||||||
|
|
||||||
|
$bewertungen = $b->bewertungen();
|
||||||
|
|
||||||
return view('main.bewertung', [
|
return view('main.bewertung', [
|
||||||
'url' => 'http' . (isset($_SERVER['HTTPS']) ? 's' : '') . '://' . "{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}"
|
"bewertungen" => $bewertungen,
|
||||||
|
'url' => 'http' . (isset($_SERVER['HTTPS']) ? 's' : '') . '://' . "{$_SERVER['HTTP_HOST']}./bewertungen"
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function meinebewertungen(Request $rd){
|
||||||
|
if(session("start",0)== 0){
|
||||||
|
session(["bewertung" => 1]);
|
||||||
|
return view('m5_a1.anmeldung', [
|
||||||
|
'url' => 'http' . (isset($_SERVER['HTTPS']) ? 's' : '') . '://' . "{$_SERVER['HTTP_HOST']}"
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$benutzer_id = session("benutzer_id",0);
|
||||||
|
if($benutzer_id == 0){
|
||||||
|
return view('main.index', [
|
||||||
|
'url' => 'http' . (isset($_SERVER['HTTPS']) ? 's' : '') . '://' . "{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}"
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$b = new bewertungen();
|
||||||
|
|
||||||
|
if($rd->isMethod("get")) {
|
||||||
|
$data = $rd;
|
||||||
|
|
||||||
|
if ($data["loschen"] != null) {
|
||||||
|
$check = $b->loschen($data["loschen"]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
$meine = $b->meine_bewertungen($benutzer_id);
|
||||||
|
|
||||||
|
return view('main.meine_bewertungen', [
|
||||||
|
"check" => $check,
|
||||||
|
"meine_bewertungen" => $meine,
|
||||||
|
'url' => 'http' . (isset($_SERVER['HTTPS']) ? 's' : '') . '://' . "{$_SERVER['HTTP_HOST']}./bewertungen"
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,11 +11,11 @@
|
|||||||
<img src="/img/fh-logo.jpg" alt="FH-Logo">
|
<img src="/img/fh-logo.jpg" alt="FH-Logo">
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<a href="#ankündigung">Ankündigung</a>
|
<a href="\#ankündigung">Ankündigung</a>
|
||||||
<a href="#speisen">Speisen</a>
|
<a href="\#speisen">Speisen</a>
|
||||||
<a href="#zahlen">Zahlen</a>
|
<a href="\#zahlen">Zahlen</a>
|
||||||
<a href="#kontakt">Kontakt</a>
|
<a href="\#kontakt">Kontakt</a>
|
||||||
<a href="#wichtig">Wichtig für uns</a>
|
<a href="\#wichtig">Wichtig für uns</a>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
@@ -83,8 +83,18 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
@else
|
@elseif(isset($bewertungen))
|
||||||
|
<?php
|
||||||
|
|
||||||
|
foreach ($bewertungen as $row){
|
||||||
|
$name = $row[0][0]->name;
|
||||||
|
$bewertungen = $row[1];
|
||||||
|
$bemerkung = $row[2];
|
||||||
|
|
||||||
|
echo "<h1>".$name."</h1> Sterne: ". $bewertungen." Bemerkung: ".$bemerkung;
|
||||||
|
}
|
||||||
|
|
||||||
|
?>
|
||||||
|
|
||||||
|
|
||||||
@endif
|
@endif
|
||||||
|
|||||||
@@ -0,0 +1,76 @@
|
|||||||
|
@extends("layouts.main_layout", ['title' => "E-Mensa"])
|
||||||
|
<?php use Illuminate\Support\Facades\Session; ?>
|
||||||
|
|
||||||
|
@section("header")
|
||||||
|
<link rel="stylesheet" href="/css/style.css">
|
||||||
|
@endsection
|
||||||
|
|
||||||
|
@section("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>
|
||||||
|
|
||||||
|
@if(session("start",0)== 0)
|
||||||
|
<a href="/anmeldung">Anmelden</a>
|
||||||
|
@else
|
||||||
|
Angemeldet als:<br>
|
||||||
|
<div>{{ session("name")}}</div>
|
||||||
|
<a href="/abmeldung">Abmelden</a>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@endsection
|
||||||
|
|
||||||
|
@section("text")
|
||||||
|
|
||||||
|
@if(isset($meine_bewertungen))
|
||||||
|
<?php
|
||||||
|
|
||||||
|
foreach ($meine_bewertungen as $row){
|
||||||
|
$name = $row[0][0]->name;
|
||||||
|
$bewertungen = $row[1];
|
||||||
|
$bemerkung = $row[2];
|
||||||
|
$bewertungs_id = $row[3];
|
||||||
|
|
||||||
|
echo "<h1>".$name."</h1> Sterne: ". $bewertungen." Bemerkung: ".$bemerkung." <a href=\"/meinebewertungen?loschen=".$bewertungs_id."\">Löschen</a>";
|
||||||
|
}
|
||||||
|
|
||||||
|
?>
|
||||||
|
|
||||||
|
|
||||||
|
@endif
|
||||||
|
@if(isset($check))
|
||||||
|
<?php
|
||||||
|
echo $check;
|
||||||
|
?>
|
||||||
|
|
||||||
|
|
||||||
|
@endif
|
||||||
|
|
||||||
|
@endsection
|
||||||
|
|
||||||
|
@section("gerichte")
|
||||||
|
|
||||||
|
|
||||||
|
@endsection
|
||||||
|
|
||||||
|
@section("footer")
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<td>(c) E-Mensa GmbH</td>
|
||||||
|
<td>Şafak Hazinedar & Robert Joel</td>
|
||||||
|
<td><a href="">Impressum</a></td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
@endsection
|
||||||
@@ -19,6 +19,7 @@ use Illuminate\Http\Request;
|
|||||||
Route::get('/', [MainController::class, 'index' ]);
|
Route::get('/', [MainController::class, 'index' ]);
|
||||||
Route::get('/bewertung', [MainController::class, 'bewertung' ]);
|
Route::get('/bewertung', [MainController::class, 'bewertung' ]);
|
||||||
Route::post("/bewertung_abschicken",[MainController::class, 'bewertung_abschicken' ]);
|
Route::post("/bewertung_abschicken",[MainController::class, 'bewertung_abschicken' ]);
|
||||||
|
Route::get("/meinebewertungen",[MainController::class, "meinebewertungen"]);
|
||||||
|
|
||||||
//Anmeldungs Controller
|
//Anmeldungs Controller
|
||||||
Route::get('/anmeldung', [AnmeldungController::class, 'start']);
|
Route::get('/anmeldung', [AnmeldungController::class, 'start']);
|
||||||
|
|||||||
Reference in New Issue
Block a user