vict3459
/
Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp

This commit is contained in:
frederikpyt 2020-07-30 12:28:11 +02:00
parent be575a9515 f4ba4f6c45
commit 666e8cb7f3
6 changed files with 73 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
skolehjem/app/Http/Controllers/UserController.php
View File

@ -305,18 +305,72 @@ class UserController extends Controller
$users = User::query()->where('phone', 'LIKE',$request->search.'%')->get();
elseif ($request->isCheck === "telefon")
$users = User::query()->where('phone', 'LIKE',$request->search.'%')->get();
elseif ($request->isCheck)
$users = User::query()->where('Roles', 'LIKE',$request->search.'%')->with(Role::class)->get();
else
$users = User::query()
->where('name_first', 'LIKE',$request->search.'%')
->orWhere('name_last','LIKE', $request->search.'%')
->orWhere('phone','LIKE', $request->search.'%')
->orWhere('email','LIKE',$request->search. '%')
->orWhere('name','LIKE',$request->search. '%')
->orWhere('roles','LIKE',$request->search. '%')
->get();
elseif ($request->isCheck) {
$roles = Role::query()->where('name', 'LIKE', $request->search . '%')->get();
$usersTEMP = User::all();
$users = [];
foreach ($usersTEMP as $user) {
foreach ($roles as $role) {
if($user->hasRole($role)) {
array_push($users, $user);
break 2;
}
}
}
if($request->search == "")
$users = User::all();
} else {
$usersTEMP = User::query()
->where('name_first', 'LIKE', $request->search . '%')
->orWhere('name_last', 'LIKE', $request->search . '%')
->orWhere('phone', 'LIKE', $request->search . '%')
->orWhere('email', 'LIKE', $request->search . '%')
->orWhere('name', 'LIKE', $request->search . '%')
->get();
$roles = Role::query()->where('name', 'LIKE', $request->search . '%')->get();
$users = [];
$allUsers = User::all();
//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)) {
array_push($users, $user);
break 2;
}
}
}
//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)
array_push($users, $userTEMP);
}
$i = 0;
foreach ($users as $user){
$i++;
foreach ($users as $userr){
if($user->id == $userr->id) {
unset($users[$i]);
break 2;
}
}
}
}
@ -351,7 +405,7 @@ class UserController extends Controller
'<td>' . $user->name_last . '</td>'.
'<td>' . $user->email . '</td>'.
'<td>' . $user->phone .'</td>'.
'<td>' . $user->name .'</td>'.
'<td>' . $rolesString .'</td>'.
'<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().

1
skolehjem/public/css/webapp.css vendored
View File

@ -341,6 +341,7 @@ a {
.links {
position: absolute;
align-self: center;
width: 100%;
bottom: 8px;
height: 2rem;

2
skolehjem/resources/views/app/events/yourevents.blade.php
View File

@ -15,7 +15,7 @@
<h3 class="sde-blue bold text-center mb-0">{{$userevent->name}}</h3>
<p class="text-center mt-0">{{$userevent->date}}</p>
<p class="text-center">{{$userevent->description}}</p>
<button type="submit" class="btn text-center btn-sde-blue" id="tilmeld">Afmeld</button>
<button type="submit" class="btn text-center btn-sde-blue" onclick="return confirm('Are you sure you want to remove this reservation?');">Afmeld</button>
</form>
@endforeach
@else

2
skolehjem/resources/views/app/layout/base.blade.php
View File

@ -48,7 +48,7 @@
Konto
</a>
<a href="{{ route('users.logout') }}">
<img src="{{URL::asset('/images/icons/Logout.svg')}}" alt="Menuplan">
<img src="{{URL::asset('/images/icons/Logout.svg')}}" alt="Logud">
Log Ud
</a>
</div>

2
skolehjem/resources/views/app/users/edit.blade.php
View File

@ -7,7 +7,7 @@
@section("content")
<main>
<h1 class="text-center sde-blue mt-0">Konto</h1>
<form method="post" action="{{ route("users.update", ['user' => Auth::user()]) }}">
<form method="post" action="{{ route("users.update", ['user' => Auth::user()]) }}">
@csrf
@method("put")
<span>Navn:</span>

4
skolehjem/resources/views/app/users/index.blade.php
View File

@ -5,7 +5,9 @@
<div class="d-flex col block-container mt-2">
<a href="{{ route('menu-plans.index') }}" class="block text-center mb-1">Menuplan</a>
<a href="{{ route('events.index') }}" class="block text-center mb-1">Aktiviteter</a>
<a href="{{ route('washing-reservations.index') }}" class="block text-center mb-1">Vaskemaskine Reservationer</a>
<a href="{{ route('washing-reservations.index') }}" class="block text-center mb-1">Reservationer</a>
<a href="{{ route('contacts.index') }}" class="block text-center mb-1">Kontoret</a>
<a href="{{ route('phones.index') }}" class="block text-center mb-1">Vagttelefon</a>
</div>
<div class="links row">
<a href="https://www.facebook.com" target="_blank" class="link">