Commit 47fb2416 authored by Julien Ait azzouzene's avatar Julien Ait azzouzene
Browse files

Merge remote-tracking branch 'origin/master' into security-sheet-editing

parents 68074c33 6ec30e54

resources/views/create_dive.blade.php

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ class="fa-solid fa-xmark"></i></button></form> 
                                @endforeach

                            </select>

                            <select required name="level" id="levelInput">

                                <option value="PB">Tout niveau</option>

                                @foreach ($levels as $level)

                                    <option value="{{ $level->PRE_CODE }}">{{ $level->PRE_CODE }}</option>

                                @endforeach

resources/views/dives.blade.php

+10 −1
Original line number Diff line number Diff line
@@ -106,10 +106,10 @@ 
                                        {{ $dive->DS_DIVERS_COUNT }}/?

                                        <svg class="ml-2" xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 448 512"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M304 128a80 80 0 1 0 -160 0 80 80 0 1 0 160 0zM96 128a128 128 0 1 1 256 0A128 128 0 1 1 96 128zM49.3 464H398.7c-8.9-63.3-63.3-112-129-112H178.3c-65.7 0-120.1 48.7-129 112zM0 482.3C0 383.8 79.8 304 178.3 304h91.4C368.2 304 448 383.8 448 482.3c0 16.4-13.3 29.7-29.7 29.7H29.7C13.3 512 0 498.7 0 482.3z"/></svg>

                                    </td>

                                

                                @endif

                                

                            <td class="px-12 py-4">

                                @if($dive->DS_DIVERS_COUNT > 0)

                                    <x-button diveId="dropdownButton-{{ $dive->DS_CODE }}">

                                        <svg class="w-6 h-6 text-gray-800 dark:text-white" aria-hidden="true"

                                            xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 18">
@@ -117,6 +117,15 @@ 
                                                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>

                                @else

                                    <x-button>

                                        <svg class="w-6 h-6 text-gray-800 dark:text-white" aria-hidden="true"

                                            xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 18">

                                            <path

                                                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>

                                @endif

                                    @if (in_array($user, $participants))

                                    <a href='/unsubscribe/{{ $dive->DS_CODE }}'>

                                        <x-button color="bg-red-700" colorHover="hover:bg-red-800">

resources/views/dives_list_management.blade.php

+9 −0
Original line number Diff line number Diff line
@@ -47,6 +47,15 @@ 
                                </svg>

                            </x-button>

                        </a>

                        <a href="/dive/update/{{$dive['DS_CODE']}}">

                            <x-button diveId="dropdownButton-{{$dive->DS_CODE}}">

                                <svg class="w-6 h-6 text-gray-800 text-white" aria-hidden="true"

                                    xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 18">

                                    <path

                                        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>

                        </a>

                    </td>

                </tr>

            @endforeach

resources/views/update_dive.blade.php

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ 
                                @endforeach

                            </select>

                            <select name="level" id="levelInput" style="width: 230px; margin-bottom: 15px;">

                                <option value="PB">Tout niveau</option>

                                @foreach ($levels as $level)

                                    @if($level->PRE_CODE == $dive->PRE_CODE)

                                        <option value="{{ $level->PRE_CODE }}" selected>{{ $level->PRE_CODE }}</option>