É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:
@@ -6,26 +6,29 @@ use App\Enums\SourceStatus;
|
||||
use App\Http\Requests\StoreSourceRequest;
|
||||
use App\Http\Requests\UpdateSourceRequest;
|
||||
use App\Models\Depot;
|
||||
use App\Models\Lieu;
|
||||
use App\Models\Source;
|
||||
use App\Models\SourceType;
|
||||
use App\Models\User;
|
||||
use App\Notifications\SourceAValiderNotification;
|
||||
use App\Notifications\SourceRejeteeNotification;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\View\View;
|
||||
|
||||
class SourceController extends Controller
|
||||
{
|
||||
public function index(): View
|
||||
public function index(Request $request): View
|
||||
{
|
||||
$this->authorize('viewAny', Source::class);
|
||||
|
||||
$user = auth()->user();
|
||||
|
||||
$query = Source::with(['sourceType', 'depot'])
|
||||
$query = Source::with(['sourceType', 'depot', 'lieu'])
|
||||
->withCount('releves');
|
||||
|
||||
if (! $user->isSectionManager()) {
|
||||
// Membre : sources terminées + sources assignées
|
||||
$assignedIds = $user->sourcesAssignees()->pluck('sources.id');
|
||||
$query->where(function ($q) use ($assignedIds) {
|
||||
$q->where('status', SourceStatus::Termine)
|
||||
@@ -33,9 +36,56 @@ class SourceController extends Controller
|
||||
});
|
||||
}
|
||||
|
||||
$sources = $query->orderBy('nom')->paginate(25);
|
||||
if ($request->filled('status')) {
|
||||
$query->where('status', $request->input('status'));
|
||||
}
|
||||
|
||||
return view('sources.index', compact('sources'));
|
||||
if ($request->filled('source_type_id')) {
|
||||
$query->where('source_type_id', $request->integer('source_type_id'));
|
||||
}
|
||||
|
||||
if ($request->filled('lieu_id')) {
|
||||
$lieuIds = $this->getLieuDescendantIds($request->integer('lieu_id'));
|
||||
$query->whereIn('lieu_id', $lieuIds);
|
||||
}
|
||||
|
||||
if ($request->filled('annee_debut')) {
|
||||
$annee = $request->integer('annee_debut');
|
||||
$query->where(function ($q) use ($annee) {
|
||||
$q->whereNull('annee_fin')->orWhere('annee_fin', '>=', $annee);
|
||||
});
|
||||
}
|
||||
|
||||
if ($request->filled('annee_fin')) {
|
||||
$annee = $request->integer('annee_fin');
|
||||
$query->where(function ($q) use ($annee) {
|
||||
$q->whereNull('annee_debut')->orWhere('annee_debut', '<=', $annee);
|
||||
});
|
||||
}
|
||||
|
||||
$sourceTypes = SourceType::orderBy('nom')->get(['id', 'nom']);
|
||||
$lieuSelectionne = $request->filled('lieu_id')
|
||||
? Lieu::find($request->integer('lieu_id'), ['id', 'nom', 'nom_long'])
|
||||
: null;
|
||||
|
||||
$sources = $query->orderBy('nom')->paginate(25)->withQueryString();
|
||||
|
||||
return view('sources.index', compact('sources', 'sourceTypes', 'lieuSelectionne'));
|
||||
}
|
||||
|
||||
private function getLieuDescendantIds(int $lieuId): array
|
||||
{
|
||||
$rows = DB::select("
|
||||
WITH RECURSIVE descendants AS (
|
||||
SELECT id FROM lieux WHERE id = ?
|
||||
UNION ALL
|
||||
SELECT l.id FROM lieux l
|
||||
INNER JOIN descendants d ON l.lieu_parent_id = d.id
|
||||
)
|
||||
SELECT id FROM descendants
|
||||
", [$lieuId]);
|
||||
|
||||
return collect($rows)->pluck('id')->toArray();
|
||||
}
|
||||
|
||||
public function create(): View
|
||||
@@ -71,6 +121,7 @@ class SourceController extends Controller
|
||||
{
|
||||
$this->authorize('update', $source);
|
||||
|
||||
$source->loadMissing('lieu');
|
||||
$sourceTypes = SourceType::orderBy('nom')->get(['id', 'nom']);
|
||||
$depots = Depot::orderBy('nom')->get(['id', 'nom']);
|
||||
|
||||
@@ -136,8 +187,28 @@ class SourceController extends Controller
|
||||
return back()->with('error', 'Transition non autorisée.');
|
||||
}
|
||||
|
||||
$previousStatus = $source->status;
|
||||
$source->update(['status' => $newStatus]);
|
||||
|
||||
$user = auth()->user();
|
||||
|
||||
if ($newStatus === SourceStatus::AValider) {
|
||||
// Notifier admins + responsables de section
|
||||
$source->load('sourceType', 'depot');
|
||||
User::whereIn('role', ['admin', 'section_manager'])
|
||||
->where('id', '!=', $user->id)
|
||||
->get()
|
||||
->each(fn ($u) => $u->notify(new SourceAValiderNotification($source, $user)));
|
||||
}
|
||||
|
||||
if ($newStatus === SourceStatus::EnCours && $previousStatus === SourceStatus::AValider) {
|
||||
// Rejet : notifier les membres assignés
|
||||
$source->membres()
|
||||
->where('users.id', '!=', $user->id)
|
||||
->get()
|
||||
->each(fn ($m) => $m->notify(new SourceRejeteeNotification($source, $user)));
|
||||
}
|
||||
|
||||
return back()->with('success', 'Statut mis à jour : ' . $newStatus->label());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user