Merge branch 'security-editing-front' (8ff32af4) · Commits · Victor Friboulet / nautilus

public/css/edit.css

0 → 100644

+3 −0

Original line number	Diff line number	Diff line
		.TitleArray{
		background-color: var(--yellow);
		}
		No newline at end of file

resources/views/components/security-sheets/cell-title.blade.php

0 → 100644

+3 −0

Original line number	Diff line number	Diff line
		<td colspan="{{$colspan ?? ''}}" style="padding: 10px; background-color: var(--yellow);">
		{{$slot}}
		</td>
		No newline at end of file

resources/views/components/security-sheets/cell.blade.php

+1 −1

Original line number	Diff line number	Diff line
		<td class="border-2 border-solid border-black" colspan="{{$colspan ?? ''}}">
		<td colspan="{{$colspan ?? ''}}" style="padding: 10px; border: 1px solid black;">
		{{$slot}}
		</td>
		No newline at end of file

resources/views/components/security-sheets/table.blade.php

+1 −1

Original line number	Diff line number	Diff line
		<table class= "border-4 border-solid border-black mb-2">
		<table style="text-align: left;">
		{{$slot}}
		</table>
		No newline at end of file

resources/views/securitySheet/edit.blade.php

+128 −83

Original line number	Diff line number	Diff line
		<script defer src="{{asset('js/securitySheets/edit.js')}}"></script>
		<script defer src="{{ asset('js/securitySheets/edit.js') }}">
		</script>

		<meta id="divingSessionId" content="{{$dive->DS_CODE}}">
		<meta id="csrf-token" content="{{csrf_token()}}">

		<x-layout>
		<x-security-sheets.table>
		<tr>
		<x-security-sheets.cell><strong>Date</strong></x-security-sheets.cell>
		<x-security-sheets.cell>{{$dive->DS_DATE}}</x-security-sheets.cell>
		</tr>
		<tr>
		<x-security-sheets.cell><strong>Directeur de plongée</strong></x-security-sheets.cell>
		<x-security-sheets.cell>{{$director->US_FIRST_NAME}} {{$director->US_NAME}}</x-security-sheets.cell>
		</tr>
		<tr>
		<x-security-sheets.cell><strong>Site de plongée</strong></x-security-sheets.cell>
		<x-security-sheets.cell>{{$location->DL_NAME}}</x-security-sheets.cell>
		</tr>
		</x-security-sheets.table>
		<link rel="stylesheet" href="{{ asset('/css/app.css') }}">
		<link rel="stylesheet" href="{{ asset('/css/edit.css') }}">

		<x-button diveId="button">Regénérer</x-button>
		<x-page-title>Fiche de sécurité</x-page-title>

		<x-security-sheets.table>
		<div class="aligne" style="margin-bottom: 40px">
		<button diveId="button" class="clickable"
		style="padding: 10px; border-radius: 10px; width:60%; height: 80px; font-size: 35px">Générer de nouveau</button>
		</div>

		<div class="aligne Column">
		<p style="font-size: 35px">Information sur la plongée</p>
		<hr style="height: 3px;background-color: black;margin-bottom: 15px;margin-top: 5px; width : 40rem">
		<table style="text-align: left;border: 1px solid black;">
		<thead style="border-bottom: 1px solid black; font-size: 15px;background-color: var(--yellow);">
		<tr>
		<x-security-sheets.cell><strong>Sécurité de surface</strong></x-security-sheets.cell>
		<x-security-sheets.cell>{{$surfaceSecurity->US_FIRST_NAME}} {{$surfaceSecurity->US_NAME}}</x-security-sheets.cell>
		<th scope="col" class="px-12 py-4">Date</th>
		<th scope="col" class="px-12 py-4">Site de plongée</th>
		<th scope="col" class="px-12 py-4">Observation météo et marée</th>
		<th scope="col" class="px-12 py-4">Directeur de plongée</th>
		<th scope="col" class="px-12 py-4">Sécurité de surface</th>
		<th scope="col" class="px-12 py-4">Pilote</th>
		</tr>
		<tr>
		<x-security-sheets.cell><strong>Pilote</strong></x-security-sheets.cell>
		<x-security-sheets.cell>{{$driver->US_FIRST_NAME}} {{$driver->US_NAME}}</x-security-sheets.cell>
		</thead>
		<tbody>
		<tr class="odd:bg-white even:bg-gray-50">
		<td class="px-12 py-4">{{ $dive->DS_DATE }}</td>
		<td class="px-12 py-4">{{ $location->DL_NAME }}</td>
		<td class="px-12 py-4">
		<input id="observation-field" class="bg-[#e6e6e6] border border-black"
		type="text" value="{{ $dive->DS_OBSERVATION_FIELD }}"
		style="border-radius: 10px;background-color: var(--yellow);
		border-color: var(--yellow);display: flex;align-items: center;justify-content: center;
		font-size: 20px;padding: 10px;width: 100%;text-align: center;">
		</td>
		<td class="px-12 py-4">{{ $director->US_FIRST_NAME }} {{ $director->US_NAME }}</td>
		<td class="px-12 py-4">{{ $surfaceSecurity->US_FIRST_NAME }} {{ $surfaceSecurity->US_NAME }}</td>
		<td class="px-12 py-4">{{ $driver->US_FIRST_NAME }} {{ $driver->US_NAME }}</td>
		</tr>
		<tr>
		<x-security-sheets.cell><strong>
		Observation
		<br>> météo et marée
		</strong></x-security-sheets.cell>
		<x-security-sheets.cell>
		<input id="observation-field" class="bg-[#e6e6e6] border border-black" type="text" value="{{$dive->DS_OBSERVATION_FIELD}}">
		</x-security-sheets.cell>
		</tr>
		</x-security-sheets.table>
		</tbody>
		</table>
		</div>

		@foreach ($divingGroups as $divingGroup)
		<x-security-sheets.table>
		@@ -47,70 +54,108 @@
		$groupNumber = $divingGroup['group']->DG_NUMBER;
		@endphp

		<!-- Table's header -->
		<x-security-sheets.header><x-security-sheets.cell colspan="4"><strong>
		PALANQUEE n° {{$groupNumber}}
		</strong></x-security-sheets.cell></x-security-sheets.header>
		<!-- Start and ending hours -->
		<div class="aligne Column">
		<p style="font-size: 35px; margin-top: 50px;">Palanquée n° {{ $groupNumber }}</p>
		<hr style="height: 3px;background-color: black;margin-bottom: 15px;margin-top: 5px; width : 40rem">
		</div>
		<table style="text-align: left;border: 1px solid black;">
		<thead style="border-bottom: 1px solid black; font-size: 15px;background-color: var(--yellow);">
		<tr>
		<x-security-sheets.cell>Heure de départ</x-security-sheets.cell>
		<x-security-sheets.cell>
		<input id="dg{{$groupNumber}}-start" class="dg-start border-2 border-solid border-gray-500" type="time" value="{{substr($divingGroup['group']->DG_BEGINNING_OF_DIVING_HOUR, 0, 5)}}">
		</x-security-sheets.cell>
		<x-security-sheets.cell>Heure de retour</x-security-sheets.cell>
		<x-security-sheets.cell>
		<input id="dg{{$groupNumber}}-end" class="dg-end border-2 border-solid border-gray-500" type="time" value="{{substr($divingGroup['group']->DG_END_OF_DIVING_HOUR, 0, 5)}}">
		</x-security-sheets.cell>
		<th scope="col" class="px-12 py-4" style="background-color: var(--yellow);">Palanquée n°
		{{ $groupNumber }}</th>
		<th scope="col" class="px-12 py-4" style="background-color: var(--yellow);"></th>
		<th scope="col" class="px-12 py-4" style="background-color: var(--yellow);"></th>
		<th scope="col" class="px-12 py-4" style="background-color: var(--yellow);"></th>
		</tr>

		<!-- Expected time and depth -->
		<tr>
		<x-security-sheets.cell>Temps prévu (minutes)</x-security-sheets.cell>
		<x-security-sheets.cell>
		<input id="dg{{$groupNumber}}-exp-time" class="dg-exp-time" type="number" value = "{{$divingGroup['group']->DG_MAX_DURATION}}">
		</x-security-sheets.cell>
		<x-security-sheets.cell>Profondeur prévue (mètres)</x-security-sheets.cell>
		<x-security-sheets.cell>
		<input id="dg{{$groupNumber}}-exp-dep" class="dg-exp-dep" type="number" value = "{{$divingGroup['group']->DG_MAX_DEPTH}}">
		</x-security-sheets.cell>
		</thead>
		<tbody>
		<tr class="odd:bg-white even:bg-gray-50">
		<td class="px-12 py-4">Heure de départ</td>
		<td class="px-12 py-4"><input id="dg{{ $groupNumber }}-start"
		class="dg-start border-2 border-solid border-gray-500" type="time"
		style="border-radius: 10px;background-color: var(--yellow);border-color: var(--yellow);
		display: flex;align-items: center;justify-content: center;
		font-size: 20px;padding: 10px;width: 50%;text-align: center;"
		value="{{ substr($divingGroup['group']->DG_BEGINNING_OF_DIVING_HOUR, 0, 5) }}">
		</td>
		<td class="px-12 py-4">Heure de retour</td>
		<td class="px-12 py-4">
		<input id="dg{{ $groupNumber }}-end" class="dg-end border-2 border-solid border-gray-500"
		type="time"
		style="border-radius: 10px;background-color: var(--yellow);border-color: var(--yellow);
		display: flex;align-items: center;justify-content: center;
		font-size: 20px;padding: 10px;width: 50%;text-align: center;"
		value="{{ substr($divingGroup['group']->DG_END_OF_DIVING_HOUR, 0, 5) }}">
		</td>
		</tr>

		<!-- Actual time and depth -->
		<tr>
		<x-security-sheets.cell>Temps réalisé (minutes)</x-security-sheets.cell>
		<x-security-sheets.cell>
		<input id="dg{{$groupNumber}}-act-time" class="dg-act-time" type="number" value = "{{$divingGroup['group']->DG_EFFECTIVE_DIVING_DURATION}}">
		</x-security-sheets.cell>
		<x-security-sheets.cell>Profondeur réalisée (mètres)</x-security-sheets.cell>
		<x-security-sheets.cell>
		<input id="dg{{$groupNumber}}-act-dep" class="dg-act-dep" type="number" value = "{{$divingGroup['group']->DG_MAX_EFFECTIVE_DEPTH}}">
		</x-security-sheets.cell>
		<tr class="odd:bg-white even:bg-gray-50">
		<td class="px-12 py-4">Temps prévu (minutes)</td>
		<td class="px-12 py-4">
		<input id="dg{{ $groupNumber }}-exp-time" class="dg-exp-time" type="number"
		value = "{{ $divingGroup['group']->DG_MAX_DURATION }}"
		style="font-size: 20px;width: 50%;-moz-appearance: textfield;text-align: center;background-color: var(--yellow);padding: 10px;border-radius: 10px;">
		</td>
		<td class="px-12 py-4">Temps réalisé (minutes)</td>
		<td class="px-12 py-4">
		<input id="dg{{ $groupNumber }}-act-time" class="dg-act-time" type="number"
		value = "{{ $divingGroup['group']->DG_EFFECTIVE_DIVING_DURATION }}"
		style="font-size: 20px;width: 50%;-moz-appearance: textfield;text-align: center;background-color: var(--yellow);padding: 10px;border-radius: 10px;">
		</td>
		</tr>

		<!-- Members table header -->
		<x-security-sheets.divers-header>
		<x-security-sheets.cell colspan="2"><strong>Prénom Nom</strong></x-security-sheets.cell>
		<x-security-sheets.cell>Aptitudes</x-security-sheets.cell>
		<x-security-sheets.cell><strong>Fonction</strong></x-security-sheets.cell>
		</x-security-sheets.divers-header>
		<tr class="odd:bg-white even:bg-gray-50">
		<td class="px-12 py-4">Profondeur prévue (mètres)</td>
		<td class="px-12 py-4">
		<input id="dg{{ $groupNumber }}-exp-dep" class="dg-exp-dep" type="number"
		value = "{{ $divingGroup['group']->DG_MAX_DEPTH }}"
		style="font-size: 20px;width: 50%;-moz-appearance: textfield;text-align: center;background-color: var(--yellow);padding: 10px;border-radius: 10px;">
		</td>
		<td class="px-12 py-4">Profondeur réalisée (mètres)</td>
		</td>
		<td class="px-12 py-4">
		<input
		style="font-size: 20px;width: 50%;-moz-appearance: textfield;text-align: center;background-color: var(--yellow);padding: 10px;border-radius: 10px;"
		id="dg{{ $groupNumber }}-act-dep" class="dg-act-dep" type="number"
		value = "{{ $divingGroup['group']->DG_MAX_EFFECTIVE_DEPTH }}">
		</td>
		</tr>
		</tbody>
		</table>

		@foreach ($divingGroup['divers'] as $diver)
		<!-- A row for a single diver -->
		<table style="text-align: left;border-right: 1px solid black;border-left: 1px solid black;border-bottom: 1px solid black; width: 100%">
		<thead style="font-size: 15px;background-color: var(--yellow);">
		<tr>
		<th scope="col" class="px-12 py-4" style="background-color: var(--yellow);">
		</th>
		<th scope="col" class="px-12 py-4" style="background-color: var(--yellow);">
		<p style="font-size: 30px; text-align: center;">Liste des participants</p>
		<th scope="col" class="px-12 py-4" style="background-color: var(--yellow);"></th>
		</tr>
		</thead>
		<thead style="border-bottom: 1px solid black; font-size: 15px;background-color: var(--yellow);">
		<tr>
		<x-security-sheets.cell colspan="2">
		{{$diver->US_NAME}} {{$diver->US_FIRST_NAME}}
		</x-security-sheets.cell>
		<x-security-sheets.cell>
		{{$diver->PRE_CODE}}
		<th scope="col" class="px-12 py-4" style="background-color: var(--yellow);">Prénom et Nom
		</th>
		<th scope="col" class="px-12 py-4" style="background-color: var(--yellow);">Aptitude</th>
		<th scope="col" class="px-12 py-4" style="background-color: var(--yellow);">Fonction</th>
		</tr>
		</thead>
		<tbody>
		@foreach ($divingGroup['divers'] as $diver)
		<tr class="odd:bg-white even:bg-gray-50">
		<td class="px-12 py-4">{{ $diver->US_NAME }} {{ $diver->US_FIRST_NAME }}</td>
		<td class="px-12 py-4"> {{ $diver->PRE_CODE }}
		@if ($diver->US_TEACHING_LEVEL > 0)
		/ E{{ $diver->US_TEACHING_LEVEL }}
		@endif
		</x-security-sheets.cell>
		<x-security-sheets.cell>
		{{$dive->getRoleForUser($diver)}}
		</x-security-sheets.cell>
		</td>
		<td class="px-12 py-4">{{ $dive->getRoleForUser($diver) }}</td>
		</tr>
		@endforeach
		</tbody>
		</table>
		<table>
		</x-security-sheets.table>
		@endforeach
		</x-layout>