Loading app/Http/Controllers/DivesList.php +15 −0 Original line number Diff line number Diff line Loading @@ -7,6 +7,7 @@ use App\Models\Prerogative; use App\Models\User; use Error; use Illuminate\Http\Request; use Illuminate\View\View; class DivesList extends Controller Loading Loading @@ -44,4 +45,18 @@ function showManagementList() { ->get(); return view('dives_list_management', ['dives' => $dives]); } function filter(Request $request) { $location = $request->input('location_filter'); $location = $request->input('location_filter'); $location = $request->input('location_filter'); $location = $request->input('location_filter'); $dives = DivingSession::select('DS_CODE', 'DS_ACTIVE', 'CAR_DIVING_SESSION.DL_ID', 'DS_DATE', 'DL_DEPTH', 'CAR_SCHEDULE', 'DL_NAME', 'DS_MAX_DEPTH') ->join('CAR_DIVING_LOCATION', 'CAR_DIVING_SESSION.DL_ID', '=', 'CAR_DIVING_LOCATION.DL_ID') ->where('DS_ACTIVE', 1) ->orderBy('DS_DATE', 'asc') ->get(); $user = session()->get('user'); return view('dives', ['dives' => $dives, 'userPre' => Prerogative::find($user->PRE_CODE)]); } } app/Http/Middleware/rightChecker.php→app/Http/Middleware/RightChecker.php +0 −0 File moved. View file public/css/button-filter.css +1 −1 Original line number Diff line number Diff line Loading @@ -47,7 +47,7 @@ .container { background-color: #e0e0e0; } .nav.li { form ul li { opacity: 0; list-style: none; &:nth-child(1) { Loading resources/views/dives.blade.php +11 −11 Original line number Diff line number Diff line Loading @@ -9,30 +9,30 @@ <svg class="change-my-color" xmlns="http://www.w3.org/2000/svg" height="19" width="19" viewBox="0 0 512 512"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M3.9 54.9C10.5 40.9 24.5 32 40 32H472c15.5 0 29.5 8.9 36.1 22.9s4.6 30.5-5.2 42.5L320 320.9V448c0 12.1-6.8 23.2-17.7 28.6s-23.8 4.3-33.5-3l-64-48c-8.1-6-12.8-15.5-12.8-25.6V320.9L9 97.3C-.7 85.4-2.8 68.8 3.9 54.9z"/></svg> <div class="nav"> <form action="{{ route('dives_filter') }}" method="POST"> <!-- @csrf --> @csrf <ul> <li> <label for="underline_select" class="sr-only">Choisir un lieux</label> <select id="underline_select" class="block py-2.5 px-0 w-full text-sm text-gray-500 bg-transparent appearance-none focus:outline-none focus:ring-0 focus:border-orange-600 peer"> <option selected>Lieux</option> <label for="location_filter" class="sr-only">Choisir un lieux</label> <select id="location_filter" class="block py-2.5 px-0 w-full text-sm text-gray-500 bg-transparent appearance-none focus:outline-none focus:ring-0 focus:border-orange-600 peer"> <option selected value="default">Lieux</option> @foreach ($dives as $dive) <option value="{{$dive->DL_NAME}}">{{$dive->DL_NAME}}</option> @endforeach </select> </li> <li> <label for="underline_select" class="sr-only">Choisir un créneau</label> <select id="underline_select" class="block py-2.5 px-0 w-full text-sm text-gray-500 bg-transparent appearance-none focus:outline-none focus:ring-0 focus:border-orange-600 peer"> <option selected>Créneau</option> <label for="creneau_filter" class="sr-only">Choisir un créneau</label> <select id="creneau_filter" class="block py-2.5 px-0 w-full text-sm text-gray-500 bg-transparent appearance-none focus:outline-none focus:ring-0 focus:border-orange-600 peer"> <option selected value="default">Créneau</option> @foreach ($dives as $dive) <option value="{{$dive->CAR_SCHEDULE}}">{{$dive->CAR_SCHEDULE}}</option> @endforeach </select> </li> <li> <label for="underline_select" class="sr-only">Choisir un niveau</label> <select id="underline_select" class="block py-2.5 px-0 w-full text-sm text-gray-500 bg-transparent appearance-none focus:outline-none focus:ring-0 focus:border-orange-600 peer"> <option selected>Niveau</option> <label for="level_filter" class="sr-only">Choisir un niveau</label> <select id="level_filter" class="block py-2.5 px-0 w-full text-sm text-gray-500 bg-transparent appearance-none focus:outline-none focus:ring-0 focus:border-orange-600 peer"> <option selected value="default">Niveau</option> @foreach ($dives as $dive) <option value="{{$dive->CAR_SCHEDULE}}">{{$dive->DL_DEPTH}}</option> @endforeach Loading @@ -40,7 +40,7 @@ </li> <li> <label class="hidden" for="start">Date de départ</label> <input type="date" name="date-dive" /> <input type="date" id="date_filter" name="date-dive"/> </li> <!--<li> <label class="hidden" for="participant_filter">Participant</label> Loading routes/api.php +1 −1 Original line number Diff line number Diff line Loading @@ -17,6 +17,6 @@ Route::get('/dives/{id}/divers', [DivesAPI::class, 'getDivers']); Route::middleware('App\Http\Middleware\rightChecker')->get('/user', function (Request $request) { Route::middleware('App\Http\Middleware\RightChecker')->get('/user', function (Request $request) { return $request->user(); }); Loading
app/Http/Controllers/DivesList.php +15 −0 Original line number Diff line number Diff line Loading @@ -7,6 +7,7 @@ use App\Models\Prerogative; use App\Models\User; use Error; use Illuminate\Http\Request; use Illuminate\View\View; class DivesList extends Controller Loading Loading @@ -44,4 +45,18 @@ function showManagementList() { ->get(); return view('dives_list_management', ['dives' => $dives]); } function filter(Request $request) { $location = $request->input('location_filter'); $location = $request->input('location_filter'); $location = $request->input('location_filter'); $location = $request->input('location_filter'); $dives = DivingSession::select('DS_CODE', 'DS_ACTIVE', 'CAR_DIVING_SESSION.DL_ID', 'DS_DATE', 'DL_DEPTH', 'CAR_SCHEDULE', 'DL_NAME', 'DS_MAX_DEPTH') ->join('CAR_DIVING_LOCATION', 'CAR_DIVING_SESSION.DL_ID', '=', 'CAR_DIVING_LOCATION.DL_ID') ->where('DS_ACTIVE', 1) ->orderBy('DS_DATE', 'asc') ->get(); $user = session()->get('user'); return view('dives', ['dives' => $dives, 'userPre' => Prerogative::find($user->PRE_CODE)]); } }
app/Http/Middleware/rightChecker.php→app/Http/Middleware/RightChecker.php +0 −0 File moved. View file
public/css/button-filter.css +1 −1 Original line number Diff line number Diff line Loading @@ -47,7 +47,7 @@ .container { background-color: #e0e0e0; } .nav.li { form ul li { opacity: 0; list-style: none; &:nth-child(1) { Loading
resources/views/dives.blade.php +11 −11 Original line number Diff line number Diff line Loading @@ -9,30 +9,30 @@ <svg class="change-my-color" xmlns="http://www.w3.org/2000/svg" height="19" width="19" viewBox="0 0 512 512"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M3.9 54.9C10.5 40.9 24.5 32 40 32H472c15.5 0 29.5 8.9 36.1 22.9s4.6 30.5-5.2 42.5L320 320.9V448c0 12.1-6.8 23.2-17.7 28.6s-23.8 4.3-33.5-3l-64-48c-8.1-6-12.8-15.5-12.8-25.6V320.9L9 97.3C-.7 85.4-2.8 68.8 3.9 54.9z"/></svg> <div class="nav"> <form action="{{ route('dives_filter') }}" method="POST"> <!-- @csrf --> @csrf <ul> <li> <label for="underline_select" class="sr-only">Choisir un lieux</label> <select id="underline_select" class="block py-2.5 px-0 w-full text-sm text-gray-500 bg-transparent appearance-none focus:outline-none focus:ring-0 focus:border-orange-600 peer"> <option selected>Lieux</option> <label for="location_filter" class="sr-only">Choisir un lieux</label> <select id="location_filter" class="block py-2.5 px-0 w-full text-sm text-gray-500 bg-transparent appearance-none focus:outline-none focus:ring-0 focus:border-orange-600 peer"> <option selected value="default">Lieux</option> @foreach ($dives as $dive) <option value="{{$dive->DL_NAME}}">{{$dive->DL_NAME}}</option> @endforeach </select> </li> <li> <label for="underline_select" class="sr-only">Choisir un créneau</label> <select id="underline_select" class="block py-2.5 px-0 w-full text-sm text-gray-500 bg-transparent appearance-none focus:outline-none focus:ring-0 focus:border-orange-600 peer"> <option selected>Créneau</option> <label for="creneau_filter" class="sr-only">Choisir un créneau</label> <select id="creneau_filter" class="block py-2.5 px-0 w-full text-sm text-gray-500 bg-transparent appearance-none focus:outline-none focus:ring-0 focus:border-orange-600 peer"> <option selected value="default">Créneau</option> @foreach ($dives as $dive) <option value="{{$dive->CAR_SCHEDULE}}">{{$dive->CAR_SCHEDULE}}</option> @endforeach </select> </li> <li> <label for="underline_select" class="sr-only">Choisir un niveau</label> <select id="underline_select" class="block py-2.5 px-0 w-full text-sm text-gray-500 bg-transparent appearance-none focus:outline-none focus:ring-0 focus:border-orange-600 peer"> <option selected>Niveau</option> <label for="level_filter" class="sr-only">Choisir un niveau</label> <select id="level_filter" class="block py-2.5 px-0 w-full text-sm text-gray-500 bg-transparent appearance-none focus:outline-none focus:ring-0 focus:border-orange-600 peer"> <option selected value="default">Niveau</option> @foreach ($dives as $dive) <option value="{{$dive->CAR_SCHEDULE}}">{{$dive->DL_DEPTH}}</option> @endforeach Loading @@ -40,7 +40,7 @@ </li> <li> <label class="hidden" for="start">Date de départ</label> <input type="date" name="date-dive" /> <input type="date" id="date_filter" name="date-dive"/> </li> <!--<li> <label class="hidden" for="participant_filter">Participant</label> Loading
routes/api.php +1 −1 Original line number Diff line number Diff line Loading @@ -17,6 +17,6 @@ Route::get('/dives/{id}/divers', [DivesAPI::class, 'getDivers']); Route::middleware('App\Http\Middleware\rightChecker')->get('/user', function (Request $request) { Route::middleware('App\Http\Middleware\RightChecker')->get('/user', function (Request $request) { return $request->user(); });