v1.3.1 - Removed search functions
This commit is contained in:
frederikpyt
parent
9096f64569
commit
7b99cd7f4e
|
|
@ -134,69 +134,4 @@ class ContactController extends Controller
|
|||
$contact->delete();
|
||||
return redirect()->route("contacts.index");
|
||||
}
|
||||
|
||||
|
||||
|
||||
public function search(Request $request){
|
||||
if($request->ajax()){
|
||||
$output = "<tr>".
|
||||
"<th>Kontakt Navn</th>".
|
||||
"<th>Titel</th>".
|
||||
"<th>E-mail</th>".
|
||||
"<th>Tlf</th>".
|
||||
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/pencil.svg')." alt=\"Update\"></th>".
|
||||
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/trashcan.svg')." alt=\"Delete\"></th>".
|
||||
"</tr>";
|
||||
|
||||
|
||||
|
||||
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.='<tr>'.
|
||||
'<td>' . $user->contactname . '</td>'.
|
||||
'<td>' . $user->title . '</td>'.
|
||||
'<td>' . $user->email . '</td>'.
|
||||
'<td>' . $user->phone .'</td>'.
|
||||
'<td><a href="'. route("contacts.edit", [ "contact" => $user->id ]) . '"><img class="w-100" src="'. asset('/images/icons/pencil-dark.svg') . '" alt="Update"></a></td>'.
|
||||
'<td><form method="post" action="' .route("contacts.destroy", [ "contact" => $user->id ]). '" class="w-100 nostyle">'.
|
||||
csrf_field().
|
||||
method_field("delete").
|
||||
|
||||
'<button class="w-100 nostyle" onclick="return confirm(\'Are you sure you want to delete?\');" type="submit"><img class="w-100 cursor-pointer" src="'. asset('/images/icons/trashcan-dark.svg') . '" alt="Delete"></button>'.
|
||||
'</form>'.
|
||||
'</td>'.
|
||||
'</tr>';
|
||||
}
|
||||
}else{
|
||||
$output.='<tr>'.
|
||||
'<td>Intet match</td>'.
|
||||
'<td></td>'.
|
||||
'<td></td>'.
|
||||
'<td></td>'.
|
||||
'<td></td>'.
|
||||
'<td></td>'.
|
||||
'</tr>';
|
||||
}
|
||||
return Response($output);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -245,56 +245,6 @@ class EventController extends Controller
|
|||
}
|
||||
}
|
||||
|
||||
public function search(Request $request){
|
||||
if($request->ajax()){
|
||||
$output = "<tr>".
|
||||
"<th>Aktivitet Navn</th>".
|
||||
"<th>Aktivitet Ansvarlig</th>".
|
||||
"<th>Aktivitet Dato</th>".
|
||||
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/eye.svg')." alt=\"see\"></th>".
|
||||
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/pencil.svg')." alt=\"Update\"></th>".
|
||||
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/trashcan.svg')." alt=\"Delete\"></th>".
|
||||
"</tr>";
|
||||
|
||||
|
||||
$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 .= '<tr>' .
|
||||
'<td>' . $event->name . '</td>' .
|
||||
'<td>' . $event->accountable . '</td>' .
|
||||
'<td>' . \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') . '</td>' .
|
||||
'<td><a href="' . route("events.signups", ["event" => $event->id]) . '"><img class="w-100" src="' . asset('/images/icons/eye-dark.svg') . '" alt="Update"></a></td>' .
|
||||
'<td><a href="' . route("events.edit", ["event" => $event->id]) . '"><img class="w-100" src="' . asset('/images/icons/pencil-dark.svg') . '" alt="Update"></a></td>' .
|
||||
'<td><form method="post" action="' . route("events.destroy", ["event" => $event->id]) . '" class="w-100 nostyle">' .
|
||||
csrf_field() .
|
||||
method_field("delete") .
|
||||
|
||||
'<button class="w-100 nostyle" onclick="return confirm(\'Are you sure you want to delete?\');" type="submit"><img class="w-100 cursor-pointer" src="' . asset('/images/icons/trashcan-dark.svg') . '" alt="Delete"></button>' .
|
||||
'</form>' .
|
||||
'</td>' .
|
||||
'</tr>';
|
||||
}
|
||||
}
|
||||
}else {
|
||||
$output.='<tr>'.
|
||||
'<td>Intet match</td>'.
|
||||
'<td></td>'.
|
||||
'<td></td>'.
|
||||
'<td></td>'.
|
||||
'<td></td>'.
|
||||
'<td></td>'.
|
||||
'</tr>';
|
||||
}
|
||||
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];
|
||||
|
|
|
|||
|
|
@ -178,44 +178,6 @@ class RolesController extends Controller
|
|||
return redirect()->route("roles.index");
|
||||
}
|
||||
|
||||
|
||||
public function search(Request $request){
|
||||
if($request->ajax()){
|
||||
$output = "<tr>".
|
||||
"<th>Navn</th>".
|
||||
"<th>Beskrivelse</th>".
|
||||
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/pencil.svg')." alt=\"Update\"></th>".
|
||||
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/trashcan.svg')." alt=\"Delete\"></th>".
|
||||
"</tr>";
|
||||
$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.='<tr>'.
|
||||
'<td>' . $role->name . '</td>'.
|
||||
'<td>' . $role->description . '</td>'.
|
||||
'<td><a href="'. route("roles.edit", [ "role" => $role->id ]) . '"><img class="w-100" src="'. asset('/images/icons/pencil-dark.svg') . '" alt="Update"></a></td>'.
|
||||
'<td><form method="post" action="' .route("roles.destroy", [ "role" => $role->id ]). '" class="w-100 nostyle">'.
|
||||
csrf_field().
|
||||
method_field("delete").
|
||||
|
||||
'<button class="w-100 nostyle" onclick="return confirm(\'Are you sure you want to delete?\');" type="submit"><img class="w-100 cursor-pointer" src="'. asset('/images/icons/trashcan-dark.svg') . '" alt="Delete"></button>'.
|
||||
'</form>'.
|
||||
'</td>'.
|
||||
'</tr>';
|
||||
}
|
||||
}else{
|
||||
$output.='<tr>'.
|
||||
'<td>Intet match</td>'.
|
||||
'<td></td>'.
|
||||
'<td></td>'.
|
||||
'<td></td>'.
|
||||
'</tr>';
|
||||
}
|
||||
return Response($output);
|
||||
}
|
||||
}
|
||||
|
||||
public function nameCheck(Request $request){
|
||||
$roles = Role::query()->where('name', 'LIKE',$request->nameCheck)->get();
|
||||
if(count($roles) > 0 && $request->nameCheck !== NULL){
|
||||
|
|
|
|||
|
|
@ -424,167 +424,8 @@ class UserController extends Controller
|
|||
}
|
||||
|
||||
/*******************************************/
|
||||
/* Search and settings */
|
||||
/* Settings */
|
||||
/*******************************************/
|
||||
|
||||
public function search(Request $request){
|
||||
if($request->ajax()){
|
||||
$output = "<tr>".
|
||||
"<th>Fornavn</th>".
|
||||
"<th>Efternavn</th>".
|
||||
"<th>Email</th>".
|
||||
"<th>Tlf nr</th>".
|
||||
"<th>Rolle(r)</th>".
|
||||
'<th style="width: 1em;"><img class="w-100" src="'. asset('/images/icons/eye.svg') .'" alt="ShowImage"></th>'.
|
||||
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/pencil.svg')." alt=\"Update\"></th>".
|
||||
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/trashcan.svg')." alt=\"Delete\"></th>".
|
||||
"</tr>";
|
||||
|
||||
|
||||
//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.='<tr>'.
|
||||
'<td>' . $user->name_first . '</td>'.
|
||||
'<td>' . $user->name_last . '</td>'.
|
||||
'<td>' . $user->email . '</td>'.
|
||||
'<td>' . $user->phone .'</td>'.
|
||||
'<td>' . $rolesString .'</td>';
|
||||
if($user->resource_id !== null)
|
||||
$output .= '<td style="overflow: visible"><a class="showUsers"><img src="'. asset('/images/icons/eye-dark.svg') .'"><img src="'. asset(\App\Resource::query()->where("id", "=", $user->resource_id)->first()->filename).'" class="showUserImages"></a></td>';
|
||||
else
|
||||
$output .= '<td style="overflow: visible"><a class="showUsers noImages"><img src="'.asset('/images/icons/eye-dark.svg').'"><img src="" class="showUserImages"></a></td>';
|
||||
|
||||
$output .= '<td><a href="'. route("users.edit", [ "user" => $user->id ]) . '"><img class="w-100" src="'. asset('/images/icons/pencil-dark.svg') . '" alt="Update"></a></td>'.
|
||||
'<td><form method="post" action="' .route("users.destroy", [ "user" => $user->id ]). '" class="w-100 nostyle">'.
|
||||
csrf_field().
|
||||
method_field("delete").
|
||||
|
||||
'<button class="w-100 nostyle" onclick="return confirm(\'Are you sure you want to delete?\');" type="submit"><img class="w-100 cursor-pointer" src="'. asset('/images/icons/trashcan-dark.svg') . '" alt="Delete"></button>'.
|
||||
'</form>'.
|
||||
'</td>'.
|
||||
'</tr>';
|
||||
}
|
||||
}else{
|
||||
$output.='<tr>'.
|
||||
'<td>Intet match</td>'.
|
||||
'<td></td>'.
|
||||
'<td></td>'.
|
||||
'<td></td>'.
|
||||
'<td></td>'.
|
||||
'<td></td>'.
|
||||
'<td></td>'.
|
||||
'<td></td>'.
|
||||
'</tr>';
|
||||
}
|
||||
return Response($output);
|
||||
}
|
||||
}
|
||||
|
||||
public function setLanguages(Request $request){
|
||||
if($request->ajax()){
|
||||
if($request->lang === "en"){
|
||||
|
|
|
|||
|
|
@ -167,78 +167,4 @@ class WashingMachineController extends Controller
|
|||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
public function search(Request $request){
|
||||
if($request->ajax()){
|
||||
$output = "<tr>".
|
||||
"<th>Navn</th>".
|
||||
"<th>Lokation</th>".
|
||||
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/pencil.svg')." alt=\"Update\"></th>".
|
||||
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/trashcan.svg')." alt=\"Delete\"></th>".
|
||||
"</tr>";
|
||||
|
||||
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.='<tr>'.
|
||||
'<td>' . $machine->washing_name . '</td>'.
|
||||
'<td>' . $machine->location_name . '</td>'.
|
||||
'<td><a href="'. route("washing-machines.edit", [ "washing_machine" => $machine->id ]) . '"><img class="w-100" src="'. asset('/images/icons/pencil-dark.svg') . '" alt="Update"></a></td>'.
|
||||
'<td><form method="post" action="' .route("washing-machines.destroy", [ "washing_machine" => $machine->id ]). '" class="w-100 nostyle">'.
|
||||
csrf_field().
|
||||
method_field("delete").
|
||||
|
||||
'<button class="w-100 nostyle" onclick="return confirm(\'Are you sure you want to delete?\');" type="submit"><img class="w-100 cursor-pointer" src="'. asset('/images/icons/trashcan-dark.svg') . '" alt="Delete"></button>'.
|
||||
'</form>'.
|
||||
'</td>'.
|
||||
'</tr>';
|
||||
}
|
||||
}else{
|
||||
$output.='<tr>'.
|
||||
'<td>Det er ikke blivet oprettet nogen vaskmaskine på denne lokation endnu</td>'.
|
||||
'<td></td>'.
|
||||
'<td></td>'.
|
||||
'<td></td>'.
|
||||
'</tr>';
|
||||
}
|
||||
}
|
||||
elseif($request->option === "all"){
|
||||
$machines = WashingMachine::all();
|
||||
|
||||
if(count($machines) !== 0){
|
||||
foreach($machines as $machine) {
|
||||
$output.= '<tr>'.
|
||||
'<td>'.$machine->name.'</td>'.
|
||||
'<td>'.Location::query()->where("id", "=", $machine->location_id)->first()->name.'</td>'.
|
||||
'<td><a href="'. route("washing-machines.edit", [ "washing_machine" => $machine->id]) . '"><img class="w-100" src="'. asset('/images/icons/pencil-dark.svg') . '" alt="Update"></a></td>'.
|
||||
'<td><form method="post" action="'. route('washing-machines.destroy', [ 'washing_machine' => $machine->id ]) .'" class="w-100 nostyle">'.
|
||||
csrf_field().
|
||||
method_field("delete").
|
||||
'<button class="w-100 nostyle" onclick="return confirm('."'Are you sure you want to delete?'".');" type="submit"><img class="w-100 cursor-pointer" src="'. asset('/images/icons/trashcan-dark.svg'). '" alt="Delete"></button>'.
|
||||
'</form>'.
|
||||
'</td>'.
|
||||
'</tr>';
|
||||
}
|
||||
}else{
|
||||
$output.='<tr>'.
|
||||
'<td>Det er ikke blivet oprettet nogen vaskmaskine på denne lokation endnu</td>'.
|
||||
'<td></td>'.
|
||||
'<td></td>'.
|
||||
'<td></td>'.
|
||||
'</tr>';
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
return Response($output);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -205,63 +205,6 @@ class WashingReservationController extends Controller
|
|||
}
|
||||
}
|
||||
|
||||
function search(Request $request){
|
||||
if($request->ajax()){
|
||||
$output = "<tr>".
|
||||
"<th>Vaskemaskine</th>".
|
||||
"<th>Tidspunkt</th>".
|
||||
"<th>Bruger</th>".
|
||||
"<th style=\"width: 1em;\"><img class=\"w-100\" src=".asset('/images/icons/trashcan.svg')." alt=\"Delete\"></th>".
|
||||
"</tr>";
|
||||
|
||||
|
||||
//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.='<tr>'.
|
||||
'<td>' . WashingMachine::query()->find($user->machine_id)->name . '</td>'.
|
||||
'<td>' . $user->time . '</td>'.
|
||||
'<td>' . ucfirst(User::query()->find($user->user_id)->name_first) . ' ' . ucfirst(User::query()->find($user->user_id)->name_last) . '</td>'.
|
||||
'<td><form method="post" action="' .route("washing-reservations.destroy", [ "washing_reservation" => $user->id ]). '" class="w-100 nostyle">'.
|
||||
csrf_field().
|
||||
method_field("delete").
|
||||
|
||||
'<button class="w-100 nostyle" onclick="return confirm(\'Are you sure you want to delete?\');" type="submit"><img class="w-100 cursor-pointer" src="'. asset('/images/icons/trashcan-dark.svg') . '" alt="Delete"></button>'.
|
||||
'</form>'.
|
||||
'</td>'.
|
||||
'</tr>';
|
||||
}
|
||||
}else{
|
||||
$output.='<tr>'.
|
||||
'<td>Intet match</td>'.
|
||||
'<td></td>'.
|
||||
'<td></td>'.
|
||||
'<td></td>'.
|
||||
'</tr>';
|
||||
}
|
||||
return Response($output);
|
||||
}
|
||||
}
|
||||
|
||||
public function appindex(Request $request)
|
||||
{
|
||||
WashingReservation::query()->where('time', '<', date('Y-m-d H:i:s', strtotime('-1 hour')))->delete();
|
||||
|
|
|
|||
Loading…
Reference in New Issue