Comptes actifs/inactifs + stats de section dans le tableau de bord

Utilisateurs actifs/inactifs :
- Migration : colonne is_active (boolean, default true) sur users
- Middleware EnsureUserIsActive : déconnecte les utilisateurs désactivés sur chaque requête
- LoginRequest : bloque la connexion si is_active=false (message explicite)
- Admin : bouton Activer/Désactiver dans la liste et la page d'édition
  Protections : impossible de désactiver son propre compte ou le dernier admin actif
- Badge « Inactif » + opacité réduite sur la ligne dans la liste admin
- Sélection de membres (sources) : filtre is_active=true

Sources liées aux sections :
- Migration : colonne section_id nullable FK sur sources
- Source::section() BelongsTo + Section::sources() HasMany
- Formulaire sources/_form : sélecteur de section (sections de l'utilisateur ou toutes pour admin)
- SourceController : passe les sections disponibles aux vues create/edit

Tableau de bord enrichi (DashboardController) :
- Membres et responsables : stats par section (sources par statut, total relevés)
  compteurs cliquables → liste filtrée, sources récentes de la section
- Mes sources assignées (tri par urgence) + mes derniers relevés (inchangés)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
2026-06-04 17:50:56 +02:00
parent 9efb6d6093
commit dbf0465b0a
18 changed files with 347 additions and 36 deletions
@@ -61,4 +61,23 @@ class UserController extends Controller
return back()->with('success', 'Rôle mis à jour.');
}
public function toggleActive(User $user): RedirectResponse
{
if ($user->id === auth()->id()) {
return back()->with('error', 'Vous ne pouvez pas désactiver votre propre compte.');
}
if ($user->is_active && $user->role === UserRole::Admin) {
$activeAdmins = User::where('role', UserRole::Admin->value)->where('is_active', true)->count();
if ($activeAdmins <= 1) {
return back()->with('error', 'Impossible de désactiver le dernier administrateur actif.');
}
}
$user->update(['is_active' => ! $user->is_active]);
$label = $user->is_active ? 'activé' : 'désactivé';
return back()->with('success', "Compte {$label}.");
}
}
@@ -0,0 +1,68 @@
<?php
namespace App\Http\Controllers;
use App\Enums\SourceStatus;
use App\Models\Releve;
use Illuminate\View\View;
class DashboardController extends Controller
{
public function index(): View
{
$user = auth()->user();
// ── Sources auxquelles je suis assigné ───────────────────────────────
$mesSources = $user->sourcesAssignees()
->with('sourceType')
->withCount('releves')
->orderByRaw("CASE status
WHEN 'en_cours' THEN 0
WHEN 'a_valider' THEN 1
WHEN 'a_faire' THEN 2
WHEN 'termine' THEN 3
ELSE 4 END")
->get();
// ── Mes derniers relevés ─────────────────────────────────────────────
$mesReleves = Releve::with(['source.sourceType'])
->where('created_by', $user->id)
->orderByDesc('created_at')
->take(8)
->get();
// ── Stats de section (membres et responsables) ───────────────────────
$sectionsStats = null;
if (! $user->isAdmin()) {
$sections = $user->sections()
->with(['sources' => fn ($q) => $q
->with('sourceType')
->withCount('releves')
->orderBy('nom'),
])
->get();
if ($sections->isNotEmpty()) {
$sectionsStats = $sections->map(function ($section) {
$sources = $section->sources;
$byStatus = collect(SourceStatus::cases())
->mapWithKeys(fn ($s) => [
$s->value => $sources->filter(fn ($src) => $src->status === $s)->count(),
]);
return [
'section' => $section,
'total_sources' => $sources->count(),
'by_status' => $byStatus,
'total_releves' => $sources->sum('releves_count'),
'sources_recentes' => $sources->sortByDesc('updated_at')->take(5),
];
});
}
}
return view('dashboard', compact('mesSources', 'mesReleves', 'sectionsStats'));
}
}
+14 -5
View File
@@ -7,6 +7,7 @@ use App\Http\Requests\StoreSourceRequest;
use App\Http\Requests\UpdateSourceRequest;
use App\Models\Depot;
use App\Models\Lieu;
use App\Models\Section;
use App\Models\Source;
use App\Models\SourceType;
use App\Models\User;
@@ -92,10 +93,14 @@ class SourceController extends Controller
{
$this->authorize('create', Source::class);
$user = auth()->user();
$sourceTypes = SourceType::orderBy('nom')->get(['id', 'nom']);
$depots = Depot::orderBy('nom')->get(['id', 'nom']);
$sections = $user->isAdmin()
? Section::orderBy('nom')->get(['id', 'nom'])
: $user->sections()->orderBy('nom')->get(['id', 'nom']);
return view('sources.create', compact('sourceTypes', 'depots'));
return view('sources.create', compact('sourceTypes', 'depots', 'sections'));
}
public function store(StoreSourceRequest $request): RedirectResponse
@@ -110,9 +115,9 @@ class SourceController extends Controller
{
$this->authorize('view', $source);
$source->load(['sourceType.fields', 'depot', 'membres', 'releves']);
$source->load(['sourceType.fields', 'depot', 'section', 'membres', 'releves']);
$availableUsers = User::orderBy('name')->get(['id', 'name', 'email']);
$availableUsers = User::where('is_active', true)->orderBy('name')->get(['id', 'name', 'email']);
return view('sources.show', compact('source', 'availableUsers'));
}
@@ -121,11 +126,15 @@ class SourceController extends Controller
{
$this->authorize('update', $source);
$source->loadMissing('lieu');
$source->loadMissing('lieu', 'section');
$user = auth()->user();
$sourceTypes = SourceType::orderBy('nom')->get(['id', 'nom']);
$depots = Depot::orderBy('nom')->get(['id', 'nom']);
$sections = $user->isAdmin()
? Section::orderBy('nom')->get(['id', 'nom'])
: $user->sections()->orderBy('nom')->get(['id', 'nom']);
return view('sources.edit', compact('source', 'sourceTypes', 'depots'));
return view('sources.edit', compact('source', 'sourceTypes', 'depots', 'sections'));
}
public function update(UpdateSourceRequest $request, Source $source): RedirectResponse
@@ -0,0 +1,24 @@
<?php
namespace App\Http\Middleware;
use Closure;
use Illuminate\Http\Request;
use Symfony\Component\HttpFoundation\Response;
class EnsureUserIsActive
{
public function handle(Request $request, Closure $next): Response
{
if (auth()->check() && ! auth()->user()->is_active) {
auth()->logout();
$request->session()->invalidate();
$request->session()->regenerateToken();
return redirect()->route('login')
->withErrors(['email' => 'Votre compte a été désactivé. Contactez un administrateur.']);
}
return $next($request);
}
}
+9
View File
@@ -50,6 +50,15 @@ class LoginRequest extends FormRequest
]);
}
if (! Auth::user()->is_active) {
Auth::logout();
RateLimiter::hit($this->throttleKey());
throw ValidationException::withMessages([
'email' => 'Votre compte est désactivé. Contactez un administrateur.',
]);
}
RateLimiter::clear($this->throttleKey());
}
+1
View File
@@ -18,6 +18,7 @@ class StoreSourceRequest extends FormRequest
'description' => ['nullable', 'string'],
'source_type_id' => ['required', 'integer', 'exists:source_types,id'],
'depot_id' => ['nullable', 'integer', 'exists:depots,id'],
'section_id' => ['nullable', 'integer', 'exists:sections,id'],
'lieu_id' => ['nullable', 'integer', 'exists:lieux,id'],
'annee_debut' => ['nullable', 'integer', 'min:1000', 'max:2100'],
'annee_fin' => ['nullable', 'integer', 'min:1000', 'max:2100', 'gte:annee_debut'],
@@ -18,6 +18,7 @@ class UpdateSourceRequest extends FormRequest
'description' => ['nullable', 'string'],
'source_type_id' => ['required', 'integer', 'exists:source_types,id'],
'depot_id' => ['nullable', 'integer', 'exists:depots,id'],
'section_id' => ['nullable', 'integer', 'exists:sections,id'],
'lieu_id' => ['nullable', 'integer', 'exists:lieux,id'],
'annee_debut' => ['nullable', 'integer', 'min:1000', 'max:2100'],
'annee_fin' => ['nullable', 'integer', 'min:1000', 'max:2100', 'gte:annee_debut'],
+6
View File
@@ -5,6 +5,7 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\HasMany;
class Section extends Model
{
@@ -21,6 +22,11 @@ class Section extends Model
->withPivot('role_in_section');
}
public function sources(): HasMany
{
return $this->hasMany(Source::class);
}
public function responsables(): BelongsToMany
{
return $this->belongsToMany(User::class, 'section_user')
+6 -1
View File
@@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
class Source extends Model
{
protected $fillable = ['nom', 'description', 'source_type_id', 'depot_id', 'lieu_id', 'annee_debut', 'annee_fin', 'cote', 'auteur', 'status'];
protected $fillable = ['nom', 'description', 'source_type_id', 'depot_id', 'section_id', 'lieu_id', 'annee_debut', 'annee_fin', 'cote', 'auteur', 'status'];
protected $casts = [
'status' => SourceStatus::class,
@@ -26,6 +26,11 @@ class Source extends Model
return $this->belongsTo(Depot::class);
}
public function section(): BelongsTo
{
return $this->belongsTo(Section::class);
}
public function lieu(): BelongsTo
{
return $this->belongsTo(Lieu::class);
+2 -1
View File
@@ -14,7 +14,7 @@ class User extends Authenticatable
/** @use HasFactory<UserFactory> */
use HasFactory, Notifiable;
protected $fillable = ['name', 'email', 'password', 'role'];
protected $fillable = ['name', 'email', 'password', 'role', 'is_active'];
protected $hidden = ['password', 'remember_token'];
@@ -24,6 +24,7 @@ class User extends Authenticatable
'email_verified_at' => 'datetime',
'password' => 'hashed',
'role' => UserRole::class,
'is_active' => 'boolean',
];
}
+1
View File
@@ -18,6 +18,7 @@ return Application::configure(basePath: dirname(__DIR__))
$middleware->alias([
'role' => \App\Http\Middleware\RoleMiddleware::class,
]);
$middleware->appendToGroup('web', \App\Http\Middleware\EnsureUserIsActive::class);
})
->withExceptions(function (Exceptions $exceptions): void {
//
@@ -0,0 +1,31 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
public function up(): void
{
Schema::table('users', function (Blueprint $table) {
$table->boolean('is_active')->default(true)->after('role');
});
Schema::table('sources', function (Blueprint $table) {
$table->foreignId('section_id')->nullable()->after('depot_id')->constrained('sections')->nullOnDelete();
});
}
public function down(): void
{
Schema::table('users', function (Blueprint $table) {
$table->dropColumn('is_active');
});
Schema::table('sources', function (Blueprint $table) {
$table->dropForeign(['section_id']);
$table->dropColumn('section_id');
});
}
};
@@ -39,6 +39,34 @@
</dl>
</div>
{{-- Statut actif / inactif --}}
<div class="bg-white shadow rounded-lg p-6 flex items-center justify-between">
<div>
<p class="text-sm font-medium text-gray-900">Statut du compte</p>
<p class="text-sm text-gray-500 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 text-red-700 border border-red-200 hover:bg-red-100'
: 'bg-green-50 text-green-700 border border-green-200 hover:bg-green-100' }}">
{{ $user->is_active ? 'Désactiver le compte' : 'Activer le compte' }}
</button>
</form>
@endif
</div>
{{-- Modifier le rôle --}}
<div class="bg-white shadow rounded-lg p-6">
<h3 class="text-sm font-semibold text-gray-700 uppercase tracking-wide mb-4">Rôle</h3>
@@ -66,12 +66,17 @@
];
$color = $roleColors[$user->role->value] ?? 'bg-gray-100 text-gray-600';
@endphp
<tr class="hover:bg-gray-50">
<tr class="hover:bg-gray-50 {{ ! $user->is_active ? 'opacity-60' : '' }}">
<td class="px-6 py-4 font-medium text-gray-900">
{{ $user->name }}
@if($user->id === auth()->id())
<span class="ml-1 text-xs text-gray-400">(vous)</span>
@endif
@if(! $user->is_active)
<span class="ml-2 inline-flex items-center px-1.5 py-0.5 rounded text-xs font-medium bg-red-100 text-red-600">
Inactif
</span>
@endif
</td>
<td class="px-6 py-4 text-gray-500">{{ $user->email }}</td>
<td class="px-6 py-4">
@@ -90,12 +95,21 @@
<td class="px-6 py-4 text-gray-500 whitespace-nowrap">
{{ $user->created_at->format('d/m/Y') }}
</td>
<td class="px-6 py-4 text-right">
<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>
<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' }}">
{{ $user->is_active ? 'Désactiver' : 'Activer' }}
</button>
</form>
@endif
</td>
</tr>
+97 -22
View File
@@ -21,24 +21,107 @@
</div>
@endif
{{-- Mes sources assignées --}}
{{-- ── Stats de section (membres et responsables) ───────────────────── --}}
@if($sectionsStats && $sectionsStats->isNotEmpty())
@foreach($sectionsStats as $stat)
@php
$mesSources = $user->sourcesAssignees()
->with('sourceType')
->withCount('releves')
->orderByRaw("CASE status
WHEN 'en_cours' THEN 0
WHEN 'a_valider' THEN 1
WHEN 'a_faire' THEN 2
WHEN 'termine' THEN 3
ELSE 4 END")
->get();
$statusColors = [
'a_faire' => ['bg' => 'bg-gray-100', 'text' => 'text-gray-700'],
'en_cours' => ['bg' => 'bg-blue-100', 'text' => 'text-blue-700'],
'a_valider' => ['bg' => 'bg-yellow-100', 'text' => 'text-yellow-700'],
'termine' => ['bg' => 'bg-green-100', 'text' => 'text-green-700'],
];
$statusLabels = [
'a_faire' => 'À faire',
'en_cours' => 'En cours',
'a_valider' => 'À valider',
'termine' => 'Terminé',
];
@endphp
<div class="space-y-4">
<h3 class="text-base font-semibold text-gray-800 flex items-center gap-2">
<span>Section {{ $stat['section']->nom }}</span>
@if($user->isManagerOfSection($stat['section']))
<span class="text-xs px-2 py-0.5 bg-blue-100 text-blue-700 rounded-full">Responsable</span>
@endif
</h3>
{{-- Compteurs par statut --}}
<div class="grid grid-cols-2 sm:grid-cols-4 gap-3">
@foreach($stat['by_status'] as $statusVal => $count)
@php $c = $statusColors[$statusVal] ?? ['bg' => 'bg-gray-100', 'text' => 'text-gray-700']; @endphp
<a href="{{ route('sources.index', ['status' => $statusVal]) }}"
class="rounded-xl border p-4 flex flex-col gap-1 hover:shadow-md transition-shadow
{{ $c['bg'] }} border-transparent">
<span class="text-2xl font-bold {{ $c['text'] }}">{{ $count }}</span>
<span class="text-xs font-medium {{ $c['text'] }}">{{ $statusLabels[$statusVal] ?? $statusVal }}</span>
<span class="text-xs opacity-60 {{ $c['text'] }}">source{{ $count > 1 ? 's' : '' }}</span>
</a>
@endforeach
</div>
{{-- Métriques globales section --}}
<div class="grid grid-cols-2 gap-4">
<div class="bg-white border border-gray-200 rounded-xl px-5 py-4 flex items-center gap-4">
<div class="p-2 bg-indigo-100 rounded-lg">
<svg class="w-5 h-5 text-indigo-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 8h14M5 8a2 2 0 110-4h14a2 2 0 110 4M5 8v10a2 2 0 002 2h10a2 2 0 002-2V8"/>
</svg>
</div>
<div>
<p class="text-xl font-bold text-gray-900">{{ $stat['total_sources'] }}</p>
<p class="text-xs text-gray-500">source{{ $stat['total_sources'] > 1 ? 's' : '' }} au total</p>
</div>
</div>
<div class="bg-white border border-gray-200 rounded-xl px-5 py-4 flex items-center gap-4">
<div class="p-2 bg-green-100 rounded-lg">
<svg class="w-5 h-5 text-green-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" 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>
</div>
<div>
<p class="text-xl font-bold text-gray-900">{{ number_format($stat['total_releves']) }}</p>
<p class="text-xs text-gray-500">relevé{{ $stat['total_releves'] > 1 ? 's' : '' }} saisi{{ $stat['total_releves'] > 1 ? 's' : '' }}</p>
</div>
</div>
</div>
{{-- Sources récentes de la section --}}
@if($stat['sources_recentes']->isNotEmpty())
<div class="bg-white border border-gray-200 rounded-xl p-5">
<p class="text-xs font-semibold text-gray-500 uppercase mb-3">Sources récentes</p>
<div class="divide-y divide-gray-100">
@foreach($stat['sources_recentes'] as $src)
@php
$sc = $statusColors[$src->status->value] ?? ['bg' => 'bg-gray-100', 'text' => 'text-gray-600'];
@endphp
<div class="flex items-center justify-between py-2.5">
<div class="min-w-0">
<a href="{{ route('sources.show', $src) }}"
class="text-sm font-medium text-indigo-600 hover:underline truncate block">
{{ $src->nom }}
</a>
<p class="text-xs text-gray-400">
{{ $src->sourceType->nom }} · {{ $src->releves_count }} relevé{{ $src->releves_count > 1 ? 's' : '' }}
</p>
</div>
<span class="ml-4 shrink-0 inline-flex items-center px-2 py-0.5 rounded-full text-xs font-medium {{ $sc['bg'] }} {{ $sc['text'] }}">
{{ $src->status->label() }}
</span>
</div>
@endforeach
</div>
</div>
@endif
</div>
@endforeach
@endif
{{-- ── Mes sources assignées ────────────────────────────────────────── --}}
@if($mesSources->isNotEmpty())
<div class="bg-white border border-gray-200 rounded-xl p-6">
<div class="flex items-center justify-between mb-4">
<h3 class="text-sm font-semibold text-gray-700 uppercase tracking-wide">Mes sources</h3>
<h3 class="text-sm font-semibold text-gray-700 uppercase tracking-wide">Mes sources assignées</h3>
<a href="{{ route('sources.index') }}" class="text-xs text-indigo-600 hover:underline">Voir toutes</a>
</div>
<div class="overflow-x-auto">
@@ -85,7 +168,7 @@
</table>
</div>
</div>
@else
@elseif(! $sectionsStats || $sectionsStats->isEmpty())
<div class="bg-white border border-gray-200 rounded-xl p-10 text-center text-gray-400">
<svg class="mx-auto w-10 h-10 mb-3 text-gray-300" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"
@@ -98,15 +181,7 @@
</div>
@endif
{{-- Mes derniers relevés saisis --}}
@php
$mesReleves = \App\Models\Releve::with(['source.sourceType'])
->where('created_by', $user->id)
->orderByDesc('created_at')
->take(8)
->get();
@endphp
{{-- ── Mes derniers relevés ─────────────────────────────────────────── --}}
@if($mesReleves->isNotEmpty())
<div class="bg-white border border-gray-200 rounded-xl p-6">
<div class="flex items-center justify-between mb-4">
+17
View File
@@ -12,6 +12,23 @@
class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500">{{ old('description', $source?->description) }}</textarea>
</div>
{{-- Section propriétaire --}}
@if($sections->isNotEmpty())
<div>
<label for="section_id" class="block text-sm font-medium text-gray-700">Section</label>
<select id="section_id" name="section_id"
class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 text-sm">
<option value=""> Aucune (globale) </option>
@foreach($sections as $sec)
<option value="{{ $sec->id }}" {{ old('section_id', $source?->section_id) == $sec->id ? 'selected' : '' }}>
{{ $sec->nom }}
</option>
@endforeach
</select>
@error('section_id') <p class="mt-1 text-sm text-red-600">{{ $message }}</p> @enderror
</div>
@endif
<div class="grid grid-cols-2 gap-4">
<div>
<label for="source_type_id" class="block text-sm font-medium text-gray-700">Type de source <span class="text-red-500">*</span></label>
+1
View File
@@ -12,6 +12,7 @@ Route::middleware(['auth', 'role:admin'])->prefix('admin')->name('admin.')->grou
Route::get('dashboard', [DashboardController::class, 'index'])->name('dashboard');
Route::resource('utilisateurs', UserController::class)->only(['index', 'edit', 'update']);
Route::post('utilisateurs/{utilisateur}/toggle-active', [UserController::class, 'toggleActive'])->name('utilisateurs.toggle-active');
Route::resource('lieu-types', LieuTypeController::class)
->parameters(['lieu-types' => 'lieuType'])
->except(['show']);
+4 -3
View File
@@ -1,5 +1,6 @@
<?php
use App\Http\Controllers\DashboardController;
use App\Http\Controllers\ExportController;
use App\Http\Controllers\LieuController;
use App\Http\Controllers\NotificationController;
@@ -13,9 +14,9 @@ Route::get('/', function () {
return view('welcome');
});
Route::get('/dashboard', function () {
return view('dashboard');
})->middleware(['auth', 'verified'])->name('dashboard');
Route::get('/dashboard', [DashboardController::class, 'index'])
->middleware(['auth', 'verified'])
->name('dashboard');
Route::middleware('auth')->group(function () {
Route::get('/profile', [ProfileController::class, 'edit'])->name('profile.edit');