É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,21 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Requests\Admin;
|
||||
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
use Illuminate\Validation\Rule;
|
||||
|
||||
class StoreLieuTypeRequest extends FormRequest
|
||||
{
|
||||
public function authorize(): bool { return $this->user()->isAdmin(); }
|
||||
|
||||
public function rules(): array
|
||||
{
|
||||
$ignore = $this->route('lieuType')?->id;
|
||||
|
||||
return [
|
||||
'nom' => ['required', 'string', 'max:100', Rule::unique('lieu_types', 'nom')->ignore($ignore)],
|
||||
'ordre' => ['required', 'integer', 'min:0', 'max:999'],
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -15,6 +15,7 @@ class StoreLieuRequest extends FormRequest
|
||||
{
|
||||
return [
|
||||
'nom' => ['required', 'string', 'max:255'],
|
||||
'lieu_type_id' => ['required', 'integer', 'exists:lieu_types,id'],
|
||||
'code' => ['nullable', 'string', 'max:20'],
|
||||
'lieu_parent_id'=> ['nullable', 'integer', 'exists:lieux,id'],
|
||||
'latitude' => ['nullable', 'numeric', 'between:-90,90'],
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Requests;
|
||||
|
||||
use App\Enums\CalendarType;
|
||||
use App\Enums\FieldType;
|
||||
use App\Models\Source;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
use Illuminate\Validation\Rules\Enum;
|
||||
|
||||
class StoreReleveRequest extends FormRequest
|
||||
{
|
||||
public function authorize(): bool
|
||||
{
|
||||
$source = $this->route('source');
|
||||
return $this->user()->can('create', [app(\App\Models\Releve::class), $source]);
|
||||
}
|
||||
|
||||
public function rules(): array
|
||||
{
|
||||
/** @var Source $source */
|
||||
$source = $this->route('source');
|
||||
$source->loadMissing('sourceType.fields');
|
||||
|
||||
$rules = [];
|
||||
|
||||
foreach ($source->sourceType->fields as $field) {
|
||||
$base = "data.{$field->name}";
|
||||
|
||||
switch ($field->type) {
|
||||
case FieldType::Date:
|
||||
$rules["{$base}.valeur"] = [$field->required ? 'required' : 'nullable', 'string', 'max:50'];
|
||||
$rules["{$base}.calendrier"] = ['required', new Enum(CalendarType::class)];
|
||||
break;
|
||||
|
||||
case FieldType::Boolean:
|
||||
$rules[$base] = ['nullable', 'boolean'];
|
||||
break;
|
||||
|
||||
case FieldType::Number:
|
||||
$rules[$base] = [$field->required ? 'required' : 'nullable', 'numeric'];
|
||||
break;
|
||||
|
||||
case FieldType::Select:
|
||||
$options = $field->options ?? [];
|
||||
$rules[$base] = [$field->required ? 'required' : 'nullable', 'string', 'in:' . implode(',', $options)];
|
||||
break;
|
||||
|
||||
default: // text, textarea
|
||||
$rules[$base] = [$field->required ? 'required' : 'nullable', 'string', 'max:2000'];
|
||||
}
|
||||
}
|
||||
|
||||
return $rules;
|
||||
}
|
||||
}
|
||||
@@ -18,6 +18,9 @@ class StoreSourceRequest extends FormRequest
|
||||
'description' => ['nullable', 'string'],
|
||||
'source_type_id' => ['required', 'integer', 'exists:source_types,id'],
|
||||
'depot_id' => ['nullable', 'integer', 'exists:depots,id'],
|
||||
'lieu_id' => ['nullable', 'integer', 'exists:lieux,id'],
|
||||
'annee_debut' => ['nullable', 'integer', 'min:1000', 'max:2100'],
|
||||
'annee_fin' => ['nullable', 'integer', 'min:1000', 'max:2100', 'gte:annee_debut'],
|
||||
'cote' => ['nullable', 'string', 'max:255'],
|
||||
'auteur' => ['nullable', 'string', 'max:255'],
|
||||
];
|
||||
|
||||
@@ -17,6 +17,7 @@ class UpdateLieuRequest extends FormRequest
|
||||
|
||||
return [
|
||||
'nom' => ['required', 'string', 'max:255'],
|
||||
'lieu_type_id' => ['required', 'integer', 'exists:lieu_types,id'],
|
||||
'code' => ['nullable', 'string', 'max:20'],
|
||||
// Interdit de se choisir soi-même ou un descendant comme parent
|
||||
'lieu_parent_id'=> ['nullable', 'integer', 'exists:lieux,id', "not_in:{$lieuId}"],
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Requests;
|
||||
|
||||
use App\Enums\CalendarType;
|
||||
use App\Enums\FieldType;
|
||||
use App\Models\Source;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
use Illuminate\Validation\Rules\Enum;
|
||||
|
||||
class UpdateReleveRequest extends FormRequest
|
||||
{
|
||||
public function authorize(): bool
|
||||
{
|
||||
return $this->user()->can('update', $this->route('releve'));
|
||||
}
|
||||
|
||||
public function rules(): array
|
||||
{
|
||||
/** @var \App\Models\Releve $releve */
|
||||
$releve = $this->route('releve');
|
||||
$releve->source->loadMissing('sourceType.fields');
|
||||
|
||||
$rules = [];
|
||||
|
||||
foreach ($releve->source->sourceType->fields as $field) {
|
||||
$base = "data.{$field->name}";
|
||||
|
||||
switch ($field->type) {
|
||||
case FieldType::Date:
|
||||
$rules["{$base}.valeur"] = [$field->required ? 'required' : 'nullable', 'string', 'max:50'];
|
||||
$rules["{$base}.calendrier"] = ['required', new Enum(CalendarType::class)];
|
||||
break;
|
||||
case FieldType::Boolean:
|
||||
$rules[$base] = ['nullable', 'boolean'];
|
||||
break;
|
||||
case FieldType::Number:
|
||||
$rules[$base] = [$field->required ? 'required' : 'nullable', 'numeric'];
|
||||
break;
|
||||
case FieldType::Select:
|
||||
$options = $field->options ?? [];
|
||||
$rules[$base] = [$field->required ? 'required' : 'nullable', 'string', 'in:' . implode(',', $options)];
|
||||
break;
|
||||
default:
|
||||
$rules[$base] = [$field->required ? 'required' : 'nullable', 'string', 'max:2000'];
|
||||
}
|
||||
}
|
||||
|
||||
return $rules;
|
||||
}
|
||||
}
|
||||
@@ -18,6 +18,9 @@ class UpdateSourceRequest extends FormRequest
|
||||
'description' => ['nullable', 'string'],
|
||||
'source_type_id' => ['required', 'integer', 'exists:source_types,id'],
|
||||
'depot_id' => ['nullable', 'integer', 'exists:depots,id'],
|
||||
'lieu_id' => ['nullable', 'integer', 'exists:lieux,id'],
|
||||
'annee_debut' => ['nullable', 'integer', 'min:1000', 'max:2100'],
|
||||
'annee_fin' => ['nullable', 'integer', 'min:1000', 'max:2100', 'gte:annee_debut'],
|
||||
'cote' => ['nullable', 'string', 'max:255'],
|
||||
'auteur' => ['nullable', 'string', 'max:255'],
|
||||
];
|
||||
|
||||
Reference in New Issue
Block a user