From 332fdc3347dfb0a8885e04181e7df6182ab5747a Mon Sep 17 00:00:00 2001 From: Neerholt Date: Mon, 10 Aug 2020 11:45:58 +0200 Subject: [PATCH] v0.5.15e - Removed search function from menuplan and fix some css on event search --- .../app/Http/Controllers/EventController.php | 6 +-- .../Http/Controllers/MenuPlanController.php | 47 ------------------- .../views/admin/menuplans/index.blade.php | 5 -- 3 files changed, 3 insertions(+), 55 deletions(-) diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index ac31368..48b316d 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -221,7 +221,7 @@ class EventController extends Controller if($request->ajax()){ $output = "". "Event Navn". - "Event Beskrivelse". + "Event Ansvarlig". "Event Dato". "\"Update\"". "\"Update\"". @@ -235,8 +235,8 @@ class EventController extends Controller foreach ($events as $key => $event){ $output.=''. '' . $event->name . ''. - '' . $event->description .''. - '' . $event->date .''. + '' . $event->accountable .''. + '' . \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') .''. ' $event->id ]).'">Update'. ' $event->id ]) . '">Update'. '
$event->id ]). '" class="w-100 nostyle">'. diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php index 49137c5..27d7da5 100644 --- a/skolehjem/app/Http/Controllers/MenuPlanController.php +++ b/skolehjem/app/Http/Controllers/MenuPlanController.php @@ -162,51 +162,4 @@ class MenuPlanController extends Controller } - public function search(Request $request){ - if($request->ajax()){ - $output = "". - "Uge". - "Mandag". - "Tirsdag". - "Onsdag". - "Torsdag". - "\"Update\"". - "\"Delete\"". - ""; - $menuplans = DB::table('menu_plans')->where('week', 'LIKE',$request->search.'%')->get(); - - if(count($menuplans) !== 0){ - foreach ($menuplans as $key => $menuplan){ - $output.=''. - '' . $menuplan->week . ''. - '' . $menuplan->monday . ''. - '' . $menuplan->tuesday . ''. - '' . $menuplan->wednesday .''. - '' . $menuplan->thursday .''. - ' $menuplan->id ]) . '">Update'. - ' $menuplan->id ]). '" class="w-100 nostyle">'. - csrf_field(). - method_field("delete"). - - ''. - '
'. - ''. - ''; - } - }else{ - $output.=''. - 'Intet match'. - ''. - ''. - ''. - ''. - ''. - ''. - ''; - } - return Response($output); - } - } - - } diff --git a/skolehjem/resources/views/admin/menuplans/index.blade.php b/skolehjem/resources/views/admin/menuplans/index.blade.php index a747f4b..b662320 100644 --- a/skolehjem/resources/views/admin/menuplans/index.blade.php +++ b/skolehjem/resources/views/admin/menuplans/index.blade.php @@ -13,11 +13,6 @@
CreateOpret Menuplan - -
- @csrf - -
{!! session()->get('WeekExists') !!}