Commit f4313371 authored by Waterfox's avatar Waterfox
Browse files

Merge branch 'master' into DivingCreation

parents 3958618a eb0e1d4f

app/Http/Controllers/DiversBySession.php

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



namespace App\Http\Controllers;



use Illuminate\Http\Request;

use App\Models\User;

use Illuminate\View\View;





class DiversBySession extends Controller

{

    public function getDiversBySession($ds_code): View

    {

        $parametre = $ds_code;

        $request = User::selectRaw('US_NAME, US_FIRST_NAME')

        ->join('CAR_REGISTRATION','CAR_REGISTRATION.US_ID', '=', 'CAR_USER.US_ID')

        ->where('DS_CODE', $ds_code)

        ->get();



        return view('diversonesession', ['datas' => $request, 'parametre' => $parametre]);

    }

    

    public function getAllSessions(): View

    {

        $sessions = User::

        join('CAR_REGISTRATION', 'CAR_REGISTRATION.US_ID', '=', 'CAR_USER.US_ID')

        ->get();

    

    return view('diversinsessions', compact('sessions'));

    

    }

}

app/Http/Controllers/DivingSignUpController.php

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ public function show(){ 
    }



    public function index($ds_code){

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

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

        session()->put('DS_CODE', $ds_code);

        $request = DivingSignUpModel::select()->where('US_ID', $userid)->where('DS_CODE', $ds_code)->count();

        if(!$request == 0)

app/Http/Controllers/HomepageController.php

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



namespace App\Http\Controllers;



use App\Models\RoleAttribution;

use Illuminate\View\View;



class HomepageController extends Controller

{

    function index(): View {

        if (!session()->has('user')) return view('dashboard');

        $roles = RoleAttribution::where('US_ID', '=', session('user')->US_ID)->get();

        $highestRole = 'VIS';

        if ($roles == null) return view('dashboard');

        else $highestRole = array('DIV');

        foreach ($roles as $role) {

            array_push($highestRole, $role->ROL_CODE);

        }

        return view('dashboard', ['highestRole' => $highestRole]);

    }

}

app/Models/DivingSignUpModel.php

+0 −2
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ 
class DivingSignUpModel extends Model

{

    protected $table = 'CAR_REGISTRATION';

    protected $primaryKey = ['us_id', 'ds_code'];

    protected $keyType = ['int', 'string'];

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

    use HasFactory;

}

public/css/drop-down.css

0 → 100644
+22 −0
Original line number Diff line number Diff line 
.drop-down {

    margin-left: 2.5em;

    margin-bottom: 1em;

    margin-top: 1em;

    animation-duration: 0.5s;

    animation-name: slidein;

  }



.drop-down-items{

  margin-bottom: 0.5em;

  column-span: all;

}

  

  @keyframes slidein {

    from {

      transform: translateX(-100px);

    }

  

    to {

      transform: translateX(0px);

     }

  }
 
 No newline at end of file