Commit 114bfa2a authored by Andgel Brissaud's avatar Andgel Brissaud
Browse files

merge with master

parents be300f3d 1adc23c8

app/Http/Controllers/DiveCreation.php

0 → 100644
+34 −0
Original line number Diff line number Diff line 
<?php



namespace App\Http\Controllers;



use Illuminate\Http\Request;

use App\Models\DivingSession;

use App\Models\DivingLocation;

use App\Models\Boat;

use App\Models\Prerogative;

use App\Models\User;



class DiveCreation extends Controller

{

    public static function index(Request $request)

    {

        $pre = DiveSessionCreation::add($request);



        error_log($pre);



        if(is_string($pre))

        {

            return view('create_dive', ['locations' => DivingLocation::all(),  'boats' => Boat::all(), 'levels' => Prerogative::all()->skip(3), 'users' => User::all(), 'error' => $pre, 'previousDives' => session()->get('previousDives')]);

        }

        else

        {

            $previousDives = session('previousDives', []);

            $previousDives[] = $pre;



            session(['previousDives' => $previousDives]);

            return view('create_dive',  ['locations' => DivingLocation::all(),  'boats' => Boat::all(), 'levels' => Prerogative::all()->skip(3), 'users' => User::all(), 'precedent' => $pre, 'previousDives' => $previousDives]);

        }



    }

}

app/Http/Controllers/DiveDeletion.php

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?php



namespace App\Http\Controllers;



use Illuminate\Http\Request;



class DiveDeletion extends Controller

{



    public static function delete($id)

    {

        DiveSessionDelete::update($id);

        $previousDives = session('previousDives', []);



        $indexToRemove = array_search($id, array_column($previousDives, 'DS_CODE'));



        if ($indexToRemove !== false) {

            unset($previousDives[$indexToRemove]);

            $previousDives = array_values($previousDives);

            session(['previousDives' => $previousDives]);

        }

    }

}

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/DiveSessionUpdate.php

+0 −2
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ public static function update($request, $id) 
        $dv->BO_ID = $request->boat;

        $dv->US_ID_CAR_SECURE = $request->security;

        $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_ACTIVE = 1;

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