Commit c5bbc612 authored by Waterfox's avatar Waterfox
Browse files

Merge branch 'DiveListUpgrade'

parents d7fa3c59 b5d3d78a

app/Exceptions/Handler.php

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ public function register() 
    {

        $this->renderable(function(QueryException $queryException, Request $request){

            if ($queryException->getCode()==45000)

            return response()->view('erreur-page',['message'=>$queryException->getMessage()]);

            return response()->view('error-page',['message'=>$queryException->getMessage()]);

        });

        $this->reportable(function (Throwable $e) {

            //

app/Http/Controllers/DiveSessionUpdate.php

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


use App\Models\DivingSession;

use Illuminate\Http\Request;

use App\Models\Boat;



class DiveSessionUpdate extends Controller

{
@@ -18,16 +17,12 @@ 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;

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



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

    }

}

app/Http/Controllers/DivesList.php

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ function index(): View 
            ->orderBy('DS_DATE', 'asc')

            ->get();

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

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

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

    }



    function show($id) {

app/Http/Controllers/DivingUnsubscribeController.php

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



namespace App\Http\Controllers;



use Illuminate\Http\Request;

use App\Models\DivingSignUpModel;



class DivingUnsubscribeController extends Controller

{

    public function index($id)

    {

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

        $request = DivingSignUpModel::where('US_ID', $userid)->where('DS_CODE', $id)->delete();

        return redirect('/dives');

    }

}

app/Models/DivingSignUpModel.php

+3 −0
Original line number Diff line number Diff line
@@ -9,5 +9,8 @@ class DivingSignUpModel extends Model 
{

    protected $table = 'CAR_REGISTRATION';

    protected $fillable = ['US_ID', 'DS_CODE', 'REG_ACTIVE'];



    public $timestamps = false;



    use HasFactory;

}