É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:
@@ -0,0 +1,100 @@
|
||||
{{--
|
||||
Rendu d'un champ dynamique selon son FieldType.
|
||||
Variables attendues : $field (SourceTypeField), $value (valeur courante ou null)
|
||||
--}}
|
||||
@php
|
||||
use App\Enums\FieldType;
|
||||
$name = "data[{$field->name}]";
|
||||
$inputId = "field_{$field->name}";
|
||||
$oldValue = old("data.{$field->name}", $value);
|
||||
@endphp
|
||||
|
||||
<div class="space-y-1">
|
||||
<label for="{{ $inputId }}" class="block text-sm font-medium text-gray-700">
|
||||
{{ $field->label }}
|
||||
@if($field->required) <span class="text-red-500">*</span> @endif
|
||||
</label>
|
||||
|
||||
@switch($field->type)
|
||||
|
||||
@case(FieldType::Text)
|
||||
<input type="text" id="{{ $inputId }}" name="{{ $name }}"
|
||||
value="{{ $oldValue }}"
|
||||
{{ $field->required ? 'required' : '' }}
|
||||
class="block w-full rounded-md border-gray-300 shadow-sm text-sm focus:border-indigo-500 focus:ring-indigo-500 @error("data.{$field->name}") border-red-500 @enderror">
|
||||
@break
|
||||
|
||||
@case(FieldType::Textarea)
|
||||
<textarea id="{{ $inputId }}" name="{{ $name }}" rows="3"
|
||||
{{ $field->required ? 'required' : '' }}
|
||||
class="block w-full rounded-md border-gray-300 shadow-sm text-sm focus:border-indigo-500 focus:ring-indigo-500 @error("data.{$field->name}") border-red-500 @enderror">{{ $oldValue }}</textarea>
|
||||
@break
|
||||
|
||||
@case(FieldType::Number)
|
||||
<input type="number" id="{{ $inputId }}" name="{{ $name }}"
|
||||
value="{{ $oldValue }}" step="any"
|
||||
{{ $field->required ? 'required' : '' }}
|
||||
class="block w-full rounded-md border-gray-300 shadow-sm text-sm focus:border-indigo-500 focus:ring-indigo-500 @error("data.{$field->name}") border-red-500 @enderror">
|
||||
@break
|
||||
|
||||
@case(FieldType::Boolean)
|
||||
@php $checked = old("data.{$field->name}", $value) ? true : false; @endphp
|
||||
<div class="flex items-center gap-2 mt-1">
|
||||
<input type="hidden" name="{{ $name }}" value="0">
|
||||
<input type="checkbox" id="{{ $inputId }}" name="{{ $name }}" value="1"
|
||||
{{ $checked ? 'checked' : '' }}
|
||||
class="rounded border-gray-300 text-indigo-600 focus:ring-indigo-500">
|
||||
<span class="text-sm text-gray-600">{{ $field->label }}</span>
|
||||
</div>
|
||||
@break
|
||||
|
||||
@case(FieldType::Select)
|
||||
<select id="{{ $inputId }}" name="{{ $name }}"
|
||||
{{ $field->required ? 'required' : '' }}
|
||||
class="block w-full rounded-md border-gray-300 shadow-sm text-sm focus:border-indigo-500 focus:ring-indigo-500 @error("data.{$field->name}") border-red-500 @enderror">
|
||||
@if(!$field->required) <option value="">— Choisir —</option> @endif
|
||||
@foreach($field->options ?? [] as $opt)
|
||||
<option value="{{ $opt }}" {{ $oldValue === $opt ? 'selected' : '' }}>{{ $opt }}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
@break
|
||||
|
||||
@case(FieldType::Date)
|
||||
@php
|
||||
$dateVal = is_array($oldValue) ? ($oldValue['valeur'] ?? '') : '';
|
||||
$dateCal = is_array($oldValue) ? ($oldValue['calendrier'] ?? 'gregorien') : old("data.{$field->name}.calendrier", 'gregorien');
|
||||
@endphp
|
||||
<div x-data="{ cal: '{{ $dateCal }}' }" class="flex gap-2">
|
||||
{{-- Sélecteur de calendrier --}}
|
||||
<select name="{{ $name }}[calendrier]" x-model="cal"
|
||||
class="w-40 rounded-md border-gray-300 shadow-sm text-sm focus:border-indigo-500 focus:ring-indigo-500">
|
||||
<option value="gregorien">Grégorien</option>
|
||||
<option value="julien">Julien</option>
|
||||
<option value="republicain">Républicain</option>
|
||||
</select>
|
||||
|
||||
{{-- Date grégorienne / julienne : input date HTML5 --}}
|
||||
<input x-show="cal !== 'republicain'"
|
||||
type="date" name="{{ $name }}[valeur]"
|
||||
value="{{ $dateCal !== 'republicain' ? $dateVal : '' }}"
|
||||
{{ $field->required ? 'required' : '' }}
|
||||
class="flex-1 rounded-md border-gray-300 shadow-sm text-sm focus:border-indigo-500 focus:ring-indigo-500">
|
||||
|
||||
{{-- Date républicaine : saisie texte libre (ex: "15 Vendémiaire An III") --}}
|
||||
<input x-show="cal === 'republicain'" x-cloak
|
||||
type="text" name="{{ $name }}[valeur]"
|
||||
value="{{ $dateCal === 'republicain' ? $dateVal : '' }}"
|
||||
placeholder="ex : 15 Vendémiaire An III"
|
||||
class="flex-1 rounded-md border-gray-300 shadow-sm text-sm focus:border-indigo-500 focus:ring-indigo-500">
|
||||
</div>
|
||||
@error("data.{$field->name}.valeur")
|
||||
<p class="text-sm text-red-600">{{ $message }}</p>
|
||||
@enderror
|
||||
@break
|
||||
|
||||
@endswitch
|
||||
|
||||
@error("data.{$field->name}")
|
||||
<p class="text-sm text-red-600">{{ $message }}</p>
|
||||
@enderror
|
||||
</div>
|
||||
@@ -0,0 +1,15 @@
|
||||
{{-- $source->sourceType->fields doit être chargé --}}
|
||||
{{-- $releve : null pour création, instance pour édition --}}
|
||||
<div class="space-y-6">
|
||||
@forelse($source->sourceType->fields as $field)
|
||||
@php
|
||||
$rawValue = $releve?->data[$field->name] ?? null;
|
||||
@endphp
|
||||
@include('releves._field', ['field' => $field, 'value' => $rawValue])
|
||||
@empty
|
||||
<p class="text-sm text-gray-400 italic">
|
||||
Ce type de source n'a aucun champ défini.
|
||||
<a href="{{ route('admin.source-types.show', $source->sourceType) }}" class="text-indigo-600 hover:underline">Configurer les champs →</a>
|
||||
</p>
|
||||
@endforelse
|
||||
</div>
|
||||
@@ -0,0 +1,28 @@
|
||||
<x-app-layout>
|
||||
<x-slot name="header">
|
||||
<div>
|
||||
<h2 class="text-xl font-semibold text-gray-800">Nouveau relevé</h2>
|
||||
<p class="text-sm text-gray-500 mt-0.5">
|
||||
Source : <a href="{{ route('sources.show', $source) }}" class="text-indigo-600 hover:underline">{{ $source->nom }}</a>
|
||||
· Type : {{ $source->sourceType->nom }}
|
||||
</p>
|
||||
</div>
|
||||
</x-slot>
|
||||
|
||||
<div class="py-8 max-w-3xl mx-auto px-4 sm:px-6 lg:px-8">
|
||||
<div class="bg-white shadow rounded-lg p-6">
|
||||
<form method="POST" action="{{ route('sources.releves.store', $source) }}">
|
||||
@csrf
|
||||
@include('releves._form', ['releve' => null])
|
||||
<div class="mt-8 pt-6 border-t border-gray-200 flex items-center gap-4">
|
||||
<button type="submit"
|
||||
class="px-5 py-2 bg-indigo-600 text-white rounded-md hover:bg-indigo-700">
|
||||
Enregistrer le relevé
|
||||
</button>
|
||||
<a href="{{ route('sources.releves.index', $source) }}"
|
||||
class="text-sm text-gray-500 hover:text-gray-700">Annuler</a>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</x-app-layout>
|
||||
@@ -0,0 +1,27 @@
|
||||
<x-app-layout>
|
||||
<x-slot name="header">
|
||||
<div>
|
||||
<h2 class="text-xl font-semibold text-gray-800">Modifier le relevé #{{ $releve->id }}</h2>
|
||||
<p class="text-sm text-gray-500 mt-0.5">
|
||||
Source : <a href="{{ route('sources.show', $source) }}" class="text-indigo-600 hover:underline">{{ $source->nom }}</a>
|
||||
</p>
|
||||
</div>
|
||||
</x-slot>
|
||||
|
||||
<div class="py-8 max-w-3xl mx-auto px-4 sm:px-6 lg:px-8">
|
||||
<div class="bg-white shadow rounded-lg p-6">
|
||||
<form method="POST" action="{{ route('releves.update', $releve) }}">
|
||||
@csrf @method('PUT')
|
||||
@include('releves._form', ['releve' => $releve])
|
||||
<div class="mt-8 pt-6 border-t border-gray-200 flex items-center gap-4">
|
||||
<button type="submit"
|
||||
class="px-5 py-2 bg-indigo-600 text-white rounded-md hover:bg-indigo-700">
|
||||
Enregistrer
|
||||
</button>
|
||||
<a href="{{ route('releves.show', $releve) }}"
|
||||
class="text-sm text-gray-500 hover:text-gray-700">Annuler</a>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</x-app-layout>
|
||||
@@ -0,0 +1,120 @@
|
||||
<x-app-layout>
|
||||
<x-slot name="header">
|
||||
<div class="flex items-center justify-between">
|
||||
<div>
|
||||
<h2 class="text-xl font-semibold text-gray-800">Relevés — {{ $source->nom }}</h2>
|
||||
<p class="text-sm text-gray-500 mt-0.5">
|
||||
Type : {{ $source->sourceType->nom }}
|
||||
@if($source->cote) · Cote : {{ $source->cote }} @endif
|
||||
</p>
|
||||
</div>
|
||||
<div class="flex items-center gap-3">
|
||||
<a href="{{ route('sources.show', $source) }}" class="text-sm text-indigo-600 hover:underline">← Source</a>
|
||||
<a href="{{ route('export.source', $source) }}"
|
||||
class="px-4 py-2 border border-gray-300 text-gray-700 text-sm rounded-md hover:bg-gray-50"
|
||||
title="Télécharger au format GEDCOM 5.5.1">
|
||||
↓ GEDCOM
|
||||
</a>
|
||||
@can('create', [App\Models\Releve::class, $source])
|
||||
<a href="{{ route('sources.releves.create', $source) }}"
|
||||
class="px-4 py-2 bg-indigo-600 text-white text-sm rounded-md hover:bg-indigo-700">
|
||||
+ Nouveau relevé
|
||||
</a>
|
||||
@endcan
|
||||
</div>
|
||||
</div>
|
||||
</x-slot>
|
||||
|
||||
<div class="py-8 max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
|
||||
@if(session('success'))
|
||||
<div class="mb-4 p-4 bg-green-50 border border-green-200 text-green-800 rounded-md">{{ session('success') }}</div>
|
||||
@endif
|
||||
|
||||
@php
|
||||
// Colonnes à afficher : les 4 premiers champs du type de source
|
||||
$colonnes = $source->sourceType->fields->take(5);
|
||||
@endphp
|
||||
|
||||
<div class="bg-white shadow rounded-lg overflow-hidden">
|
||||
<div class="overflow-x-auto">
|
||||
<table class="min-w-full divide-y divide-gray-200 text-sm">
|
||||
<thead class="bg-gray-50">
|
||||
<tr>
|
||||
@foreach($colonnes as $col)
|
||||
<th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase whitespace-nowrap">
|
||||
{{ $col->label }}
|
||||
</th>
|
||||
@endforeach
|
||||
<th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">Saisi par</th>
|
||||
<th class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">Date</th>
|
||||
<th class="px-4 py-3"></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody class="divide-y divide-gray-200">
|
||||
@forelse($releves as $releve)
|
||||
<tr class="hover:bg-gray-50">
|
||||
@foreach($colonnes as $col)
|
||||
<td class="px-4 py-3 text-gray-700">
|
||||
@php $val = $releve->data[$col->name] ?? null; @endphp
|
||||
@if(is_array($val))
|
||||
{{ $val['valeur'] ?? '' }}
|
||||
@if(!empty($val['calendrier']) && $val['calendrier'] !== 'gregorien')
|
||||
<span class="text-xs text-gray-400">({{ $val['calendrier'] }})</span>
|
||||
@endif
|
||||
@elseif(is_bool($val))
|
||||
{{ $val ? 'Oui' : 'Non' }}
|
||||
@else
|
||||
{{ $val ?? '—' }}
|
||||
@endif
|
||||
</td>
|
||||
@endforeach
|
||||
<td class="px-4 py-3 text-gray-500">{{ $releve->createur?->name ?? '—' }}</td>
|
||||
<td class="px-4 py-3 text-gray-500 whitespace-nowrap">{{ $releve->created_at->format('d/m/Y') }}</td>
|
||||
<td class="px-4 py-3 text-right whitespace-nowrap space-x-3">
|
||||
<a href="{{ route('releves.show', $releve) }}" class="text-indigo-600 hover:underline">Voir</a>
|
||||
@can('update', $releve)
|
||||
<a href="{{ route('releves.edit', $releve) }}" class="text-gray-600 hover:text-indigo-600">Modifier</a>
|
||||
@endcan
|
||||
@can('delete', $releve)
|
||||
<form method="POST" action="{{ route('releves.destroy', $releve) }}" class="inline"
|
||||
x-data @submit.prevent="if(confirm('Supprimer ce relevé ?')) $el.submit()">
|
||||
@csrf @method('DELETE')
|
||||
<button type="submit" class="text-red-500 hover:text-red-700">Supprimer</button>
|
||||
</form>
|
||||
@endcan
|
||||
</td>
|
||||
</tr>
|
||||
@empty
|
||||
<tr>
|
||||
<td colspan="{{ $colonnes->count() + 3 }}"
|
||||
class="px-6 py-10 text-center text-gray-400">
|
||||
Aucun relevé pour cette source.
|
||||
</td>
|
||||
</tr>
|
||||
@endforelse
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
{{-- Navigation curseur (keyset pagination) --}}
|
||||
@if($releves->hasPages())
|
||||
<div class="px-6 py-4 border-t border-gray-200 flex items-center justify-between text-sm">
|
||||
<div>
|
||||
@if($releves->onFirstPage())
|
||||
<span class="text-gray-400">← Précédent</span>
|
||||
@else
|
||||
<a href="{{ $releves->previousPageUrl() }}" class="text-indigo-600 hover:underline">← Précédent</a>
|
||||
@endif
|
||||
</div>
|
||||
<div>
|
||||
@if($releves->hasMorePages())
|
||||
<a href="{{ $releves->nextPageUrl() }}" class="text-indigo-600 hover:underline">Suivant →</a>
|
||||
@else
|
||||
<span class="text-gray-400">Suivant →</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</x-app-layout>
|
||||
@@ -0,0 +1,74 @@
|
||||
<x-app-layout>
|
||||
<x-slot name="header">
|
||||
<div class="flex items-center justify-between">
|
||||
<div>
|
||||
<h2 class="text-xl font-semibold text-gray-800">Relevé #{{ $releve->id }}</h2>
|
||||
<p class="text-sm text-gray-500 mt-0.5">
|
||||
Source : <a href="{{ route('sources.show', $source) }}" class="text-indigo-600 hover:underline">{{ $source->nom }}</a>
|
||||
</p>
|
||||
</div>
|
||||
<div class="flex items-center gap-3">
|
||||
@can('update', $releve)
|
||||
<a href="{{ route('releves.edit', $releve) }}"
|
||||
class="px-4 py-2 bg-indigo-600 text-white text-sm rounded-md hover:bg-indigo-700">
|
||||
Modifier
|
||||
</a>
|
||||
@endcan
|
||||
@can('delete', $releve)
|
||||
<form method="POST" action="{{ route('releves.destroy', $releve) }}"
|
||||
x-data @submit.prevent="if(confirm('Supprimer ce relevé ?')) $el.submit()">
|
||||
@csrf @method('DELETE')
|
||||
<button type="submit"
|
||||
class="px-4 py-2 bg-red-600 text-white text-sm rounded-md hover:bg-red-700">
|
||||
Supprimer
|
||||
</button>
|
||||
</form>
|
||||
@endcan
|
||||
</div>
|
||||
</div>
|
||||
</x-slot>
|
||||
|
||||
<div class="py-8 max-w-3xl mx-auto px-4 sm:px-6 lg:px-8 space-y-6">
|
||||
@if(session('success'))
|
||||
<div class="p-4 bg-green-50 border border-green-200 text-green-800 rounded-md">{{ session('success') }}</div>
|
||||
@endif
|
||||
|
||||
{{-- Champs du relevé --}}
|
||||
<div class="bg-white shadow rounded-lg divide-y divide-gray-100">
|
||||
@foreach($source->sourceType->fields as $field)
|
||||
@php $val = $releve->data[$field->name] ?? null; @endphp
|
||||
<div class="px-6 py-4 grid grid-cols-3 gap-4 text-sm">
|
||||
<dt class="font-medium text-gray-500">{{ $field->label }}</dt>
|
||||
<dd class="col-span-2 text-gray-900">
|
||||
@if($val === null || $val === '')
|
||||
<span class="text-gray-400">—</span>
|
||||
@elseif(is_array($val))
|
||||
{{ $val['valeur'] ?? '—' }}
|
||||
@if(!empty($val['calendrier']) && $val['calendrier'] !== 'gregorien')
|
||||
<span class="ml-1 text-xs text-gray-400 capitalize">({{ $val['calendrier'] }})</span>
|
||||
@endif
|
||||
@elseif(is_bool($val))
|
||||
<span class="{{ $val ? 'text-green-700' : 'text-gray-400' }}">
|
||||
{{ $val ? 'Oui' : 'Non' }}
|
||||
</span>
|
||||
@else
|
||||
{{ $val }}
|
||||
@endif
|
||||
</dd>
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
|
||||
{{-- Méta-données de saisie --}}
|
||||
<div class="bg-gray-50 rounded-lg px-6 py-4 text-xs text-gray-500 space-y-1">
|
||||
<p>Saisi par <strong>{{ $releve->createur?->name ?? '?' }}</strong> le {{ $releve->created_at->format('d/m/Y à H:i') }}</p>
|
||||
@if($releve->updated_at != $releve->created_at)
|
||||
<p>Modifié par <strong>{{ $releve->modificateur?->name ?? '?' }}</strong> le {{ $releve->updated_at->format('d/m/Y à H:i') }}</p>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<div class="flex gap-4 text-sm">
|
||||
<a href="{{ route('sources.releves.index', $source) }}" class="text-indigo-600 hover:underline">← Liste des relevés</a>
|
||||
</div>
|
||||
</div>
|
||||
</x-app-layout>
|
||||
Reference in New Issue
Block a user