From 7b99cd7f4e55cc50236a1227b1aec85f2a19937c Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Fri, 18 Sep 2020 10:30:44 +0200 Subject: [PATCH] v1.3.1 - Removed search functions --- .../Http/Controllers/ContactController.php | 65 ------- .../app/Http/Controllers/EventController.php | 50 ------ .../app/Http/Controllers/RolesController.php | 38 ----- .../app/Http/Controllers/UserController.php | 161 +----------------- .../Controllers/WashingMachineController.php | 74 -------- .../WashingReservationController.php | 57 ------- 6 files changed, 1 insertion(+), 444 deletions(-) diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php index ee97876..e4c7b15 100644 --- a/skolehjem/app/Http/Controllers/ContactController.php +++ b/skolehjem/app/Http/Controllers/ContactController.php @@ -134,69 +134,4 @@ class ContactController extends Controller $contact->delete(); return redirect()->route("contacts.index"); } - - - - public function search(Request $request){ - if($request->ajax()){ - $output = "". - "Kontakt Navn". - "Titel". - "E-mail". - "Tlf". - "\"Update\"". - "\"Delete\"". - ""; - - - - if($request->isCheck === "navn") - $users = Contact::query()->where('contactname', 'LIKE',$request->search.'%')->get(); - elseif ($request->isCheck === "titel") - $users = Contact::query()->where('title', 'LIKE',$request->search.'%')->get(); - elseif ($request->isCheck === "email") - $users = Contact::query()->where('email', 'LIKE',$request->search.'%')->get(); - elseif ($request->isCheck === "tf") - $users = Contact::query()->where('phone', 'LIKE',$request->search.'%')->get(); - else - $users = DB::table('contacts')->where('contactname', 'LIKE',$request->search.'%') - ->orWhere('title','LIKE', $request->search.'%') - ->orWhere('phone','LIKE', $request->search.'%') - ->orWhere('email','LIKE',$request->search. '%')->get(); - - if(count($users) !== 0){ - foreach ($users as $key => $user){ - $output.=''. - '' . $user->contactname . ''. - '' . $user->title . ''. - '' . $user->email . ''. - '' . $user->phone .''. - ' $user->id ]) . '">Update'. - '
$user->id ]). '" class="w-100 nostyle">'. - csrf_field(). - method_field("delete"). - - ''. - '
'. - ''. - ''; - } - }else{ - $output.=''. - 'Intet match'. - ''. - ''. - ''. - ''. - ''. - ''; - } - return Response($output); - } - } - - - - - } diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index a938a7a..f414c0b 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -245,56 +245,6 @@ class EventController extends Controller } } - public function search(Request $request){ - if($request->ajax()){ - $output = "". - "Aktivitet Navn". - "Aktivitet Ansvarlig". - "Aktivitet Dato". - "\"see\"". - "\"Update\"". - "\"Delete\"". - ""; - - - $events = DB::table('events')->orderBY('date' , 'asc')->where('name', 'LIKE',$request->search.'%') - ->orWhere('date','LIKE', $request->search.'%') - ->orWhere('accountable','LIKE', $request->search.'%') - ->get();//Job is here dude :9 - - if(count($events) !== 0){ - foreach ($events as $event){ - if(date('Y-m-d H:i', strtotime('-1 day')) < date('Y-m-d H:i', strtotime($event->date))) { - $output .= '' . - '' . $event->name . '' . - '' . $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">' . - csrf_field() . - method_field("delete") . - - '' . - '
' . - '' . - ''; - } - } - }else { - $output.=''. - 'Intet match'. - ''. - ''. - ''. - ''. - ''. - ''; - } - return Response($output); - } - } - public function closetags($html) { preg_match_all('#<(?!meta|img|br|hr|input\b)\b([a-z]+)(?: .*)?(?#iU', $html, $result); $openedtags = $result[1]; diff --git a/skolehjem/app/Http/Controllers/RolesController.php b/skolehjem/app/Http/Controllers/RolesController.php index 38c68de..5ef2029 100644 --- a/skolehjem/app/Http/Controllers/RolesController.php +++ b/skolehjem/app/Http/Controllers/RolesController.php @@ -178,44 +178,6 @@ class RolesController extends Controller return redirect()->route("roles.index"); } - - public function search(Request $request){ - if($request->ajax()){ - $output = "". - "Navn". - "Beskrivelse". - "\"Update\"". - "\"Delete\"". - ""; - $roles = DB::table('roles')->where("id", "!=", 1)->where("id", "!=", 2)->where('name', 'LIKE',$request->search.'%')->get(); - - if(count($roles) !== 0){ - foreach ($roles as $key => $role){ - $output.=''. - '' . $role->name . ''. - '' . $role->description . ''. - ' $role->id ]) . '">Update'. - '
$role->id ]). '" class="w-100 nostyle">'. - csrf_field(). - method_field("delete"). - - ''. - '
'. - ''. - ''; - } - }else{ - $output.=''. - 'Intet match'. - ''. - ''. - ''. - ''; - } - return Response($output); - } - } - public function nameCheck(Request $request){ $roles = Role::query()->where('name', 'LIKE',$request->nameCheck)->get(); if(count($roles) > 0 && $request->nameCheck !== NULL){ diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 800cac0..6ce4dfb 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -424,167 +424,8 @@ class UserController extends Controller } /*******************************************/ - /* Search and settings */ + /* Settings */ /*******************************************/ - - public function search(Request $request){ - if($request->ajax()){ - $output = "". - "Fornavn". - "Efternavn". - "Email". - "Tlf nr". - "Rolle(r)". - 'ShowImage'. - "\"Update\"". - "\"Delete\"". - ""; - - - //Join user and roles tables - - - - - //$users = User::query()->where('Roles', 'LIKE',$request->search.'%')->with(Spatie\Permission\Models\Role)->get(); - - - //filter search - if($request->isCheck === "navn") - $users = User::query()->firstWhere("id", "!=", 1)->where('name_first', 'LIKE',$request->search.'%')->get(); - elseif ($request->isCheck === "efternavn") - $users = User::query()->firstWhere("id", "!=", 1)->where('name_last', 'LIKE',$request->search.'%')->get(); - elseif ($request->isCheck === "email") - $users = User::query()->firstWhere("id", "!=", 1)->where('email', 'LIKE',$request->search.'%')->get(); - elseif ($request->isCheck === "telefon") - $users = User::query()->firstWhere("id", "!=", 1)->where('phone', 'LIKE',$request->search.'%')->get(); - elseif ($request->isCheck === "telefon") - $users = User::query()->firstWhere("id", "!=", 1)->where('phone', 'LIKE',$request->search.'%')->get(); - elseif ($request->isCheck) { - $roles = Role::query()->where('name', 'LIKE', $request->search . '%')->get(); - $usersTEMP = User::query()->where("id", "!=", 1)->get(); - $users = []; - - foreach ($usersTEMP as $user) { - foreach ($roles as $role) { - if($user->hasRole($role)) { - array_push($users, $user); - break 1; - } - } - } - - if($request->search == "") - $users = User::query()->where("id", "!=", 1)->get(); - - } else { - $usersTEMP = User::query() - ->whereKeyNot(1) - ->where('name_first', 'LIKE', $request->search . '%') - ->orWhere('name_last', 'LIKE', $request->search . '%') - ->orWhere('phone', 'LIKE', $request->search . '%') - ->orWhere('email', 'LIKE', $request->search . '%') - ->get()->except(1); - - $roles = Role::query()->where('name', 'LIKE', $request->search . '%')->get(); - - $users = new Collection(); - - $allUsers = User::query()->where("id", "!=", 1)->get(); - - //For hver user i systemet, check om han har en af de roller der matcher søgeordet - foreach ($allUsers as $user) { - foreach ($roles as $role) { - if($user->hasRole($role)) { - $users->add($user); - break 1; - } - } - } - - - //For hver user der har data, der matcher søgeordet, check om useren allerede er i resultatet, hvis ikke så tilføj ham - foreach ($usersTEMP as $userTEMP){ - $isInUsers = false; - foreach ($users as $user) { - if($userTEMP == $user) { - $isInUsers = true; - break 2; - } - } - - if($isInUsers == false) - $users->add($userTEMP); - } - - if($request->search == "") - $users = User::query()->where("id", "!=", 1)->get(); - - $unique = $users->flatten()->unique('phone'); - - $users = $unique->values()->all(); - } - - - if(count($users) !== 0){ - foreach ($users as $key => $user){ - - $roles = null; - $rolesString = null; - - foreach (User::query()->where("id", "!=", 1)->get() as $usr) { - if($usr->id == $user->id) - $roles = $usr->roles; - } - - if(!is_a($roles, 'Illuminate\Database\Eloquent\Collection')) - dd([$roles, $user]); - - for($i = 0; $i < count($roles); $i++) { - if(count($roles)-1 != $i) { - $rolesString .= $roles[$i]->name.","; - }else { - $rolesString = $roles[$i]->name; - } - } - - $output.=''. - '' . $user->name_first . ''. - '' . $user->name_last . ''. - '' . $user->email . ''. - '' . $user->phone .''. - '' . $rolesString .''; - if($user->resource_id !== null) - $output .= ''; - else - $output .= ''; - - $output .= ' $user->id ]) . '">Update'. - '
$user->id ]). '" class="w-100 nostyle">'. - csrf_field(). - method_field("delete"). - - ''. - '
'. - ''. - ''; - } - }else{ - $output.=''. - 'Intet match'. - ''. - ''. - ''. - ''. - ''. - ''. - ''. - ''; - } - return Response($output); - } - } - public function setLanguages(Request $request){ if($request->ajax()){ if($request->lang === "en"){ diff --git a/skolehjem/app/Http/Controllers/WashingMachineController.php b/skolehjem/app/Http/Controllers/WashingMachineController.php index 08a0469..a853ed3 100644 --- a/skolehjem/app/Http/Controllers/WashingMachineController.php +++ b/skolehjem/app/Http/Controllers/WashingMachineController.php @@ -167,78 +167,4 @@ class WashingMachineController extends Controller return 1; } } - - public function search(Request $request){ - if($request->ajax()){ - $output = "". - "Navn". - "Lokation". - "\"Update\"". - "\"Delete\"". - ""; - - if($request->option !== 'all') { - $machines = DB::table('washing_machines') - ->join('locations', 'washing_machines.location_id','=', 'locations.id') - ->select(DB::raw('washing_machines.name as washing_name, locations.name as location_name, washing_machines.id as id')) - ->where('locations.id', '=', $request->option) - ->get(); - - if(count($machines) !== 0){ - foreach ($machines as $machine){ - $output.=''. - '' . $machine->washing_name . ''. - '' . $machine->location_name . ''. - ' $machine->id ]) . '">Update'. - '
$machine->id ]). '" class="w-100 nostyle">'. - csrf_field(). - method_field("delete"). - - ''. - '
'. - ''. - ''; - } - }else{ - $output.=''. - 'Det er ikke blivet oprettet nogen vaskmaskine på denne lokation endnu'. - ''. - ''. - ''. - ''; - } - } - elseif($request->option === "all"){ - $machines = WashingMachine::all(); - - if(count($machines) !== 0){ - foreach($machines as $machine) { - $output.= ''. - ''.$machine->name.''. - ''.Location::query()->where("id", "=", $machine->location_id)->first()->name.''. - ' $machine->id]) . '">Update'. - '
'. - csrf_field(). - method_field("delete"). - ''. - '
'. - ''. - ''; - } - }else{ - $output.=''. - 'Det er ikke blivet oprettet nogen vaskmaskine på denne lokation endnu'. - ''. - ''. - ''. - ''; - } - } - - - - - return Response($output); - } - } } diff --git a/skolehjem/app/Http/Controllers/WashingReservationController.php b/skolehjem/app/Http/Controllers/WashingReservationController.php index 28a7015..f3c4fda 100644 --- a/skolehjem/app/Http/Controllers/WashingReservationController.php +++ b/skolehjem/app/Http/Controllers/WashingReservationController.php @@ -205,63 +205,6 @@ class WashingReservationController extends Controller } } - function search(Request $request){ - if($request->ajax()){ - $output = "". - "Vaskemaskine". - "Tidspunkt". - "Bruger". - "\"Delete\"". - ""; - - - //Kan ikke søge på vaskemaskine da det er en foreign key - //Kan ikke søge på bruger - //Man kan søge på tidspunkt! - - - - - - //filter search - if($request->isCheck === "vaskemaskine") - $users = WashingReservation::query()->where('machine_id', 'LIKE',$request->search.'%')->get(); - elseif ($request->isCheck === "tidspunkt") - $users = WashingReservation::query()->where('time', 'LIKE',$request->search.'%')->get(); - else - $users = WashingReservation::query()->where('time', 'LIKE',$request->search.'%') - ->orWhere('machine','LIKE', $request->search.'%') - ->get(); - - - - if(count($users) !== 0){ - foreach ($users as $key => $user){ - $output.=''. - '' . WashingMachine::query()->find($user->machine_id)->name . ''. - '' . $user->time . ''. - '' . ucfirst(User::query()->find($user->user_id)->name_first) . ' ' . ucfirst(User::query()->find($user->user_id)->name_last) . ''. - '
$user->id ]). '" class="w-100 nostyle">'. - csrf_field(). - method_field("delete"). - - ''. - '
'. - ''. - ''; - } - }else{ - $output.=''. - 'Intet match'. - ''. - ''. - ''. - ''; - } - return Response($output); - } - } - public function appindex(Request $request) { WashingReservation::query()->where('time', '<', date('Y-m-d H:i:s', strtotime('-1 hour')))->delete();