Commit 557974ca authored by cyprien's avatar cyprien
Browse files

Merge branch 'DivingCreation' of... 

Merge branch 'DivingCreation' of https://forge.info.unicaen.fr/git/but-info-sae3-2024-groupe3 into DivingCreation
parents 0518cf56 84544c47

app/Http/Controllers/DiveSessionCreation.php

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ class DiveSessionCreation extends Controller 
    public static function add($request)

    {

        $dv = new DivingSession();



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

        $dv->US_ID = $request->pilot;

        $dv->DL_ID = $request->location;
@@ -27,6 +28,8 @@ public static function add($request) 
        $dv->DS_MAX_DEPTH = DivingLocation::find($request->location)->DL_DEPTH;

        $dv->DS_ACTIVE = 1;

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

        $dv->DS_MIN_DIVERS = $request->min;



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

app/Http/Controllers/DiveSessionUpdate.php

+6 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 


use App\Models\DivingSession;

use Illuminate\Http\Request;

use App\Models\Boat;



class DiveSessionUpdate extends Controller

{
@@ -12,6 +13,11 @@ public static function update($request, $id) 
    {

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



        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->US_ID = $request->pilot;

        $dv->DL_ID = $request->location;

        $dv->BO_ID = $request->boat;

app/Http/Controllers/DivingNumberController.php

+16 −7
Original line number Diff line number Diff line
@@ -11,20 +11,28 @@ 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

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

            $user = session('user');

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

        }else{

            $userId = NULL;

            $userId = null;

        }

        

        $dateDives = DivingNumberModel::join('CAR_REGISTRATION', 'CAR_USER.us_id', '=', 'CAR_REGISTRATION.us_id')



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

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

        ->where('CAR_DIVING_SESSION.DS_DATE','<',now())

        ->get();



        $dateDivesAfter = 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_DIVING_SESSION.DS_DATE','>=',now())

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

        ->get();
@@ -41,7 +49,8 @@ public function index(): View 
            ->count();

        $usersCount = 99 - $usersCount ;



        return view('diveractivities', compact('usersCount'), ['dates' => $dateDives]);

        return view('diveractivities', compact('usersCount'), ['datesB' => $dateDivesBefore,

                                                                'datesA' => $dateDivesAfter]);

    }



    public function allIndex(Request $request): View

resources/views/components/page-subtitle.blade.php

0 → 100644
+1 −0
Original line number Diff line number Diff line 
<h2 class="mb-6 font-bold md:text-5xl lg:text-3xl underline underline-offset-8">{{ $slot }}</h2>

resources/views/create_dive.blade.php

+6 −0
Original line number Diff line number Diff line
@@ -106,8 +106,14 @@ class="fa-solid fa-xmark"></i></button></form> 
                            <label for="maxInput">Maximum :</label>

                        </div>

                        <div class="divideFlexBig Column">

                            @if (isset($precedent))

                                <input required type="number" name="min" id="minInput" min="0" placeholder="0"

                                    style="width: 20%;-moz-appearance: textfield;text-align: center;"

                                    value="{{ $precedent->DS_MIN_DIVERS }}">

                            @else

                                <input required type="number" name="min" id="minInput" min="0" placeholder="0"

                                    style="width: 20%;-moz-appearance: textfield;text-align: center;">

                            @endif

                            @if (isset($precedent))

                                <input required type="number" name="max" id="maxInput" min="0"

                                    placeholder="0" style="width: 20%;-moz-appearance: textfield;text-align: center;"