Commit 096797dc authored by Julien Sailly's avatar Julien Sailly
Browse files

Merge branch 'master' into gestion-adherents

parents 73cebbff 6d6fce83

app/Http/Controllers/DiveSessionCreation.php

+9 −3
Original line number Diff line number Diff line
@@ -4,7 +4,9 @@ 


use Illuminate\Http\Request;

use App\Models\DivingSession;



use App\Models\DivingLocation;

use App\Models\Boat;

use Error;



class DiveSessionCreation extends Controller

{
@@ -22,13 +24,17 @@ public static function add($request) 
        $dv->US_ID_CAR_DIRECT = $request->manager;

        $dv->DS_DATE = $request->day;

        $dv->CAR_SCHEDULE = $request->hour;

        $dv->DS_MAX_DEPTH = $request->maxDepth;

        $dv->DS_MAX_DEPTH = DivingLocation::find($request->location)->DL_DEPTH;

        $dv->DS_ACTIVE = 1;

        $dv->DS_MAX_DIVERS = $request->max;

        if(intval($dv->DS_MAX_DIVERS) > Boat::find($request->boat)->BO_NUMBER_OF_SEATS)

        {

            return "Le nombre de plongeurs est supérieur au nombre de places du bateau";

        }

        $dv->PRE_CODE = $request->level;

        $dv->DS_LEVEL = 1;

        $dv->save();

        error_log($dv->DS_CODE);

        $dv->DS_CODE = 'DS'.sizeof(DivingSession::all());

        return $dv;

    }

}

app/Http/Controllers/DiveSessionDelete.php

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ class DiveSessionDelete extends Controller 


    public static function update($id)

    {

        $dv = DivingSession::where('DS_CODE', $id)->first();

        $dv = DivingSession::find($id);

        $dv->DS_ACTIVE = 0;

        $dv->save();

    }

app/Http/Controllers/DivesList.php

+16 −1
Original line number Diff line number Diff line
@@ -12,10 +12,25 @@ class DivesList extends Controller 
{

    function index(): View

    {

        $dives = DivingSession::select('DS_CODE', 'CAR_DIVING_SESSION.DL_ID', 'DS_DATE', 'DL_DEPTH', 'CAR_SCHEDULE', 'DL_NAME', 'DS_MAX_DEPTH')

        $dives = DivingSession::select('DS_CODE', 'DS_ACTIVE', 'CAR_DIVING_SESSION.DL_ID', 'DS_DATE', 'DL_DEPTH', 'CAR_SCHEDULE', 'DL_NAME', 'DS_MAX_DEPTH')

            ->join('CAR_DIVING_LOCATION', 'CAR_DIVING_SESSION.DL_ID', '=', 'CAR_DIVING_LOCATION.DL_ID')

            ->where('DS_ACTIVE', 1)

            ->orderBy('DS_DATE', 'asc')

            ->get();

        $user = session()->get('user');

        return view('dives', ['dives' => $dives, 'userPre' => Prerogative::find($user->PRE_CODE)]);

    }



    function show($id) {

        $divingSession = DivingSession::join('CAR_DIVING_LOCATION', 'CAR_DIVING_SESSION.DL_ID', '=', 'CAR_DIVING_LOCATION.DL_ID')

            ->join('CAR_BOAT', 'CAR_DIVING_SESSION.BO_ID', '=', 'CAR_BOAT.BO_ID')

            ->where('DS_CODE', '=', $id)

            ->first();

        if($divingSession === null) return redirect()->route('homepage');

        $creator = User::find($divingSession->US_ID);

        $security = User::find($divingSession->US_ID_CAR_SECURE);

        $director = User::find($divingSession->US_ID_CAR_DIRECT);

        $divingSession->DS_DATE = strftime('%d/%m/%Y', strtotime($divingSession->DS_DATE));

        return view('dive_infos_palanque', ['dive' => $divingSession, 'divers' => $divingSession->getParticipants(), 'creator' => $creator, 'security' => $security, 'director' => $director]);

    }

}

app/Http/Controllers/DivingNumberController.php

+35 −35
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_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)

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

        ->get();





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

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

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

            ->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();

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

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

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

    })

    ->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_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,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_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,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_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();

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();