Release 1.0.5 — changelog + bump version dev 1.0.6

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

CHANGELOG.md

@@ -5,6 +5,34 @@ Format : [Keep a Changelog](https://keepachangelog.com/fr/1.0.0/) — versionnag
 
 ---
 
+## [1.0.5] — 2026-06-05
+
+### Ajouté
+
+- **Type de champ « place » (Lieu) dans les relevés** — permet de sélectionner un lieu existant dans la hiérarchie lors de la saisie d'un relevé ; la valeur est stockée en JSONB `{id, nom_long}` et correctement exportée en CSV
+- **Export CSV des relevés d'une source** — disponible depuis la fiche source ; colonnes générées dynamiquement à partir des champs du type de source ; valeurs de dates et lieux converties en texte lisible
+- **Import CSV des relevés d'une source** — depuis la fiche source ; détection automatique du séparateur (`;` / `,`) ; correspondance des colonnes par libellé (tolérant casse et accents) ; parsing des dates en grégorien ou calendrier nommé, des lieux par nom long
+- **Import/export CSV des lieux** — depuis la liste des lieux ; export UTF-8 BOM (compatible Excel) avec colonnes `nom, code, type, lieu_parent, latitude, longitude, note` ; import avec résolution du parent par `nom_long` et du type par nom
+- **Connexion avec email ou nom d'utilisateur** — le champ de connexion accepte indifféremment l'adresse e-mail ou le nom d'utilisateur
+
+### Modifié
+
+- **Carte Leaflet — passage au bundle Vite/npm** — la bibliothèque Leaflet est désormais packagée localement (suppression de la dépendance au CDN externe) pour un fonctionnement sur serveurs sans accès internet
+- **Suppression de l'export GEDCOM** — la fonctionnalité d'export au format GEDCOM 5.5.1 a été retirée
+- **Traductions françaises des vues d'authentification** — formulaires de connexion, inscription et mot de passe oublié entièrement traduits (`lang/fr.json`)
+
+### Corrigé
+
+- **Tableau de bord admin — erreur MySQL `ONLY_FULL_GROUP_BY`** : la requête d'activité mensuelle sélectionnait `DATE_FORMAT(created_at, ...)` sans l'inclure dans le `GROUP BY` ; corrigé en agrégeant avec `MIN(created_at)` et en groupant par `YEAR() / MONTH()`
+- **Compatibilité MySQL — `NULLS LAST` et `withCount/select`** : `NULLS LAST` n'est pas supporté en MySQL ; ajout de `DbCompat::nullsLast()` générant la syntaxe portable ; correction de l'ordre des clauses `withCount` / `select` pour MySQL strict
+- **Bouton « Modifier » d'un champ de type de source** : le formulaire inline Alpine.js ne s'ouvrait pas car `x-data` était positionné sur le `<button>` et non sur le `<li>` parent partagé avec le formulaire
+- **Saisie de date dans un relevé — double soumission** : `x-show` masque visuellement les éléments mais ne les retire pas du DOM ; les deux inputs (grégorien et républicain) étaient soumis simultanément ; l'attribut `:disabled` lié à l'état Alpine résout le problème
+- **Affichage / modification / suppression d'un relevé — erreur 500** : les routes `->shallow()` suppriment `{source}` de l'URL pour les actions individuelles sur les relevés ; Laravel ne peut pas binder automatiquement `Source $source` — corrigé en chargeant la source depuis `$releve->source`
+- **Menus de navigation masqués derrière la carte Leaflet** : Leaflet utilise des z-index internes jusqu'à 800 ; la balise `<nav>` sans `position: relative` n'avait pas de contexte d'empilement ; ajout de `relative z-40`
+- **`RelevePolicy` — signatures incompatibles** : `create` et `viewAny` recevaient `(User, Source)` via le Gate (class string) mais étaient définies sans le paramètre Source, ou avec un paramètre `Releve` inopportun ; signatures harmonisées avec les conventions d'appel du Gate
+
+---
+
 ## [1.0.4] — 2026-06-05
 
 ### Corrigé

VERSION

@@ -1 +1 @@
-1.0.5
+1.0.6

app/Enums/FieldType.php

@@ -10,4 +10,5 @@ enum FieldType: string
     case Select   = 'select';
     case Textarea = 'textarea';
     case Number   = 'number';
+    case Place    = 'place';
 }

app/Http/Controllers/Admin/DashboardController.php

@@ -50,12 +50,21 @@ class DashboardController extends Controller
             ->take(10)
             ->get();
 
-        // Activité mensuelle des 6 derniers mois
+        // Activité mensuelle des 6 derniers mois (compatible MySQL et PostgreSQL)
+        $driver = config('database.default');
+        if ($driver === 'pgsql') {
             $activiteMensuelle = Releve::selectRaw("to_char(date_trunc('month', created_at), 'Mon YYYY') as mois, count(*) as total")
                 ->where('created_at', '>=', now()->subMonths(5)->startOfMonth())
                 ->groupByRaw("date_trunc('month', created_at)")
                 ->orderByRaw("date_trunc('month', created_at)")
                 ->get();
+        } else {
+            $activiteMensuelle = Releve::selectRaw("DATE_FORMAT(MIN(created_at), '%b %Y') as mois, count(*) as total")
+                ->where('created_at', '>=', now()->subMonths(5)->startOfMonth())
+                ->groupByRaw("YEAR(created_at), MONTH(created_at)")
+                ->orderByRaw("YEAR(created_at), MONTH(created_at)")
+                ->get();
+        }
 
         return view('admin.dashboard', compact(
             'sourcesByStatus', 'totalSources', 'totalReleves',

app/Http/Controllers/Admin/SourceTypeController.php

@@ -76,7 +76,15 @@ class SourceTypeController extends Controller
     public function updateField(StoreSourceTypeFieldRequest $request, SourceType $sourceType, SourceTypeField $field): RedirectResponse
     {
         abort_if($field->source_type_id !== $sourceType->id, 404);
-        $field->update($request->validated());
+        $data = $request->validated();
+
+        if ($request->filled('options_raw')) {
+            $data['options'] = array_filter(array_map('trim', explode("\n", $request->input('options_raw'))));
+        } elseif ($request->input('type') !== 'select') {
+            $data['options'] = null;
+        }
+
+        $field->update($data);
         return back()->with('success', 'Champ mis à jour.');
     }
 

app/Http/Controllers/CarteController.php

@@ -21,8 +21,8 @@ class CarteController extends Controller
             ->whereHas('sources.releves')
             ->with([
                 'sources' => function ($q) {
-                    $q->withCount('releves')
+                    $q->select('id', 'nom', 'lieu_id', 'status', 'annee_debut', 'annee_fin')
-                      ->select('id', 'nom', 'lieu_id', 'status', 'annee_debut', 'annee_fin')
+                      ->withCount('releves')
                       ->orderBy('nom');
                 },
             ])

app/Http/Controllers/ExportController.php

@@ -2,108 +2,68 @@
 
 namespace App\Http\Controllers;
 
-use App\Enums\SourceStatus;
+use App\Enums\FieldType;
-use App\Models\Releve;
 use App\Models\Source;
-use App\Services\GedcomExportService;
-use App\Support\DbCompat;
-use Illuminate\Http\Request;
 use Illuminate\Http\Response;
-use Illuminate\Support\Facades\DB;
 
 class ExportController extends Controller
 {
-    public function __construct(
+    /** Export CSV de tous les relevés d'une source */
-        private readonly GedcomExportService $gedcom,
+    public function sourceCsv(Source $source): Response
-    ) {}
-
-    /** Export de tous les relevés d'une source */
-    public function source(Source $source): Response
     {
         $this->authorize('view', $source);
 
-        $gedcomContent = $this->gedcom->exportSource($source);
+        $source->load(['sourceType.fields', 'releves']);
-        $filename = $this->sanitizeFilename($source->nom) . '.ged';
+        $fields = $source->sourceType->fields->sortBy('order');
 
-        return response($gedcomContent, 200, [
+        $handle = fopen('php://temp', 'r+');
-            'Content-Type'        => 'text/plain; charset=UTF-8',
+
+        // BOM UTF-8 pour la compatibilité Excel
+        fwrite($handle, "\xEF\xBB\xBF");
+
+        // En-tête
+        fputcsv($handle, $fields->pluck('label')->toArray(), ';');
+
+        // Lignes
+        foreach ($source->releves as $releve) {
+            $row = [];
+            foreach ($fields as $field) {
+                $val   = $releve->data[$field->name] ?? null;
+                $row[] = $this->formatCsvValue($val, $field->type);
+            }
+            fputcsv($handle, $row, ';');
+        }
+
+        rewind($handle);
+        $csv = stream_get_contents($handle);
+        fclose($handle);
+
+        $filename = $this->sanitizeFilename($source->nom) . '.csv';
+
+        return response($csv, 200, [
+            'Content-Type'        => 'text/csv; charset=UTF-8',
             'Content-Disposition' => "attachment; filename=\"{$filename}\"",
         ]);
     }
 
-    /** Export depuis les résultats de recherche (avec les mêmes filtres) */
+    private function formatCsvValue(mixed $val, FieldType $type): string
-    public function recherche(Request $request): Response
     {
-        $user = auth()->user();
+        if ($val === null || $val === '') {
-
+            return '';
-        $query = Releve::with(['source.sourceType', 'createur'])
-            ->whereHas('source', function ($q) use ($user, $request) {
-                if (! $user->isSectionManager()) {
-                    $assignedIds = $user->sourcesAssignees()->pluck('sources.id');
-                    $q->where(function ($sq) use ($assignedIds) {
-                        $sq->where('status', SourceStatus::Termine)
-                           ->orWhereIn('id', $assignedIds);
-                    });
-                }
-                if ($request->filled('source_type_id')) {
-                    $q->where('source_type_id', $request->integer('source_type_id'));
-                }
-            }); // $request déjà dans le use()
-
-        if ($request->filled('q')) {
-            $q    = trim($request->get('q'));
-            $like = DbCompat::like();
-            $fts  = DbCompat::ftsRaw();
-
-            $query->where(function ($wq) use ($q, $like, $fts) {
-                $wq->where('nom',             $like, "%{$q}%")
-                   ->orWhere('prenom',         $like, "%{$q}%")
-                   ->orWhere('date_evenement', $like, "%{$q}%");
-                if ($fts) {
-                    $wq->orWhereRaw($fts, [$q]);
-                }
-            });
         }
 
-        if ($request->filled('lieu_id')) {
+        return match ($type) {
-            $rows = DB::select("
+            FieldType::Boolean => $val ? 'Oui' : 'Non',
-                WITH RECURSIVE descendants AS (
+            FieldType::Date    => is_array($val)
-                    SELECT id, nom FROM lieux WHERE id = ?
+                ? trim(($val['valeur'] ?? '') . (
-                    UNION ALL
+                    ! empty($val['calendrier']) && $val['calendrier'] !== 'gregorien'
-                    SELECT l.id, l.nom FROM lieux l
+                        ? ' (' . $val['calendrier'] . ')'
-                    INNER JOIN descendants d ON l.lieu_parent_id = d.id
+                        : ''
-                )
+                ))
-                SELECT DISTINCT nom FROM descendants WHERE nom IS NOT NULL
+                : (string) $val,
-            ", [$request->integer('lieu_id')]);
+            FieldType::Place   => is_array($val) ? ($val['nom_long'] ?? '') : (string) $val,
-
+            default            => (string) $val,
-            $noms = collect($rows)->pluck('nom')->filter();
+        };
-            if ($noms->isNotEmpty()) {
-                $pattern = $noms->map(fn ($n) => preg_quote($n, '/'))->join('|');
-                $query->whereRaw(DbCompat::jsonRegexRaw('data'), [$pattern]);
-            }
-        }
-
-        if ($request->filled('annee_debut')) {
-            $query->whereRaw('date_evenement >= ?', [$request->integer('annee_debut') . '-01-01']);
-        }
-        if ($request->filled('annee_fin')) {
-            $query->whereRaw('date_evenement <= ?', [$request->integer('annee_fin') . '-12-31']);
-        }
-
-        $releves = $query->orderByRaw('nom ASC NULLS LAST')->get();
-
-        if ($releves->isEmpty()) {
-            return back()->with('error', 'Aucun relevé à exporter.');
-        }
-
-        $titre = $request->filled('q') ? 'Recherche_' . $request->get('q') : 'Export';
-        $gedcomContent = $this->gedcom->exportReleves($releves, $titre);
-        $filename = $this->sanitizeFilename($titre) . '.ged';
-
-        return response($gedcomContent, 200, [
-            'Content-Type'        => 'text/plain; charset=UTF-8',
-            'Content-Disposition' => "attachment; filename=\"{$filename}\"",
-        ]);
     }
 
     private function sanitizeFilename(string $name): string

app/Http/Controllers/ImportController.php

@@ -0,0 +1,131 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Enums\FieldType;
+use App\Models\Lieu;
+use App\Models\Releve;
+use App\Models\Source;
+use App\Support\DbCompat;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\View\View;
+
+class ImportController extends Controller
+{
+    public function create(Source $source): View
+    {
+        $this->authorize('create', [Releve::class, $source]);
+
+        $source->load('sourceType.fields');
+
+        return view('sources.import', compact('source'));
+    }
+
+    public function store(Request $request, Source $source): RedirectResponse
+    {
+        $this->authorize('create', [Releve::class, $source]);
+
+        $request->validate([
+            'fichier' => ['required', 'file', 'mimes:csv,txt', 'max:10240'],
+        ]);
+
+        $source->load('sourceType.fields');
+        $fieldsByLabel = $source->sourceType->fields->keyBy('label');
+
+        $path   = $request->file('fichier')->getRealPath();
+        $handle = fopen($path, 'r');
+
+        // Suppression du BOM UTF-8 éventuel
+        $bom = fread($handle, 3);
+        if ($bom !== "\xEF\xBB\xBF") {
+            rewind($handle);
+        }
+
+        // Détection automatique du séparateur (; ou ,)
+        $firstLine = fgets($handle);
+        rewind($handle);
+        if ($bom === "\xEF\xBB\xBF") {
+            fread($handle, 3);
+        }
+        $sep = substr_count($firstLine, ';') >= substr_count($firstLine, ',') ? ';' : ',';
+
+        $header = fgetcsv($handle, 0, $sep);
+        if (! $header) {
+            fclose($handle);
+            return back()->with('error', 'Fichier CSV vide ou invalide.');
+        }
+        $header = array_map('trim', $header);
+
+        $imported = 0;
+        $userId   = auth()->id();
+
+        while (($line = fgetcsv($handle, 0, $sep)) !== false) {
+            if (count(array_filter($line, fn ($v) => $v !== '')) === 0) {
+                continue;
+            }
+
+            $data = [];
+            foreach ($header as $i => $label) {
+                $field = $fieldsByLabel->get($label);
+                if (! $field) {
+                    continue;
+                }
+                $data[$field->name] = $this->parseValue(trim($line[$i] ?? ''), $field->type);
+            }
+
+            $source->releves()->create([
+                'data'       => $data,
+                'created_by' => $userId,
+                'updated_by' => $userId,
+            ]);
+            $imported++;
+        }
+
+        fclose($handle);
+
+        if ($imported === 0) {
+            return back()->with('error', 'Aucun relevé importé — vérifiez que les en-têtes correspondent aux libellés des champs.');
+        }
+
+        return redirect()->route('sources.releves.index', $source)
+            ->with('success', "{$imported} relevé(s) importé(s) avec succès.");
+    }
+
+    private function parseValue(string $raw, FieldType $type): mixed
+    {
+        return match ($type) {
+            FieldType::Boolean => in_array(mb_strtolower($raw), ['oui', 'yes', '1', 'true'], true),
+            FieldType::Number  => $raw !== '' ? (float) str_replace(',', '.', $raw) : null,
+            FieldType::Date    => $this->parseDate($raw),
+            FieldType::Place   => $this->parsePlace($raw),
+            default            => $raw !== '' ? $raw : null,
+        };
+    }
+
+    private function parseDate(string $raw): array
+    {
+        if ($raw === '') {
+            return ['valeur' => null, 'calendrier' => 'gregorien'];
+        }
+        // Format export : "YYYY-MM-DD" ou "YYYY-MM-DD (calendrier)"
+        if (preg_match('/^(.+?)\s*\((\w+)\)\s*$/', $raw, $m)) {
+            return ['valeur' => trim($m[1]), 'calendrier' => trim($m[2])];
+        }
+        return ['valeur' => $raw, 'calendrier' => 'gregorien'];
+    }
+
+    private function parsePlace(string $raw): ?array
+    {
+        if ($raw === '') {
+            return null;
+        }
+        $like = DbCompat::like();
+        $lieu = Lieu::where('nom_long', $raw)->first(['id', 'nom_long'])
+            ?? Lieu::where('nom_long', $like, $raw . '%')->first(['id', 'nom_long']);
+
+        return $lieu
+            ? ['id' => $lieu->id, 'nom_long' => $lieu->nom_long]
+            : ['id' => null, 'nom_long' => $raw];
+    }
+}

app/Http/Controllers/LieuController.php

@@ -10,6 +10,7 @@ use App\Support\DbCompat;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 use Illuminate\Support\Facades\DB;
 use Illuminate\View\View;
 
@@ -129,6 +130,112 @@ class LieuController extends Controller
             ->with('success', 'Lieu supprimé.');
     }
 
+    public function exportCsv(): Response
+    {
+        $this->authorize('viewAny', Lieu::class);
+
+        $lieux = Lieu::with(['lieuType', 'parent'])->orderBy('nom_long')->get();
+
+        $handle = fopen('php://temp', 'r+');
+        fwrite($handle, "\xEF\xBB\xBF");
+
+        fputcsv($handle, ['nom', 'code', 'type', 'lieu_parent', 'latitude', 'longitude', 'note'], ';');
+
+        foreach ($lieux as $lieu) {
+            fputcsv($handle, [
+                $lieu->nom,
+                $lieu->code ?? '',
+                $lieu->lieuType?->nom ?? '',
+                $lieu->parent?->nom_long ?? '',
+                $lieu->latitude ?? '',
+                $lieu->longitude ?? '',
+                $lieu->note ?? '',
+            ], ';');
+        }
+
+        rewind($handle);
+        $csv = stream_get_contents($handle);
+        fclose($handle);
+
+        return response($csv, 200, [
+            'Content-Type'        => 'text/csv; charset=UTF-8',
+            'Content-Disposition' => 'attachment; filename="lieux.csv"',
+        ]);
+    }
+
+    public function importCreate(): View
+    {
+        $this->authorize('create', Lieu::class);
+
+        return view('lieux.import');
+    }
+
+    public function importStore(Request $request): RedirectResponse
+    {
+        $this->authorize('create', Lieu::class);
+
+        $request->validate([
+            'fichier' => ['required', 'file', 'mimes:csv,txt', 'max:10240'],
+        ]);
+
+        $handle = fopen($request->file('fichier')->getRealPath(), 'r');
+
+        $bom = fread($handle, 3);
+        if ($bom !== "\xEF\xBB\xBF") {
+            rewind($handle);
+        }
+
+        $firstLine = fgets($handle);
+        rewind($handle);
+        if ($bom === "\xEF\xBB\xBF") {
+            fread($handle, 3);
+        }
+        $sep = substr_count($firstLine, ';') >= substr_count($firstLine, ',') ? ';' : ',';
+
+        $header = array_map('trim', fgetcsv($handle, 0, $sep) ?: []);
+        $colIdx = array_flip($header);
+
+        $lieuTypesCache = LieuType::all()->keyBy('nom');
+        $imported = 0;
+
+        while (($line = fgetcsv($handle, 0, $sep)) !== false) {
+            $nom = trim($line[$colIdx['nom'] ?? -1] ?? '');
+            if ($nom === '') {
+                continue;
+            }
+
+            $parentNomLong = trim($line[$colIdx['lieu_parent'] ?? -1] ?? '');
+            $typeName      = trim($line[$colIdx['type'] ?? -1] ?? '');
+
+            $parentId  = $parentNomLong
+                ? Lieu::where('nom_long', $parentNomLong)->value('id')
+                : null;
+            $lieuTypeId = $typeName
+                ? $lieuTypesCache->get($typeName)?->id
+                : null;
+
+            Lieu::create([
+                'nom'           => $nom,
+                'code'          => trim($line[$colIdx['code'] ?? -1] ?? '') ?: null,
+                'lieu_type_id'  => $lieuTypeId,
+                'lieu_parent_id'=> $parentId,
+                'latitude'      => ($v = trim($line[$colIdx['latitude']  ?? -1] ?? '')) !== '' ? (float) str_replace(',', '.', $v) : null,
+                'longitude'     => ($v = trim($line[$colIdx['longitude'] ?? -1] ?? '')) !== '' ? (float) str_replace(',', '.', $v) : null,
+                'note'          => trim($line[$colIdx['note'] ?? -1] ?? '') ?: null,
+            ]);
+            $imported++;
+        }
+
+        fclose($handle);
+
+        if ($imported === 0) {
+            return back()->with('error', 'Aucun lieu importé — vérifiez que la colonne « nom » est présente.');
+        }
+
+        return redirect()->route('lieux.index')
+            ->with('success', "{$imported} lieu(x) importé(s) avec succès.");
+    }
+
     private function getDescendantAndSelfIds(int $lieuId): array
     {
         $rows = DB::select("

app/Http/Controllers/RechercheController.php

@@ -88,8 +88,8 @@ class RechercheController extends Controller
         // ── Tri + pagination ────────────────────────────────────────────────
         $total    = $query->count();
         $resultats = $query
-            ->orderByRaw('nom ASC NULLS LAST')
+            ->orderByRaw(DbCompat::nullsLast('nom'))
-            ->orderByRaw('date_evenement ASC NULLS LAST')
+            ->orderByRaw(DbCompat::nullsLast('date_evenement'))
             ->paginate(25)
             ->withQueryString();
 

app/Http/Controllers/ReleveController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
 use App\Enums\FieldType;
 use App\Http\Requests\StoreReleveRequest;
 use App\Http\Requests\UpdateReleveRequest;
+use App\Models\Lieu;
 use App\Models\Releve;
 use App\Models\Source;
 use Illuminate\Http\RedirectResponse;
@@ -49,27 +50,28 @@ class ReleveController extends Controller
             ->with('success', 'Relevé ajouté.');
     }
 
-    public function show(Source $source, Releve $releve): View
+    public function show(Releve $releve): View
     {
         $this->authorize('view', $releve);
 
-        $source->load('sourceType.fields');
+        $source = $releve->source->load('sourceType.fields');
         $releve->load('createur', 'modificateur');
 
         return view('releves.show', compact('source', 'releve'));
     }
 
-    public function edit(Source $source, Releve $releve): View
+    public function edit(Releve $releve): View
     {
         $this->authorize('update', $releve);
 
-        $source->load('sourceType.fields');
+        $source = $releve->source->load('sourceType.fields');
 
         return view('releves.edit', compact('source', 'releve'));
     }
 
-    public function update(UpdateReleveRequest $request, Source $source, Releve $releve): RedirectResponse
+    public function update(UpdateReleveRequest $request, Releve $releve): RedirectResponse
     {
+        $source = $releve->source->load('sourceType.fields');
         $data = $this->buildData($request->validated()['data'] ?? [], $source);
 
         $releve->update([
@@ -77,14 +79,15 @@ class ReleveController extends Controller
             'updated_by' => $request->user()->id,
         ]);
 
-        return redirect()->route('sources.releves.show', [$source, $releve])
+        return redirect()->route('releves.show', $releve)
             ->with('success', 'Relevé mis à jour.');
     }
 
-    public function destroy(Source $source, Releve $releve): RedirectResponse
+    public function destroy(Releve $releve): RedirectResponse
     {
         $this->authorize('delete', $releve);
 
+        $source = $releve->source;
         $releve->delete();
 
         return redirect()->route('sources.releves.index', $source)
@@ -106,6 +109,10 @@ class ReleveController extends Controller
                     'valeur'     => $value['valeur'] ?? null,
                     'calendrier' => $value['calendrier'] ?? 'gregorien',
                 ],
+                FieldType::Place   => $value ? (function () use ($value) {
+                    $lieu = Lieu::find((int) $value, ['id', 'nom_long']);
+                    return $lieu ? ['id' => $lieu->id, 'nom_long' => $lieu->nom_long] : null;
+                })() : null,
                 default => $value === '' ? null : $value,
             };
         }

app/Http/Requests/Auth/LoginRequest.php

@@ -28,25 +28,23 @@ class LoginRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'email' => ['required', 'string', 'email'],
+            'login'    => ['required', 'string'],
             'password' => ['required', 'string'],
         ];
     }
 
-    /**
-     * Attempt to authenticate the request's credentials.
-     *
-     * @throws ValidationException
-     */
     public function authenticate(): void
     {
         $this->ensureIsNotRateLimited();
 
-        if (! Auth::attempt($this->only('email', 'password'), $this->boolean('remember'))) {
+        $login = $this->string('login')->toString();
+        $field = filter_var($login, FILTER_VALIDATE_EMAIL) ? 'email' : 'name';
+
+        if (! Auth::attempt([$field => $login, 'password' => $this->string('password')->toString()], $this->boolean('remember'))) {
             RateLimiter::hit($this->throttleKey());
 
             throw ValidationException::withMessages([
-                'email' => trans('auth.failed'),
+                'login' => trans('auth.failed'),
             ]);
         }
 
@@ -55,18 +53,13 @@ class LoginRequest extends FormRequest
             RateLimiter::hit($this->throttleKey());
 
             throw ValidationException::withMessages([
-                'email' => 'Votre compte est désactivé. Contactez un administrateur.',
+                'login' => 'Votre compte est désactivé. Contactez un administrateur.',
             ]);
         }
 
         RateLimiter::clear($this->throttleKey());
     }
 
-    /**
-     * Ensure the login request is not rate limited.
-     *
-     * @throws ValidationException
-     */
     public function ensureIsNotRateLimited(): void
     {
         if (! RateLimiter::tooManyAttempts($this->throttleKey(), 5)) {
@@ -78,18 +71,15 @@ class LoginRequest extends FormRequest
         $seconds = RateLimiter::availableIn($this->throttleKey());
 
         throw ValidationException::withMessages([
-            'email' => trans('auth.throttle', [
+            'login' => trans('auth.throttle', [
                 'seconds' => $seconds,
                 'minutes' => ceil($seconds / 60),
             ]),
         ]);
     }
 
-    /**
-     * Get the rate limiting throttle key for the request.
-     */
     public function throttleKey(): string
     {
-        return Str::transliterate(Str::lower($this->string('email')).'|'.$this->ip());
+        return Str::transliterate(Str::lower($this->string('login')).'|'.$this->ip());
     }
 }

app/Http/Requests/StoreReleveRequest.php

@@ -13,7 +13,7 @@ class StoreReleveRequest extends FormRequest
     public function authorize(): bool
     {
         $source = $this->route('source');
-        return $this->user()->can('create', [app(\App\Models\Releve::class), $source]);
+        return $this->user()->can('create', [\App\Models\Releve::class, $source]);
     }
 
     public function rules(): array
@@ -46,6 +46,10 @@ class StoreReleveRequest extends FormRequest
                     $rules[$base] = [$field->required ? 'required' : 'nullable', 'string', 'in:' . implode(',', $options)];
                     break;
 
+                case FieldType::Place:
+                    $rules[$base] = [$field->required ? 'required' : 'nullable', 'integer', 'exists:lieux,id'];
+                    break;
+
                 default: // text, textarea
                     $rules[$base] = [$field->required ? 'required' : 'nullable', 'string', 'max:2000'];
             }

app/Http/Requests/UpdateReleveRequest.php

@@ -41,6 +41,9 @@ class UpdateReleveRequest extends FormRequest
                     $options = $field->options ?? [];
                     $rules[$base] = [$field->required ? 'required' : 'nullable', 'string', 'in:' . implode(',', $options)];
                     break;
+                case FieldType::Place:
+                    $rules[$base] = [$field->required ? 'required' : 'nullable', 'integer', 'exists:lieux,id'];
+                    break;
                 default:
                     $rules[$base] = [$field->required ? 'required' : 'nullable', 'string', 'max:2000'];
             }

app/Support/DbCompat.php

@@ -58,6 +58,18 @@ class DbCompat
             : "JSON_UNQUOTE(JSON_EXTRACT(data, '$.$jsonKey'))";
     }
 
+    /**
+     * Fragment ORDER BY "colonne ASC, nulls en dernier".
+     * Usage : ->orderByRaw(DbCompat::nullsLast('nom'))
+     */
+    public static function nullsLast(string $column, string $direction = 'ASC'): string
+    {
+        $dir = strtoupper($direction);
+        return self::isPgsql()
+            ? "{$column} {$dir} NULLS LAST"
+            : "({$column} IS NULL) ASC, {$column} {$dir}";
+    }
+
     /** Syntaxe de la colonne générée stockée pour un champ JSON imbriqué (ex: date_evenement.valeur) */
     public static function generatedJsonNestedCol(string $jsonPath): string
     {

lang/fr.json

@@ -0,0 +1,19 @@
+{
+    "Already registered?": "Déjà inscrit ?",
+    "A new verification link has been sent to the email address you provided during registration.": "Un nouveau lien de vérification a été envoyé à l'adresse e-mail fournie lors de l'inscription.",
+    "Confirm": "Confirmer",
+    "Confirm Password": "Confirmer le mot de passe",
+    "Email": "Adresse e-mail",
+    "Email Password Reset Link": "Envoyer le lien de réinitialisation",
+    "Forgot your password?": "Mot de passe oublié ?",
+    "Forgot your password? No problem. Just let us know your email address and we will email you a password reset link that will allow you to choose a new one.": "Mot de passe oublié ? Indiquez votre adresse e-mail et nous vous enverrons un lien pour en choisir un nouveau.",
+    "Log in": "Se connecter",
+    "Log Out": "Se déconnecter",
+    "Name": "Nom",
+    "Password": "Mot de passe",
+    "Register": "S'inscrire",
+    "Remember me": "Se souvenir de moi",
+    "Resend Verification Email": "Renvoyer l'e-mail de vérification",
+    "Reset Password": "Réinitialiser le mot de passe",
+    "This is a secure area of the application. Please confirm your password before continuing.": "Zone sécurisée. Veuillez confirmer votre mot de passe avant de continuer."
+}

package-lock.json

@@ -4,6 +4,9 @@
     "requires": true,
     "packages": {
         "": {
+            "dependencies": {
+                "leaflet": "^1.9.4"
+            },
             "devDependencies": {
                 "@tailwindcss/forms": "^0.5.2",
                 "@tailwindcss/vite": "^4.0.0",
@@ -2276,6 +2279,12 @@
                 "vite": "^7.0.0"
             }
         },
+        "node_modules/leaflet": {
+            "version": "1.9.4",
+            "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.9.4.tgz",
+            "integrity": "sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==",
+            "license": "BSD-2-Clause"
+        },
         "node_modules/lightningcss": {
             "version": "1.32.0",
             "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.32.0.tgz",

package.json

@@ -17,5 +17,8 @@
         "postcss": "^8.4.31",
         "tailwindcss": "^3.1.0",
         "vite": "^7.0.7"
+    },
+    "dependencies": {
+        "leaflet": "^1.9.4"
     }
 }

resources/js/carte.js

@@ -0,0 +1,16 @@
+import L from 'leaflet';
+import 'leaflet/dist/leaflet.css';
+
+// Correction des icônes Leaflet avec Vite (les chemins par défaut ne fonctionnent pas avec bundler)
+import markerIcon2x from 'leaflet/dist/images/marker-icon-2x.png';
+import markerIcon from 'leaflet/dist/images/marker-icon.png';
+import markerShadow from 'leaflet/dist/images/marker-shadow.png';
+
+delete L.Icon.Default.prototype._getIconUrl;
+L.Icon.Default.mergeOptions({
+    iconRetinaUrl: markerIcon2x,
+    iconUrl: markerIcon,
+    shadowUrl: markerShadow,
+});
+
+window.LeafletMap = L;

resources/views/admin/source-types/show.blade.php

@@ -33,7 +33,13 @@
 
             <ul id="fields-list" class="divide-y divide-gray-100 dark:divide-gray-700">
                 @foreach($sourceType->fields as $field)
-                <li class="px-6 py-3 flex items-center gap-4" data-id="{{ $field->id }}">
+                <li class="px-6 py-3" data-id="{{ $field->id }}"
+                    x-data="{
+                        open: false,
+                        type: '{{ $field->type->value }}',
+                        optionsRaw: {{ json_encode(collect($field->options ?? [])->join("\n")) }}
+                    }">
+                    <div class="flex items-center gap-4">
                         <span class="cursor-move text-gray-300 dark:text-gray-600 hover:text-gray-500 select-none">⠿</span>
                         <div class="flex-1 grid grid-cols-4 gap-3 text-sm">
                             <span class="font-mono text-indigo-700">{{ $field->name }}</span>
@@ -42,16 +48,61 @@
                             <span class="text-gray-400 dark:text-gray-500">{{ $field->required ? 'Obligatoire' : 'Optionnel' }}</span>
                         </div>
                         <div class="flex gap-2">
-                        <button type="button"
+                            <button type="button" @click="open = !open"
-                                x-data="{ open: false }"
+                                    class="text-xs text-gray-500 dark:text-gray-400 hover:text-indigo-600"
-                                @click="open = !open"
+                                    x-text="open ? 'Annuler' : 'Modifier'">Modifier</button>
-                                class="text-xs text-gray-500 dark:text-gray-400 hover:text-indigo-600">Modifier</button>
                             <form method="POST" action="{{ route('admin.source-types.fields.destroy', [$sourceType, $field]) }}"
                                   x-data @submit.prevent="if(confirm('Supprimer ce champ ?')) $el.submit()">
                                 @csrf @method('DELETE')
                                 <button type="submit" class="text-xs text-red-500 hover:text-red-700">Supprimer</button>
                             </form>
                         </div>
+                    </div>
+
+                    {{-- Formulaire d'édition inline --}}
+                    <div x-show="open" x-cloak class="mt-3 pl-8 border-t border-gray-100 dark:border-gray-700 pt-3">
+                        <form method="POST" action="{{ route('admin.source-types.fields.update', [$sourceType, $field]) }}">
+                            @csrf @method('PUT')
+                            <div class="grid grid-cols-2 gap-3">
+                                <div>
+                                    <label class="block text-xs font-medium text-gray-600 dark:text-gray-400 mb-1">Nom technique</label>
+                                    <input type="text" name="name" value="{{ $field->name }}" required
+                                           class="block w-full rounded-md border-gray-300 dark:border-gray-600 shadow-sm text-sm focus:border-indigo-500 focus:ring-indigo-500">
+                                </div>
+                                <div>
+                                    <label class="block text-xs font-medium text-gray-600 dark:text-gray-400 mb-1">Libellé affiché</label>
+                                    <input type="text" name="label" value="{{ $field->label }}" required
+                                           class="block w-full rounded-md border-gray-300 dark:border-gray-600 shadow-sm text-sm focus:border-indigo-500 focus:ring-indigo-500">
+                                </div>
+                                <div>
+                                    <label class="block text-xs font-medium text-gray-600 dark:text-gray-400 mb-1">Type</label>
+                                    <select name="type" x-model="type"
+                                            class="block w-full rounded-md border-gray-300 dark:border-gray-600 shadow-sm text-sm focus:border-indigo-500 focus:ring-indigo-500">
+                                        @foreach(\App\Enums\FieldType::cases() as $ft)
+                                            <option value="{{ $ft->value }}" {{ $field->type->value === $ft->value ? 'selected' : '' }}>{{ $ft->value }}</option>
+                                        @endforeach
+                                    </select>
+                                    <div x-show="type === 'select'" x-cloak class="mt-2">
+                                        <label class="block text-xs font-medium text-gray-600 dark:text-gray-400 mb-1">Options (une par ligne)</label>
+                                        <textarea name="options_raw" rows="3" x-model="optionsRaw"
+                                                  class="block w-full rounded-md border-gray-300 dark:border-gray-600 shadow-sm text-sm focus:border-indigo-500 focus:ring-indigo-500"></textarea>
+                                    </div>
+                                </div>
+                                <div class="flex items-end">
+                                    <label class="flex items-center gap-2 text-sm text-gray-700 dark:text-gray-300">
+                                        <input type="checkbox" name="required" value="1" {{ $field->required ? 'checked' : '' }}
+                                               class="rounded border-gray-300 dark:border-gray-600 text-indigo-600 focus:ring-indigo-500">
+                                        Champ obligatoire
+                                    </label>
+                                </div>
+                            </div>
+                            <div class="mt-3">
+                                <button type="submit" class="px-3 py-1.5 bg-indigo-600 text-white text-xs rounded-md hover:bg-indigo-700">
+                                    Enregistrer
+                                </button>
+                            </div>
+                        </form>
+                    </div>
                 </li>
                 @endforeach
             </ul>

resources/views/auth/login.blade.php

@@ -5,11 +5,11 @@
     <form method="POST" action="{{ route('login') }}">
         @csrf
 
-        <!-- Email Address -->
+        <!-- Email ou nom d'utilisateur -->
         <div>
-            <x-input-label for="email" :value="__('Email')" />
+            <x-input-label for="login" :value="__('Email ou nom d\'utilisateur')" />
-            <x-text-input id="email" class="block mt-1 w-full" type="email" name="email" :value="old('email')" required autofocus autocomplete="username" />
+            <x-text-input id="login" class="block mt-1 w-full" type="text" name="login" :value="old('login')" required autofocus autocomplete="username" />
-            <x-input-error :messages="$errors->get('email')" class="mt-2" />
+            <x-input-error :messages="$errors->get('login')" class="mt-2" />
         </div>
 
         <!-- Password -->

resources/views/carte/index.blade.php

@@ -7,9 +7,8 @@
     </x-slot>
 
     @push('head')
-        {{-- Leaflet CSS --}}
+        {{-- Leaflet (bundlé via Vite) --}}
-        <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css"
+        @vite('resources/js/carte.js')
-              integrity="sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY=" crossorigin="">
         <style>
             #carte-map {
                 height: calc(100vh - 120px);
@@ -45,13 +44,11 @@
     <div id="carte-map" class="w-full"></div>
 
     @push('head')
-        {{-- Leaflet JS (chargé en fin de head pour ne pas bloquer le rendu) --}}
-        <script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"
-                integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV/XN2GqM8=" crossorigin=""
-                defer></script>
-
         <script>
         document.addEventListener('DOMContentLoaded', function () {
+            const L = window.LeafletMap;
+            if (!L) return;
+
             // ── Initialisation de la carte ──────────────────────────────────────
             const map = L.map('carte-map', {
                 center: [46.5, 2.2],   // centre de la France

resources/views/layouts/navigation.blade.php

@@ -1,4 +1,4 @@
-<nav x-data="{ open: false }" class="bg-white dark:bg-gray-800 border-b border-gray-100 dark:border-gray-700">
+<nav x-data="{ open: false }" class="relative z-40 bg-white dark:bg-gray-800 border-b border-gray-100 dark:border-gray-700">
     <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
         <div class="flex justify-between h-16">
             <div class="flex">

resources/views/lieux/import.blade.php

@@ -0,0 +1,80 @@
+<x-app-layout>
+    <x-slot name="header">
+        <h2 class="text-xl font-semibold text-gray-800 dark:text-gray-200">Importer des lieux</h2>
+    </x-slot>
+
+    <div class="py-8 max-w-2xl mx-auto px-4 sm:px-6 lg:px-8 space-y-6">
+
+        @if(session('error'))
+            <div class="p-4 bg-red-50 dark:bg-red-900/30 border border-red-200 dark:border-red-700 text-red-800 dark:text-red-200 rounded-md">
+                {{ session('error') }}
+            </div>
+        @endif
+
+        <div class="bg-white dark:bg-gray-800 shadow rounded-lg p-6">
+            <form method="POST" action="{{ route('lieux.import.store') }}" enctype="multipart/form-data">
+                @csrf
+                <div>
+                    <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+                        Fichier CSV <span class="text-red-500">*</span>
+                    </label>
+                    <input type="file" name="fichier" accept=".csv,.txt" required
+                           class="block w-full text-sm text-gray-700 dark:text-gray-300
+                                  file:mr-4 file:py-2 file:px-4 file:rounded-md file:border-0
+                                  file:text-sm file:font-medium file:bg-indigo-50 file:text-indigo-700
+                                  hover:file:bg-indigo-100 dark:file:bg-indigo-900/30 dark:file:text-indigo-300">
+                    @error('fichier')
+                        <p class="mt-1 text-sm text-red-600">{{ $message }}</p>
+                    @enderror
+                </div>
+                <div class="mt-5">
+                    <button type="submit"
+                            class="px-5 py-2 bg-indigo-600 text-white rounded-md hover:bg-indigo-700 text-sm">
+                        Importer
+                    </button>
+                </div>
+            </form>
+        </div>
+
+        <div class="bg-gray-50 dark:bg-gray-700 rounded-lg p-5 text-sm space-y-3">
+            <p class="font-medium text-gray-700 dark:text-gray-300">Format attendu</p>
+            <ul class="text-gray-600 dark:text-gray-400 space-y-1 list-disc list-inside">
+                <li>Encodage <strong>UTF-8</strong>, séparateur <strong>point-virgule</strong> (<code>;</code>) ou virgule (<code>,</code>)</li>
+                <li>Première ligne = en-têtes (noms exacts ci-dessous)</li>
+                <li>Le parent est identifié par son <strong>nom long complet</strong> (ex : <code>Gironde, France</code>)</li>
+                <li>Le type est identifié par son <strong>nom exact</strong> tel que défini dans les types de lieux</li>
+            </ul>
+
+            <div class="mt-3 overflow-x-auto">
+                <table class="text-xs border-collapse w-full">
+                    <thead>
+                        <tr class="bg-gray-200 dark:bg-gray-600">
+                            @foreach(['nom *', 'code', 'type', 'lieu_parent', 'latitude', 'longitude', 'note'] as $col)
+                                <th class="border border-gray-300 dark:border-gray-500 px-2 py-1 text-left font-mono text-gray-700 dark:text-gray-200">{{ $col }}</th>
+                            @endforeach
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr class="text-gray-500 dark:text-gray-400">
+                            <td class="border border-gray-300 dark:border-gray-500 px-2 py-1">Bordeaux</td>
+                            <td class="border border-gray-300 dark:border-gray-500 px-2 py-1">33063</td>
+                            <td class="border border-gray-300 dark:border-gray-500 px-2 py-1">Commune</td>
+                            <td class="border border-gray-300 dark:border-gray-500 px-2 py-1">Gironde, France</td>
+                            <td class="border border-gray-300 dark:border-gray-500 px-2 py-1">44.8378</td>
+                            <td class="border border-gray-300 dark:border-gray-500 px-2 py-1">-0.5792</td>
+                            <td class="border border-gray-300 dark:border-gray-500 px-2 py-1"></td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+
+            <p class="text-gray-500 dark:text-gray-400 text-xs mt-2">
+                Astuce : utilisez
+                <a href="{{ route('lieux.export.csv') }}" class="text-indigo-600 hover:underline">l'export CSV</a>
+                de la liste des lieux comme modèle.
+            </p>
+        </div>
+
+        <a href="{{ route('lieux.index') }}" class="text-sm text-indigo-600 hover:underline">← Retour aux lieux</a>
+    </div>
+</x-app-layout>

resources/views/lieux/index.blade.php

@@ -2,13 +2,23 @@
     <x-slot name="header">
         <div class="flex items-center justify-between">
             <h2 class="text-xl font-semibold text-gray-800 dark:text-gray-200">Lieux</h2>
+            <div class="flex items-center gap-2">
+                <a href="{{ route('lieux.export.csv') }}"
+                   class="px-4 py-2 bg-white dark:bg-gray-800 border border-gray-300 dark:border-gray-600 text-gray-700 dark:text-gray-300 text-sm rounded-md hover:bg-gray-50 dark:hover:bg-gray-700">
+                    ↓ CSV
+                </a>
                 @can('create', App\Models\Lieu::class)
+                    <a href="{{ route('lieux.import.create') }}"
+                       class="px-4 py-2 bg-white dark:bg-gray-800 border border-gray-300 dark:border-gray-600 text-gray-700 dark:text-gray-300 text-sm rounded-md hover:bg-gray-50 dark:hover:bg-gray-700">
+                        ↑ Importer CSV
+                    </a>
                     <a href="{{ route('lieux.create') }}"
                        class="px-4 py-2 bg-indigo-600 text-white text-sm rounded-md hover:bg-indigo-700">
                         + Nouveau lieu
                     </a>
                 @endcan
             </div>
+        </div>
     </x-slot>
 
     <div class="py-8 max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 space-y-6">

resources/views/recherche/index.blade.php

@@ -108,11 +108,6 @@
                     @else
                         <strong>{{ number_format($total) }}</strong> relevé{{ $total > 1 ? 's' : '' }} trouvé{{ $total > 1 ? 's' : '' }}
                         @if(request('q')) pour <em>« {{ request('q') }} »</em> @endif
-                        —
-                        <a href="{{ route('export.recherche', request()->query()) }}"
-                           class="text-indigo-600 hover:underline">
-                            ↓ Exporter en GEDCOM
-                        </a>
                     @endif
                 </p>
 

resources/views/releves/_field.blade.php

@@ -7,6 +7,10 @@
     $name     = "data[{$field->name}]";
     $inputId  = "field_{$field->name}";
     $oldValue = old("data.{$field->name}", $value);
+
+    // Pour le type place : $value est soit null, soit ['id'=>…,'nom_long'=>…]
+    $placeId      = $field->type === FieldType::Place ? ($value['id']      ?? null) : null;
+    $placeNomLong = $field->type === FieldType::Place ? ($value['nom_long'] ?? '')  : '';
 @endphp
 
 <div class="space-y-1">
@@ -75,6 +79,7 @@
 
                 {{-- Date grégorienne / julienne : input date HTML5 --}}
                 <input x-show="cal !== 'republicain'"
+                       :disabled="cal === 'republicain'"
                        type="date" name="{{ $name }}[valeur]"
                        value="{{ $dateCal !== 'republicain' ? $dateVal : '' }}"
                        {{ $field->required ? 'required' : '' }}
@@ -82,6 +87,7 @@
 
                 {{-- Date républicaine : saisie texte libre (ex: "15 Vendémiaire An III") --}}
                 <input x-show="cal === 'republicain'" x-cloak
+                       :disabled="cal !== 'republicain'"
                        type="text" name="{{ $name }}[valeur]"
                        value="{{ $dateCal === 'republicain' ? $dateVal : '' }}"
                        placeholder="ex : 15 Vendémiaire An III"
@@ -92,6 +98,17 @@
             @enderror
             @break
 
+        @case(FieldType::Place)
+            <x-lieu-picker
+                :name="$name"
+                :value="$placeId"
+                :display-value="$placeNomLong"
+                :required="$field->required"
+                label=""
+                placeholder="Rechercher un lieu…"
+            />
+            @break
+
     @endswitch
 
     @error("data.{$field->name}")

resources/views/releves/index.blade.php

@@ -10,12 +10,7 @@
             </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) }}"
+@can('create', [App\Models\Releve::class, $source])
-                   class="px-4 py-2 border border-gray-300 dark:border-gray-600 text-gray-700 dark:text-gray-300 text-sm rounded-md hover:bg-gray-50 dark:hover:bg-gray-700"
-                   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é

resources/views/releves/show.blade.php

@@ -42,6 +42,8 @@
                     <dd class="col-span-2 text-gray-900 dark:text-white">
                         @if($val === null || $val === '')
                             <span class="text-gray-400 dark:text-gray-500">—</span>
+                        @elseif(is_array($val) && isset($val['nom_long']))
+                            {{ $val['nom_long'] }}
                         @elseif(is_array($val))
                             {{ $val['valeur'] ?? '—' }}
                             @if(!empty($val['calendrier']) && $val['calendrier'] !== 'gregorien')

resources/views/sources/import.blade.php

@@ -0,0 +1,84 @@
+<x-app-layout>
+    <x-slot name="header">
+        <div>
+            <h2 class="text-xl font-semibold text-gray-800 dark:text-gray-200">Importer des relevés</h2>
+            <p class="text-sm text-gray-500 dark:text-gray-400 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-2xl mx-auto px-4 sm:px-6 lg:px-8 space-y-6">
+
+        @if(session('error'))
+            <div class="p-4 bg-red-50 dark:bg-red-900/30 border border-red-200 dark:border-red-700 text-red-800 dark:text-red-200 rounded-md">
+                {{ session('error') }}
+            </div>
+        @endif
+
+        <div class="bg-white dark:bg-gray-800 shadow rounded-lg p-6 space-y-5">
+            <form method="POST" action="{{ route('sources.import.store', $source) }}" enctype="multipart/form-data">
+                @csrf
+
+                <div>
+                    <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
+                        Fichier CSV <span class="text-red-500">*</span>
+                    </label>
+                    <input type="file" name="fichier" accept=".csv,.txt" required
+                           class="block w-full text-sm text-gray-700 dark:text-gray-300
+                                  file:mr-4 file:py-2 file:px-4 file:rounded-md file:border-0
+                                  file:text-sm file:font-medium file:bg-indigo-50 file:text-indigo-700
+                                  hover:file:bg-indigo-100 dark:file:bg-indigo-900/30 dark:file:text-indigo-300">
+                    @error('fichier')
+                        <p class="mt-1 text-sm text-red-600">{{ $message }}</p>
+                    @enderror
+                </div>
+
+                <div class="mt-5">
+                    <button type="submit"
+                            class="px-5 py-2 bg-indigo-600 text-white rounded-md hover:bg-indigo-700 text-sm">
+                        Importer
+                    </button>
+                </div>
+            </form>
+        </div>
+
+        {{-- Format attendu --}}
+        <div class="bg-gray-50 dark:bg-gray-700 rounded-lg p-5 text-sm space-y-3">
+            <p class="font-medium text-gray-700 dark:text-gray-300">Format attendu</p>
+            <ul class="text-gray-600 dark:text-gray-400 space-y-1 list-disc list-inside">
+                <li>Encodage <strong>UTF-8</strong>, séparateur <strong>point-virgule</strong> (<code>;</code>) ou virgule (<code>,</code>)</li>
+                <li>Première ligne = en-têtes correspondant aux <strong>libellés</strong> des champs</li>
+                <li>Dates au format <code>AAAA-MM-JJ</code>, ou <code>AAAA-MM-JJ (calendrier)</code> pour julien/républicain</li>
+                <li>Booléens : <code>Oui</code> / <code>Non</code></li>
+                <li>Lieux : nom long du lieu (ex : <code>Bordeaux, Gironde, France</code>)</li>
+            </ul>
+            @if($source->releves->isNotEmpty() ?? $source->releves()->exists())
+            <p class="text-gray-500 dark:text-gray-400 text-xs mt-2">
+                Astuce : utilisez
+                <a href="{{ route('export.source.csv', $source) }}" class="text-indigo-600 hover:underline">l'export CSV</a>
+                d'une source existante comme modèle.
+            </p>
+            @endif
+
+            @if($source->sourceType->fields->isNotEmpty())
+            <div class="mt-3">
+                <p class="text-xs font-medium text-gray-500 dark:text-gray-400 uppercase mb-2">Colonnes attendues pour ce type de source</p>
+                <div class="flex flex-wrap gap-2">
+                    @foreach($source->sourceType->fields->sortBy('order') as $field)
+                        <span class="inline-flex items-center gap-1 px-2 py-0.5 rounded bg-white dark:bg-gray-600 border border-gray-200 dark:border-gray-500 text-xs text-gray-700 dark:text-gray-300">
+                            {{ $field->label }}
+                            @if($field->required)
+                                <span class="text-red-500">*</span>
+                            @endif
+                            <span class="text-gray-400 dark:text-gray-500">({{ $field->type->value }})</span>
+                        </span>
+                    @endforeach
+                </div>
+            </div>
+            @endif
+        </div>
+
+        <a href="{{ route('sources.show', $source) }}" class="text-sm text-indigo-600 hover:underline">← Retour à la source</a>
+    </div>
+</x-app-layout>

resources/views/sources/show.blade.php

@@ -134,13 +134,25 @@
         <div class="bg-white dark:bg-gray-800 shadow rounded-lg overflow-hidden">
             <div class="px-6 py-4 border-b border-gray-200 dark:border-gray-700 flex items-center justify-between">
                 <h3 class="font-medium text-gray-900 dark:text-white">Relevés ({{ $source->releves->count() }})</h3>
+                <div class="flex items-center gap-2">
+                    @if($source->releves->isNotEmpty())
+                        <a href="{{ route('export.source.csv', $source) }}"
+                           class="px-3 py-1.5 bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 text-gray-700 dark:text-gray-300 text-xs rounded-md hover:bg-gray-50 dark:hover:bg-gray-600">
+                            ↓ CSV
+                        </a>
+                    @endif
                     @can('create', [App\Models\Releve::class, $source])
+                        <a href="{{ route('sources.import.create', $source) }}"
+                           class="px-3 py-1.5 bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 text-gray-700 dark:text-gray-300 text-xs rounded-md hover:bg-gray-50 dark:hover:bg-gray-600">
+                            ↑ Importer CSV
+                        </a>
                         <a href="{{ route('sources.releves.create', $source) }}"
                            class="px-3 py-1.5 bg-indigo-600 text-white text-xs rounded-md hover:bg-indigo-700">
                             + Nouveau relevé
                         </a>
                     @endcan
                 </div>
+            </div>
             @if($source->releves->isEmpty())
                 <p class="px-6 py-8 text-center text-gray-400 dark:text-gray-500 text-sm">Aucun relevé pour cette source.</p>
             @else

routes/web.php

@@ -3,6 +3,7 @@
 use App\Http\Controllers\CarteController;
 use App\Http\Controllers\DashboardController;
 use App\Http\Controllers\ExportController;
+use App\Http\Controllers\ImportController;
 use App\Http\Controllers\LieuController;
 use App\Http\Controllers\NotificationController;
 use App\Http\Controllers\ProfileController;
@@ -46,6 +47,9 @@ Route::middleware('auth')->group(function () {
     Route::delete('/profile', [ProfileController::class, 'destroy'])->name('profile.destroy');
 
     Route::get('lieux/search',         [LieuController::class, 'search'])->name('lieux.search');
+    Route::get('lieux/export/csv',     [LieuController::class, 'exportCsv'])->name('lieux.export.csv');
+    Route::get('lieux/import',         [LieuController::class, 'importCreate'])->name('lieux.import.create');
+    Route::post('lieux/import',        [LieuController::class, 'importStore'])->name('lieux.import.store');
     Route::resource('lieux', LieuController::class)->parameters(['lieux' => 'lieu']);
 
     Route::resource('sources', SourceController::class);
@@ -60,8 +64,9 @@ Route::middleware('auth')->group(function () {
     Route::get('recherche', [RechercheController::class, 'index'])->name('recherche');
     Route::get('carte',          [CarteController::class, 'index'])->name('carte');
     Route::get('carte/data',     [CarteController::class, 'data'])->name('carte.data');
-    Route::get('export/source/{source}', [ExportController::class, 'source'])->name('export.source');
+    Route::get('export/source/{source}/csv', [ExportController::class, 'sourceCsv'])->name('export.source.csv');
-    Route::get('export/recherche', [ExportController::class, 'recherche'])->name('export.recherche');
+    Route::get('sources/{source}/import',  [ImportController::class, 'create'])->name('sources.import.create');
+    Route::post('sources/{source}/import', [ImportController::class, 'store'])->name('sources.import.store');
 
     Route::get('notifications', [NotificationController::class, 'index'])->name('notifications.index');
     Route::post('notifications/{id}/read', [NotificationController::class, 'markAsRead'])->name('notifications.read');

vite.config.js

@@ -4,7 +4,7 @@ import laravel from 'laravel-vite-plugin';
 export default defineConfig({
     plugins: [
         laravel({
-            input: ['resources/css/app.css', 'resources/js/app.js'],
+            input: ['resources/css/app.css', 'resources/js/app.js', 'resources/js/carte.js'],
             refresh: true,
         }),
     ],