Commit a54062cb authored by LucBUTGH's avatar LucBUTGH
Browse files

feat: dives for diver

parent c37f0c98

app/Http/Controllers/DivingNumberController.php

+2 −0
Original line number Diff line number Diff line
@@ -23,12 +23,14 @@ public function index(): View 


        $dateDivesBefore = DivingNumberModel::join('car_registration', 'car_user.us_id', '=', 'car_registration.us_id')

        ->join('car_diving_session','car_registration.ds_code','=','car_diving_session.ds_code')

        ->join('car_diving_location','car_diving_session.DL_ID','=','car_diving_location.DL_ID')

        ->where('car_user.US_ID',$userId)

        ->where('CAR_DIVING_SESSION.DS_DATE','<',now())

        ->get();



        $dateDivesAfter = DivingNumberModel::join('car_registration', 'car_user.us_id', '=', 'car_registration.us_id')

        ->join('car_diving_session','car_registration.ds_code','=','car_diving_session.ds_code')

        ->join('car_diving_location','car_diving_session.DL_ID','=','car_diving_location.DL_ID')

        ->where('car_user.US_ID',$userId)

        ->where('CAR_DIVING_SESSION.DS_DATE','>=',now())

        ->get();

resources/views/diveractivities.blade.php

+4 −8
Original line number Diff line number Diff line
@@ -21,16 +21,14 @@ 
        <table class="text-sm text-left text-gray-500 w-full">

            <thead class="text-xs text-gray-700 uppercase bg-gray-50">

            <tr>

                <th scope="col" class="px-6 py-3">Nom</th>

                <th scope="col" class="px-6 py-3">Prénom</th>

                <th scope="col" class="px-6 py-3">Lieu</th>

                <th scope="col" class="px-6 py-3">Date</th>

            </tr>

            </thead>

            <tbody>

                @foreach($datesA as $dateA)

                <tr class="odd:bg-white even:bg-gray-50 border-b">

                <td class="px-6 py-4">{{ $dateA->US_NAME }}</td>

                    <td class="px-6 py-4">{{ $dateA->US_FIRST_NAME }}</td>

                <td class="px-6 py-4">{{ $dateA->DL_NAME }}</td>

                    <td class="px-6 py-4">{{ $dateA->DS_DATE }}</td>

                </tr>

                @endforeach
@@ -43,16 +41,14 @@ 
        <table class="text-sm text-left text-gray-500 w-full">

            <thead class="text-xs text-gray-700 uppercase bg-gray-50">

            <tr>

                <th scope="col" class="px-6 py-3">Nom</th>

                <th scope="col" class="px-6 py-3">Prénom</th>

                <th scope="col" class="px-6 py-3">Lieu</th>

                <th scope="col" class="px-6 py-3">Date</th>

            </tr>

            </thead>

            <tbody>

                @foreach($datesB as $dateB)

                <tr class="odd:bg-white even:bg-gray-50 border-b">

                <td class="px-6 py-4">{{ $dateB->US_NAME }}</td>

                    <td class="px-6 py-4">{{ $dateB->US_FIRST_NAME }}</td>

                    <td class="px-6 py-4">{{ $dateB->DL_NAME }}</td>

                    <td class="px-6 py-4">{{ $dateB->DS_DATE }}</td>

                </tr>

                @endforeach