vict3459
/
Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anders 2020-06-29 08:34:49 +02:00
parent 8987db9d31 4061b590cb
commit 0c3d6dab25
6 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
skolehjem/app/Http/Controllers/MenuPlanController.php
View File

@ -75,8 +75,8 @@ class MenuPlanController extends Controller
*/ */
public function edit($id) public function edit($id)
{ {
$editLink = MenuPlan::find($id); $menuplan = MenuPlan::find($id);
return Response::detect("menuplans.edit", ["menuPlans" => $editLink]); return Response::detect("menuplans.edit", ["menuplan" => $menuplan]);
} }
/** /**
@ -88,15 +88,14 @@ class MenuPlanController extends Controller
*/ */
public function update(Request $request, $id) public function update(Request $request, $id)
{ {
$data = $request->validate([ $data = $request->all();
"name" => "",
"link" => ""
]);
$id->update($data);
$id->save();
return Response::detect("menuplans.update"); $menuplan = MenuPlan::find($id);
$menuplan->update($data);
$menuplan->save();
return Response::detect("menuplans.update", [ "menuplan" => $menuplan ]);
} }
/** /**
@ -107,7 +106,8 @@ class MenuPlanController extends Controller
*/ */
public function destroy($id) public function destroy($id)
{ {
$id->delete(); $menuplan = MenuPlan::find($id);
return Response::detect("menuplans.destroy"); $menuplan->delete();
return redirect()->route("menu-plans.index");
} }
} }

2
skolehjem/resources/views/admin/external-links/edit.blade.php
View File

@ -11,7 +11,7 @@
@section("content") @section("content")
<h1>Rediger Link:</h1> <h1>Rediger Link:</h1>
<form method="post" action="{{ route("external-links.update", ['name' => $link->name]) }}"> <form method="post" action="{{ route("external-links.edit", ['external_link' => $link]) }}">
@csrf @csrf
<label for="title">Titel:</label> <label for="title">Titel:</label>
<input type="text" name="title" id="title" required> <input type="text" name="title" id="title" required>

4
skolehjem/resources/views/admin/external-links/index.blade.php
View File

@ -19,8 +19,8 @@
</tr> </tr>
@foreach($links as $link) @foreach($links as $link)
<tr> <tr>
<th>{Titel}</th> <th>{{$link->name}}</th>
<th>{Link}</th> <th><a href="{{$link->link}}">{{$link->link}}</th>
<td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td> <td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
<td><a href=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td> <td><a href=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
</tr> </tr>

20
skolehjem/resources/views/admin/menuplans/edit.blade.php
View File

@ -6,26 +6,28 @@
@endsection @endsection
@section("path") @section("path")
<a href="{{ route('menu-plans.edit') }}" class="text-white">Rediger Menuplan</a> / <a href="{{ route('menu-plans.edit', [ "menu_plan" => $menuplan ]) }}" class="text-white">Rediger Menuplan</a> /
@endsection @endsection
@section("content") @section("content")
<h1>Rediger Menuplan:</h1> <h1>Rediger Menuplan:</h1>
<form method="post" action=""> <form method="post" action="{{ route("menu-plans.update", [ "menu_plan" => $menuplan ]) }}">
@csrf
@method("PUT")
<label for="mandag">Mandag:</label> <label for="mandag">Mandag:</label>
<input type="text" name="mandag" id="mandag" value="{Mandag}" required> <input type="text" name="mandag" id="mandag" value="{{ $menuplan->monday }}" required>
<label for="tirsdag">Tirsdag:</label> <label for="tirsdag">Tirsdag:</label>
<input type="text" name="tirsdag" id="tirsdag" value="{Tirsdag}" required> <input type="text" name="tirsdag" id="tirsdag" value="{{ $menuplan->tuesday }}" required>
<label for="onsdag">Onsdag:</label> <label for="onsdag">Onsdag:</label>
<input type="text" name="onsdag" id="onsdag" value="{Onsdag}" required> <input type="text" name="onsdag" id="onsdag" value="{{ $menuplan->wednesday }}" required>
<label for="torsdag">Torsdag:</label> <label for="torsdag">Torsdag:</label>
<input type="text" name="torsdag" id="torsdag" value="{Torsdag}" required> <input type="text" name="torsdag" id="torsdag" value="{{ $menuplan->thursday }}" required>
<label for="fredag">Fredag:</label> <label for="fredag">Fredag:</label>
<input type="text" name="fredag" id="fredag" value="{Fredag}" required> <input type="text" name="fredag" id="fredag" value="{{ $menuplan->friday }}" required>
<label for="lørdag">Lørdag:</label> <label for="lørdag">Lørdag:</label>
<input type="text" name="lørdag" id="lørdag" value="{Lørdag}" required> <input type="text" name="lørdag" id="lørdag" value="{{ $menuplan->saturday }}" required>
<label for="søndag">Søndag:</label> <label for="søndag">Søndag:</label>
<input type="text" name="søndag" id="søndag" value="{Søndag}" required> <input type="text" name="søndag" id="søndag" value="{{ $menuplan->sunday }}" required>
<input type="submit" class="btn btn-dark text-white" value="Opret Menuplan"> <input type="submit" class="btn btn-dark text-white" value="Opret Menuplan">
</form> </form>

4
skolehjem/resources/views/admin/menuplans/index.blade.php
View File

@ -31,8 +31,8 @@
<td>{{$menuplan->friday}}</td> <td>{{$menuplan->friday}}</td>
<td>{{$menuplan->saturday}}</td> <td>{{$menuplan->saturday}}</td>
<td>{{$menuplan->sunday}}</td> <td>{{$menuplan->sunday}}</td>
<td><a href="{{route('menu-plans.edit', $menuplan->id)}}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td> <td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
<td><a href=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td> <td><a href="{{ route("menu-plans.destroy", [ "menu_plan" => $menuplan ]) }}"><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
</tr> </tr>
@endforeach @endforeach
</table> </table>

4
skolehjem/resources/views/admin/menuplans/update.blade.php
View File

@ -6,9 +6,9 @@
@endsection @endsection
@section("path") @section("path")
<a href="{{ route('menu-plans.edit') }}" class="text-white">Rediger Menuplan</a> / <a href="{{ route('menu-plans.edit', [ "menu_plan" => $menuplan ]) }}" class="text-white">Rediger Menuplan</a> /
@endsection @endsection
@section("content") @section("content")
Din menuplan blev (ikke) redigeret. Din menuplan blev redigeret.
@endsection @endsection