Commit 4ffbd949 authored by LucBUTGH's avatar LucBUTGH
Browse files

Fix: number of dives of divers for a director

parent c4b45f25

app/Http/Controllers/DivingNumberController.php

+16 −1
Original line number Diff line number Diff line
@@ -23,10 +23,25 @@ public function index(): View 
                $dg->on('car_registration.ds_code', '=', 'car_diving_group.ds_code')

                    ->on('car_registration.dg_number', '=', 'car_diving_group.dg_number');

            })

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

            ->where('car_user.US_ID', 1)

            ->count();

        $usersCount = 99 - $usersCount;



        return view('diveractivities', compact('usersCount'));

    }



    public function allIndex(): View

    {

        $usersDatas = DivingNumberModel::selectRaw('COUNT(*) as aggregate, car_user.US_NAME')

    ->join('car_registration', 'car_user.us_id', '=', 'car_registration.us_id')

    ->join('car_diving_group', function ($join) {

        $join->on('car_registration.ds_code', '=', 'car_diving_group.ds_code')

            ->on('car_registration.dg_number', '=', 'car_diving_group.dg_number');

    })

    ->groupBy('car_user.us_id', 'car_user.US_NAME')

    ->get();



        return view('alldiversactivities', ['datas' => $usersDatas]);



    }

}

resources/views/alldiversactivities.blade.php

+6 −6
Original line number Diff line number Diff line
@@ -4,16 +4,16 @@ 
        <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">Noms et Prénoms</th>

                <th scope="col" class="px-6 py-3">Nombre de plongées</th>

                <th scope="col" class="px-6 py-3">Nombre de plongées réalisées</th>

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



            </tr>

            </thead>

            <tbody>

            @foreach ($users as $user)

            @foreach ($datas as $data)

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

                    <td class="px-6 py-4">{{ $user->left }}</td>

                    <td class="px-6 py-4">{{ $user->US_ID }}</td>

                    <td class="px-6 py-4"><x-button>S'inscrire</x-button><x-button>Voir les inscrits</x-button></td>

                    <td class="px-6 py-4">{{ $data->aggregate }}</td>

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

                </tr>

            @endforeach

            </tbody>

routes/web.php

+3 −0
Original line number Diff line number Diff line
@@ -28,3 +28,6 @@ 


Route::get('/divings', [DivingNumberController::class, 'index']);



Route::get('/alldivings', [DivingNumberController::class, 'allIndex']);