diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index 1227237..9ea766d 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -172,6 +172,7 @@ class EventController extends Controller */ public function update(Request $request, $id) { + $data = $request->all(); $event = Event::find($id); @@ -182,6 +183,11 @@ class EventController extends Controller return redirect()->route("events.index", ['events' => $event]); }else{ $event->update($data); + + if($request->file("resource")) { + $event->resource_id = ResourceController::store($request)->id; + } + $event->save(); $events = Event::query()->get(); @@ -196,9 +202,6 @@ class EventController extends Controller $news->resource_id = $event->resource_id; $news->content = "

" . $this->closetags(substr($event->description, 0, 300)); - if($request->file("resource")) { - $event->resource_id = ResourceController::store($request)->id; - } NewsController::storeAndGet($news); diff --git a/skolehjem/app/Http/Controllers/GuideController.php b/skolehjem/app/Http/Controllers/GuideController.php index 2a950ae..2366361 100644 --- a/skolehjem/app/Http/Controllers/GuideController.php +++ b/skolehjem/app/Http/Controllers/GuideController.php @@ -126,14 +126,16 @@ class GuideController extends Controller */ public function update(Request $request, Guide $guide) { - $data = $request->validate([ - "name" => "required|max:255", - "guide_articles" => "required", - "guide_category_id" => "required", - ]); + $data = $request->all(); $guidee = Guide::query()->where("id", "=", $guide->id)->first(); $guidee->update($data); + + //If an image has been uploaded, store the file + if($request->file("resource")) { + $guidee->resource_id = ResourceController::store($request)->id; + } + $saved = $guidee->save(); if(!$saved){ diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php index 9442903..b192cb6 100644 --- a/skolehjem/app/Http/Controllers/MenuPlanController.php +++ b/skolehjem/app/Http/Controllers/MenuPlanController.php @@ -76,8 +76,6 @@ class MenuPlanController extends Controller $menuPlan->save(); $menuPlans = MenuPlan::query()->get(); - $menuArray = []; - if($request->newsoption == true){ $news = new News(); @@ -177,6 +175,10 @@ class MenuPlanController extends Controller '

Torsdag:

'. '

'.$menuplan->thursday.'

'; + $oldResourceID = News::query()->where('arrangement_id', '=', $menuplan->id)->first(); + + if ($oldResourceID != null) + $news->resource_id = $oldResourceID->resource_id; NewsController::storeAndGet($news); } diff --git a/skolehjem/app/Http/Controllers/NewsController.php b/skolehjem/app/Http/Controllers/NewsController.php index 7d71d6a..475eb80 100644 --- a/skolehjem/app/Http/Controllers/NewsController.php +++ b/skolehjem/app/Http/Controllers/NewsController.php @@ -84,6 +84,10 @@ class NewsController extends Controller */ public static function storeAndGet(News $news) { + $OldNews = News::query()->where('arrangement_id', "=", $news->arrangement_id); + + $OldNews->delete(); + $news->save(); Helpers::sendNewsNotification($news, User::query()->where("wants_emails", "=", true)->get()); diff --git a/skolehjem/resources/views/admin/events/edit.blade.php b/skolehjem/resources/views/admin/events/edit.blade.php index 981f128..0d30e4f 100644 --- a/skolehjem/resources/views/admin/events/edit.blade.php +++ b/skolehjem/resources/views/admin/events/edit.blade.php @@ -24,7 +24,7 @@

Rediger Aktivitet:

-
$event])}}"> + $event])}}" enctype="multipart/form-data"> @csrf @method("PUT") @@ -43,7 +43,7 @@ diff --git a/skolehjem/resources/views/admin/guides/edit.blade.php b/skolehjem/resources/views/admin/guides/edit.blade.php index c2f9cca..0814a05 100644 --- a/skolehjem/resources/views/admin/guides/edit.blade.php +++ b/skolehjem/resources/views/admin/guides/edit.blade.php @@ -24,7 +24,7 @@

Rediger vejledning:

- $guide])}}"> + $guide])}}" enctype="multipart/form-data"> @csrf @method("PUT") @@ -52,7 +52,7 @@ diff --git a/skolehjem/resources/views/admin/menuplans/edit.blade.php b/skolehjem/resources/views/admin/menuplans/edit.blade.php index 8b28918..9acac3f 100644 --- a/skolehjem/resources/views/admin/menuplans/edit.blade.php +++ b/skolehjem/resources/views/admin/menuplans/edit.blade.php @@ -40,7 +40,7 @@ diff --git a/skolehjem/resources/views/admin/news/edit.blade.php b/skolehjem/resources/views/admin/news/edit.blade.php index 121496c..fb6048d 100644 --- a/skolehjem/resources/views/admin/news/edit.blade.php +++ b/skolehjem/resources/views/admin/news/edit.blade.php @@ -23,9 +23,9 @@ - For at kunne indsætte et link, skal du markere den text du vil lave som et link først. + For at kunne indsætte et link, skal du markere den text du vil lave som et link først.
{!! $news->content !!}
diff --git a/skolehjem/resources/views/admin/users/create.blade.php b/skolehjem/resources/views/admin/users/create.blade.php index c1af8e0..d7d0db4 100644 --- a/skolehjem/resources/views/admin/users/create.blade.php +++ b/skolehjem/resources/views/admin/users/create.blade.php @@ -10,7 +10,24 @@ @endsection @section("content") + + + +

Opret Bruger:

@csrf @@ -36,12 +53,12 @@ - + + @foreach($roles as $role) + + @endforeach + diff --git a/skolehjem/resources/views/admin/users/edit.blade.php b/skolehjem/resources/views/admin/users/edit.blade.php index 2f5089c..30b3a0a 100644 --- a/skolehjem/resources/views/admin/users/edit.blade.php +++ b/skolehjem/resources/views/admin/users/edit.blade.php @@ -10,6 +10,23 @@ @endsection @section("content") + + + +

Rediger Bruger:

$user]) }}" onsubmit="return checkInputs()" enctype="multipart/form-data"> @csrf @@ -36,16 +53,14 @@ - + @if(count($user->roles) == 0) - - @foreach($roles as $role) @endforeach @else - - @foreach($roles as $role) {{ $selected = "" }} @foreach($user->roles as $userRole) @@ -56,6 +71,7 @@ @endforeach @endif + diff --git a/skolehjem/resources/views/app/guides/index.blade.php b/skolehjem/resources/views/app/guides/index.blade.php index c13a188..02c837a 100644 --- a/skolehjem/resources/views/app/guides/index.blade.php +++ b/skolehjem/resources/views/app/guides/index.blade.php @@ -90,7 +90,6 @@ @else

{{__('msg.dereringenvejledninger')}}.

@endif -