Commit d49459cc authored by Julien Sailly's avatar Julien Sailly
Browse files

Merge branch 'dive-management-infos'

parents 9b20ae82 120d5a63

app/Http/Controllers/DivesList.php

+13 −0
Changes for app/Http/Controllers/DivesList.php: 13 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -20,4 +20,17 @@ function index(): View 
        $user = session()->get('user');

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

    }



    function show($id) {

        $divingSession = DivingSession::join('CAR_DIVING_LOCATION', 'CAR_DIVING_SESSION.DL_ID', '=', 'CAR_DIVING_LOCATION.DL_ID')

            ->join('CAR_BOAT', 'CAR_DIVING_SESSION.BO_ID', '=', 'CAR_BOAT.BO_ID')

            ->where('DS_CODE', '=', $id)

            ->first();

        if($divingSession === null) return redirect()->route('homepage');

        $creator = User::find($divingSession->US_ID);

        $security = User::find($divingSession->US_ID_CAR_SECURE);

        $director = User::find($divingSession->US_ID_CAR_DIRECT);

        $divingSession->DS_DATE = strftime('%d/%m/%Y', strtotime($divingSession->DS_DATE));

        return view('dive_infos_palanque', ['dive' => $divingSession, 'divers' => $divingSession->getParticipants(), 'creator' => $creator, 'security' => $security, 'director' => $director]);

    }

}

resources/views/dive_infos_palanque.blade.php

0 → 100644
+58 −0
Changes for resources/views/dive_infos_palanque.blade.php: 58 added lines, 0 removed lines.
Original line number Diff line number Diff line 


<link href='https://api.mapbox.com/mapbox-gl-js/v3.0.1/mapbox-gl.css' rel='stylesheet' />



<x-layout>

    <x-page-title>Plongée du {{ $dive->DS_DATE }} - {{ $dive->DL_NAME }}</x-page-title>

    <div class="flex flex-col md:flex-row gap-2 rounded-lg border shadow">

        <div class="flex-1 border-r p-4">

            <h3 class="text-xl font-bold mb-2">Plongée</h3>

            <ul class="space-y-2 list-disc list-inside">

                <li>Date : {{ $dive->DS_DATE }} ({{ $dive->CAR_SCHEDULE }})</li>

                <li>Responsables :

                    <ul class="ps-5 mt-2 space-y-1 list-disc list-inside">

                        <li>Directeur de plongée : {{ $director->US_FIRST_NAME . " " . strtoupper($director->US_NAME) }}</li>

                        <li>Sécurité de surface : {{ $security->US_FIRST_NAME . " " . strtoupper($security->US_NAME) }}</li>

                        <li>Créateur de la plongée : {{ $creator->US_FIRST_NAME . " " . strtoupper($creator->US_NAME) }}</li>

                    </ul>

                </li>

                <li>Nombre de plongeurs : {{ $dive->DS_DIVERS_COUNT }}</li>

                <li>Bateau : {{ $dive->BO_NAME }}</li>

                <li>Observation : {{ $dive->DS_OBSERVATION_FIELD }}</li>

            </ul>

            @if(preg_match("/[0-9]*\.[0-9]*/", $dive->DL_LONGITUDE) == 1 && preg_match("/[0-9]*\.[0-9]*/", $dive->DL_LATITUDE) == 1)

                <div id='map' class="shadow rounded-lg w-full mt-4 aspect-video"></div>

                <script src='https://api.mapbox.com/mapbox-gl-js/v3.0.1/mapbox-gl.js'></script>

                <style>

                    div.mapboxgl-ctrl-bottom-right {

                        display: none;

                    }

                </style>

                <script>

                    mapboxgl.accessToken = 'pk.eyJ1IjoiZ290Y2hldXIiLCJhIjoiY2xyOGFyMnlhMHlxMTJqcHF3NHVsdWJiaiJ9.0tkuFzJwXUn1XwTAwaLHng';

                    const map = new mapboxgl.Map({

                        container: 'map',

                        style: 'mapbox://styles/gotcheur/clr8b55yw001v01pebzatbczl',

                        center: [{{ $dive->DL_LONGITUDE }}, {{ $dive->DL_LATITUDE }}],

                        zoom: 12

                    });

                    const diveLocation = new mapboxgl.Marker()

                        .setLngLat([{{ $dive->DL_LONGITUDE }}, {{ $dive->DL_LATITUDE }}])

                        .addTo(map);

                    map.addControl(new mapboxgl.NavigationControl());

                    //map.addControl(new mapboxgl.ScaleControl());

                    //map.addControl(new mapboxgl.FullscreenControl());

                    map.on('idle',function(){

                        map.resize()

                    })

                </script>

            @endif

            <p class="text-xl font-bold my-2">{{ $dive->DL_NAME }} • {{ $dive->DS_MAX_DEPTH }}m</p>

        </div>

        <div class="flex-1 border-r p-4">

            <h3 class="text-xl font-bold mb-2">Plongeurs</h3>

        </div>

        <div class="flex-1 p-4">

            <h3 class="text-xl font-bold mb-2">Palanquées</h3>

        </div>

    </div>

</x-layout>

routes/web.php

+4 −0
Changes for routes/web.php: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -146,3 +146,7 @@ 
Route::middleware('App\Http\Middleware\rightChecker')

    ->post('manage/members/roles', [ManageAdherentController::class, 'update'])

    ->name('updateMembersRole');



Route::middleware('App\Http\Middleware\rightChecker')

    ->get('dive/{id}', [DivesList::class, 'show'])

    ->name('dives_show');