Commit c4b45f25 authored by LucBUTGH's avatar LucBUTGH
Browse files

Fix: number of dives done for a diver

parent 1e9c9542

app/Http/Controllers/DivingNumberController.php

+18 −5
Original line number Diff line number Diff line 
<?php



namespace App\Http\Controllers;



use Illuminate\Support\Facades\Auth;

use App\Models\DivingNumberModel;

use Illuminate\Http\Request;

use Illuminate\View\View;



class DivingNumberController extends Controller

{

    public function index(): View{

        $request = DivingNumberModel::select()->join('car_registration', 'car_user.us_id', '=', 'car_registration.us_id')

    public function index(): View

    {

        $user = Auth::user();

        if ($user) {

            $userId = $user->US_ID; // Utilisez la propriété d'ID de votre modèle User

        }else{

            $userId = 1;

        }

        // Assurez-vous que la propriété 'US_ID' est disponible dans la requête ou ajustez selon votre logique

        $dives = 99;

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

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

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

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

        })->count();

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

            })

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

            ->count();

        $usersCount = 99 - $usersCount;



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

    }

}

resources/views/alldiversactivities.blade.php

+2 −4
Original line number Diff line number Diff line
@@ -11,10 +11,8 @@ 
            <tbody>

            @foreach ($users as $user)

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

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

                    <td class="px-6 py-4">{{ $dive->CAR_SCHEDULE }}</td>

                    <td class="px-6 py-4">{{ $dive->DL_DEPTH }}</td>

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

                    <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>

                </tr>

            @endforeach

resources/views/diveractivities.blade.php

+1 −8
Original line number Diff line number Diff line
@@ -4,20 +4,13 @@ 
        <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>

            </tr>

            </thead>

            <tbody>

            @foreach ($dives as $dive)

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

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

                    <td class="px-6 py-4">{{ $dive->CAR_SCHEDULE }}</td>

                    <td class="px-6 py-4">{{ $dive->DL_DEPTH }}</td>

                    <td class="px-6 py-4">{{ $dive->DL_NAME }}</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">{{ $usersCount }}</td>

                </tr>

            @endforeach

            </tbody>

        </table>

    </div>