Commit 25e378b6 authored by Waterfox's avatar Waterfox
Browse files

Merge branch 'DivingCreation'

parents 6d6fce83 5b115b9c
Loading
Loading
Loading
Loading
+34 −0
Original line number Diff line number Diff line
<?php

namespace App\Http\Controllers;

use Illuminate\Http\Request;
use App\Models\DivingSession;
use App\Models\DivingLocation;
use App\Models\Boat;
use App\Models\Prerogative;
use App\Models\User;

class DiveCreation extends Controller
{
    public static function index(Request $request)
    {
        $pre = DiveSessionCreation::add($request);

        error_log($pre);

        if(is_string($pre))
        {
            return view('create_dive', ['locations' => DivingLocation::all(),  'boats' => Boat::all(), 'levels' => Prerogative::all()->skip(3), 'users' => User::all(), 'error' => $pre, 'previousDives' => session()->get('previousDives')]);
        }
        else
        {
            $previousDives = session('previousDives', []);
            $previousDives[] = $pre;

            session(['previousDives' => $previousDives]);
            return view('create_dive',  ['locations' => DivingLocation::all(),  'boats' => Boat::all(), 'levels' => Prerogative::all()->skip(3), 'users' => User::all(), 'precedent' => $pre, 'previousDives' => $previousDives]);
        }

    }
}
+23 −0
Original line number Diff line number Diff line
<?php

namespace App\Http\Controllers;

use Illuminate\Http\Request;

class DiveDeletion extends Controller
{

    public static function delete($id)
    {
        DiveSessionDelete::update($id);
        $previousDives = session('previousDives', []);

        $indexToRemove = array_search($id, array_column($previousDives, 'DS_CODE'));

        if ($indexToRemove !== false) {
            unset($previousDives[$indexToRemove]);
            $previousDives = array_values($previousDives);
            session(['previousDives' => $previousDives]);
        }
    }
}
+0 −2
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ public static function update($request, $id)
        $dv->BO_ID = $request->boat;
        $dv->US_ID_CAR_SECURE = $request->security;
        $dv->US_ID_CAR_DIRECT = $request->manager;
        $dv->DS_DATE = $request->day;
        $dv->CAR_SCHEDULE = $request->hour;
        $dv->DS_MAX_DEPTH = $request->maxDepth;
        $dv->DS_ACTIVE = 1;
        $dv->DS_MAX_DIVERS = $request->max;
+15 −0
Original line number Diff line number Diff line
@@ -77,3 +77,18 @@ .inputTime{
    padding: 7px;
    width: 60% !important;
}

.clickableDelete{
    width: auto !important;
    height: auto !important;
    background-color: var(--bad) !important;
    color: var(--black) !important;
    transition: all 0.4s ease-out;
}


.clickableDelete:hover{
    cursor: pointer;
    background-color: var(--badDarker) !important;
    color: var(--white) !important;
}
 No newline at end of file
+23 −0
Original line number Diff line number Diff line
document.addEventListener('DOMContentLoaded', function () {
    function checkButtons() {
        var deleteButtons = document.querySelectorAll('.clickableRed');
        var historiqueContainer = document.getElementById('Historique');
        var DiverImage = document.getElementById('imageDiver');

        if (deleteButtons.length > 0) {
            historiqueContainer.style.display = 'block';
            DiverImage.style.display = 'none';
        } else {
            historiqueContainer.style.display = 'none';
            DiverImage.style.display = 'block';
        }
    }

    checkButtons();

    document.addEventListener('click', function (event) {
        if (event.target.classList.contains('clickableRed')) {
            setTimeout(checkButtons, 100);
        }
    });
});
 No newline at end of file
Loading