Étapes 6-9 + types de lieux + picker + filtres
- Étape 6 : formulaire de saisie dynamique des relevés (piloté par source_type_fields, calendriers grégorien/julien/républicain) - Étape 7 : workflow de statut des sources + notifications mail+DB (SourceAValider, SourceRejetee) - Étape 8 : recherche fulltext PostgreSQL avec filtres type/lieu/années et CTE récursive pour les subdivisions de lieux - Étape 9 : export GEDCOM 5.5.1 (GedcomExportService + DateConversionService) - Types de lieux : CRUD admin (LieuTypeController) avec champ ordre - Composant lieu-picker : modale Alpine.js avec recherche AJAX + debounce - Filtres sources : statut, type, lieu (CTE récursive), période annee_debut/annee_fin - Filtres lieux : type, texte, lieu parent avec descendants (CTE récursive) - Migration : lieu_id + annee_debut + annee_fin sur sources Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -9,6 +9,27 @@
|
||||
@error('nom') <p class="mt-1 text-sm text-red-600">{{ $message }}</p> @enderror
|
||||
</div>
|
||||
|
||||
{{-- Type de lieu --}}
|
||||
<div>
|
||||
<label for="lieu_type_id" class="block text-sm font-medium text-gray-700">Type <span class="text-red-500">*</span></label>
|
||||
<select id="lieu_type_id" name="lieu_type_id" required
|
||||
class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 @error('lieu_type_id') border-red-500 @enderror">
|
||||
<option value="">— Choisir un type —</option>
|
||||
@foreach($lieuTypes as $lt)
|
||||
<option value="{{ $lt->id }}" {{ old('lieu_type_id', $lieu?->lieu_type_id) == $lt->id ? 'selected' : '' }}>
|
||||
{{ $lt->nom }}
|
||||
</option>
|
||||
@endforeach
|
||||
</select>
|
||||
@error('lieu_type_id') <p class="mt-1 text-sm text-red-600">{{ $message }}</p> @enderror
|
||||
@if($lieuTypes->isEmpty())
|
||||
<p class="mt-1 text-sm text-amber-600">
|
||||
Aucun type défini.
|
||||
<a href="{{ route('admin.lieu-types.create') }}" class="underline">Créer des types →</a>
|
||||
</p>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
{{-- Code --}}
|
||||
<div>
|
||||
<label for="code" class="block text-sm font-medium text-gray-700">Code (INSEE, postal…)</label>
|
||||
@@ -18,21 +39,16 @@
|
||||
maxlength="20">
|
||||
</div>
|
||||
|
||||
{{-- Parent --}}
|
||||
<div>
|
||||
<label for="lieu_parent_id" class="block text-sm font-medium text-gray-700">Lieu parent</label>
|
||||
<select id="lieu_parent_id" name="lieu_parent_id"
|
||||
class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500">
|
||||
<option value="">— Aucun (lieu racine) —</option>
|
||||
@foreach($parents as $parent)
|
||||
<option value="{{ $parent->id }}"
|
||||
{{ old('lieu_parent_id', $lieu?->lieu_parent_id) == $parent->id ? 'selected' : '' }}>
|
||||
{{ $parent->nom_long ?? $parent->nom }}
|
||||
</option>
|
||||
@endforeach
|
||||
</select>
|
||||
@error('lieu_parent_id') <p class="mt-1 text-sm text-red-600">{{ $message }}</p> @enderror
|
||||
</div>
|
||||
{{-- Lieu parent --}}
|
||||
<x-lieu-picker
|
||||
name="lieu_parent_id"
|
||||
label="Lieu parent"
|
||||
:value="old('lieu_parent_id', $lieu?->lieu_parent_id)"
|
||||
:display-value="old('lieu_parent_id')
|
||||
? ''
|
||||
: ($lieu?->parent?->nom_long ?? $lieu?->parent?->nom ?? '')"
|
||||
placeholder="— Aucun (lieu racine) —"
|
||||
/>
|
||||
|
||||
{{-- Coordonnées --}}
|
||||
<div class="grid grid-cols-2 gap-4">
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<div class="bg-white shadow rounded-lg p-6">
|
||||
<form method="POST" action="{{ route('lieux.store') }}">
|
||||
@csrf
|
||||
@include('lieux._form', ['lieu' => null, 'parents' => $parents])
|
||||
@include('lieux._form', ['lieu' => null])
|
||||
|
||||
<div class="mt-6 flex items-center gap-4">
|
||||
<button type="submit"
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<div class="bg-white shadow rounded-lg p-6">
|
||||
<form method="POST" action="{{ route('lieux.update', $lieu) }}">
|
||||
@csrf @method('PUT')
|
||||
@include('lieux._form', ['lieu' => $lieu, 'parents' => $parents])
|
||||
@include('lieux._form', ['lieu' => $lieu])
|
||||
|
||||
<div class="mt-6 flex items-center gap-4">
|
||||
<button type="submit"
|
||||
|
||||
@@ -11,24 +11,78 @@
|
||||
</div>
|
||||
</x-slot>
|
||||
|
||||
<div class="py-8 max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
|
||||
<div class="py-8 max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 space-y-6">
|
||||
|
||||
@if(session('success'))
|
||||
<div class="mb-4 p-4 bg-green-50 border border-green-200 text-green-800 rounded-md">
|
||||
{{ session('success') }}
|
||||
</div>
|
||||
<div class="p-4 bg-green-50 border border-green-200 text-green-800 rounded-md">{{ session('success') }}</div>
|
||||
@endif
|
||||
@if(session('error'))
|
||||
<div class="mb-4 p-4 bg-red-50 border border-red-200 text-red-800 rounded-md">
|
||||
{{ session('error') }}
|
||||
</div>
|
||||
<div class="p-4 bg-red-50 border border-red-200 text-red-800 rounded-md">{{ session('error') }}</div>
|
||||
@endif
|
||||
|
||||
{{-- Filtres --}}
|
||||
@php $hasFilters = request()->anyFilled(['lieu_type_id', 'q', 'lieu_id']); @endphp
|
||||
<div class="bg-white shadow rounded-lg p-5">
|
||||
<form method="GET" action="{{ route('lieux.index') }}">
|
||||
<div class="flex flex-wrap items-end gap-4">
|
||||
|
||||
<div class="flex-1 min-w-[200px]">
|
||||
<label class="block text-xs font-medium text-gray-600 mb-1">Recherche</label>
|
||||
<input type="text" name="q" value="{{ request('q') }}"
|
||||
placeholder="Nom, code INSEE…"
|
||||
class="block w-full rounded-md border-gray-300 shadow-sm text-sm focus:border-indigo-500 focus:ring-indigo-500">
|
||||
</div>
|
||||
|
||||
<div class="w-52">
|
||||
<label class="block text-xs font-medium text-gray-600 mb-1">Type de lieu</label>
|
||||
<select name="lieu_type_id"
|
||||
class="block w-full rounded-md border-gray-300 shadow-sm text-sm focus:border-indigo-500 focus:ring-indigo-500">
|
||||
<option value="">— Tous les types —</option>
|
||||
@foreach($lieuTypes as $lt)
|
||||
<option value="{{ $lt->id }}" {{ request('lieu_type_id') == $lt->id ? 'selected' : '' }}>
|
||||
{{ $lt->nom }}
|
||||
</option>
|
||||
@endforeach
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="flex items-center gap-3 self-end">
|
||||
<button type="submit"
|
||||
class="px-5 py-2 bg-indigo-600 text-white text-sm font-medium rounded-md hover:bg-indigo-700">
|
||||
Filtrer
|
||||
</button>
|
||||
@if($hasFilters)
|
||||
<a href="{{ route('lieux.index') }}"
|
||||
class="px-4 py-2 border border-gray-300 text-gray-600 text-sm rounded-md hover:bg-gray-50">
|
||||
Effacer
|
||||
</a>
|
||||
<span class="inline-flex items-center px-2 py-0.5 rounded-full text-xs bg-indigo-100 text-indigo-700">
|
||||
filtres actifs
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{{-- Filtre par lieu parent --}}
|
||||
<div class="mt-4 max-w-sm">
|
||||
<x-lieu-picker
|
||||
name="lieu_id"
|
||||
label="Lieu (et ses subdivisions)"
|
||||
:value="request('lieu_id')"
|
||||
:display-value="$lieuSelectionne?->nom_long ?? $lieuSelectionne?->nom ?? ''"
|
||||
placeholder="— Tous les lieux —"
|
||||
/>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
{{-- Tableau --}}
|
||||
<div class="bg-white shadow rounded-lg overflow-hidden">
|
||||
<table class="min-w-full divide-y divide-gray-200">
|
||||
<thead class="bg-gray-50">
|
||||
<tr>
|
||||
<th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Lieu</th>
|
||||
<th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Type</th>
|
||||
<th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Code</th>
|
||||
<th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Parent</th>
|
||||
<th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Coordonnées</th>
|
||||
@@ -43,6 +97,7 @@
|
||||
{{ $lieu->nom }}
|
||||
</a>
|
||||
</td>
|
||||
<td class="px-6 py-4 text-sm text-gray-500">{{ $lieu->lieuType?->nom ?? '—' }}</td>
|
||||
<td class="px-6 py-4 text-sm text-gray-500">{{ $lieu->code ?? '—' }}</td>
|
||||
<td class="px-6 py-4 text-sm text-gray-500">
|
||||
@if($lieu->parent)
|
||||
@@ -76,7 +131,10 @@
|
||||
</tr>
|
||||
@empty
|
||||
<tr>
|
||||
<td colspan="5" class="px-6 py-10 text-center text-gray-400">Aucun lieu enregistré.</td>
|
||||
<td colspan="6" class="px-6 py-10 text-center text-gray-400">
|
||||
@if($hasFilters) Aucun lieu ne correspond aux filtres.
|
||||
@else Aucun lieu enregistré. @endif
|
||||
</td>
|
||||
</tr>
|
||||
@endforelse
|
||||
</tbody>
|
||||
|
||||
@@ -37,6 +37,10 @@
|
||||
<dt class="font-medium text-gray-500">Nom complet</dt>
|
||||
<dd class="col-span-2 text-gray-900">{{ $lieu->nom_long ?? $lieu->nom }}</dd>
|
||||
</div>
|
||||
<div class="px-6 py-4 grid grid-cols-3 gap-4 text-sm">
|
||||
<dt class="font-medium text-gray-500">Type</dt>
|
||||
<dd class="col-span-2 text-gray-900">{{ $lieu->lieuType?->nom ?? '—' }}</dd>
|
||||
</div>
|
||||
@if($lieu->code)
|
||||
<div class="px-6 py-4 grid grid-cols-3 gap-4 text-sm">
|
||||
<dt class="font-medium text-gray-500">Code</dt>
|
||||
|
||||
Reference in New Issue
Block a user