diff --git a/skolehjem/app/Http/Controllers/MultipleEventsController.php b/skolehjem/app/Http/Controllers/MultipleEventsController.php index fa72e0d..aa91e37 100644 --- a/skolehjem/app/Http/Controllers/MultipleEventsController.php +++ b/skolehjem/app/Http/Controllers/MultipleEventsController.php @@ -129,9 +129,11 @@ class MultipleEventsController extends Controller * @param \App\MultipleEvents $multipleeventsController * @return \Illuminate\Http\Response */ - public function edit(MultipleeventsController $multipleeventsController) + public function edit(MultipleeventsController $id) { - // + dd("asd"); + $multiEvent = MultipleEvents::find($id); + return Response::detect("multiple-events.edit", ["multiEvent" => $multiEvent]); } /** @@ -209,8 +211,8 @@ class MultipleEventsController extends Controller public function genPDF($Id){ + dd("Ka"); $multiEvent = MultipleEventsParent::query()->join("multiple_events", "multiple_events.multiple_events_parent_id", "=", "multiple_events_parent.id")->where("id", "=", $Id)->first(); - $var = 149; $multiEvent->name = substr($multiEvent->name, 0, $var); @@ -219,7 +221,7 @@ class MultipleEventsController extends Controller $multiEvent->date = substr($multiEvent->date, 0, $var); $multiEvent->event_end = substr($multiEvent->event_end, 0, $var); - $pdf = PDF::loadView('pdf.multipleevent', ["multiEvent" => $multiEvent]); + $pdf = PDF::loadView('multipdf.multipleevent', ["multiEvent" => $multiEvent]); $pdf->setPaper('A4', 'portrait'); diff --git a/skolehjem/resources/views/admin/events/index.blade.php b/skolehjem/resources/views/admin/events/index.blade.php index 4c3d17a..8de8da4 100644 --- a/skolehjem/resources/views/admin/events/index.blade.php +++ b/skolehjem/resources/views/admin/events/index.blade.php @@ -86,8 +86,8 @@ {{ $event->week}} preview @if(auth()->user()->can('event.edit')) - $event ]) }}" target="_blank">Print - Update + $event->id ]) }}" target="_blank">Print + $event->id ]) }}">Update @endif @if(auth()->user()->can('event.delete')) diff --git a/skolehjem/resources/views/admin/multiple-events/create.blade.php b/skolehjem/resources/views/admin/multiple-events/create.blade.php index 7534ef0..6e56cac 100644 --- a/skolehjem/resources/views/admin/multiple-events/create.blade.php +++ b/skolehjem/resources/views/admin/multiple-events/create.blade.php @@ -6,7 +6,7 @@ @endsection @section("path") - Opret ugentligt aktivitet / + Opret ugentligt aktivitet / @endsection @section("content") diff --git a/skolehjem/resources/views/admin/multiple-events/edit.blade.php b/skolehjem/resources/views/admin/multiple-events/edit.blade.php index 0d30e4f..41fafa8 100644 --- a/skolehjem/resources/views/admin/multiple-events/edit.blade.php +++ b/skolehjem/resources/views/admin/multiple-events/edit.blade.php @@ -2,11 +2,11 @@ @extends("admin.layout.header") @section("title") - Aktivitet - Rediger + Rediger ugentligt aktivitet - Vis @endsection @section("path") - $event])}}" class="text-white">Rediger Aktivitet / + Opret ugentligt aktivitet / @endsection @section("content") @@ -18,64 +18,75 @@ border-color: black; } - #editor { - margin-bottom: 1rem; + table { + font-family: arial, sans-serif; + border-collapse: collapse; + width: 100%; } + + td, th { + + text-align: left; + padding: 8px; + } + + -

Rediger Aktivitet:

-
$event])}}" enctype="multipart/form-data"> +

Opret ugentligt aktivitet: [Vi er i uge ]

+ + @csrf - @method("PUT") - - - - - - - For at kunne indsætte et link, skal du markere den text du vil lave som et link først. -
{!! $event->description !!}
- - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
UgedagAktivitets navnAktivitets beskrivelseTovholderTidsrum (Start)
Mandag
Tirsdag
Onsdag
Torsdag
+ - -
- - - + + @endsection @section("scripts")