Commit 6d6fce83 authored by Waterfox's avatar Waterfox
Browse files

On branch divingsFix 

Changes to be committed:
	modified:   app/Http/Controllers/DivingNumberController.php
parent 16c826ce

app/Http/Controllers/DivingNumberController.php

+21 −19
Original line number Diff line number Diff line
@@ -12,15 +12,17 @@ class DivingNumberController extends Controller 
    public function index(): View

    {

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

            $userId = session('user')->US_ID;

            $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_LOCATION','CAR_REGISTRATION.ds_code','=','CAR_DIVING_LOCATION.ds_code')

        ->join('CAR_DIVING_LOCATION','CAR_DIVING_LOCATION.dl_id','=','CAR_DIVING_LOCATION.dl_id')

        ->join('CAR_ROLE_ATTRIBUTION','CAR_USER.us_id','=','CAR_ROLE_ATTRIBUTION.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')

        ->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',$userId)
@@ -28,12 +30,12 @@ public function index(): View 




        $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_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_LOCATION','CAR_REGISTRATION.ds_code','=','CAR_DIVING_LOCATION.ds_code')

            ->where('CAR_DIVING_LOCATION.ds_date','>=',date("Y").'-00-00')

            ->join('CAR_DIVING_SESSION','CAR_REGISTRATION.ds_code','=','CAR_DIVING_SESSION.ds_code')

            ->where('CAR_DIVING_SESSION.ds_date','>=',date("Y").'-00-00')

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

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

            ->count();
@@ -57,9 +59,9 @@ public function allIndex(Request $request): View 


        $usersDatas = DivingNumberModel::selectRaw('COUNT(*) as aggregate, CAR_USER.US_FIRST_NAME, 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');

    ->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', 'CAR_USER.US_FIRST_NAME')

    ->get();
@@ -74,9 +76,9 @@ public function afterAndBefore(string $after, string $before): View 


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

        ->join('CAR_REGISTRATION', 'CAR_USER.us_id', '=', 'CAR_REGISTRATION.us_id')

        ->join('CAR_DIVING_LOCATION', 'CAR_REGISTRATION.DS_CODE', '=', 'CAR_DIVING_LOCATION.DS_CODE')

        ->where('CAR_DIVING_LOCATION.DS_DATE', '>=', $after)

                ->where('CAR_DIVING_LOCATION.DS_DATE', '<=', $before)

        ->join('CAR_DIVING_SESSION', 'CAR_REGISTRATION.DS_CODE', '=', 'CAR_DIVING_SESSION.DS_CODE')

        ->where('CAR_DIVING_SESSION.DS_DATE', '>=', $after)

                ->where('CAR_DIVING_SESSION.DS_DATE', '<=', $before)

        ->groupBy('CAR_USER.us_id', 'CAR_USER.US_NAME', 'CAR_USER.US_FIRST_NAME')

        ->get();
@@ -92,8 +94,8 @@ public function after(string $after): View 


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

        ->join('CAR_REGISTRATION', 'CAR_USER.us_id', '=', 'CAR_REGISTRATION.us_id')

        ->join('CAR_DIVING_LOCATION', 'CAR_REGISTRATION.DS_CODE', '=', 'CAR_DIVING_LOCATION.DS_CODE')

        ->where('CAR_DIVING_LOCATION.DS_DATE', '>=', $after)

        ->join('CAR_DIVING_SESSION', 'CAR_REGISTRATION.DS_CODE', '=', 'CAR_DIVING_SESSION.DS_CODE')

        ->where('CAR_DIVING_SESSION.DS_DATE', '>=', $after)

        ->groupBy('CAR_USER.us_id', 'CAR_USER.US_NAME', 'CAR_USER.US_FIRST_NAME')

        ->get();
@@ -109,8 +111,8 @@ public function before(string $before): View 


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

        ->join('CAR_REGISTRATION', 'CAR_USER.us_id', '=', 'CAR_REGISTRATION.us_id')

        ->join('CAR_DIVING_LOCATION', 'CAR_REGISTRATION.DS_CODE', '=', 'CAR_DIVING_LOCATION.DS_CODE')

        ->where('CAR_DIVING_LOCATION.DS_DATE', '<=', $before)

        ->join('CAR_DIVING_SESSION', 'CAR_REGISTRATION.DS_CODE', '=', 'CAR_DIVING_SESSION.DS_CODE')

        ->where('CAR_DIVING_SESSION.DS_DATE', '<=', $before)

        ->groupBy('CAR_USER.us_id', 'CAR_USER.US_NAME', 'CAR_USER.US_FIRST_NAME')

        ->get();