Commit 3958618a authored by Waterfox's avatar Waterfox
Browse files

Merge branch 'DivingCreation' of...

Merge branch 'DivingCreation' of https://forge.info.unicaen.fr/git/but-info-sae3-2024-groupe3 into DivingCreation
parents 0c41cf52 b8f0918a
Loading
Loading
Loading
Loading
+37 −36
Original line number Diff line number Diff line
@@ -31,41 +31,6 @@
            <h1 class="text-4xl"
                style="font-family: 'Space Grotesk', sans-serif; font-weight: bold; margin-bottom: 30px;">Création d'une
                plongée</h1>
            <div style="display: flex">
                <div style="width: 50%">
                    <label for="locationInput" style="margin-right: 20px;">Site : </label>
                    <select name="location" id="locationInput" style="width: 200px;">
                        @foreach ($locations as $location)
                            @if(isset($precedent))
                                @if($location->DL_ID == $precedent->DL_ID)
                                    <option value="{{ $location->DL_ID }}" selected>{{ $location->DL_NAME }}</option>
                                @else
                                    <option value="{{ $location->DL_ID }}">{{ $location->DL_NAME }}</option>
                                @endif
                            @else
                                <option value="{{ $location->DL_ID }}">{{ $location->DL_NAME }}</option>
                            @endif
                        @endforeach
                    </select>
                </div>
                <div style="width: 50%">
                    <label for="boatInput" style="margin-right: 20px;">Bateau : </label>
                    <select name="boat" id="boatInput" style="width: 200px;">
                        @foreach ($boats as $boat)
                            @if(isset($precedent))
                                @if($location->BO_ID == $precedent->BO_ID)
                                    <option value="{{ $boat->BO_ID }}" selected>{{ $boat->BO_NAME }}</option>
                                @else
                                    <option value="{{ $boat->BO_ID }}">{{ $boat->BO_NAME }}</option>
                                @endif
                            @else
                                <option value="{{ $boat->BO_ID }}">{{ $boat->BO_NAME }}</option>
                            @endif

                        @endforeach
                    </select>
                </div>
            </div>
            <div style="display: flex;">
                <div style="width: 58%; margin-bottom: 40px;margin-top: 40px;">
                    <h2>Nombres d'inscrits</h2>
@@ -129,7 +94,43 @@
                    </div>
                </div>
            </div>
            <div style="display: flex;">
            <hr style="height: 3px;background-color: black;margin-bottom: 30px;margin-top: 5px; width : 50%;">
            <div style="display: flex; margin-bottom: 50px;">
                <div style="width: 50%">
                    <label for="locationInput" style="margin-right: 20px;">Site : </label>
                    <select name="location" id="locationInput" style="width: 200px;">
                        @foreach ($locations as $location)
                            @if(isset($precedent))
                                @if($location->DL_ID == $precedent->DL_ID)
                                    <option value="{{ $location->DL_ID }}" selected>{{ $location->DL_NAME }}</option>
                                @else
                                    <option value="{{ $location->DL_ID }}">{{ $location->DL_NAME }}</option>
                                @endif
                            @else
                                <option value="{{ $location->DL_ID }}">{{ $location->DL_NAME }}</option>
                            @endif
                        @endforeach
                    </select>
                </div>
                <div style="width: 50%">
                    <label for="boatInput" style="margin-right: 20px;">Bateau : </label>
                    <select name="boat" id="boatInput" style="width: 200px;">
                        @foreach ($boats as $boat)
                            @if(isset($precedent))
                                @if($location->BO_ID == $precedent->BO_ID)
                                    <option value="{{ $boat->BO_ID }}" selected>{{ $boat->BO_NAME }}</option>
                                @else
                                    <option value="{{ $boat->BO_ID }}">{{ $boat->BO_NAME }}</option>
                                @endif
                            @else
                                <option value="{{ $boat->BO_ID }}">{{ $boat->BO_NAME }}</option>
                            @endif

                        @endforeach
                    </select>
                </div>
            </div>
            <div style="display: flex; margin-bottom: 50px;">
                <div style="display: flex;flex-direction: column;width: 30%; margin-right: 2%; margin-bottom: 30px;">
                    <label for="securityInput">Sécurité de surface</label>
                    <hr style="height: 3px;background-color: black;margin-bottom: 15px;margin-top: 5px;">
+30 −33
Original line number Diff line number Diff line
@@ -10,32 +10,6 @@
            <h1 class="text-4xl"
                style="font-family: 'Space Grotesk', sans-serif; font-weight: bold; margin-bottom: 30px;">Modification d'une
                plongée</h1>
            <div style="display: flex">
                <div style="width: 50%">
                    <label for="locationInput" style="margin-right: 20px;">Site : </label>
                    <select name="location" id="locationInput" style="width: 200px;">
                        @foreach ($locations as $location)
                            @if ($location->DL_ID == $dive->DL_ID)
                                <option value="{{ $location->DL_ID }}" selected>{{ $location->DL_NAME }}</option>
                            @else
                                <option value="{{ $location->DL_ID }}">{{ $location->DL_NAME }}</option>
                            @endif
                        @endforeach
                    </select>
                </div>
                <div style="width: 50%">
                    <label for="boatInput" style="margin-right: 20px;">Bateau : </label>
                    <select name="boat" id="boatInput" style="width: 200px;">
                        @foreach ($boats as $boat)
                            @if ($boat->BO_ID == $dive->BO_ID)
                                <option value="{{ $boat->BO_ID }}" selected>{{ $boat->BO_NAME }}</option>
                            @else
                                <option value="{{ $boat->BO_ID }}">{{ $boat->BO_NAME }}</option>
                            @endif
                        @endforeach
                    </select>
                </div>
            </div>
            <div style="display: flex;">
                <div style="width: 58%; margin-bottom: 40px;margin-top: 40px;">
                    <h2>Nombres d'inscrits</h2>
@@ -53,7 +27,7 @@
                        </div>
                    </div>
                    <label for="levelInput">Niveau requis : </label>
                    <select name="level" id="levelInput" style="width: 200px; margin-bottom: 15px; width : 150px">
                    <select name="level" id="levelInput" style="width: 230px; margin-bottom: 15px;">
                        @foreach ($levels as $level)
                            @if($level->PRE_CODE == $dive->PRE_CODE)
                                <option value="{{ $level->PRE_CODE }}" selected>{{ $level->PRE_CODE }}</option>
@@ -62,10 +36,6 @@
                            @endif
                        @endforeach
                    </select>
                    <label for="levelInput">Niveau : </label>
                    <input type="number" name="level" id="levelInput" min=1 max=4 style="width: 40px;border: 2px solid black;border-radius: 7px;-moz-appearance: textfield;text-align: center;" placeholder="0" value="{{$dive->DS_LEVEL}}">
                    <br>

                    <label for="maxDepth">Profondeur maximum : </label>
                    <input type="number" name="maxDepth" min=1 id="maxDepth" style="width: 40px;border: 2px solid black;border-radius: 7px;-moz-appearance: textfield;text-align: center;" placeholder="0" value="{{$dive->DS_MAX_DEPTH}}">
                </div>
@@ -75,12 +45,12 @@
                    <div style="display: flex;flex-direction: column;">
                        <div>
                            <label for="dayInput">Jour : </label>
                            <input type="date" name="day" id="dayInput"
                            <input disabled type="date" name="day" id="dayInput"
                                style="border: 2px solid black;border-radius: 10px;padding: 7px;" value="{{$dive->DS_DATE}}">
                        </div>
                        <div style="margin-top: 15px;">
                            <label for="hourInput">Heure de début</label>
                            <select name="hour" id="hour" style="width: 160px; margin-bottom: 15px;">
                            <select name="hour" id="hour" style="width: 100px; margin-bottom: 15px; margin-left: 20px;" disabled>
                                <option value="Matin">Matin</option>
                                <option value="Apres-midi">Après midi</option>
                                <option value="Soir">Soir</option>
@@ -89,6 +59,33 @@
                    </div>
                </div>
            </div>
            <hr style="height: 3px;background-color: black;margin-bottom: 30px;margin-top: 5px; width : 50%;">
            <div style="display: flex; margin-bottom: 50px;">
                <div style="width: 50%">
                    <label for="locationInput" style="margin-right: 20px;">Site : </label>
                    <select name="location" id="locationInput" style="width: 200px;">
                        @foreach ($locations as $location)
                            @if ($location->DL_ID == $dive->DL_ID)
                                <option value="{{ $location->DL_ID }}" selected>{{ $location->DL_NAME }}</option>
                            @else
                                <option value="{{ $location->DL_ID }}">{{ $location->DL_NAME }}</option>
                            @endif
                        @endforeach
                    </select>
                </div>
                <div style="width: 50%">
                    <label for="boatInput" style="margin-right: 20px;">Bateau : </label>
                    <select name="boat" id="boatInput" style="width: 200px;">
                        @foreach ($boats as $boat)
                            @if ($boat->BO_ID == $dive->BO_ID)
                                <option value="{{ $boat->BO_ID }}" selected>{{ $boat->BO_NAME }}</option>
                            @else
                                <option value="{{ $boat->BO_ID }}">{{ $boat->BO_NAME }}</option>
                            @endif
                        @endforeach
                    </select>
                </div>
            </div>
            <div style="display: flex;">
                <div style="display: flex;flex-direction: column;width: 30%; margin-right: 2%; margin-bottom: 30px;">
                    <label for="securityInput">Sécurité de surface</label>