Merge branch 'master' of https://forge.info.unicaen.fr/git/but-info-sae3-2024-groupe3 (e984c9cf) · Commits · Victor Friboulet / nautilus

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/dives.blade.php

+7 −7

Original line number	Diff line number	Diff line
		@@ -22,6 +22,13 @@
		<td class="px-12 py-4">{{ $dive->DL_DEPTH }}m</td>
		<td class="px-12 py-4">{{ $dive->DL_NAME }}</td>
		<td class="px-12 py-4">
		<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">
		<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 href='/dives/{{ $dive->DS_CODE }}'>
		@if ($userPre->PRE_MAX_DEPTH > $dive->DS_MAX_DEPTH)
		<x-button color="bg-green-700" colorHover="hover:bg-green-800">
		@@ -34,13 +41,6 @@
		</x-button>
		@endif
		</a>
		<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">
		<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>
		@if ($userPre->PRE_MAX_DEPTH <= $dive->DS_MAX_DEPTH)
		<div class="text-red-400">
		<p>Vous n'avez pas le niveau requis</p>

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('/');
		});