Commit 22247427 authored by LucBUTGH's avatar LucBUTGH
Browse files

fix: divings

parent 6d57f45f

app/Http/Controllers/DivingNumberController.php

+11 −9
Changes for app/Http/Controllers/DivingNumberController.php: 11 added lines, 9 removed lines.
Original line number Diff line number Diff line 
<?php



namespace App\Http\Controllers;

use Illuminate\Support\Facades\Auth;

use App\Models\DivingNumberModel;

use DateTime;

use Illuminate\Support\Facades\Auth;

use Illuminate\Http\Request;

use Illuminate\View\View;
@@ -11,6 +11,13 @@ class DivingNumberController extends Controller 
{

    public function index(): View

    {

        if (session()->has('user')) {

            $userId = session('user')->US_ID; // Récupérer l'ID de l'utilisateur connecté

    

            // Faire quelque chose avec l'utilisateur ou son ID

        } else {

            $userId = NULL;

        }



        $dateDives = 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')
@@ -18,23 +25,18 @@ public function index(): View 
        ->join('car_role_attribution','car_user.us_id','=','car_role_attribution.Us_id')

        ->join('car_role','car_role_attribution.rol_code','=','car_role.rol_code')



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

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

        ->get();



        $user = Auth::user();

        if ($user) {

            $userId = $user->US_ID;

        }else{

            $userId = 1;

        }



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

            })

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

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

            ->orderBy('ds_date','desc')

            ->count();

        $usersCount = 99 - $usersCount ;

resources/views/diveractivities.blade.php

+1 −1

File changed.

Contains only whitespace changes.