Compare commits
20 Commits
1.0.4
...
6a73a2f001
| Author | SHA1 | Date | |
|---|---|---|---|
| 6a73a2f001 | |||
| dab9e758fe | |||
| 7c6e72760b | |||
| aaf0fc2cd9 | |||
| cdbf6d458c | |||
| f5a7407be0 | |||
| ff615ca0a1 | |||
| 82e2ae5cd6 | |||
| e29824b575 | |||
| fdd81977c2 | |||
| 79bbf3671a | |||
| d38efaad60 | |||
| fe96bbdf6e | |||
| 5feceb0882 | |||
| 4a5ff3e1a5 | |||
| 156e20c763 | |||
| 77dd16143c | |||
| bc4dd29ae7 | |||
| 6271963a94 | |||
| 7fcdbdc362 |
@@ -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é
|
||||
|
||||
@@ -10,4 +10,5 @@ enum FieldType: string
|
||||
case Select = 'select';
|
||||
case Textarea = 'textarea';
|
||||
case Number = 'number';
|
||||
case Place = 'place';
|
||||
}
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -163,12 +163,26 @@ class SettingController extends Controller
|
||||
{
|
||||
$data = $request->validate([
|
||||
'site_name' => ['nullable', 'string', 'max:100'],
|
||||
'search_max_results' => ['nullable', 'integer', 'min:10', 'max:5000'],
|
||||
]);
|
||||
|
||||
$siteName = trim($data['site_name'] ?? '');
|
||||
SiteSettingsService::set('site_name', $siteName ?: null);
|
||||
SiteSettingsService::set('registration_enabled', $request->boolean('registration_enabled'));
|
||||
if (isset($data['search_max_results'])) {
|
||||
SiteSettingsService::set('search_max_results', (int) $data['search_max_results']);
|
||||
}
|
||||
|
||||
return back()->with('success', 'Paramètres enregistrés.');
|
||||
}
|
||||
|
||||
public function storageLink(): RedirectResponse
|
||||
{
|
||||
try {
|
||||
\Illuminate\Support\Facades\Artisan::call('storage:link');
|
||||
return back()->with('success', 'Lien de stockage public créé (public/storage → storage/app/public).');
|
||||
} catch (\Exception $e) {
|
||||
return back()->with('error', 'Impossible de créer le lien : ' . $e->getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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.');
|
||||
}
|
||||
|
||||
|
||||
@@ -208,6 +208,33 @@ class UserController extends Controller
|
||||
return view('admin.utilisateurs.import', compact('results', 'created', 'errors'));
|
||||
}
|
||||
|
||||
public function create(): View
|
||||
{
|
||||
return view('admin.utilisateurs.create');
|
||||
}
|
||||
|
||||
public function store(Request $request): RedirectResponse
|
||||
{
|
||||
$data = $request->validate([
|
||||
'name' => ['required', 'string', 'max:255'],
|
||||
'email' => ['required', 'email', 'max:255', 'unique:users,email'],
|
||||
'password' => ['required', 'string', 'min:8', 'confirmed'],
|
||||
'role' => ['required', new Enum(UserRole::class)],
|
||||
]);
|
||||
|
||||
$user = User::create([
|
||||
'name' => $data['name'],
|
||||
'email' => $data['email'],
|
||||
'password' => Hash::make($data['password']),
|
||||
'role' => $data['role'],
|
||||
'is_active' => true,
|
||||
'email_verified_at' => now(),
|
||||
]);
|
||||
|
||||
return redirect()->route('admin.utilisateurs.edit', $user)
|
||||
->with('success', 'Utilisateur créé.');
|
||||
}
|
||||
|
||||
public function edit(User $user): View
|
||||
{
|
||||
$user->load('sections', 'sourcesAssignees');
|
||||
@@ -217,24 +244,64 @@ class UserController extends Controller
|
||||
|
||||
public function update(Request $request, User $user): RedirectResponse
|
||||
{
|
||||
$data = $request->validate([
|
||||
'role' => ['required', new Enum(UserRole::class)],
|
||||
]);
|
||||
$isSelf = $user->id === auth()->id();
|
||||
|
||||
if ($user->id === auth()->id()) {
|
||||
return back()->with('error', 'Vous ne pouvez pas modifier votre propre rôle.');
|
||||
$rules = [
|
||||
'name' => ['required', 'string', 'max:255'],
|
||||
'email' => ['required', 'email', 'max:255', 'unique:users,email,' . $user->id],
|
||||
'role' => ['required', new Enum(UserRole::class)],
|
||||
];
|
||||
|
||||
if ($request->filled('password')) {
|
||||
$rules['password'] = ['string', 'min:8', 'confirmed'];
|
||||
$rules['password_confirmation'] = ['required'];
|
||||
}
|
||||
|
||||
if ($user->role === UserRole::Admin && $data['role'] !== UserRole::Admin->value) {
|
||||
$data = $request->validate($rules);
|
||||
|
||||
// Protection : retrait du dernier admin ou de son propre rôle
|
||||
if (! $isSelf && $user->role === UserRole::Admin && $data['role'] !== UserRole::Admin->value) {
|
||||
$adminCount = User::where('role', UserRole::Admin->value)->count();
|
||||
if ($adminCount <= 1) {
|
||||
return back()->with('error', 'Impossible de retirer le rôle admin au dernier administrateur.');
|
||||
}
|
||||
}
|
||||
|
||||
$user->update(['role' => $data['role']]);
|
||||
$update = [
|
||||
'name' => $data['name'],
|
||||
'email' => $data['email'],
|
||||
];
|
||||
|
||||
return back()->with('success', 'Rôle mis à jour.');
|
||||
if (! $isSelf) {
|
||||
$update['role'] = $data['role'];
|
||||
}
|
||||
|
||||
if ($request->filled('password')) {
|
||||
$update['password'] = Hash::make($data['password']);
|
||||
}
|
||||
|
||||
$user->update($update);
|
||||
|
||||
return back()->with('success', 'Utilisateur mis à jour.');
|
||||
}
|
||||
|
||||
public function destroy(User $user): RedirectResponse
|
||||
{
|
||||
if ($user->id === auth()->id()) {
|
||||
return back()->with('error', 'Vous ne pouvez pas supprimer votre propre compte.');
|
||||
}
|
||||
|
||||
if ($user->role === UserRole::Admin) {
|
||||
$adminCount = User::where('role', UserRole::Admin->value)->count();
|
||||
if ($adminCount <= 1) {
|
||||
return back()->with('error', 'Impossible de supprimer le dernier administrateur.');
|
||||
}
|
||||
}
|
||||
|
||||
$user->delete();
|
||||
|
||||
return redirect()->route('admin.utilisateurs.index')
|
||||
->with('success', 'Utilisateur supprimé.');
|
||||
}
|
||||
|
||||
public function toggleActive(User $user): RedirectResponse
|
||||
|
||||
@@ -21,8 +21,8 @@ class CarteController extends Controller
|
||||
->whereHas('sources.releves')
|
||||
->with([
|
||||
'sources' => function ($q) {
|
||||
$q->withCount('releves')
|
||||
->select('id', 'nom', 'lieu_id', 'status', 'annee_debut', 'annee_fin')
|
||||
$q->select('id', 'nom', 'lieu_id', 'status', 'annee_debut', 'annee_fin')
|
||||
->withCount('releves')
|
||||
->orderBy('nom');
|
||||
},
|
||||
])
|
||||
|
||||
@@ -2,108 +2,68 @@
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Enums\SourceStatus;
|
||||
use App\Models\Releve;
|
||||
use App\Enums\FieldType;
|
||||
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(
|
||||
private readonly GedcomExportService $gedcom,
|
||||
) {}
|
||||
|
||||
/** Export de tous les relevés d'une source */
|
||||
public function source(Source $source): Response
|
||||
/** Export CSV de tous les relevés d'une source */
|
||||
public function sourceCsv(Source $source): Response
|
||||
{
|
||||
$this->authorize('view', $source);
|
||||
|
||||
$gedcomContent = $this->gedcom->exportSource($source);
|
||||
$filename = $this->sanitizeFilename($source->nom) . '.ged';
|
||||
$source->load(['sourceType.fields', 'releves']);
|
||||
$fields = $source->sourceType->fields->sortBy('order');
|
||||
|
||||
return response($gedcomContent, 200, [
|
||||
'Content-Type' => 'text/plain; charset=UTF-8',
|
||||
$handle = fopen('php://temp', 'r+');
|
||||
|
||||
// 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) */
|
||||
public function recherche(Request $request): Response
|
||||
private function formatCsvValue(mixed $val, FieldType $type): string
|
||||
{
|
||||
$user = auth()->user();
|
||||
|
||||
$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 ($val === null || $val === '') {
|
||||
return '';
|
||||
}
|
||||
|
||||
if ($request->filled('lieu_id')) {
|
||||
$rows = DB::select("
|
||||
WITH RECURSIVE descendants AS (
|
||||
SELECT id, nom FROM lieux WHERE id = ?
|
||||
UNION ALL
|
||||
SELECT l.id, l.nom FROM lieux l
|
||||
INNER JOIN descendants d ON l.lieu_parent_id = d.id
|
||||
)
|
||||
SELECT DISTINCT nom FROM descendants WHERE nom IS NOT NULL
|
||||
", [$request->integer('lieu_id')]);
|
||||
|
||||
$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}\"",
|
||||
]);
|
||||
return match ($type) {
|
||||
FieldType::Boolean => $val ? 'Oui' : 'Non',
|
||||
FieldType::Date => is_array($val)
|
||||
? trim(($val['valeur'] ?? '') . (
|
||||
! empty($val['calendrier']) && $val['calendrier'] !== 'gregorien'
|
||||
? ' (' . $val['calendrier'] . ')'
|
||||
: ''
|
||||
))
|
||||
: (string) $val,
|
||||
FieldType::Place => is_array($val) ? ($val['nom_long'] ?? '') : (string) $val,
|
||||
default => (string) $val,
|
||||
};
|
||||
}
|
||||
|
||||
private function sanitizeFilename(string $name): string
|
||||
|
||||
@@ -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];
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
@@ -65,9 +66,10 @@ class LieuController extends Controller
|
||||
$lieuSelectionne = $request->filled('lieu_id')
|
||||
? Lieu::find($request->integer('lieu_id'), ['id', 'nom', 'nom_long'])
|
||||
: null;
|
||||
$lieux = $query->paginate(50)->withQueryString();
|
||||
$hasFilters = $request->anyFilled(['lieu_type_id', 'q', 'lieu_id']);
|
||||
$lieux = $hasFilters ? $query->paginate(50)->withQueryString() : null;
|
||||
|
||||
return view('lieux.index', compact('lieux', 'lieuTypes', 'lieuSelectionne'));
|
||||
return view('lieux.index', compact('lieux', 'lieuTypes', 'lieuSelectionne', 'hasFilters'));
|
||||
}
|
||||
|
||||
public function create(): View
|
||||
@@ -129,6 +131,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("
|
||||
|
||||
@@ -6,6 +6,7 @@ use App\Enums\SourceStatus;
|
||||
use App\Models\Lieu;
|
||||
use App\Models\Releve;
|
||||
use App\Models\SourceType;
|
||||
use App\Services\SiteSettingsService;
|
||||
use App\Support\DbCompat;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
@@ -18,6 +19,7 @@ class RechercheController extends Controller
|
||||
$sourceTypes = SourceType::orderBy('nom')->get(['id', 'nom']);
|
||||
$resultats = null;
|
||||
$total = null;
|
||||
$limited = false;
|
||||
|
||||
// Charger le lieu sélectionné pour pré-remplir le picker
|
||||
$lieuSelectionne = $request->filled('lieu_id')
|
||||
@@ -25,10 +27,10 @@ class RechercheController extends Controller
|
||||
: null;
|
||||
|
||||
if ($request->anyFilled(['q', 'source_type_id', 'lieu_id', 'annee_debut', 'annee_fin'])) {
|
||||
[$resultats, $total] = $this->search($request);
|
||||
[$resultats, $total, $limited] = $this->search($request);
|
||||
}
|
||||
|
||||
return view('recherche.index', compact('sourceTypes', 'resultats', 'total', 'lieuSelectionne'));
|
||||
return view('recherche.index', compact('sourceTypes', 'resultats', 'total', 'limited', 'lieuSelectionne'));
|
||||
}
|
||||
|
||||
private function search(Request $request): array
|
||||
@@ -85,15 +87,17 @@ class RechercheController extends Controller
|
||||
$query->whereRaw("date_evenement <= ?", [$request->integer('annee_fin') . '-12-31']);
|
||||
}
|
||||
|
||||
// ── Tri + pagination ────────────────────────────────────────────────
|
||||
// ── Limite configurable par l'admin ─────────────────────────────────
|
||||
$max = SiteSettingsService::searchMaxResults();
|
||||
$total = $query->count();
|
||||
$resultats = $query
|
||||
->orderByRaw('nom ASC NULLS LAST')
|
||||
->orderByRaw('date_evenement ASC NULLS LAST')
|
||||
->paginate(25)
|
||||
->withQueryString();
|
||||
|
||||
return [$resultats, $total];
|
||||
$resultats = $query
|
||||
->orderByRaw(DbCompat::nullsLast('nom'))
|
||||
->orderByRaw(DbCompat::nullsLast('date_evenement'))
|
||||
->limit($max)
|
||||
->get();
|
||||
|
||||
return [$resultats, $total, $total > $max];
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -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,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -219,6 +219,17 @@ class SetupController extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
// 4b. Lien de stockage public (symlink public/storage → storage/app/public)
|
||||
// Non bloquant : l'installation continue même si le serveur interdit les symlinks.
|
||||
if ($success) {
|
||||
try {
|
||||
\Illuminate\Support\Facades\Artisan::call('storage:link');
|
||||
$steps[] = ['ok' => true, 'label' => 'Lien de stockage public créé'];
|
||||
} catch (\Exception $e) {
|
||||
$steps[] = ['ok' => false, 'label' => 'Lien de stockage public (non bloquant — créez-le manuellement via « Administration → Paramètres »)', 'error' => $e->getMessage()];
|
||||
}
|
||||
}
|
||||
|
||||
// 5. Paramètres du site
|
||||
if ($success) {
|
||||
try {
|
||||
|
||||
@@ -69,9 +69,16 @@ class SourceController extends Controller
|
||||
? Lieu::find($request->integer('lieu_id'), ['id', 'nom', 'nom_long'])
|
||||
: null;
|
||||
|
||||
$sources = $query->orderBy('nom')->paginate(25)->withQueryString();
|
||||
// Pour les admins/responsables, exiger au moins un filtre avant d'afficher
|
||||
// les résultats (ils peuvent voir potentiellement des milliers de sources).
|
||||
// Les membres normaux voient toujours leurs sources (déjà filtrées par accès).
|
||||
$hasFilters = $request->anyFilled(['status', 'source_type_id', 'lieu_id', 'annee_debut', 'annee_fin']);
|
||||
$requiresFilter = $user->isSectionManager();
|
||||
$sources = ($requiresFilter && ! $hasFilters)
|
||||
? null
|
||||
: $query->orderBy('nom')->paginate(25)->withQueryString();
|
||||
|
||||
return view('sources.index', compact('sources', 'sourceTypes', 'lieuSelectionne'));
|
||||
return view('sources.index', compact('sources', 'sourceTypes', 'lieuSelectionne', 'hasFilters'));
|
||||
}
|
||||
|
||||
private function getLieuDescendantIds(int $lieuId): array
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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'];
|
||||
}
|
||||
|
||||
@@ -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'];
|
||||
}
|
||||
|
||||
@@ -88,6 +88,13 @@ class SiteSettingsService
|
||||
return (bool) self::get('registration_enabled', false);
|
||||
}
|
||||
|
||||
// ── Recherche ────────────────────────────────────────────────────────────────
|
||||
|
||||
public static function searchMaxResults(): int
|
||||
{
|
||||
return max(10, (int) self::get('search_max_results', 200));
|
||||
}
|
||||
|
||||
// ── Mises à jour ──────────────────────────────────────────────────────────
|
||||
|
||||
public static function updatesDisabled(): bool
|
||||
|
||||
@@ -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
|
||||
{
|
||||
|
||||
@@ -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."
|
||||
}
|
||||
Generated
+9
@@ -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",
|
||||
|
||||
@@ -17,5 +17,8 @@
|
||||
"postcss": "^8.4.31",
|
||||
"tailwindcss": "^3.1.0",
|
||||
"vite": "^7.0.7"
|
||||
},
|
||||
"dependencies": {
|
||||
"leaflet": "^1.9.4"
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
# ── Sécurité ──────────────────────────────────────────────────────────────────
|
||||
Options -Indexes -MultiViews
|
||||
Options -Indexes -MultiViews +FollowSymLinks
|
||||
|
||||
# ── En-têtes HTTP transmis à PHP ───────────────────────────────────────────────
|
||||
# Nécessaire pour que Laravel reçoive le token Authorization (API) et CSRF
|
||||
|
||||
@@ -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;
|
||||
@@ -37,6 +37,24 @@
|
||||
@enderror
|
||||
</div>
|
||||
|
||||
{{-- Nombre maximum de résultats de recherche --}}
|
||||
<div class="pt-4 border-t border-gray-100 dark:border-gray-700">
|
||||
<label for="search_max_results" class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
|
||||
Nombre maximum de résultats de recherche
|
||||
</label>
|
||||
<input type="number" id="search_max_results" name="search_max_results"
|
||||
value="{{ old('search_max_results', \App\Services\SiteSettingsService::get('search_max_results', 200)) }}"
|
||||
min="10" max="5000"
|
||||
class="block w-32 rounded-md border-gray-300 dark:border-gray-600 shadow-sm text-sm
|
||||
focus:border-indigo-500 focus:ring-indigo-500">
|
||||
<p class="mt-1 text-xs text-gray-400 dark:text-gray-500">
|
||||
La page de recherche affiche au plus ce nombre de relevés. Si la limite est atteinte, un message invite l'utilisateur à affiner ses critères. (10 – 5000, défaut : 200)
|
||||
</p>
|
||||
@error('search_max_results')
|
||||
<p class="mt-1 text-sm text-red-600">{{ $message }}</p>
|
||||
@enderror
|
||||
</div>
|
||||
|
||||
{{-- Inscriptions --}}
|
||||
<div class="pt-4 border-t border-gray-100 dark:border-gray-700">
|
||||
<p class="text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">Inscription publique des comptes</p>
|
||||
@@ -62,6 +80,22 @@
|
||||
</form>
|
||||
</div>
|
||||
|
||||
{{-- Lien de stockage public --}}
|
||||
<div class="bg-white dark:bg-gray-800 shadow rounded-lg p-6 space-y-3">
|
||||
<h3 class="text-sm font-semibold text-gray-700 dark:text-gray-300 uppercase tracking-wide">Lien de stockage</h3>
|
||||
<p class="text-sm text-gray-500 dark:text-gray-400">
|
||||
Le lien symbolique <code class="bg-gray-100 dark:bg-gray-700 px-1 rounded text-xs">public/storage</code> permet de servir les fichiers (logo, etc.) via l'URL <code class="bg-gray-100 dark:bg-gray-700 px-1 rounded text-xs">/storage/…</code>.
|
||||
S'il est absent, le logo sera invisible et d'autres fichiers seront inaccessibles.
|
||||
</p>
|
||||
<form method="POST" action="{{ route('admin.parametres.storage-link') }}">
|
||||
@csrf
|
||||
<button type="submit"
|
||||
class="px-4 py-2 bg-gray-100 dark:bg-gray-700 border border-gray-300 dark:border-gray-600 text-gray-700 dark:text-gray-300 text-sm rounded-md hover:bg-gray-200 dark:hover:bg-gray-600">
|
||||
Recréer le lien de stockage
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
{{-- Logo --}}
|
||||
<div class="bg-white dark:bg-gray-800 shadow rounded-lg p-6 space-y-5">
|
||||
<h3 class="text-sm font-semibold text-gray-700 dark:text-gray-300 uppercase tracking-wide">Logo du site</h3>
|
||||
|
||||
@@ -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"
|
||||
x-data="{ open: false }"
|
||||
@click="open = !open"
|
||||
class="text-xs text-gray-500 dark:text-gray-400 hover:text-indigo-600">Modifier</button>
|
||||
<button type="button" @click="open = !open"
|
||||
class="text-xs text-gray-500 dark:text-gray-400 hover:text-indigo-600"
|
||||
x-text="open ? 'Annuler' : 'Modifier'">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>
|
||||
|
||||
@@ -0,0 +1,101 @@
|
||||
<x-app-layout>
|
||||
<x-slot name="header">
|
||||
<div class="flex items-center gap-3">
|
||||
<a href="{{ route('admin.utilisateurs.index') }}" class="text-sm text-indigo-600 hover:underline">← Utilisateurs</a>
|
||||
<span class="text-gray-400 dark:text-gray-500">/</span>
|
||||
<h2 class="text-xl font-semibold text-gray-800 dark:text-gray-200">Nouvel utilisateur</h2>
|
||||
</div>
|
||||
</x-slot>
|
||||
|
||||
<div class="py-8 max-w-2xl mx-auto px-4 sm:px-6 lg:px-8">
|
||||
|
||||
<div class="bg-white dark:bg-gray-800 shadow rounded-lg p-6 space-y-5">
|
||||
<form method="POST" action="{{ route('admin.utilisateurs.store') }}">
|
||||
@csrf
|
||||
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
|
||||
Nom <span class="text-red-500">*</span>
|
||||
</label>
|
||||
<input type="text" name="name" value="{{ old('name') }}" required autofocus
|
||||
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">
|
||||
@error('name')
|
||||
<p class="mt-1 text-sm text-red-600">{{ $message }}</p>
|
||||
@enderror
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
|
||||
Adresse e-mail <span class="text-red-500">*</span>
|
||||
</label>
|
||||
<input type="email" name="email" value="{{ old('email') }}" 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">
|
||||
@error('email')
|
||||
<p class="mt-1 text-sm text-red-600">{{ $message }}</p>
|
||||
@enderror
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
|
||||
Mot de passe <span class="text-red-500">*</span>
|
||||
</label>
|
||||
<input type="password" name="password" required autocomplete="new-password"
|
||||
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">
|
||||
@error('password')
|
||||
<p class="mt-1 text-sm text-red-600">{{ $message }}</p>
|
||||
@enderror
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
|
||||
Confirmer le mot de passe <span class="text-red-500">*</span>
|
||||
</label>
|
||||
<input type="password" name="password_confirmation" required autocomplete="new-password"
|
||||
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-sm font-medium text-gray-700 dark:text-gray-300 mb-3">
|
||||
Rôle <span class="text-red-500">*</span>
|
||||
</label>
|
||||
<div class="space-y-2">
|
||||
@foreach(\App\Enums\UserRole::cases() as $role)
|
||||
<label class="flex items-start gap-3 p-3 border rounded-lg cursor-pointer hover:bg-gray-50 dark:hover:bg-gray-700
|
||||
{{ old('role', 'member') === $role->value ? 'border-indigo-400 bg-indigo-50 dark:bg-indigo-900/30' : 'border-gray-200 dark:border-gray-700' }}">
|
||||
<input type="radio" name="role" value="{{ $role->value }}"
|
||||
{{ old('role', 'member') === $role->value ? 'checked' : '' }}
|
||||
class="mt-0.5 text-indigo-600">
|
||||
<div>
|
||||
<p class="text-sm font-medium text-gray-900 dark:text-white">{{ $role->label() }}</p>
|
||||
<p class="text-xs text-gray-500 dark:text-gray-400 mt-0.5">
|
||||
@if($role === \App\Enums\UserRole::Admin)
|
||||
Accès complet : gestion des utilisateurs, sections, dépôts, types de sources et statistiques.
|
||||
@elseif($role === \App\Enums\UserRole::SectionManager)
|
||||
Peut créer des sources, assigner des membres et valider les relevés de sa section.
|
||||
@else
|
||||
Peut saisir des relevés sur les sources auxquelles il est assigné.
|
||||
@endif
|
||||
</p>
|
||||
</div>
|
||||
</label>
|
||||
@endforeach
|
||||
</div>
|
||||
@error('role')
|
||||
<p class="mt-1 text-sm text-red-600">{{ $message }}</p>
|
||||
@enderror
|
||||
</div>
|
||||
|
||||
<div class="flex gap-4 pt-2">
|
||||
<button type="submit"
|
||||
class="px-5 py-2 bg-indigo-600 text-white text-sm font-medium rounded-md hover:bg-indigo-700">
|
||||
Créer l'utilisateur
|
||||
</button>
|
||||
<a href="{{ route('admin.utilisateurs.index') }}"
|
||||
class="text-sm text-gray-500 dark:text-gray-400 self-center hover:text-gray-700 dark:hover:text-gray-300">
|
||||
Annuler
|
||||
</a>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</x-app-layout>
|
||||
@@ -16,63 +16,68 @@
|
||||
<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
|
||||
|
||||
{{-- Informations --}}
|
||||
<div class="bg-white dark:bg-gray-800 shadow rounded-lg p-6 space-y-3">
|
||||
<h3 class="text-sm font-semibold text-gray-700 dark:text-gray-300 uppercase tracking-wide">Informations</h3>
|
||||
<dl class="grid grid-cols-2 gap-x-6 gap-y-3 text-sm">
|
||||
<dt class="text-gray-500 dark:text-gray-400">Nom</dt>
|
||||
<dd class="text-gray-900 dark:text-white font-medium">{{ $user->name }}</dd>
|
||||
<dt class="text-gray-500 dark:text-gray-400">E-mail</dt>
|
||||
<dd class="text-gray-900 dark:text-white">{{ $user->email }}</dd>
|
||||
<dt class="text-gray-500 dark:text-gray-400">Inscrit le</dt>
|
||||
<dd class="text-gray-900 dark:text-white">{{ $user->created_at->format('d/m/Y') }}</dd>
|
||||
<dt class="text-gray-500 dark:text-gray-400">Sections</dt>
|
||||
<dd class="text-gray-900 dark:text-white">
|
||||
@if($user->sections->isNotEmpty())
|
||||
{{ $user->sections->pluck('nom')->join(', ') }}
|
||||
@else
|
||||
—
|
||||
@endif
|
||||
</dd>
|
||||
<dt class="text-gray-500 dark:text-gray-400">Sources assignées</dt>
|
||||
<dd class="text-gray-900 dark:text-white">{{ $user->sourcesAssignees->count() }}</dd>
|
||||
</dl>
|
||||
</div>
|
||||
|
||||
{{-- Statut actif / inactif --}}
|
||||
<div class="bg-white dark:bg-gray-800 shadow rounded-lg p-6 flex items-center justify-between">
|
||||
<div>
|
||||
<p class="text-sm font-medium text-gray-900 dark:text-white">Statut du compte</p>
|
||||
<p class="text-sm text-gray-500 dark:text-gray-400 mt-0.5">
|
||||
@if($user->is_active)
|
||||
Le compte est <span class="text-green-600 font-medium">actif</span> — l'utilisateur peut se connecter et être assigné à des sources.
|
||||
@else
|
||||
Le compte est <span class="text-red-600 font-medium">inactif</span> — l'utilisateur ne peut pas se connecter.
|
||||
@endif
|
||||
</p>
|
||||
</div>
|
||||
@if($user->id !== auth()->id())
|
||||
<form method="POST" action="{{ route('admin.utilisateurs.toggle-active', $user) }}"
|
||||
x-data
|
||||
@submit.prevent="if(confirm('{{ $user->is_active ? 'Désactiver' : 'Activer' }} ce compte ?')) $el.submit()">
|
||||
@csrf
|
||||
<button type="submit"
|
||||
class="px-4 py-2 text-sm font-medium rounded-md
|
||||
{{ $user->is_active
|
||||
? 'bg-red-50 dark:bg-red-900/30 text-red-700 border border-red-200 dark:border-red-700 hover:bg-red-100'
|
||||
: 'bg-green-50 dark:bg-green-900/30 text-green-700 border border-green-200 dark:border-green-700 hover:bg-green-100' }}">
|
||||
{{ $user->is_active ? 'Désactiver le compte' : 'Activer le compte' }}
|
||||
</button>
|
||||
</form>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
{{-- Modifier le rôle --}}
|
||||
{{-- Formulaire principal --}}
|
||||
<div class="bg-white dark:bg-gray-800 shadow rounded-lg p-6">
|
||||
<h3 class="text-sm font-semibold text-gray-700 dark:text-gray-300 uppercase tracking-wide mb-4">Rôle</h3>
|
||||
<h3 class="text-sm font-semibold text-gray-700 dark:text-gray-300 uppercase tracking-wide mb-5">Informations</h3>
|
||||
|
||||
<form method="POST" action="{{ route('admin.utilisateurs.update', $user) }}">
|
||||
@csrf @method('PUT')
|
||||
<div class="space-y-3">
|
||||
|
||||
<div class="space-y-5">
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
|
||||
Nom <span class="text-red-500">*</span>
|
||||
</label>
|
||||
<input type="text" name="name" value="{{ old('name', $user->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">
|
||||
@error('name')
|
||||
<p class="mt-1 text-sm text-red-600">{{ $message }}</p>
|
||||
@enderror
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
|
||||
Adresse e-mail <span class="text-red-500">*</span>
|
||||
</label>
|
||||
<input type="email" name="email" value="{{ old('email', $user->email) }}" 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">
|
||||
@error('email')
|
||||
<p class="mt-1 text-sm text-red-600">{{ $message }}</p>
|
||||
@enderror
|
||||
</div>
|
||||
|
||||
<div x-data="{ open: false }">
|
||||
<button type="button" @click="open = !open"
|
||||
class="text-sm text-indigo-600 hover:underline">
|
||||
<span x-show="!open">Changer le mot de passe…</span>
|
||||
<span x-show="open">Annuler le changement de mot de passe</span>
|
||||
</button>
|
||||
<div x-show="open" x-cloak class="mt-3 space-y-3">
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
|
||||
Nouveau mot de passe
|
||||
</label>
|
||||
<input type="password" name="password" autocomplete="new-password"
|
||||
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">
|
||||
@error('password')
|
||||
<p class="mt-1 text-sm text-red-600">{{ $message }}</p>
|
||||
@enderror
|
||||
</div>
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-1">
|
||||
Confirmer le nouveau mot de passe
|
||||
</label>
|
||||
<input type="password" name="password_confirmation" autocomplete="new-password"
|
||||
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>
|
||||
</div>
|
||||
|
||||
{{-- Rôle (masqué pour soi-même) --}}
|
||||
@if($user->id !== auth()->id())
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-3">Rôle</label>
|
||||
<div class="space-y-2">
|
||||
@foreach(\App\Enums\UserRole::cases() as $role)
|
||||
<label class="flex items-start gap-3 p-3 border rounded-lg cursor-pointer hover:bg-gray-50 dark:hover:bg-gray-700
|
||||
{{ $user->role === $role ? 'border-indigo-400 bg-indigo-50 dark:bg-indigo-900/30' : 'border-gray-200 dark:border-gray-700' }}">
|
||||
@@ -94,7 +99,17 @@
|
||||
</label>
|
||||
@endforeach
|
||||
</div>
|
||||
<div class="mt-5 flex gap-4">
|
||||
</div>
|
||||
@else
|
||||
{{-- Champ caché pour ne pas perdre le rôle lors du submit --}}
|
||||
<input type="hidden" name="role" value="{{ $user->role->value }}">
|
||||
<p class="text-sm text-gray-500 dark:text-gray-400 italic">
|
||||
Vous ne pouvez pas modifier votre propre rôle.
|
||||
</p>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<div class="mt-6 flex gap-4">
|
||||
<button type="submit"
|
||||
class="px-5 py-2 bg-indigo-600 text-white text-sm font-medium rounded-md hover:bg-indigo-700">
|
||||
Enregistrer
|
||||
@@ -106,5 +121,68 @@
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
{{-- Statut actif / inactif --}}
|
||||
<div class="bg-white dark:bg-gray-800 shadow rounded-lg p-6 flex items-center justify-between">
|
||||
<div>
|
||||
<p class="text-sm font-medium text-gray-900 dark:text-white">Statut du compte</p>
|
||||
<p class="text-sm text-gray-500 dark:text-gray-400 mt-0.5">
|
||||
@if($user->is_active)
|
||||
Le compte est <span class="text-green-600 font-medium">actif</span> — l'utilisateur peut se connecter.
|
||||
@else
|
||||
Le compte est <span class="text-red-600 font-medium">inactif</span> — l'utilisateur ne peut pas se connecter.
|
||||
@endif
|
||||
</p>
|
||||
</div>
|
||||
@if($user->id !== auth()->id())
|
||||
<form method="POST" action="{{ route('admin.utilisateurs.toggle-active', $user) }}"
|
||||
x-data
|
||||
@submit.prevent="if(confirm('{{ $user->is_active ? 'Désactiver' : 'Activer' }} ce compte ?')) $el.submit()">
|
||||
@csrf
|
||||
<button type="submit"
|
||||
class="px-4 py-2 text-sm font-medium rounded-md
|
||||
{{ $user->is_active
|
||||
? 'bg-red-50 dark:bg-red-900/30 text-red-700 border border-red-200 dark:border-red-700 hover:bg-red-100'
|
||||
: 'bg-green-50 dark:bg-green-900/30 text-green-700 border border-green-200 dark:border-green-700 hover:bg-green-100' }}">
|
||||
{{ $user->is_active ? 'Désactiver le compte' : 'Activer le compte' }}
|
||||
</button>
|
||||
</form>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
{{-- Informations complémentaires --}}
|
||||
<div class="bg-white dark:bg-gray-800 shadow rounded-lg p-6 space-y-2">
|
||||
<h3 class="text-sm font-semibold text-gray-700 dark:text-gray-300 uppercase tracking-wide mb-3">Détails</h3>
|
||||
<dl class="grid grid-cols-2 gap-x-6 gap-y-2 text-sm">
|
||||
<dt class="text-gray-500 dark:text-gray-400">Inscrit le</dt>
|
||||
<dd class="text-gray-900 dark:text-white">{{ $user->created_at->format('d/m/Y') }}</dd>
|
||||
<dt class="text-gray-500 dark:text-gray-400">Sections</dt>
|
||||
<dd class="text-gray-900 dark:text-white">
|
||||
{{ $user->sections->isNotEmpty() ? $user->sections->pluck('nom')->join(', ') : '—' }}
|
||||
</dd>
|
||||
<dt class="text-gray-500 dark:text-gray-400">Sources assignées</dt>
|
||||
<dd class="text-gray-900 dark:text-white">{{ $user->sourcesAssignees->count() ?: '—' }}</dd>
|
||||
</dl>
|
||||
</div>
|
||||
|
||||
{{-- Zone danger : suppression --}}
|
||||
@if($user->id !== auth()->id())
|
||||
<div class="bg-white dark:bg-gray-800 shadow rounded-lg p-6 border border-red-200 dark:border-red-800">
|
||||
<h3 class="text-sm font-semibold text-red-700 dark:text-red-400 uppercase tracking-wide mb-2">Zone dangereuse</h3>
|
||||
<p class="text-sm text-gray-500 dark:text-gray-400 mb-4">
|
||||
La suppression est définitive. Les relevés et assignations liés à cet utilisateur seront également supprimés.
|
||||
</p>
|
||||
<form method="POST" action="{{ route('admin.utilisateurs.destroy', $user) }}"
|
||||
x-data
|
||||
@submit.prevent="if(confirm('Supprimer définitivement {{ addslashes($user->name) }} ? Cette action est irréversible.')) $el.submit()">
|
||||
@csrf @method('DELETE')
|
||||
<button type="submit"
|
||||
class="px-4 py-2 bg-red-600 text-white text-sm font-medium rounded-md hover:bg-red-700">
|
||||
Supprimer cet utilisateur
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
</div>
|
||||
</x-app-layout>
|
||||
|
||||
@@ -3,6 +3,10 @@
|
||||
<div class="flex items-center justify-between">
|
||||
<h2 class="text-xl font-semibold text-gray-800 dark:text-gray-200">Gestion des utilisateurs</h2>
|
||||
<div class="flex items-center gap-3">
|
||||
<a href="{{ route('admin.utilisateurs.create') }}"
|
||||
class="flex items-center gap-1.5 px-4 py-2 bg-indigo-600 text-white text-sm font-medium rounded-md hover:bg-indigo-700 transition-colors">
|
||||
+ Nouvel utilisateur
|
||||
</a>
|
||||
<a href="{{ route('admin.utilisateurs.import') }}"
|
||||
class="flex items-center gap-1.5 px-4 py-2 border border-gray-300 dark:border-gray-600 text-sm text-gray-700 dark:text-gray-300 rounded-md hover:bg-gray-50 dark:hover:bg-gray-700 transition-colors">
|
||||
<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
@@ -139,19 +143,28 @@
|
||||
{{ $user->created_at->format('d/m/Y') }}
|
||||
</td>
|
||||
<td class="px-6 py-4 text-right space-x-3">
|
||||
@if($user->id !== auth()->id())
|
||||
<a href="{{ route('admin.utilisateurs.edit', $user) }}"
|
||||
class="text-indigo-600 hover:underline text-sm">Modifier</a>
|
||||
@if($user->id !== auth()->id())
|
||||
<form method="POST"
|
||||
action="{{ route('admin.utilisateurs.toggle-active', $user) }}"
|
||||
class="inline" x-data
|
||||
@submit.prevent="if(confirm('{{ $user->is_active ? 'Désactiver' : 'Activer' }} ce compte ?')) $el.submit()">
|
||||
@csrf
|
||||
<button type="submit"
|
||||
class="text-sm {{ $user->is_active ? 'text-red-500 hover:text-red-700' : 'text-green-600 hover:text-green-700' }}">
|
||||
class="text-sm {{ $user->is_active ? 'text-orange-500 hover:text-orange-700' : 'text-green-600 hover:text-green-700' }}">
|
||||
{{ $user->is_active ? 'Désactiver' : 'Activer' }}
|
||||
</button>
|
||||
</form>
|
||||
<form method="POST"
|
||||
action="{{ route('admin.utilisateurs.destroy', $user) }}"
|
||||
class="inline" x-data
|
||||
@submit.prevent="if(confirm('Supprimer définitivement {{ addslashes($user->name) }} ?')) $el.submit()">
|
||||
@csrf @method('DELETE')
|
||||
<button type="submit" class="text-sm text-red-500 hover:text-red-700">
|
||||
Supprimer
|
||||
</button>
|
||||
</form>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -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-text-input id="email" class="block mt-1 w-full" type="email" name="email" :value="old('email')" required autofocus autocomplete="username" />
|
||||
<x-input-error :messages="$errors->get('email')" class="mt-2" />
|
||||
<x-input-label for="login" :value="__('Email ou nom d\'utilisateur')" />
|
||||
<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('login')" class="mt-2" />
|
||||
</div>
|
||||
|
||||
<!-- Password -->
|
||||
|
||||
@@ -7,9 +7,8 @@
|
||||
</x-slot>
|
||||
|
||||
@push('head')
|
||||
{{-- Leaflet CSS --}}
|
||||
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css"
|
||||
integrity="sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY=" crossorigin="">
|
||||
{{-- Leaflet (bundlé via Vite) --}}
|
||||
@vite('resources/js/carte.js')
|
||||
<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
|
||||
|
||||
@@ -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">
|
||||
|
||||
@@ -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>
|
||||
@@ -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">
|
||||
@@ -76,7 +86,8 @@
|
||||
</form>
|
||||
</div>
|
||||
|
||||
{{-- Tableau --}}
|
||||
{{-- Tableau (uniquement si un filtre est actif) --}}
|
||||
@if($lieux !== null)
|
||||
<div class="bg-white dark:bg-gray-800 shadow rounded-lg overflow-hidden">
|
||||
<table class="min-w-full divide-y divide-gray-200 dark:divide-gray-700">
|
||||
<thead class="bg-gray-50 dark:bg-gray-700">
|
||||
@@ -132,8 +143,7 @@
|
||||
@empty
|
||||
<tr>
|
||||
<td colspan="6" class="px-6 py-10 text-center text-gray-400 dark:text-gray-500">
|
||||
@if($hasFilters) Aucun lieu ne correspond aux filtres.
|
||||
@else Aucun lieu enregistré. @endif
|
||||
Aucun lieu ne correspond aux filtres.
|
||||
</td>
|
||||
</tr>
|
||||
@endforelse
|
||||
@@ -146,5 +156,14 @@
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
@else
|
||||
<div class="text-center py-16 text-gray-400 dark:text-gray-500">
|
||||
<svg class="mx-auto w-12 h-12 mb-4 text-gray-300 dark:text-gray-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M17.657 16.657L13.414 20.9a1.998 1.998 0 01-2.827 0l-4.244-4.243a8 8 0 1111.314 0z"/>
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M15 11a3 3 0 11-6 0 3 3 0 016 0z"/>
|
||||
</svg>
|
||||
<p class="text-sm">Utilisez les filtres ci-dessus pour rechercher des lieux.</p>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</x-app-layout>
|
||||
|
||||
@@ -102,19 +102,28 @@
|
||||
{{-- Résultats --}}
|
||||
@if($resultats !== null)
|
||||
<div>
|
||||
<p class="text-sm text-gray-500 dark:text-gray-400 mb-3">
|
||||
<div class="flex items-center justify-between mb-3">
|
||||
<p class="text-sm text-gray-500 dark:text-gray-400">
|
||||
@if($total === 0)
|
||||
Aucun relevé trouvé.
|
||||
@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>
|
||||
</div>
|
||||
|
||||
@if($limited)
|
||||
<div class="mb-4 p-4 bg-amber-50 dark:bg-amber-900/30 border border-amber-200 dark:border-amber-700 rounded-md flex items-start gap-3">
|
||||
<svg class="w-5 h-5 text-amber-500 shrink-0 mt-0.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01M10.29 3.86L1.82 18a2 2 0 001.71 3h16.94a2 2 0 001.71-3L13.71 3.86a2 2 0 00-3.42 0z"/>
|
||||
</svg>
|
||||
<p class="text-sm text-amber-800 dark:text-amber-200">
|
||||
Seuls les <strong>{{ number_format($resultats->count()) }} premiers résultats</strong> sur {{ number_format($total) }} sont affichés.
|
||||
Affinez vos critères de recherche pour obtenir des résultats plus précis.
|
||||
</p>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if($resultats->isNotEmpty())
|
||||
<div class="bg-white dark:bg-gray-800 shadow rounded-lg overflow-hidden">
|
||||
@@ -180,11 +189,6 @@
|
||||
</table>
|
||||
</div>
|
||||
|
||||
@if($resultats->hasPages())
|
||||
<div class="px-6 py-4 border-t border-gray-200 dark:border-gray-700">
|
||||
{{ $resultats->links() }}
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
@@ -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}")
|
||||
|
||||
@@ -10,11 +10,6 @@
|
||||
</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 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">
|
||||
|
||||
@@ -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')
|
||||
|
||||
@@ -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>
|
||||
@@ -97,6 +97,14 @@
|
||||
</div>
|
||||
|
||||
{{-- Tableau --}}
|
||||
@if($sources === null)
|
||||
<div class="text-center py-16 text-gray-400 dark:text-gray-500">
|
||||
<svg class="mx-auto w-12 h-12 mb-4 text-gray-300 dark:text-gray-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"/>
|
||||
</svg>
|
||||
<p class="text-sm">Utilisez les filtres ci-dessus pour afficher les sources.</p>
|
||||
</div>
|
||||
@else
|
||||
<div class="bg-white dark:bg-gray-800 shadow rounded-lg overflow-hidden">
|
||||
<table class="min-w-full divide-y divide-gray-200 dark:divide-gray-700 text-sm">
|
||||
<thead class="bg-gray-50 dark:bg-gray-700">
|
||||
@@ -165,5 +173,6 @@
|
||||
<div class="px-6 py-4 border-t">{{ $sources->links() }}</div>
|
||||
@endif
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</x-app-layout>
|
||||
|
||||
@@ -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
|
||||
|
||||
+2
-1
@@ -21,6 +21,7 @@ Route::middleware(['auth', 'role:admin'])->prefix('admin')->name('admin.')->grou
|
||||
Route::delete('parametres/smtp', [SettingController::class, 'deleteSmtp'])->name('parametres.smtp.delete');
|
||||
Route::post('parametres/smtp/test', [SettingController::class, 'testSmtp'])->name('parametres.smtp.test');
|
||||
Route::post('parametres/updates', [SettingController::class, 'updateUpdates'])->name('parametres.updates');
|
||||
Route::post('parametres/storage-link', [SettingController::class, 'storageLink'])->name('parametres.storage-link');
|
||||
|
||||
// Routes spécifiques avant la resource pour éviter les conflits de paramètre
|
||||
Route::get('utilisateurs/export', [UserController::class, 'export'])->name('utilisateurs.export');
|
||||
@@ -28,7 +29,7 @@ Route::middleware(['auth', 'role:admin'])->prefix('admin')->name('admin.')->grou
|
||||
Route::post('utilisateurs/import', [UserController::class, 'import'])->name('utilisateurs.import.store');
|
||||
Route::get('utilisateurs/import/modele', [UserController::class, 'importTemplate'])->name('utilisateurs.import.modele');
|
||||
|
||||
Route::resource('utilisateurs', UserController::class)->only(['index', 'edit', 'update']);
|
||||
Route::resource('utilisateurs', UserController::class)->only(['index', 'create', 'store', 'edit', 'update', 'destroy']);
|
||||
Route::post('utilisateurs/{utilisateur}/toggle-active', [UserController::class, 'toggleActive'])->name('utilisateurs.toggle-active');
|
||||
Route::resource('lieu-types', LieuTypeController::class)
|
||||
->parameters(['lieu-types' => 'lieuType'])
|
||||
|
||||
+7
-2
@@ -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/recherche', [ExportController::class, 'recherche'])->name('export.recherche');
|
||||
Route::get('export/source/{source}/csv', [ExportController::class, 'sourceCsv'])->name('export.source.csv');
|
||||
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');
|
||||
|
||||
+1
-1
@@ -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,
|
||||
}),
|
||||
],
|
||||
|
||||
Reference in New Issue
Block a user