Commit 892d2f0d authored by Waterfox's avatar Waterfox
Browse files

Fix join statements and variable names in DivingNumberController and ManageAdherentController

parent 5fdf34ec

app/Http/Controllers/DivingNumberController.php

+33 −33
Original line number Diff line number Diff line
@@ -19,24 +19,24 @@ public function index(): View 
            $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')

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

        $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_ROLE ','CAR_ROLE_ATTRIBUTION .rol_code','=','CAR_ROLE .rol_code')



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

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

        ->get();





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

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

                $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_diving_session.ds_date','>=',date("Y").'-00-00')

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

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

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

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

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

            ->count();

        $usersCount = 99 - $usersCount ;
@@ -57,13 +57,13 @@ public function allIndex(Request $request): View 
            return DivingNumberController::before($request['beforethe']);

        }



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

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

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

    ->get();



        return view('alldiversactivities', ['datas' => $usersDatas]);
@@ -74,12 +74,12 @@ 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_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')

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

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

        ->get();
@@ -92,11 +92,11 @@ 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_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')

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

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

        ->get();
@@ -109,11 +109,11 @@ 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_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')

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

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

        ->get();

app/Http/Controllers/ManageAdherentController.php

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


class ManageAdherentController extends Controller {

    function index() {

        $users = User::select('car_user.US_ID', 'car_user.US_FIRST_NAME', 'car_user.US_NAME', 'car_role_attribution.ROL_CODE')->leftjoin('car_role_attribution', 'car_role_attribution.US_ID', '=', 'car_user.US_ID')->orderBy('car_user.US_ID')->get();

        $users = User::select('CAR_USER.US_ID', 'CAR_USER.US_FIRST_NAME', 'CAR_USER.US_NAME', 'CAR_ROLE_ATTRIBUTION .ROL_CODE')->leftjoin('CAR_ROLE_ATTRIBUTION ', 'CAR_ROLE_ATTRIBUTION .US_ID', '=', 'CAR_USER.US_ID')->orderBy('CAR_USER.US_ID')->get();



        $user_role = array();

        $usersInfos = array();