Commit 9b20ae82 authored by Julien Ait azzouzene's avatar Julien Ait azzouzene
Browse files

Merge remote-tracking branch 'origin/master' into securitySheets

parents 6300bd2c c8e1a196

app/Http/Controllers/DivesList.php

+3 −1
Original line number Diff line number Diff line
@@ -12,8 +12,10 @@ 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)]);

resources/views/dives.blade.php

+23 −0
Original line number Diff line number Diff line 
<x-layout>

    <link rel="stylesheet" href="/css/drop-down.css">

    <link rel="stylesheet" href="{{ asset('/css/app.css') }}">



    <x-page-title>Liste des plongées</x-page-title>

    <div class="shadow-md max-w-full rounded-lg overflow-hidden border-2">

        <table class="text-sm text-left text-gray-500 w-full">
@@ -38,6 +40,11 @@ 
                                    d="M14 2a3.963 3.963 0 0 0-1.4.267 6.439 6.439 0 0 1-1.331 6.638A4 4 0 1 0 14 2Zm1 9h-1.264A6.957 6.957 0 0 1 15 15v2a2.97 2.97 0 0 1-.184 1H19a1 1 0 0 0 1-1v-1a5.006 5.006 0 0 0-5-5ZM6.5 9a4.5 4.5 0 1 0 0-9 4.5 4.5 0 0 0 0 9ZM8 10H5a5.006 5.006 0 0 0-5 5v2a1 1 0 0 0 1 1h11a1 1 0 0 0 1-1v-2a5.006 5.006 0 0 0-5-5Z"/>

                            </svg>

                        </x-button>

                        @if($userPre->PRE_MAX_DEPTH <= $dive->DS_MAX_DEPTH)

                            <div class="text-red-400">

                                <p>Vous n'avez pas le niveau requis</p>

                            </div>

                        @endif

                        @if ($errors->any())

                            <div class="text-red-400">

                                <ul>
@@ -68,5 +75,21 @@ 
            </tbody>

        </table>

    </div>



    <div id="toast-default"

    class="flex items-center w-full max-w-xs p-4 text-gray-500 bg-white rounded-lg shadow dark:text-gray-400 dark:bg-gray-800"

            role="alert" style="background-color: var(--badDarker);color: white;">

            <div class="ms-3 text-sm font-normal"><i class="fa-solid fa-triangle-exclamation" style="margin-right: 10px"></i> Attention, une erreur !</div>

            <button type="button" style="background-color: var(--badDarker);color: white;"

            class="ms-auto -mx-1.5 -my-1.5 bg-white text-gray-400 hover:text-gray-900 rounded-lg focus:ring-2 focus:ring-gray-300 p-1.5 hover:bg-gray-100 inline-flex items-center justify-center h-8 w-8 dark:text-gray-500 dark:hover:text-white dark:bg-gray-800 dark:hover:bg-gray-700"

                data-dismiss-target="#toast-default" aria-label="Close">

                <span class="sr-only">Close</span>

                <svg class="w-3 h-3" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none"

                    viewBox="0 0 14 14">

                    <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"

                        stroke-width="2" d="m1 1 6 6m0 0 6 6M7 7l6-6M7 7l-6 6" />

                </svg>

            </button>

        </div>

    <script type="text/javascript" src="/js/drop-down.js"></script>

</x-layout>