Commit 580fc745 authored by Waterfox's avatar Waterfox
Browse files

Fix dashboard and update dive view

parent 9708e3e1

resources/views/dashboard.blade.php

+2 −3
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
            </button>

        </div>

    @else

        <x-page-title hrSize="30%">Tableau de bord</x-page-title>

        <x-page-title>Tableau de bord</x-page-title>

        <h2 class="text-2xl font-semibold text-gray-800">Bonjour

            {{ session('user')->US_FIRST_NAME . ' ' . session('user')->US_NAME . ',' }}</h2>

        <div class="flex flex-row justify-evenly mt-10">
@@ -31,7 +31,7 @@ 
            </x-square-button>

            @if (array_search('DIR', $highestRole))

                <x-square-button bgColor="bg-[#909aef]" textColor="text-black" textSubtitle="Gérer mes plongées (directeur)"

                    link="{{ route('manage_dives_dir') }}">

                    link="#">

                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-12 h-12">

                        <path stroke-linecap="round" stroke-linejoin="round" d="M4.26 10.147a60.438 60.438 0 0 0-.491 6.347A48.62 48.62 0 0 1 12 20.904a48.62 48.62 0 0 1 8.232-4.41 60.46 60.46 0 0 0-.491-6.347m-15.482 0a50.636 50.636 0 0 0-2.658-.813A59.906 59.906 0 0 1 12 3.493a59.903 59.903 0 0 1 10.399 5.84c-.896.248-1.783.52-2.658.814m-15.482 0A50.717 50.717 0 0 1 12 13.489a50.702 50.702 0 0 1 7.74-3.342M6.75 15a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5Zm0 0v-3.675A55.378 55.378 0 0 1 12 8.443m-7.007 11.55A5.981 5.981 0 0 0 6.75 15.75v-1.5" />

                      </svg>
@@ -65,7 +65,6 @@ 
                        <path stroke-linecap="round" stroke-linejoin="round"

                            d="M10.5 6h9.75M10.5 6a1.5 1.5 0 1 1-3 0m3 0a1.5 1.5 0 1 0-3 0M3.75 6H7.5m3 12h9.75m-9.75 0a1.5 1.5 0 0 1-3 0m3 0a1.5 1.5 0 0 0-3 0m-3.75 0H7.5m9-6h3.75m-3.75 0a1.5 1.5 0 0 1-3 0m3 0a1.5 1.5 0 0 0-3 0m-9.75 0h9.75" />

                    </svg>



                </x-square-button>

            </div>

        @endif

resources/views/update_dive.blade.php

+4 −0
Original line number Diff line number Diff line
@@ -36,6 +36,10 @@ 
                    </div>

                </div>

                <div class="divideFlex Column">

                    @if(isset($msg))

                    {

                        <p>{{$msg}}</p>

                    }

                    <h2>Lieu</h2>

                    <hr style="height: 3px;background-color: black;margin-bottom: 15px;margin-top: 5px; width : 40%">

                    <div class="aligne">

routes/web.php

+10 −1
Original line number Diff line number Diff line
@@ -138,7 +138,16 @@ 
 * @param $id the code of the diving session

 */

Route::post('/dive/update/{id}', function($id, Request $request){

        DiveSessionUpdate::update($request, $id);

        $msg = DiveSessionUpdate::update($request, $id);

        if($msg !== null)

        {

            return view('update_dive', ['dive' => DivingSession::find($id),

            'locations' => DivingLocation::all(),

            'boats' => Boat::all(),

            'levels' => Prerogative::all(),

            'users' => User::all(),

            'error' => $msg]);

        }

        return redirect('/');

});