Commit 394fe95e authored by Waterfox's avatar Waterfox
Browse files

Add DS_ACTIVE filter and sort dives by date

parent 64afb4f0

app/Http/Controllers/DivesList.php

+3 −1
Original line number Diff line number Diff line
@@ -12,8 +12,10 @@ class DivesList extends Controller 
{

    function index(): View

    {

        $dives = DivingSession::select('DS_CODE', 'CAR_DIVING_SESSION.DL_ID', 'DS_DATE', 'DL_DEPTH', 'CAR_SCHEDULE', 'DL_NAME', 'DS_MAX_DEPTH')

        $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)]);

resources/views/dives.blade.php

+5 −0
Original line number Diff line number Diff line
@@ -40,6 +40,11 @@ 
                                    d="M14 2a3.963 3.963 0 0 0-1.4.267 6.439 6.439 0 0 1-1.331 6.638A4 4 0 1 0 14 2Zm1 9h-1.264A6.957 6.957 0 0 1 15 15v2a2.97 2.97 0 0 1-.184 1H19a1 1 0 0 0 1-1v-1a5.006 5.006 0 0 0-5-5ZM6.5 9a4.5 4.5 0 1 0 0-9 4.5 4.5 0 0 0 0 9ZM8 10H5a5.006 5.006 0 0 0-5 5v2a1 1 0 0 0 1 1h11a1 1 0 0 0 1-1v-2a5.006 5.006 0 0 0-5-5Z"/>

                            </svg>

                        </x-button>

                        @if($userPre->PRE_MAX_DEPTH <= $dive->DS_MAX_DEPTH)

                            <div class="text-red-400">

                                <p>Vous n'avez pas le niveau requis</p>

                            </div>

                        @endif

                        @if ($errors->any())

                            <div class="text-red-400">

                                <ul>