Import/export CSV utilisateurs, filtre statut et titre du site modifiable
Utilisateurs :
- Filtre actif/inactif dans la liste (status=active|inactive)
- Export CSV avec les filtres actifs — séparateur ;, BOM UTF-8 (compatible Excel)
- Import CSV : détection auto du séparateur, validation ligne par ligne,
mot de passe temporaire généré + affiché une seule fois dans les résultats
- Téléchargement d'un fichier modèle CSV
Paramètres du site :
- Champ "Titre du site" (site_name dans site_settings.json)
- Titre partagé via SiteSettingsService::siteName() et injecté dans config('app.name')
au boot — s'applique partout sans modifier .env
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -63,6 +63,12 @@ class SettingController extends Controller
|
|||||||
|
|
||||||
public function updateSettings(Request $request): RedirectResponse
|
public function updateSettings(Request $request): RedirectResponse
|
||||||
{
|
{
|
||||||
|
$data = $request->validate([
|
||||||
|
'site_name' => ['nullable', 'string', 'max:100'],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$siteName = trim($data['site_name'] ?? '');
|
||||||
|
SiteSettingsService::set('site_name', $siteName ?: null);
|
||||||
SiteSettingsService::set('registration_enabled', $request->boolean('registration_enabled'));
|
SiteSettingsService::set('registration_enabled', $request->boolean('registration_enabled'));
|
||||||
|
|
||||||
return back()->with('success', 'Paramètres enregistrés.');
|
return back()->with('success', 'Paramètres enregistrés.');
|
||||||
|
|||||||
@@ -8,6 +8,9 @@ use App\Models\User;
|
|||||||
use App\Support\DbCompat;
|
use App\Support\DbCompat;
|
||||||
use Illuminate\Http\RedirectResponse;
|
use Illuminate\Http\RedirectResponse;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
|
use Illuminate\Http\Response;
|
||||||
|
use Illuminate\Support\Facades\Hash;
|
||||||
|
use Illuminate\Support\Str;
|
||||||
use Illuminate\Validation\Rules\Enum;
|
use Illuminate\Validation\Rules\Enum;
|
||||||
use Illuminate\View\View;
|
use Illuminate\View\View;
|
||||||
|
|
||||||
@@ -21,6 +24,14 @@ class UserController extends Controller
|
|||||||
$query->where('role', $request->input('role'));
|
$query->where('role', $request->input('role'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($request->filled('status')) {
|
||||||
|
match ($request->input('status')) {
|
||||||
|
'active' => $query->where('is_active', true),
|
||||||
|
'inactive' => $query->where('is_active', false),
|
||||||
|
default => null,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
if ($request->filled('q')) {
|
if ($request->filled('q')) {
|
||||||
$q = trim($request->get('q'));
|
$q = trim($request->get('q'));
|
||||||
$like = DbCompat::like();
|
$like = DbCompat::like();
|
||||||
@@ -35,6 +46,168 @@ class UserController extends Controller
|
|||||||
return view('admin.utilisateurs.index', compact('users'));
|
return view('admin.utilisateurs.index', compact('users'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ── Export CSV ────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
public function export(Request $request): Response
|
||||||
|
{
|
||||||
|
$query = User::with('sections')->orderBy('name');
|
||||||
|
|
||||||
|
if ($request->filled('role')) {
|
||||||
|
$query->where('role', $request->input('role'));
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($request->filled('status')) {
|
||||||
|
match ($request->input('status')) {
|
||||||
|
'active' => $query->where('is_active', true),
|
||||||
|
'inactive' => $query->where('is_active', false),
|
||||||
|
default => null,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($request->filled('q')) {
|
||||||
|
$q = trim($request->get('q'));
|
||||||
|
$like = DbCompat::like();
|
||||||
|
$query->where(fn ($wq) => $wq
|
||||||
|
->where('name', $like, "%{$q}%")
|
||||||
|
->orWhere('email', $like, "%{$q}%")
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
$filename = 'utilisateurs-' . date('Y-m-d') . '.csv';
|
||||||
|
|
||||||
|
$callback = function () use ($query) {
|
||||||
|
$handle = fopen('php://output', 'w');
|
||||||
|
// BOM UTF-8 pour compatibilité Excel
|
||||||
|
fwrite($handle, "\xEF\xBB\xBF");
|
||||||
|
|
||||||
|
fputcsv($handle, ['id', 'name', 'email', 'role', 'is_active', 'created_at', 'sections'], ';');
|
||||||
|
|
||||||
|
$query->chunk(500, function ($users) use ($handle) {
|
||||||
|
foreach ($users as $user) {
|
||||||
|
fputcsv($handle, [
|
||||||
|
$user->id,
|
||||||
|
$user->name,
|
||||||
|
$user->email,
|
||||||
|
$user->role->value,
|
||||||
|
$user->is_active ? '1' : '0',
|
||||||
|
$user->created_at->format('Y-m-d'),
|
||||||
|
$user->sections->pluck('nom')->join(', '),
|
||||||
|
], ';');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
fclose($handle);
|
||||||
|
};
|
||||||
|
|
||||||
|
return response()->stream($callback, 200, [
|
||||||
|
'Content-Type' => 'text/csv; charset=UTF-8',
|
||||||
|
'Content-Disposition' => "attachment; filename=\"{$filename}\"",
|
||||||
|
'Cache-Control' => 'no-cache, no-store',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Import CSV ────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
public function importForm(): View
|
||||||
|
{
|
||||||
|
return view('admin.utilisateurs.import');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function importTemplate(): Response
|
||||||
|
{
|
||||||
|
$csv = "\xEF\xBB\xBF" // BOM UTF-8
|
||||||
|
. "name;email;role;is_active\n"
|
||||||
|
. "Jean Dupont;jean.dupont@exemple.fr;member;1\n"
|
||||||
|
. "Marie Martin;marie.martin@exemple.fr;section_manager;1\n";
|
||||||
|
|
||||||
|
return response($csv, 200, [
|
||||||
|
'Content-Type' => 'text/csv; charset=UTF-8',
|
||||||
|
'Content-Disposition' => 'attachment; filename="modele-utilisateurs.csv"',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function import(Request $request): View|RedirectResponse
|
||||||
|
{
|
||||||
|
$request->validate([
|
||||||
|
'file' => ['required', 'file', 'mimes:csv,txt', 'max:2048'],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$content = file_get_contents($request->file('file')->getRealPath());
|
||||||
|
|
||||||
|
// Supprimer le BOM UTF-8 si présent
|
||||||
|
if (str_starts_with($content, "\xEF\xBB\xBF")) {
|
||||||
|
$content = substr($content, 3);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Normaliser les fins de lignes
|
||||||
|
$content = str_replace(["\r\n", "\r"], "\n", trim($content));
|
||||||
|
$lines = array_values(array_filter(explode("\n", $content)));
|
||||||
|
|
||||||
|
if (empty($lines)) {
|
||||||
|
return back()->withErrors(['file' => 'Le fichier CSV est vide.']);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Détecter le séparateur (; ou ,)
|
||||||
|
$sep = str_contains($lines[0], ';') ? ';' : ',';
|
||||||
|
$header = array_map('strtolower', array_map('trim', str_getcsv(array_shift($lines), $sep)));
|
||||||
|
|
||||||
|
$required = ['name', 'email', 'role'];
|
||||||
|
foreach ($required as $col) {
|
||||||
|
if (! in_array($col, $header, true)) {
|
||||||
|
return back()->withErrors(['file' => "Colonne obligatoire manquante : « {$col} »."]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$validRoles = array_column(UserRole::cases(), 'value');
|
||||||
|
$results = [];
|
||||||
|
|
||||||
|
foreach ($lines as $lineNum => $line) {
|
||||||
|
if (trim($line) === '') continue;
|
||||||
|
|
||||||
|
$row = array_map('trim', str_getcsv($line, $sep));
|
||||||
|
$data = array_combine(array_slice($header, 0, count($row)), $row);
|
||||||
|
|
||||||
|
$name = $data['name'] ?? '';
|
||||||
|
$email = strtolower($data['email'] ?? '');
|
||||||
|
$role = strtolower($data['role'] ?? '');
|
||||||
|
$isActive = isset($data['is_active']) ? (bool) $data['is_active'] : true;
|
||||||
|
|
||||||
|
// Validation de la ligne
|
||||||
|
$error = null;
|
||||||
|
if ($name === '') {
|
||||||
|
$error = 'Nom vide.';
|
||||||
|
} elseif (! filter_var($email, FILTER_VALIDATE_EMAIL)) {
|
||||||
|
$error = "E-mail invalide : {$email}.";
|
||||||
|
} elseif (! in_array($role, $validRoles, true)) {
|
||||||
|
$error = "Rôle invalide : {$role}. Valeurs acceptées : " . implode(', ', $validRoles) . '.';
|
||||||
|
} elseif (User::where('email', $email)->exists()) {
|
||||||
|
$error = "L'adresse e-mail est déjà utilisée.";
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($error) {
|
||||||
|
$results[] = ['line' => $lineNum + 2, 'name' => $name, 'email' => $email, 'ok' => false, 'error' => $error];
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$password = Str::random(10);
|
||||||
|
User::create([
|
||||||
|
'name' => $name,
|
||||||
|
'email' => $email,
|
||||||
|
'password' => Hash::make($password),
|
||||||
|
'role' => $role,
|
||||||
|
'is_active' => $isActive,
|
||||||
|
'email_verified_at' => now(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
$results[] = ['line' => $lineNum + 2, 'name' => $name, 'email' => $email, 'role' => $role, 'ok' => true, 'password' => $password];
|
||||||
|
}
|
||||||
|
|
||||||
|
$created = count(array_filter($results, fn ($r) => $r['ok']));
|
||||||
|
$errors = count($results) - $created;
|
||||||
|
|
||||||
|
return view('admin.utilisateurs.import', compact('results', 'created', 'errors'));
|
||||||
|
}
|
||||||
|
|
||||||
public function edit(User $user): View
|
public function edit(User $user): View
|
||||||
{
|
{
|
||||||
$user->load('sections', 'sourcesAssignees');
|
$user->load('sections', 'sourcesAssignees');
|
||||||
|
|||||||
@@ -12,11 +12,12 @@ class AppServiceProvider extends ServiceProvider
|
|||||||
|
|
||||||
public function boot(): void
|
public function boot(): void
|
||||||
{
|
{
|
||||||
// Partage le logo et les paramètres globaux avec toutes les vues
|
// Partage les paramètres globaux du site avec toutes les vues
|
||||||
$logoUrl = SiteSettingsService::logoUrl();
|
View::share('siteLogoUrl', SiteSettingsService::logoUrl());
|
||||||
$registrationEnabled = SiteSettingsService::registrationEnabled();
|
View::share('registrationEnabled', SiteSettingsService::registrationEnabled());
|
||||||
|
View::share('siteName', SiteSettingsService::siteName());
|
||||||
|
|
||||||
View::share('siteLogoUrl', $logoUrl);
|
// Remplace config('app.name') par le titre du site défini dans les paramètres
|
||||||
View::share('registrationEnabled', $registrationEnabled);
|
config(['app.name' => SiteSettingsService::siteName()]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -60,6 +60,13 @@ class SiteSettingsService
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ── Titre du site ─────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
public static function siteName(): string
|
||||||
|
{
|
||||||
|
return self::get('site_name') ?: config('app.name', 'MesRelevés');
|
||||||
|
}
|
||||||
|
|
||||||
// ── Inscriptions ─────────────────────────────────────────────────────────
|
// ── Inscriptions ─────────────────────────────────────────────────────────
|
||||||
|
|
||||||
public static function registrationEnabled(): bool
|
public static function registrationEnabled(): bool
|
||||||
|
|||||||
@@ -95,16 +95,41 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{{-- Inscriptions --}}
|
{{-- Titre du site + Inscriptions (formulaire commun) --}}
|
||||||
<div class="bg-white shadow rounded-lg p-6 space-y-4">
|
<div class="bg-white shadow rounded-lg p-6 space-y-6">
|
||||||
<h3 class="text-sm font-semibold text-gray-700 uppercase tracking-wide">Inscriptions</h3>
|
<h3 class="text-sm font-semibold text-gray-700 uppercase tracking-wide">Paramètres généraux</h3>
|
||||||
<p class="text-sm text-gray-500">
|
|
||||||
Autorise ou non les visiteurs à créer un compte via la page d'inscription publique.
|
|
||||||
Quand désactivées, seul un administrateur peut créer des comptes (via la gestion des utilisateurs).
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<form method="POST" action="{{ route('admin.parametres.update') }}">
|
<form method="POST" action="{{ route('admin.parametres.update') }}" class="space-y-5">
|
||||||
@csrf
|
@csrf
|
||||||
|
|
||||||
|
{{-- Titre du site --}}
|
||||||
|
<div>
|
||||||
|
<label for="site_name" class="block text-sm font-medium text-gray-700 mb-1">
|
||||||
|
Titre du site
|
||||||
|
</label>
|
||||||
|
<input type="text" id="site_name" name="site_name"
|
||||||
|
value="{{ old('site_name', \App\Services\SiteSettingsService::get('site_name')) }}"
|
||||||
|
placeholder="{{ config('app.name', 'MesRelevés') }}"
|
||||||
|
maxlength="100"
|
||||||
|
class="block w-full rounded-md border-gray-300 shadow-sm text-sm
|
||||||
|
focus:border-indigo-500 focus:ring-indigo-500">
|
||||||
|
<p class="mt-1 text-xs text-gray-400">
|
||||||
|
Affiché dans la navigation, les e-mails et les exports.
|
||||||
|
Laisser vide pour utiliser la valeur par défaut
|
||||||
|
(« {{ config('app.name', 'MesRelevés') }} »).
|
||||||
|
</p>
|
||||||
|
@error('site_name')
|
||||||
|
<p class="mt-1 text-sm text-red-600">{{ $message }}</p>
|
||||||
|
@enderror
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{{-- Inscriptions --}}
|
||||||
|
<div class="pt-4 border-t border-gray-100">
|
||||||
|
<p class="text-sm font-medium text-gray-700 mb-2">Inscription publique des comptes</p>
|
||||||
|
<p class="text-xs text-gray-500 mb-3">
|
||||||
|
Autorise ou non les visiteurs à créer un compte via la page d'inscription.
|
||||||
|
Quand désactivée, seul un administrateur peut créer des comptes.
|
||||||
|
</p>
|
||||||
<label class="flex items-center gap-3 cursor-pointer">
|
<label class="flex items-center gap-3 cursor-pointer">
|
||||||
<input type="hidden" name="registration_enabled" value="0">
|
<input type="hidden" name="registration_enabled" value="0">
|
||||||
<input type="checkbox" name="registration_enabled" value="1"
|
<input type="checkbox" name="registration_enabled" value="1"
|
||||||
@@ -112,7 +137,9 @@
|
|||||||
class="w-4 h-4 text-indigo-600 border-gray-300 rounded focus:ring-indigo-500">
|
class="w-4 h-4 text-indigo-600 border-gray-300 rounded focus:ring-indigo-500">
|
||||||
<span class="text-sm text-gray-700">Autoriser l'inscription de nouveaux comptes</span>
|
<span class="text-sm text-gray-700">Autoriser l'inscription de nouveaux comptes</span>
|
||||||
</label>
|
</label>
|
||||||
<div class="mt-4">
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
<button type="submit"
|
<button type="submit"
|
||||||
class="px-5 py-2 bg-indigo-600 text-white text-sm font-medium rounded-md hover:bg-indigo-700">
|
class="px-5 py-2 bg-indigo-600 text-white text-sm font-medium rounded-md hover:bg-indigo-700">
|
||||||
Enregistrer
|
Enregistrer
|
||||||
|
|||||||
@@ -0,0 +1,132 @@
|
|||||||
|
<x-app-layout>
|
||||||
|
<x-slot name="header">
|
||||||
|
<div class="flex items-center justify-between">
|
||||||
|
<h2 class="text-xl font-semibold text-gray-800">Importer des utilisateurs</h2>
|
||||||
|
<a href="{{ route('admin.utilisateurs.index') }}"
|
||||||
|
class="text-sm text-indigo-600 hover:underline">← Retour à la liste</a>
|
||||||
|
</div>
|
||||||
|
</x-slot>
|
||||||
|
|
||||||
|
<div class="py-8 max-w-3xl mx-auto px-4 sm:px-6 lg:px-8 space-y-6">
|
||||||
|
|
||||||
|
{{-- Résultats d'import --}}
|
||||||
|
@if(isset($results))
|
||||||
|
<div class="bg-white shadow rounded-lg p-6 space-y-4">
|
||||||
|
<div class="flex items-center gap-4">
|
||||||
|
@if($created > 0)
|
||||||
|
<span class="text-green-700 font-semibold text-sm">
|
||||||
|
✓ {{ $created }} compte{{ $created > 1 ? 's' : '' }} créé{{ $created > 1 ? 's' : '' }}
|
||||||
|
</span>
|
||||||
|
@endif
|
||||||
|
@if($errors > 0)
|
||||||
|
<span class="text-red-600 font-semibold text-sm">
|
||||||
|
✗ {{ $errors }} ligne{{ $errors > 1 ? 's' : '' }} en erreur
|
||||||
|
</span>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@if($created > 0)
|
||||||
|
<div class="p-3 bg-amber-50 border border-amber-200 rounded-lg text-xs text-amber-800">
|
||||||
|
Les mots de passe temporaires ci-dessous sont affichés <strong>une seule fois</strong>.
|
||||||
|
Notez-les et communiquez-les aux utilisateurs concernés. Ils pourront les changer via leur profil.
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
<div class="overflow-x-auto">
|
||||||
|
<table class="min-w-full text-sm divide-y divide-gray-200">
|
||||||
|
<thead class="bg-gray-50">
|
||||||
|
<tr>
|
||||||
|
<th class="px-4 py-2 text-left text-xs font-medium text-gray-500 uppercase">Ligne</th>
|
||||||
|
<th class="px-4 py-2 text-left text-xs font-medium text-gray-500 uppercase">Nom</th>
|
||||||
|
<th class="px-4 py-2 text-left text-xs font-medium text-gray-500 uppercase">E-mail</th>
|
||||||
|
<th class="px-4 py-2 text-left text-xs font-medium text-gray-500 uppercase">Rôle</th>
|
||||||
|
<th class="px-4 py-2 text-left text-xs font-medium text-gray-500 uppercase">Mot de passe temporaire</th>
|
||||||
|
<th class="px-4 py-2 text-left text-xs font-medium text-gray-500 uppercase">Statut</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody class="divide-y divide-gray-200 bg-white">
|
||||||
|
@foreach($results as $r)
|
||||||
|
<tr class="{{ $r['ok'] ? '' : 'bg-red-50' }}">
|
||||||
|
<td class="px-4 py-2 text-gray-400">{{ $r['line'] }}</td>
|
||||||
|
<td class="px-4 py-2 font-medium text-gray-900">{{ $r['name'] }}</td>
|
||||||
|
<td class="px-4 py-2 text-gray-600">{{ $r['email'] }}</td>
|
||||||
|
<td class="px-4 py-2 text-gray-500">{{ $r['role'] ?? '' }}</td>
|
||||||
|
<td class="px-4 py-2 font-mono text-indigo-700">
|
||||||
|
{{ $r['ok'] ? $r['password'] : '' }}
|
||||||
|
</td>
|
||||||
|
<td class="px-4 py-2">
|
||||||
|
@if($r['ok'])
|
||||||
|
<span class="text-green-700 font-medium">✓ Créé</span>
|
||||||
|
@else
|
||||||
|
<span class="text-red-600 text-xs">{{ $r['error'] }}</span>
|
||||||
|
@endif
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
@endforeach
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="pt-2">
|
||||||
|
<a href="{{ route('admin.utilisateurs.index') }}"
|
||||||
|
class="px-5 py-2 bg-indigo-600 text-white text-sm font-medium rounded-md hover:bg-indigo-700 inline-block">
|
||||||
|
Voir la liste des utilisateurs
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
{{-- Formulaire d'import --}}
|
||||||
|
<div class="bg-white shadow rounded-lg p-6 space-y-5">
|
||||||
|
<h3 class="text-sm font-semibold text-gray-700 uppercase tracking-wide">Importer un fichier CSV</h3>
|
||||||
|
|
||||||
|
@if($errors->any())
|
||||||
|
<div class="p-4 bg-red-50 border border-red-200 text-red-700 text-sm rounded-md space-y-1">
|
||||||
|
@foreach($errors->all() as $e)<p>{{ $e }}</p>@endforeach
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
<div class="p-4 bg-blue-50 border border-blue-200 rounded-lg text-sm text-blue-800 space-y-1">
|
||||||
|
<p class="font-semibold">Format attendu du fichier CSV :</p>
|
||||||
|
<ul class="list-disc list-inside text-xs space-y-0.5">
|
||||||
|
<li>Séparateur : <code class="bg-blue-100 px-1 rounded">;</code> ou <code class="bg-blue-100 px-1 rounded">,</code></li>
|
||||||
|
<li>Encodage : UTF-8 (avec ou sans BOM)</li>
|
||||||
|
<li>Colonnes obligatoires : <code class="bg-blue-100 px-1 rounded">name</code>, <code class="bg-blue-100 px-1 rounded">email</code>, <code class="bg-blue-100 px-1 rounded">role</code></li>
|
||||||
|
<li>Colonne optionnelle : <code class="bg-blue-100 px-1 rounded">is_active</code> (1 ou 0, défaut : 1)</li>
|
||||||
|
<li>Valeurs acceptées pour <code class="bg-blue-100 px-1 rounded">role</code> :
|
||||||
|
<code class="bg-blue-100 px-1 rounded">member</code>,
|
||||||
|
<code class="bg-blue-100 px-1 rounded">section_manager</code>,
|
||||||
|
<code class="bg-blue-100 px-1 rounded">admin</code>
|
||||||
|
</li>
|
||||||
|
<li>Un mot de passe temporaire aléatoire sera généré pour chaque compte importé.</li>
|
||||||
|
</ul>
|
||||||
|
<a href="{{ route('admin.utilisateurs.import.modele') }}"
|
||||||
|
class="inline-block mt-2 text-xs text-indigo-700 font-medium hover:underline">
|
||||||
|
↓ Télécharger le fichier modèle (CSV)
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<form method="POST" action="{{ route('admin.utilisateurs.import.store') }}"
|
||||||
|
enctype="multipart/form-data" class="space-y-4">
|
||||||
|
@csrf
|
||||||
|
<div>
|
||||||
|
<label for="file" class="block text-sm font-medium text-gray-700 mb-1">
|
||||||
|
Fichier CSV <span class="text-red-500">*</span>
|
||||||
|
</label>
|
||||||
|
<input type="file" id="file" name="file" accept=".csv,.txt" required
|
||||||
|
class="block w-full text-sm text-gray-500
|
||||||
|
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">
|
||||||
|
<p class="mt-1 text-xs text-gray-400">Taille maximale : 2 Mo.</p>
|
||||||
|
@error('file') <p class="mt-1 text-sm text-red-600">{{ $message }}</p> @enderror
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<button type="submit"
|
||||||
|
class="px-5 py-2 bg-indigo-600 text-white text-sm font-medium rounded-md hover:bg-indigo-700">
|
||||||
|
Importer
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</x-app-layout>
|
||||||
@@ -1,24 +1,59 @@
|
|||||||
<x-app-layout>
|
<x-app-layout>
|
||||||
<x-slot name="header">
|
<x-slot name="header">
|
||||||
|
<div class="flex items-center justify-between">
|
||||||
<h2 class="text-xl font-semibold text-gray-800">Gestion des utilisateurs</h2>
|
<h2 class="text-xl font-semibold text-gray-800">Gestion des utilisateurs</h2>
|
||||||
|
<div class="flex items-center gap-3">
|
||||||
|
<a href="{{ route('admin.utilisateurs.import') }}"
|
||||||
|
class="flex items-center gap-1.5 px-4 py-2 border border-gray-300 text-sm text-gray-700 rounded-md hover:bg-gray-50 transition-colors">
|
||||||
|
<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
|
||||||
|
d="M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4"/>
|
||||||
|
</svg>
|
||||||
|
Importer CSV
|
||||||
|
</a>
|
||||||
|
<a href="{{ route('admin.utilisateurs.export', request()->only(['role', 'status', 'q'])) }}"
|
||||||
|
class="flex items-center gap-1.5 px-4 py-2 border border-gray-300 text-sm text-gray-700 rounded-md hover:bg-gray-50 transition-colors">
|
||||||
|
<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
|
||||||
|
d="M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-8l-4 4m0 0l4 4m-4-4h12"/>
|
||||||
|
</svg>
|
||||||
|
Exporter CSV
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</x-slot>
|
</x-slot>
|
||||||
|
|
||||||
<div class="py-8 max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 space-y-6">
|
<div class="py-8 max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 space-y-6">
|
||||||
|
|
||||||
|
@if(session('success'))
|
||||||
|
<div class="p-4 bg-green-50 border border-green-200 text-green-800 text-sm rounded-md">
|
||||||
|
{{ session('success') }}
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
@if(session('error'))
|
||||||
|
<div class="p-4 bg-red-50 border border-red-200 text-red-800 text-sm rounded-md">
|
||||||
|
{{ session('error') }}
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
|
||||||
{{-- Filtres --}}
|
{{-- Filtres --}}
|
||||||
@php $hasFilters = request()->anyFilled(['role', 'q']); @endphp
|
@php $hasFilters = request()->anyFilled(['role', 'q', 'status']); @endphp
|
||||||
<div class="bg-white shadow rounded-lg p-5">
|
<div class="bg-white shadow rounded-lg p-5">
|
||||||
<form method="GET" action="{{ route('admin.utilisateurs.index') }}" class="flex flex-wrap items-end gap-4">
|
<form method="GET" action="{{ route('admin.utilisateurs.index') }}"
|
||||||
<div class="flex-1 min-w-[200px]">
|
class="flex flex-wrap items-end gap-4">
|
||||||
|
<div class="flex-1 min-w-[180px]">
|
||||||
<label class="block text-xs font-medium text-gray-600 mb-1">Recherche</label>
|
<label class="block text-xs font-medium text-gray-600 mb-1">Recherche</label>
|
||||||
<input type="text" name="q" value="{{ request('q') }}"
|
<input type="text" name="q" value="{{ request('q') }}"
|
||||||
placeholder="Nom ou e-mail…"
|
placeholder="Nom ou e-mail…"
|
||||||
class="block w-full rounded-md border-gray-300 shadow-sm text-sm focus:border-indigo-500 focus:ring-indigo-500">
|
class="block w-full rounded-md border-gray-300 shadow-sm text-sm
|
||||||
|
focus:border-indigo-500 focus:ring-indigo-500">
|
||||||
</div>
|
</div>
|
||||||
<div class="w-52">
|
|
||||||
|
<div class="w-44">
|
||||||
<label class="block text-xs font-medium text-gray-600 mb-1">Rôle</label>
|
<label class="block text-xs font-medium text-gray-600 mb-1">Rôle</label>
|
||||||
<select name="role"
|
<select name="role"
|
||||||
class="block w-full rounded-md border-gray-300 shadow-sm text-sm focus:border-indigo-500 focus:ring-indigo-500">
|
class="block w-full rounded-md border-gray-300 shadow-sm text-sm
|
||||||
|
focus:border-indigo-500 focus:ring-indigo-500">
|
||||||
<option value="">— Tous —</option>
|
<option value="">— Tous —</option>
|
||||||
@foreach(\App\Enums\UserRole::cases() as $r)
|
@foreach(\App\Enums\UserRole::cases() as $r)
|
||||||
<option value="{{ $r->value }}" {{ request('role') === $r->value ? 'selected' : '' }}>
|
<option value="{{ $r->value }}" {{ request('role') === $r->value ? 'selected' : '' }}>
|
||||||
@@ -27,6 +62,18 @@
|
|||||||
@endforeach
|
@endforeach
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="w-40">
|
||||||
|
<label class="block text-xs font-medium text-gray-600 mb-1">Statut</label>
|
||||||
|
<select name="status"
|
||||||
|
class="block w-full rounded-md border-gray-300 shadow-sm text-sm
|
||||||
|
focus:border-indigo-500 focus:ring-indigo-500">
|
||||||
|
<option value="">— Tous —</option>
|
||||||
|
<option value="active" {{ request('status') === 'active' ? 'selected' : '' }}>Actifs</option>
|
||||||
|
<option value="inactive" {{ request('status') === 'inactive' ? 'selected' : '' }}>Inactifs</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="flex items-center gap-3">
|
<div class="flex items-center gap-3">
|
||||||
<button type="submit"
|
<button type="submit"
|
||||||
class="px-5 py-2 bg-indigo-600 text-white text-sm font-medium rounded-md hover:bg-indigo-700">
|
class="px-5 py-2 bg-indigo-600 text-white text-sm font-medium rounded-md hover:bg-indigo-700">
|
||||||
@@ -51,7 +98,7 @@
|
|||||||
<th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase">E-mail</th>
|
<th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase">E-mail</th>
|
||||||
<th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase">Rôle</th>
|
<th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase">Rôle</th>
|
||||||
<th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase">Sections</th>
|
<th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase">Sections</th>
|
||||||
<th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase">Sources assignées</th>
|
<th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase">Sources</th>
|
||||||
<th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase">Inscrit le</th>
|
<th class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase">Inscrit le</th>
|
||||||
<th class="px-6 py-3"></th>
|
<th class="px-6 py-3"></th>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -85,11 +132,7 @@
|
|||||||
</span>
|
</span>
|
||||||
</td>
|
</td>
|
||||||
<td class="px-6 py-4 text-gray-500">
|
<td class="px-6 py-4 text-gray-500">
|
||||||
@if($user->sections->isNotEmpty())
|
{{ $user->sections->isNotEmpty() ? $user->sections->pluck('nom')->join(', ') : '—' }}
|
||||||
{{ $user->sections->pluck('nom')->join(', ') }}
|
|
||||||
@else
|
|
||||||
—
|
|
||||||
@endif
|
|
||||||
</td>
|
</td>
|
||||||
<td class="px-6 py-4 text-gray-500">{{ $user->sources_assignees_count ?: '—' }}</td>
|
<td class="px-6 py-4 text-gray-500">{{ $user->sources_assignees_count ?: '—' }}</td>
|
||||||
<td class="px-6 py-4 text-gray-500 whitespace-nowrap">
|
<td class="px-6 py-4 text-gray-500 whitespace-nowrap">
|
||||||
@@ -98,10 +141,9 @@
|
|||||||
<td class="px-6 py-4 text-right space-x-3">
|
<td class="px-6 py-4 text-right space-x-3">
|
||||||
@if($user->id !== auth()->id())
|
@if($user->id !== auth()->id())
|
||||||
<a href="{{ route('admin.utilisateurs.edit', $user) }}"
|
<a href="{{ route('admin.utilisateurs.edit', $user) }}"
|
||||||
class="text-indigo-600 hover:underline text-sm">
|
class="text-indigo-600 hover:underline text-sm">Modifier</a>
|
||||||
Modifier
|
<form method="POST"
|
||||||
</a>
|
action="{{ route('admin.utilisateurs.toggle-active', $user) }}"
|
||||||
<form method="POST" action="{{ route('admin.utilisateurs.toggle-active', $user) }}"
|
|
||||||
class="inline" x-data
|
class="inline" x-data
|
||||||
@submit.prevent="if(confirm('{{ $user->is_active ? 'Désactiver' : 'Activer' }} ce compte ?')) $el.submit()">
|
@submit.prevent="if(confirm('{{ $user->is_active ? 'Désactiver' : 'Activer' }} ce compte ?')) $el.submit()">
|
||||||
@csrf
|
@csrf
|
||||||
@@ -126,5 +168,6 @@
|
|||||||
<div class="px-6 py-4 border-t">{{ $users->links() }}</div>
|
<div class="px-6 py-4 border-t">{{ $users->links() }}</div>
|
||||||
@endif
|
@endif
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</x-app-layout>
|
</x-app-layout>
|
||||||
|
|||||||
@@ -18,6 +18,12 @@ Route::middleware(['auth', 'role:admin'])->prefix('admin')->name('admin.')->grou
|
|||||||
Route::delete('parametres/logo', [SettingController::class, 'deleteLogo'])->name('parametres.logo.delete');
|
Route::delete('parametres/logo', [SettingController::class, 'deleteLogo'])->name('parametres.logo.delete');
|
||||||
Route::post('parametres/settings', [SettingController::class, 'updateSettings'])->name('parametres.update');
|
Route::post('parametres/settings', [SettingController::class, 'updateSettings'])->name('parametres.update');
|
||||||
|
|
||||||
|
// Routes spécifiques avant la resource pour éviter les conflits de paramètre
|
||||||
|
Route::get('utilisateurs/export', [UserController::class, 'export'])->name('utilisateurs.export');
|
||||||
|
Route::get('utilisateurs/import', [UserController::class, 'importForm'])->name('utilisateurs.import');
|
||||||
|
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', 'edit', 'update']);
|
||||||
Route::post('utilisateurs/{utilisateur}/toggle-active', [UserController::class, 'toggleActive'])->name('utilisateurs.toggle-active');
|
Route::post('utilisateurs/{utilisateur}/toggle-active', [UserController::class, 'toggleActive'])->name('utilisateurs.toggle-active');
|
||||||
Route::resource('lieu-types', LieuTypeController::class)
|
Route::resource('lieu-types', LieuTypeController::class)
|
||||||
|
|||||||
Reference in New Issue
Block a user