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:
@@ -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'));
|
||||
}
|
||||
}
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user