sépare la vitrine de l'application : vraie coquille, barre par rôle, chat
Une fois connecté, plus aucun lien vitrine : nouvelle layouts/app (barre
du haut avec menu avatar, barre latérale par rôle, bulle de chat
Messenger, barre d'onglets mobile). Les 10 entrées de navigation
demandées sont construites en vrai plutôt qu'en renvoi "bientôt
disponible" : Ma classe, Emploi du temps, Mes devoirs, Mes cours, Mes
notes côté élève ; Mes classes, Emploi du temps, Séances en direct,
Bibliothèque, Résultats (avec Observations, la dernière fonction
fictive du tableau de bord démo) côté prof.
Chat élève <-> prof de sa classe, jamais entre élèves. Mon profil,
Paramètres (thème, taille du texte), Signaler un problème, Mes
raccourcis. /eleve vidée des faux contenus ("À faire", "Ma progression",
"Mes QCM") restés avant le chantier "vrai cockpit".
Bug trouvé en testant en réel sur le serveur (pas en local) : le
compteur de messages non lus du chat ne redescendait jamais à zéro
(FilConversation sans lu_par_prof_a/lu_par_eleve_a dans son fillable) —
corrigé avec un test de non-régression.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
parent
a41951d4e6
commit
592cba9c4c
89 changed files with 2890 additions and 138 deletions
|
|
@ -10,9 +10,10 @@ use Illuminate\Support\Facades\Log;
|
|||
/**
|
||||
* RGPD (CLAUDE.md, étape 14) : supprime les classes archivées depuis
|
||||
* 90 jours, avec en cascade leurs élèves, séances, sessions de lab, machines,
|
||||
* corrections, quiz et devoirs maison (chantier « vrai cockpit »). Le compte du
|
||||
* prof est conservé. Le journal ne garde que des identifiants et des
|
||||
* nombres, jamais de nom d'élève.
|
||||
* corrections, quiz et devoirs maison (chantier « vrai cockpit »), ainsi que
|
||||
* les annonces, observations et le chat élève ↔ prof (séparation vitrine/
|
||||
* application, 2026-10-13). Le compte du prof est conservé. Le journal ne
|
||||
* garde que des identifiants et des nombres, jamais de nom d'élève.
|
||||
*
|
||||
* Les sauvegardes chiffrées contenant encore ces données expirent d'elles-
|
||||
* mêmes au plus 4 semaines plus tard (rotation, docs/runbooks/sauvegardes.md).
|
||||
|
|
|
|||
45
portail/app/Console/Commands/SynchroniserCours.php
Normal file
45
portail/app/Console/Commands/SynchroniserCours.php
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
<?php
|
||||
|
||||
namespace App\Console\Commands;
|
||||
|
||||
use App\Models\Cours;
|
||||
use Illuminate\Console\Command;
|
||||
use Illuminate\Support\Facades\File;
|
||||
use Symfony\Component\Yaml\Yaml;
|
||||
|
||||
/**
|
||||
* Catalogue des cours.md de paillasse-contenus/ (même esprit que
|
||||
* labs:synchroniser et quiz:synchroniser-banque) : lu par « Mes cours ».
|
||||
* Un seul lab (08-deux-lan-routeur) a un cours.md aujourd'hui — les autres
|
||||
* séquences n'apparaissent simplement pas, jamais de contenu inventé.
|
||||
*/
|
||||
class SynchroniserCours extends Command
|
||||
{
|
||||
protected $signature = 'cours:synchroniser';
|
||||
|
||||
protected $description = 'Crée ou met à jour le catalogue des cours depuis les cours.md de paillasse-contenus/';
|
||||
|
||||
public function handle(): void
|
||||
{
|
||||
$dossier = config('contenus.dossier');
|
||||
|
||||
foreach (File::directories($dossier) as $chemin) {
|
||||
$identifiant = basename($chemin);
|
||||
$cheminCours = "{$chemin}/cours.md";
|
||||
$cheminLab = "{$chemin}/lab.yaml";
|
||||
|
||||
if (! File::exists($cheminCours) || ! File::exists($cheminLab)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$titre = Yaml::parseFile($cheminLab)['titre'];
|
||||
|
||||
$cours = Cours::updateOrCreate(
|
||||
['identifiant' => $identifiant],
|
||||
['titre' => $titre, 'contenu_markdown' => File::get($cheminCours)],
|
||||
);
|
||||
|
||||
$this->line(($cours->wasRecentlyCreated ? 'créé' : 'à jour')." : {$identifiant}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -24,7 +24,7 @@ class SynchroniserLabs extends Command
|
|||
|
||||
$lab = Lab::updateOrCreate(
|
||||
['identifiant' => $definition->identifiant],
|
||||
['titre' => $definition->titre, 'niveau' => $definition->niveau, 'duree_min' => $definition->dureeMin],
|
||||
['titre' => $definition->titre, 'niveau' => $definition->niveau, 'duree_min' => $definition->dureeMin, 'competences' => $definition->competences],
|
||||
);
|
||||
|
||||
$this->line(($lab->wasRecentlyCreated ? 'créé' : 'à jour')." : {$identifiant}");
|
||||
|
|
|
|||
14
portail/app/Http/Controllers/AideController.php
Normal file
14
portail/app/Http/Controllers/AideController.php
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\View\View;
|
||||
|
||||
class AideController extends Controller
|
||||
{
|
||||
public function show(): View
|
||||
{
|
||||
return view('aide-app', ['estProf' => Auth::guard('web')->check()]);
|
||||
}
|
||||
}
|
||||
45
portail/app/Http/Controllers/AnnonceController.php
Normal file
45
portail/app/Http/Controllers/AnnonceController.php
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\Annonce;
|
||||
use App\Models\Classe;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
||||
/**
|
||||
* Annonces du prof à sa classe, lues par l'élève dans « Ma classe »
|
||||
* (séparation vitrine/application, 2026-10-13).
|
||||
*/
|
||||
class AnnonceController extends Controller
|
||||
{
|
||||
public function store(Request $request, Classe $classe): RedirectResponse
|
||||
{
|
||||
$this->verifierProprietaire($classe);
|
||||
|
||||
$donnees = $request->validate([
|
||||
'titre' => ['required', 'string', 'max:150'],
|
||||
'contenu' => ['required', 'string', 'max:3000'],
|
||||
]);
|
||||
|
||||
$classe->annonces()->create([...$donnees, 'user_id' => Auth::guard('web')->id()]);
|
||||
|
||||
return redirect()->route('mes-classes.show', $classe);
|
||||
}
|
||||
|
||||
public function destroy(Classe $classe, Annonce $annonce): RedirectResponse
|
||||
{
|
||||
$this->verifierProprietaire($classe);
|
||||
abort_if($annonce->classe_id !== $classe->id, 404);
|
||||
|
||||
$annonce->delete();
|
||||
|
||||
return redirect()->route('mes-classes.show', $classe);
|
||||
}
|
||||
|
||||
private function verifierProprietaire(Classe $classe): void
|
||||
{
|
||||
abort_if($classe->user_id !== Auth::guard('web')->id(), 403);
|
||||
}
|
||||
}
|
||||
29
portail/app/Http/Controllers/BibliothequeProfController.php
Normal file
29
portail/app/Http/Controllers/BibliothequeProfController.php
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\Lab;
|
||||
use App\Models\Quiz;
|
||||
use Illuminate\View\View;
|
||||
|
||||
/**
|
||||
* Bibliothèque du prof : labs et quiz réels (séparation vitrine/
|
||||
* application, 2026-10-13) — distincte de /bibliotheque (vitrine,
|
||||
* démonstration). Regroupée comme /banque-quiz.
|
||||
*/
|
||||
class BibliothequeProfController extends Controller
|
||||
{
|
||||
public function show(): View
|
||||
{
|
||||
$quizzes = Quiz::where('partage', true)
|
||||
->with(['classe.etablissement'])
|
||||
->withCount('questions')
|
||||
->latest()
|
||||
->get();
|
||||
|
||||
return view('bibliotheque-app', [
|
||||
'labs' => Lab::orderBy('titre')->get(),
|
||||
'groupesQuiz' => $quizzes->groupBy(fn (Quiz $q) => $q->theme ?? '')->sortKeys(),
|
||||
]);
|
||||
}
|
||||
}
|
||||
64
portail/app/Http/Controllers/ChatEleveController.php
Normal file
64
portail/app/Http/Controllers/ChatEleveController.php
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\FilConversation;
|
||||
use App\Models\MessageChat;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
||||
/**
|
||||
* Chat Messenger élève ↔ prof de sa classe (règles d'Adam, 2026-10-13) :
|
||||
* un seul fil, créé à la première ouverture. Jamais de message si le prof
|
||||
* a coupé le chat de la classe.
|
||||
*/
|
||||
class ChatEleveController extends Controller
|
||||
{
|
||||
/**
|
||||
* `lu=1` seulement quand la fenêtre de chat est réellement ouverte :
|
||||
* le sondage du badge en arrière-plan ne doit jamais marquer comme lu.
|
||||
*/
|
||||
public function etat(Request $request): JsonResponse
|
||||
{
|
||||
$eleve = Auth::guard('eleve')->user()->load('classe');
|
||||
$fil = $eleve->filConversation;
|
||||
|
||||
if ($fil && $request->boolean('lu')) {
|
||||
$fil->update(['lu_par_eleve_a' => now()]);
|
||||
}
|
||||
|
||||
return response()->json([
|
||||
'actif' => $eleve->classe->chat_actif,
|
||||
'non_lus' => $fil ? $fil->nonLusPourEleve() : 0,
|
||||
'messages' => $fil ? $fil->messages->map(fn (MessageChat $m) => [
|
||||
'id' => $m->id,
|
||||
'expediteur' => $m->expediteur,
|
||||
'contenu' => $m->contenu,
|
||||
'envoye_a' => $m->created_at->toIso8601String(),
|
||||
]) : [],
|
||||
]);
|
||||
}
|
||||
|
||||
public function envoyer(Request $request): JsonResponse
|
||||
{
|
||||
$eleve = Auth::guard('eleve')->user()->load('classe');
|
||||
abort_unless($eleve->classe->chat_actif, 403, 'Le chat est désactivé pour ta classe.');
|
||||
|
||||
$donnees = $request->validate(['contenu' => ['required', 'string', 'max:2000']]);
|
||||
|
||||
$fil = FilConversation::firstOrCreate(
|
||||
['eleve_id' => $eleve->id],
|
||||
['classe_id' => $eleve->classe_id],
|
||||
);
|
||||
|
||||
// Pas de mise à jour de lu_par_eleve_a ici : nonLusPourEleve() ne
|
||||
// compte que les messages du prof, jamais les siens.
|
||||
$message = $fil->messages()->create([
|
||||
'expediteur' => MessageChat::ELEVE,
|
||||
'contenu' => $donnees['contenu'],
|
||||
]);
|
||||
|
||||
return response()->json(['id' => $message->id], 201);
|
||||
}
|
||||
}
|
||||
76
portail/app/Http/Controllers/ChatProfController.php
Normal file
76
portail/app/Http/Controllers/ChatProfController.php
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\FilConversation;
|
||||
use App\Models\MessageChat;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
||||
/**
|
||||
* Chat Messenger élève ↔ prof : côté prof, une liste de fils (un par
|
||||
* élève lui ayant déjà écrit), jamais de fil entre deux élèves.
|
||||
*/
|
||||
class ChatProfController extends Controller
|
||||
{
|
||||
public function index(): JsonResponse
|
||||
{
|
||||
$classeIds = Auth::guard('web')->user()->classes()->pluck('id');
|
||||
|
||||
$fils = FilConversation::whereIn('classe_id', $classeIds)
|
||||
->whereHas('messages')
|
||||
->with(['eleve', 'classe'])
|
||||
->get()
|
||||
->map(fn (FilConversation $f) => [
|
||||
'id' => $f->id,
|
||||
'eleve' => $f->eleve->nomAffiche(),
|
||||
'classe' => $f->classe->nom,
|
||||
'non_lus' => $f->nonLusPourProf(),
|
||||
'dernier_message_a' => $f->messages->last()?->created_at->toIso8601String(),
|
||||
])
|
||||
->sortByDesc('dernier_message_a')
|
||||
->values();
|
||||
|
||||
return response()->json(['fils' => $fils]);
|
||||
}
|
||||
|
||||
public function etat(FilConversation $fil): JsonResponse
|
||||
{
|
||||
$this->verifierProprietaire($fil);
|
||||
$fil->update(['lu_par_prof_a' => now()]);
|
||||
|
||||
return response()->json([
|
||||
'eleve' => $fil->eleve->nomAffiche(),
|
||||
'actif' => $fil->classe->chat_actif,
|
||||
'messages' => $fil->messages->map(fn (MessageChat $m) => [
|
||||
'id' => $m->id,
|
||||
'expediteur' => $m->expediteur,
|
||||
'contenu' => $m->contenu,
|
||||
'envoye_a' => $m->created_at->toIso8601String(),
|
||||
]),
|
||||
]);
|
||||
}
|
||||
|
||||
public function envoyer(Request $request, FilConversation $fil): JsonResponse
|
||||
{
|
||||
$this->verifierProprietaire($fil);
|
||||
abort_unless($fil->classe->chat_actif, 403, 'Le chat est désactivé pour cette classe.');
|
||||
|
||||
$donnees = $request->validate(['contenu' => ['required', 'string', 'max:2000']]);
|
||||
|
||||
// Pas de mise à jour de lu_par_prof_a ici : nonLusPourProf() ne
|
||||
// compte que les messages de l'élève, jamais les siens.
|
||||
$message = $fil->messages()->create([
|
||||
'expediteur' => MessageChat::PROF,
|
||||
'contenu' => $donnees['contenu'],
|
||||
]);
|
||||
|
||||
return response()->json(['id' => $message->id], 201);
|
||||
}
|
||||
|
||||
private function verifierProprietaire(FilConversation $fil): void
|
||||
{
|
||||
abort_if($fil->classe->user_id !== Auth::guard('web')->id(), 403);
|
||||
}
|
||||
}
|
||||
23
portail/app/Http/Controllers/ClasseChatController.php
Normal file
23
portail/app/Http/Controllers/ClasseChatController.php
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\Classe;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
||||
/**
|
||||
* Le prof peut couper le chat élève ↔ prof de sa classe (règle d'Adam,
|
||||
* 2026-10-13).
|
||||
*/
|
||||
class ClasseChatController extends Controller
|
||||
{
|
||||
public function basculer(Classe $classe): RedirectResponse
|
||||
{
|
||||
abort_if($classe->user_id !== Auth::guard('web')->id(), 403);
|
||||
|
||||
$classe->update(['chat_actif' => ! $classe->chat_actif]);
|
||||
|
||||
return redirect()->route('mes-classes.show', $classe);
|
||||
}
|
||||
}
|
||||
|
|
@ -81,7 +81,7 @@ class ClasseController extends Controller
|
|||
|
||||
return view('mes-classes.show', [
|
||||
'classes' => Auth::guard('web')->user()->classes()->withCount('eleves')->orderBy('nom')->get(),
|
||||
'classe' => $classe->load('eleves'),
|
||||
'classe' => $classe->load(['eleves', 'annonces.auteur', 'observations.eleve']),
|
||||
'demandes' => $classe->demandesInscription()->where('statut', DemandeInscription::EN_ATTENTE)->oldest()->get(),
|
||||
'seance' => $seance,
|
||||
'avancement' => $avancement,
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Services\CompteurDevoirsEnAttente;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\View\View;
|
||||
|
||||
|
|
@ -11,6 +12,6 @@ class EleveTableauDeBordController extends Controller
|
|||
{
|
||||
$eleve = Auth::guard('eleve')->user()->load('classe');
|
||||
|
||||
return view('eleve', ['eleve' => $eleve]);
|
||||
return view('eleve', ['eleve' => $eleve, 'badgeMesDevoirs' => CompteurDevoirsEnAttente::pour($eleve)]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
75
portail/app/Http/Controllers/EmploiDuTempsController.php
Normal file
75
portail/app/Http/Controllers/EmploiDuTempsController.php
Normal file
|
|
@ -0,0 +1,75 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\Devoir;
|
||||
use App\Models\Seance;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Support\Collection;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\View\View;
|
||||
|
||||
/**
|
||||
* Emploi du temps (séparation vitrine/application, 2026-10-13) : séances
|
||||
* et échéances de devoirs, réunies et triées par date. Pas d'examens ici
|
||||
* tant qu'aucun modèle d'examen n'existe (CLAUDE.md : pas de ligne vide ni
|
||||
* de donnée inventée).
|
||||
*/
|
||||
class EmploiDuTempsController extends Controller
|
||||
{
|
||||
public function show(): View
|
||||
{
|
||||
if ($prof = Auth::guard('web')->user()) {
|
||||
$classeIds = $prof->classes()->whereNull('archivee_a')->pluck('id');
|
||||
|
||||
$seances = Seance::whereIn('classe_id', $classeIds)
|
||||
->whereIn('statut', [Seance::PLANIFIEE, Seance::SALLE_ATTENTE, Seance::EN_COURS])
|
||||
->whereNotNull('prevue_a')
|
||||
->with(['classe', 'lab'])
|
||||
->get();
|
||||
|
||||
$devoirs = Devoir::whereIn('classe_id', $classeIds)
|
||||
->where('echeance', '>=', now())
|
||||
->with('classe')
|
||||
->get();
|
||||
} else {
|
||||
$eleve = Auth::guard('eleve')->user();
|
||||
|
||||
$seances = $eleve->classe->seances()
|
||||
->whereIn('statut', [Seance::PLANIFIEE, Seance::SALLE_ATTENTE, Seance::EN_COURS])
|
||||
->whereNotNull('prevue_a')
|
||||
->with(['lab', 'classe'])
|
||||
->get();
|
||||
|
||||
$devoirs = $eleve->classe->devoirs()->where('echeance', '>=', now())->get();
|
||||
}
|
||||
|
||||
$evenements = $this->fusionner($seances, $devoirs);
|
||||
|
||||
return view('emploi-du-temps', ['evenements' => $evenements]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Collection<int, Seance> $seances
|
||||
* @param Collection<int, Devoir> $devoirs
|
||||
* @return Collection<int, array{date: ?Carbon, type: string, titre: string, classe: string}>
|
||||
*/
|
||||
private function fusionner(Collection $seances, Collection $devoirs): Collection
|
||||
{
|
||||
$depuisSeances = $seances->map(fn (Seance $s) => [
|
||||
'date' => $s->prevue_a,
|
||||
'type' => 'seance',
|
||||
'titre' => $s->lab->titre,
|
||||
'classe' => $s->classe->nom,
|
||||
]);
|
||||
|
||||
$depuisDevoirs = $devoirs->map(fn (Devoir $d) => [
|
||||
'date' => $d->echeance,
|
||||
'type' => 'devoir',
|
||||
'titre' => $d->titre,
|
||||
'classe' => $d->classe->nom,
|
||||
]);
|
||||
|
||||
return $depuisSeances->concat($depuisDevoirs)->sortBy('date')->values();
|
||||
}
|
||||
}
|
||||
27
portail/app/Http/Controllers/MaClasseController.php
Normal file
27
portail/app/Http/Controllers/MaClasseController.php
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\View\View;
|
||||
|
||||
/**
|
||||
* « Ma classe » (séparation vitrine/application, 2026-10-13) : annonces du
|
||||
* prof, camarades (prénom + initiale, comme partout ailleurs pour les
|
||||
* mineurs), qui est connecté. Jamais de message privé entre élèves —
|
||||
* voir le chat, limité à élève ↔ prof.
|
||||
*/
|
||||
class MaClasseController extends Controller
|
||||
{
|
||||
public function show(): View
|
||||
{
|
||||
$eleve = Auth::guard('eleve')->user();
|
||||
$classe = $eleve->classe()->with(['etablissement', 'annonces.auteur', 'eleves'])->first();
|
||||
|
||||
return view('ma-classe', [
|
||||
'classe' => $classe,
|
||||
'eleve' => $eleve,
|
||||
'camarades' => $classe->eleves,
|
||||
]);
|
||||
}
|
||||
}
|
||||
40
portail/app/Http/Controllers/MesCoursController.php
Normal file
40
portail/app/Http/Controllers/MesCoursController.php
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\Cours;
|
||||
use App\Models\Lab;
|
||||
use App\Models\Seance;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Str;
|
||||
use Illuminate\View\View;
|
||||
|
||||
/**
|
||||
* « Mes cours » (séparation vitrine/application, 2026-10-13) : seulement
|
||||
* les cours des labs déjà pratiqués par la classe, et seulement ceux qui
|
||||
* ont un vrai cours.md (un seul aujourd'hui). Pas de fiche de démonstration
|
||||
* (CLAUDE.md : pas de donnée inventée).
|
||||
*/
|
||||
class MesCoursController extends Controller
|
||||
{
|
||||
public function show(): View
|
||||
{
|
||||
$eleve = Auth::guard('eleve')->user();
|
||||
|
||||
$labIds = Seance::where('classe_id', $eleve->classe_id)->distinct()->pluck('lab_id');
|
||||
|
||||
$identifiants = Lab::whereIn('id', $labIds)->pluck('identifiant');
|
||||
|
||||
$cours = Cours::whereIn('identifiant', $identifiants)->orderBy('titre')->get();
|
||||
|
||||
return view('mes-cours', ['cours' => $cours]);
|
||||
}
|
||||
|
||||
public function montrer(Cours $cours): View
|
||||
{
|
||||
return view('cours-detail', [
|
||||
'cours' => $cours,
|
||||
'html' => Str::markdown($cours->contenu_markdown),
|
||||
]);
|
||||
}
|
||||
}
|
||||
45
portail/app/Http/Controllers/MesDevoirsController.php
Normal file
45
portail/app/Http/Controllers/MesDevoirsController.php
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\Seance;
|
||||
use App\Models\SessionQuiz;
|
||||
use App\Services\CompteurDevoirsEnAttente;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\View\View;
|
||||
|
||||
/**
|
||||
* « Mes devoirs » (séparation vitrine/application, 2026-10-13) : devoirs
|
||||
* maison réels, QCM en direct si une session de quiz tourne, TP joignables
|
||||
* via une séance ouverte par le prof. Pas de TD assigné : ce type n'existe
|
||||
* pas encore comme devoir (CLAUDE.md : pas de donnée inventée).
|
||||
*/
|
||||
class MesDevoirsController extends Controller
|
||||
{
|
||||
public function show(): View
|
||||
{
|
||||
$eleve = Auth::guard('eleve')->user()->load('classe');
|
||||
|
||||
$devoirs = $eleve->classe->devoirs()
|
||||
->where('echeance', '>=', now()->subDays(7))
|
||||
->with(['rendus' => fn ($q) => $q->where('eleve_id', $eleve->id)])
|
||||
->get();
|
||||
|
||||
$seancesOuvertes = $eleve->classe->seances()
|
||||
->whereIn('statut', [Seance::SALLE_ATTENTE, Seance::EN_COURS])
|
||||
->with('lab')
|
||||
->get();
|
||||
|
||||
$sessionQuiz = SessionQuiz::whereHas('quiz', fn ($q) => $q->where('classe_id', $eleve->classe_id))
|
||||
->whereIn('statut', [SessionQuiz::EN_ATTENTE, SessionQuiz::EN_COURS])
|
||||
->latest()
|
||||
->first();
|
||||
|
||||
return view('mes-devoirs', [
|
||||
'devoirs' => $devoirs,
|
||||
'seancesOuvertes' => $seancesOuvertes,
|
||||
'sessionQuiz' => $sessionQuiz,
|
||||
'nombreEnAttente' => CompteurDevoirsEnAttente::pour($eleve),
|
||||
]);
|
||||
}
|
||||
}
|
||||
71
portail/app/Http/Controllers/MesNotesController.php
Normal file
71
portail/app/Http/Controllers/MesNotesController.php
Normal file
|
|
@ -0,0 +1,71 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\Correction;
|
||||
use App\Models\RenduDevoir;
|
||||
use Illuminate\Support\Collection;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\View\View;
|
||||
|
||||
/**
|
||||
* « Mes notes » (séparation vitrine/application, 2026-10-13) : notes des
|
||||
* devoirs maison et des labs, groupées par compétence quand le lab en a
|
||||
* (lab.yaml, jamais lu jusqu'ici). « Sans compétence associée » sinon —
|
||||
* jamais de taux inventé.
|
||||
*/
|
||||
class MesNotesController extends Controller
|
||||
{
|
||||
public function show(): View
|
||||
{
|
||||
$eleve = Auth::guard('eleve')->user();
|
||||
|
||||
$notesDevoirs = RenduDevoir::where('eleve_id', $eleve->id)
|
||||
->whereNotNull('note')
|
||||
->with('devoir')
|
||||
->get()
|
||||
->map(fn (RenduDevoir $r) => [
|
||||
'titre' => $r->devoir->titre,
|
||||
'note' => (int) $r->note,
|
||||
'note_max' => 20,
|
||||
'competences' => [],
|
||||
]);
|
||||
|
||||
$notesLabs = Correction::whereHas('labSession', fn ($q) => $q->where('eleve_id', $eleve->id))
|
||||
->with('labSession.lab')
|
||||
->get()
|
||||
->map(fn (Correction $c) => [
|
||||
'titre' => $c->labSession->lab->titre,
|
||||
'note' => $c->note,
|
||||
'note_max' => $c->note_max,
|
||||
'competences' => $c->labSession->lab->competences ?? [],
|
||||
]);
|
||||
|
||||
$notes = $notesDevoirs->concat($notesLabs);
|
||||
|
||||
return view('mes-notes', ['notes' => $notes, 'parCompetence' => $this->grouperParCompetence($notes)]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param Collection<int, array{titre: string, note: int, note_max: int, competences: array<int, string>}> $notes
|
||||
* @return Collection<string, array{moyenne: int, nombre: int}>
|
||||
*/
|
||||
private function grouperParCompetence(Collection $notes): Collection
|
||||
{
|
||||
$parCompetence = [];
|
||||
|
||||
foreach ($notes as $note) {
|
||||
$competences = $note['competences'] ?: ['Sans compétence associée'];
|
||||
$taux = $note['note_max'] > 0 ? $note['note'] / $note['note_max'] * 100 : 0;
|
||||
|
||||
foreach ($competences as $competence) {
|
||||
$parCompetence[$competence][] = $taux;
|
||||
}
|
||||
}
|
||||
|
||||
return collect($parCompetence)->map(fn (array $taux) => [
|
||||
'moyenne' => (int) round(array_sum($taux) / count($taux)),
|
||||
'nombre' => count($taux),
|
||||
]);
|
||||
}
|
||||
}
|
||||
47
portail/app/Http/Controllers/ObservationController.php
Normal file
47
portail/app/Http/Controllers/ObservationController.php
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\Classe;
|
||||
use App\Models\Observation;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
||||
/**
|
||||
* Observations : notes rapides du prof sur un élève, pour le conseil de
|
||||
* classe (chantier « vrai cockpit », dernière fonction fictive du tableau
|
||||
* de bord démo). Jamais montrées à l'élève.
|
||||
*/
|
||||
class ObservationController extends Controller
|
||||
{
|
||||
public function store(Request $request, Classe $classe): RedirectResponse
|
||||
{
|
||||
$this->verifierProprietaire($classe);
|
||||
|
||||
$donnees = $request->validate([
|
||||
'eleve_id' => ['required', 'integer'],
|
||||
'contenu' => ['required', 'string', 'max:2000'],
|
||||
]);
|
||||
$classe->eleves()->findOrFail($donnees['eleve_id']);
|
||||
|
||||
$classe->observations()->create([...$donnees, 'user_id' => Auth::guard('web')->id()]);
|
||||
|
||||
return redirect()->route('mes-classes.show', $classe);
|
||||
}
|
||||
|
||||
public function destroy(Classe $classe, Observation $observation): RedirectResponse
|
||||
{
|
||||
$this->verifierProprietaire($classe);
|
||||
abort_if($observation->classe_id !== $classe->id, 404);
|
||||
|
||||
$observation->delete();
|
||||
|
||||
return redirect()->route('mes-classes.show', $classe);
|
||||
}
|
||||
|
||||
private function verifierProprietaire(Classe $classe): void
|
||||
{
|
||||
abort_if($classe->user_id !== Auth::guard('web')->id(), 403);
|
||||
}
|
||||
}
|
||||
45
portail/app/Http/Controllers/ParametresController.php
Normal file
45
portail/app/Http/Controllers/ParametresController.php
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\Eleve;
|
||||
use App\Models\User;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\View\View;
|
||||
|
||||
/**
|
||||
* Thème clair/sombre et taille du texte (séparation vitrine/application,
|
||||
* 2026-10-13) : un réglage réel, appliqué immédiatement, pas de données
|
||||
* inventées.
|
||||
*/
|
||||
class ParametresController extends Controller
|
||||
{
|
||||
public function show(): View
|
||||
{
|
||||
$compte = $this->compteConnecte();
|
||||
|
||||
return view('parametres', [
|
||||
'theme' => $compte->preferenceTheme(),
|
||||
'tailleTexte' => $compte->preferenceTailleTexte(),
|
||||
]);
|
||||
}
|
||||
|
||||
public function update(Request $request): RedirectResponse
|
||||
{
|
||||
$donnees = $request->validate([
|
||||
'theme' => ['required', 'in:'.implode(',', User::THEMES)],
|
||||
'taille_texte' => ['required', 'in:'.implode(',', User::TAILLES_TEXTE)],
|
||||
]);
|
||||
|
||||
$this->compteConnecte()->definirPreferences($donnees['theme'], $donnees['taille_texte']);
|
||||
|
||||
return back()->with('parametres_enregistres', true);
|
||||
}
|
||||
|
||||
private function compteConnecte(): User|Eleve
|
||||
{
|
||||
return Auth::guard('web')->user() ?? Auth::guard('eleve')->user();
|
||||
}
|
||||
}
|
||||
36
portail/app/Http/Controllers/ProfilController.php
Normal file
36
portail/app/Http/Controllers/ProfilController.php
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\View\View;
|
||||
|
||||
/**
|
||||
* « Mon profil » du menu avatar (séparation vitrine/application,
|
||||
* 2026-10-13) : une seule page, pour un prof ou un élève connecté.
|
||||
*/
|
||||
class ProfilController extends Controller
|
||||
{
|
||||
public function show(): View
|
||||
{
|
||||
if ($prof = Auth::guard('web')->user()) {
|
||||
return view('profil', [
|
||||
'role' => 'prof',
|
||||
'nom' => $prof->name,
|
||||
'email' => $prof->email,
|
||||
'etablissement' => $prof->etablissement,
|
||||
'classes' => $prof->classes()->whereNull('archivee_a')->orderBy('nom')->get(),
|
||||
]);
|
||||
}
|
||||
|
||||
$eleve = Auth::guard('eleve')->user()->load('classe.etablissement');
|
||||
|
||||
return view('profil', [
|
||||
'role' => 'eleve',
|
||||
'nom' => $eleve->nomAffiche(),
|
||||
'identifiant' => $eleve->identifiant,
|
||||
'etablissement' => $eleve->classe->etablissement,
|
||||
'classes' => collect([$eleve->classe]),
|
||||
]);
|
||||
}
|
||||
}
|
||||
51
portail/app/Http/Controllers/RaccourciController.php
Normal file
51
portail/app/Http/Controllers/RaccourciController.php
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\Eleve;
|
||||
use App\Models\Raccourci;
|
||||
use App\Models\User;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
||||
/**
|
||||
* « Mes raccourcis » dans la barre latérale (séparation vitrine/application,
|
||||
* 2026-10-13) : le prof ou l'élève épingle une page qu'il visite déjà.
|
||||
*/
|
||||
class RaccourciController extends Controller
|
||||
{
|
||||
public function store(Request $request): RedirectResponse
|
||||
{
|
||||
$donnees = $request->validate([
|
||||
'label' => ['required', 'string', 'max:80'],
|
||||
'url' => ['required', 'string', 'max:500'],
|
||||
]);
|
||||
|
||||
$compte = Auth::guard('web')->user() ?? Auth::guard('eleve')->user();
|
||||
$ordre = Raccourci::when($compte instanceof User, fn ($q) => $q->where('user_id', $compte->id))
|
||||
->when($compte instanceof Eleve, fn ($q) => $q->where('eleve_id', $compte->id))
|
||||
->max('ordre');
|
||||
|
||||
Raccourci::create([
|
||||
'user_id' => $compte instanceof User ? $compte->id : null,
|
||||
'eleve_id' => $compte instanceof Eleve ? $compte->id : null,
|
||||
'label' => $donnees['label'],
|
||||
'url' => $donnees['url'],
|
||||
'ordre' => ($ordre ?? 0) + 1,
|
||||
]);
|
||||
|
||||
return back()->with('raccourci_ajoute', true);
|
||||
}
|
||||
|
||||
public function destroy(Raccourci $raccourci): RedirectResponse
|
||||
{
|
||||
$compte = Auth::guard('web')->user() ?? Auth::guard('eleve')->user();
|
||||
$proprietaire = $compte instanceof User ? $raccourci->user_id === $compte->id : $raccourci->eleve_id === $compte->id;
|
||||
abort_unless($proprietaire, 403);
|
||||
|
||||
$raccourci->delete();
|
||||
|
||||
return back();
|
||||
}
|
||||
}
|
||||
40
portail/app/Http/Controllers/ResultatsController.php
Normal file
40
portail/app/Http/Controllers/ResultatsController.php
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\Classe;
|
||||
use App\Models\Correction;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\View\View;
|
||||
|
||||
/**
|
||||
* « Résultats » (séparation vitrine/application, 2026-10-13) : vue
|
||||
* d'ensemble, par classe, des corrections et des observations. Le détail
|
||||
* séance par séance reste dans le cockpit de chaque classe.
|
||||
*/
|
||||
class ResultatsController extends Controller
|
||||
{
|
||||
public function show(): View
|
||||
{
|
||||
$prof = Auth::guard('web')->user();
|
||||
$classes = $prof->classes()->whereNull('archivee_a')->orderBy('nom')->get();
|
||||
|
||||
$resultats = $classes->map(function (Classe $classe) {
|
||||
$corrections = Correction::whereHas('labSession', fn ($q) => $q->whereIn('seance_id', $classe->seances()->select('id')))
|
||||
->latest()
|
||||
->limit(50)
|
||||
->get();
|
||||
|
||||
return [
|
||||
'classe' => $classe,
|
||||
'nombreCorrections' => $corrections->count(),
|
||||
'reussiteMoyenne' => $corrections->isNotEmpty()
|
||||
? (int) round($corrections->avg(fn ($c) => $c->note_max > 0 ? $c->note / $c->note_max * 100 : 0))
|
||||
: null,
|
||||
'observations' => $classe->observations()->with('eleve')->limit(5)->get(),
|
||||
];
|
||||
});
|
||||
|
||||
return view('resultats', ['resultats' => $resultats]);
|
||||
}
|
||||
}
|
||||
28
portail/app/Http/Controllers/SeancesEnDirectController.php
Normal file
28
portail/app/Http/Controllers/SeancesEnDirectController.php
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\Seance;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\View\View;
|
||||
|
||||
/**
|
||||
* Vue transverse de toutes les classes du prof (séparation vitrine/
|
||||
* application, 2026-10-13) : avant, il fallait ouvrir chaque classe pour
|
||||
* savoir où une séance était en cours.
|
||||
*/
|
||||
class SeancesEnDirectController extends Controller
|
||||
{
|
||||
public function show(): View
|
||||
{
|
||||
$prof = Auth::guard('web')->user();
|
||||
$classeIds = $prof->classes()->whereNull('archivee_a')->pluck('id');
|
||||
|
||||
$seances = Seance::whereIn('classe_id', $classeIds)
|
||||
->whereIn('statut', [Seance::SALLE_ATTENTE, Seance::EN_COURS])
|
||||
->with(['classe', 'lab'])
|
||||
->get();
|
||||
|
||||
return view('seances-en-direct', ['seances' => $seances]);
|
||||
}
|
||||
}
|
||||
37
portail/app/Http/Controllers/SignalementController.php
Normal file
37
portail/app/Http/Controllers/SignalementController.php
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\Eleve;
|
||||
use App\Models\Signalement;
|
||||
use App\Models\User;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
||||
/**
|
||||
* « Signaler un problème » du menu avatar (séparation vitrine/application,
|
||||
* 2026-10-13) : juste enregistré, relu par Adam — pas de traitement
|
||||
* automatique, pas de ticket inventé.
|
||||
*/
|
||||
class SignalementController extends Controller
|
||||
{
|
||||
public function store(Request $request): RedirectResponse
|
||||
{
|
||||
$donnees = $request->validate([
|
||||
'message' => ['required', 'string', 'max:2000'],
|
||||
'page_url' => ['nullable', 'string', 'max:500'],
|
||||
]);
|
||||
|
||||
$compte = Auth::guard('web')->user() ?? Auth::guard('eleve')->user();
|
||||
|
||||
Signalement::create([
|
||||
'user_id' => $compte instanceof User ? $compte->id : null,
|
||||
'eleve_id' => $compte instanceof Eleve ? $compte->id : null,
|
||||
'page_url' => $donnees['page_url'] ?? null,
|
||||
'message' => $donnees['message'],
|
||||
]);
|
||||
|
||||
return back()->with('signalement_envoye', true);
|
||||
}
|
||||
}
|
||||
26
portail/app/Http/Middleware/MetAJourActivite.php
Normal file
26
portail/app/Http/Middleware/MetAJourActivite.php
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Middleware;
|
||||
|
||||
use Closure;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
|
||||
/**
|
||||
* « Qui est connecté » dans Ma classe (séparation vitrine/application,
|
||||
* 2026-10-13) : une seule écriture par minute, pas à chaque requête.
|
||||
*/
|
||||
class MetAJourActivite
|
||||
{
|
||||
public function handle(Request $request, Closure $next): Response
|
||||
{
|
||||
$eleve = Auth::guard('eleve')->user();
|
||||
|
||||
if ($eleve !== null && (! $eleve->derniere_activite_a || $eleve->derniere_activite_a->lt(now()->subMinute()))) {
|
||||
$eleve->forceFill(['derniere_activite_a' => now()])->save();
|
||||
}
|
||||
|
||||
return $next($request);
|
||||
}
|
||||
}
|
||||
23
portail/app/Models/Annonce.php
Normal file
23
portail/app/Models/Annonce.php
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
|
||||
class Annonce extends Model
|
||||
{
|
||||
protected $fillable = ['classe_id', 'user_id', 'titre', 'contenu'];
|
||||
|
||||
/** @return BelongsTo<Classe, $this> */
|
||||
public function classe(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(Classe::class);
|
||||
}
|
||||
|
||||
/** @return BelongsTo<User, $this> */
|
||||
public function auteur(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(User::class, 'user_id');
|
||||
}
|
||||
}
|
||||
|
|
@ -15,10 +15,11 @@ class Classe extends Model
|
|||
/** @use HasFactory<ClasseFactory> */
|
||||
use HasFactory;
|
||||
|
||||
protected $fillable = ['etablissement_id', 'user_id', 'nom', 'formation', 'code_classe'];
|
||||
protected $fillable = ['etablissement_id', 'user_id', 'nom', 'formation', 'code_classe', 'chat_actif'];
|
||||
|
||||
protected $casts = [
|
||||
'archivee_a' => 'datetime',
|
||||
'chat_actif' => 'boolean',
|
||||
];
|
||||
|
||||
protected static function booted(): void
|
||||
|
|
@ -79,6 +80,24 @@ class Classe extends Model
|
|||
return $this->hasMany(Devoir::class)->latest('echeance');
|
||||
}
|
||||
|
||||
/** @return HasMany<Annonce, $this> */
|
||||
public function annonces(): HasMany
|
||||
{
|
||||
return $this->hasMany(Annonce::class)->latest();
|
||||
}
|
||||
|
||||
/** @return HasMany<Observation, $this> */
|
||||
public function observations(): HasMany
|
||||
{
|
||||
return $this->hasMany(Observation::class)->latest();
|
||||
}
|
||||
|
||||
/** @return HasMany<FilConversation, $this> */
|
||||
public function filsConversation(): HasMany
|
||||
{
|
||||
return $this->hasMany(FilConversation::class);
|
||||
}
|
||||
|
||||
public function estArchivee(): bool
|
||||
{
|
||||
return $this->archivee_a !== null;
|
||||
|
|
|
|||
29
portail/app/Models/Concerns/GerePreferences.php
Normal file
29
portail/app/Models/Concerns/GerePreferences.php
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
<?php
|
||||
|
||||
namespace App\Models\Concerns;
|
||||
|
||||
/**
|
||||
* Thème (clair/sombre/système) et taille du texte, pour le menu
|
||||
* Paramètres de la barre du haut — partagé entre User et Eleve.
|
||||
*/
|
||||
trait GerePreferences
|
||||
{
|
||||
public const THEMES = ['clair', 'sombre', 'systeme'];
|
||||
|
||||
public const TAILLES_TEXTE = ['normal', 'grand'];
|
||||
|
||||
public function preferenceTheme(): string
|
||||
{
|
||||
return $this->preferences['theme'] ?? 'systeme';
|
||||
}
|
||||
|
||||
public function preferenceTailleTexte(): string
|
||||
{
|
||||
return $this->preferences['taille_texte'] ?? 'normal';
|
||||
}
|
||||
|
||||
public function definirPreferences(string $theme, string $tailleTexte): void
|
||||
{
|
||||
$this->forceFill(['preferences' => ['theme' => $theme, 'taille_texte' => $tailleTexte]])->save();
|
||||
}
|
||||
}
|
||||
14
portail/app/Models/Cours.php
Normal file
14
portail/app/Models/Cours.php
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
/**
|
||||
* Cours.md de paillasse-contenus/ (cours:synchroniser), lié au lab de même
|
||||
* identifiant. « Mes cours » ne montre que les séquences qui en ont un.
|
||||
*/
|
||||
class Cours extends Model
|
||||
{
|
||||
protected $fillable = ['identifiant', 'titre', 'contenu_markdown'];
|
||||
}
|
||||
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
namespace App\Models;
|
||||
|
||||
use App\Models\Concerns\GerePreferences;
|
||||
use App\Models\Concerns\GereSessionUnique;
|
||||
use Database\Factories\EleveFactory;
|
||||
use Illuminate\Auth\Authenticatable;
|
||||
|
|
@ -10,11 +11,12 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
|
|||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||
use Illuminate\Database\Eloquent\Relations\HasOne;
|
||||
|
||||
class Eleve extends Model implements AuthenticatableContract
|
||||
{
|
||||
/** @use HasFactory<EleveFactory> */
|
||||
use Authenticatable, GereSessionUnique, HasFactory;
|
||||
use Authenticatable, GerePreferences, GereSessionUnique, HasFactory;
|
||||
|
||||
protected $fillable = ['classe_id', 'prenom', 'nom', 'identifiant', 'code_secret', 'jeton_qr'];
|
||||
|
||||
|
|
@ -22,8 +24,19 @@ class Eleve extends Model implements AuthenticatableContract
|
|||
|
||||
protected $casts = [
|
||||
'derniere_connexion_a' => 'datetime',
|
||||
'derniere_activite_a' => 'datetime',
|
||||
'preferences' => 'array',
|
||||
];
|
||||
|
||||
/**
|
||||
* En ligne : une requête authentifiée dans les 3 dernières minutes
|
||||
* (middleware MetAJourActivite) — pas une vraie présence temps réel.
|
||||
*/
|
||||
public function estEnLigne(): bool
|
||||
{
|
||||
return $this->derniere_activite_a !== null && $this->derniere_activite_a->gt(now()->subMinutes(3));
|
||||
}
|
||||
|
||||
public function getAuthPasswordName(): string
|
||||
{
|
||||
return 'code_secret';
|
||||
|
|
@ -41,6 +54,18 @@ class Eleve extends Model implements AuthenticatableContract
|
|||
return $this->hasMany(LabSession::class);
|
||||
}
|
||||
|
||||
/** @return HasMany<Raccourci, $this> */
|
||||
public function raccourcis(): HasMany
|
||||
{
|
||||
return $this->hasMany(Raccourci::class)->orderBy('ordre');
|
||||
}
|
||||
|
||||
/** @return HasOne<FilConversation, $this> */
|
||||
public function filConversation(): HasOne
|
||||
{
|
||||
return $this->hasOne(FilConversation::class);
|
||||
}
|
||||
|
||||
public function nomAffiche(): string
|
||||
{
|
||||
return $this->nom
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ class Etablissement extends Model
|
|||
/** @use HasFactory<EtablissementFactory> */
|
||||
use HasFactory;
|
||||
|
||||
protected $fillable = ['nom', 'ville', 'uai'];
|
||||
protected $fillable = ['nom', 'ville', 'uai', 'url_ent'];
|
||||
|
||||
/** @return HasMany<User, $this> */
|
||||
public function profs(): HasMany
|
||||
|
|
|
|||
57
portail/app/Models/FilConversation.php
Normal file
57
portail/app/Models/FilConversation.php
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||
|
||||
/**
|
||||
* Chat Messenger élève ↔ prof de sa classe (règles d'Adam, 2026-10-13) :
|
||||
* un seul fil par élève, jamais de message privé entre élèves.
|
||||
*/
|
||||
class FilConversation extends Model
|
||||
{
|
||||
protected $table = 'fils_conversation';
|
||||
|
||||
protected $fillable = ['classe_id', 'eleve_id', 'lu_par_prof_a', 'lu_par_eleve_a'];
|
||||
|
||||
protected $casts = [
|
||||
'lu_par_prof_a' => 'datetime',
|
||||
'lu_par_eleve_a' => 'datetime',
|
||||
];
|
||||
|
||||
/** @return BelongsTo<Classe, $this> */
|
||||
public function classe(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(Classe::class);
|
||||
}
|
||||
|
||||
/** @return BelongsTo<Eleve, $this> */
|
||||
public function eleve(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(Eleve::class);
|
||||
}
|
||||
|
||||
/** @return HasMany<MessageChat, $this> */
|
||||
public function messages(): HasMany
|
||||
{
|
||||
return $this->hasMany(MessageChat::class)->orderBy('created_at');
|
||||
}
|
||||
|
||||
public function nonLusPourProf(): int
|
||||
{
|
||||
return $this->messages()
|
||||
->where('expediteur', MessageChat::ELEVE)
|
||||
->when($this->lu_par_prof_a, fn ($q) => $q->where('created_at', '>', $this->lu_par_prof_a))
|
||||
->count();
|
||||
}
|
||||
|
||||
public function nonLusPourEleve(): int
|
||||
{
|
||||
return $this->messages()
|
||||
->where('expediteur', MessageChat::PROF)
|
||||
->when($this->lu_par_eleve_a, fn ($q) => $q->where('created_at', '>', $this->lu_par_eleve_a))
|
||||
->count();
|
||||
}
|
||||
}
|
||||
|
|
@ -7,12 +7,19 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
|
|||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||
|
||||
/**
|
||||
* @property-read array<int, string> $competences
|
||||
*/
|
||||
class Lab extends Model
|
||||
{
|
||||
/** @use HasFactory<LabFactory> */
|
||||
use HasFactory;
|
||||
|
||||
protected $fillable = ['identifiant', 'titre', 'niveau', 'duree_min'];
|
||||
protected $fillable = ['identifiant', 'titre', 'niveau', 'duree_min', 'competences'];
|
||||
|
||||
protected $casts = [
|
||||
'competences' => 'array',
|
||||
];
|
||||
|
||||
/** @return HasMany<Seance, $this> */
|
||||
public function seances(): HasMany
|
||||
|
|
|
|||
23
portail/app/Models/MessageChat.php
Normal file
23
portail/app/Models/MessageChat.php
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
|
||||
class MessageChat extends Model
|
||||
{
|
||||
public const PROF = 'prof';
|
||||
|
||||
public const ELEVE = 'eleve';
|
||||
|
||||
protected $table = 'messages_chat';
|
||||
|
||||
protected $fillable = ['fil_conversation_id', 'expediteur', 'contenu'];
|
||||
|
||||
/** @return BelongsTo<FilConversation, $this> */
|
||||
public function fil(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(FilConversation::class, 'fil_conversation_id');
|
||||
}
|
||||
}
|
||||
34
portail/app/Models/Observation.php
Normal file
34
portail/app/Models/Observation.php
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
|
||||
/**
|
||||
* Note rapide du prof sur un élève, pour le conseil de classe (chantier
|
||||
* « vrai cockpit », visible dans « Résultats »). Jamais montrée à l'élève
|
||||
* ni à ses camarades.
|
||||
*/
|
||||
class Observation extends Model
|
||||
{
|
||||
protected $fillable = ['classe_id', 'eleve_id', 'user_id', 'contenu'];
|
||||
|
||||
/** @return BelongsTo<Classe, $this> */
|
||||
public function classe(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(Classe::class);
|
||||
}
|
||||
|
||||
/** @return BelongsTo<Eleve, $this> */
|
||||
public function eleve(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(Eleve::class);
|
||||
}
|
||||
|
||||
/** @return BelongsTo<User, $this> */
|
||||
public function auteur(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(User::class, 'user_id');
|
||||
}
|
||||
}
|
||||
23
portail/app/Models/Raccourci.php
Normal file
23
portail/app/Models/Raccourci.php
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
|
||||
class Raccourci extends Model
|
||||
{
|
||||
protected $fillable = ['user_id', 'eleve_id', 'label', 'url', 'ordre'];
|
||||
|
||||
/** @return BelongsTo<User, $this> */
|
||||
public function user(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(User::class);
|
||||
}
|
||||
|
||||
/** @return BelongsTo<Eleve, $this> */
|
||||
public function eleve(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(Eleve::class);
|
||||
}
|
||||
}
|
||||
23
portail/app/Models/Signalement.php
Normal file
23
portail/app/Models/Signalement.php
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
|
||||
class Signalement extends Model
|
||||
{
|
||||
protected $fillable = ['user_id', 'eleve_id', 'page_url', 'message'];
|
||||
|
||||
/** @return BelongsTo<User, $this> */
|
||||
public function user(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(User::class);
|
||||
}
|
||||
|
||||
/** @return BelongsTo<Eleve, $this> */
|
||||
public function eleve(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(Eleve::class);
|
||||
}
|
||||
}
|
||||
|
|
@ -3,6 +3,7 @@
|
|||
namespace App\Models;
|
||||
|
||||
// use Illuminate\Contracts\Auth\MustVerifyEmail;
|
||||
use App\Models\Concerns\GerePreferences;
|
||||
use App\Models\Concerns\GereSessionUnique;
|
||||
use Database\Factories\UserFactory;
|
||||
use Illuminate\Database\Eloquent\Attributes\Fillable;
|
||||
|
|
@ -18,7 +19,7 @@ use Illuminate\Notifications\Notifiable;
|
|||
class User extends Authenticatable
|
||||
{
|
||||
/** @use HasFactory<UserFactory> */
|
||||
use GereSessionUnique, HasFactory, Notifiable;
|
||||
use GerePreferences, GereSessionUnique, HasFactory, Notifiable;
|
||||
|
||||
/**
|
||||
* Get the attributes that should be cast.
|
||||
|
|
@ -30,6 +31,7 @@ class User extends Authenticatable
|
|||
return [
|
||||
'email_verified_at' => 'datetime',
|
||||
'password' => 'hashed',
|
||||
'preferences' => 'array',
|
||||
];
|
||||
}
|
||||
|
||||
|
|
@ -44,4 +46,10 @@ class User extends Authenticatable
|
|||
{
|
||||
return $this->hasMany(Classe::class);
|
||||
}
|
||||
|
||||
/** @return HasMany<Raccourci, $this> */
|
||||
public function raccourcis(): HasMany
|
||||
{
|
||||
return $this->hasMany(Raccourci::class)->orderBy('ordre');
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,11 @@
|
|||
|
||||
namespace App\Providers;
|
||||
|
||||
use App\Models\Eleve;
|
||||
use App\Models\User;
|
||||
use App\Services\CompteurDevoirsEnAttente;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\View;
|
||||
use Illuminate\Support\ServiceProvider;
|
||||
|
||||
class AppServiceProvider extends ServiceProvider
|
||||
|
|
@ -19,6 +24,20 @@ class AppServiceProvider extends ServiceProvider
|
|||
*/
|
||||
public function boot(): void
|
||||
{
|
||||
//
|
||||
// Coquille de l'application (layouts/app) : variables communes à
|
||||
// la barre du haut et à la barre latérale, pour qu'aucun contrôleur
|
||||
// n'ait à les repasser (séparation vitrine/application, 2026-10-13).
|
||||
View::composer('layouts.app', function ($vue): void {
|
||||
$prof = Auth::guard('web')->user();
|
||||
$compte = $prof ?? Auth::guard('eleve')->user();
|
||||
|
||||
$vue->with([
|
||||
'compte' => $compte,
|
||||
'estProf' => $compte instanceof User,
|
||||
'nomAffiche' => $compte instanceof Eleve ? $compte->nomAffiche() : $compte->name,
|
||||
'raccourcis' => $compte->raccourcis,
|
||||
'badgeMesDevoirs' => $compte instanceof Eleve ? CompteurDevoirsEnAttente::pour($compte) : 0,
|
||||
]);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
|||
33
portail/app/Services/CompteurDevoirsEnAttente.php
Normal file
33
portail/app/Services/CompteurDevoirsEnAttente.php
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
<?php
|
||||
|
||||
namespace App\Services;
|
||||
|
||||
use App\Models\Eleve;
|
||||
use App\Models\Seance;
|
||||
use App\Models\SessionQuiz;
|
||||
|
||||
/**
|
||||
* Nombre affiché sur le badge « Mes devoirs » (barre latérale et onglet
|
||||
* mobile) : devoirs non rendus avant échéance, séances ouvertes, quiz en
|
||||
* cours — partagé entre MesDevoirsController et le composeur de la barre.
|
||||
*/
|
||||
class CompteurDevoirsEnAttente
|
||||
{
|
||||
public static function pour(Eleve $eleve): int
|
||||
{
|
||||
$devoirsEnAttente = $eleve->classe->devoirs()
|
||||
->where('echeance', '>=', now())
|
||||
->whereDoesntHave('rendus', fn ($q) => $q->where('eleve_id', $eleve->id))
|
||||
->count();
|
||||
|
||||
$seancesOuvertes = $eleve->classe->seances()
|
||||
->whereIn('statut', [Seance::SALLE_ATTENTE, Seance::EN_COURS])
|
||||
->count();
|
||||
|
||||
$quizEnCours = SessionQuiz::whereHas('quiz', fn ($q) => $q->where('classe_id', $eleve->classe_id))
|
||||
->whereIn('statut', [SessionQuiz::EN_ATTENTE, SessionQuiz::EN_COURS])
|
||||
->exists();
|
||||
|
||||
return $devoirsEnAttente + $seancesOuvertes + ($quizEnCours ? 1 : 0);
|
||||
}
|
||||
}
|
||||
|
|
@ -21,6 +21,9 @@ class DefinitionLab
|
|||
|
||||
public readonly ?int $dureeMin;
|
||||
|
||||
/** @var array<int, string> */
|
||||
public readonly array $competences;
|
||||
|
||||
/** @var array<int, array{nom: string, cidr: string}> */
|
||||
public readonly array $reseaux;
|
||||
|
||||
|
|
@ -71,6 +74,7 @@ class DefinitionLab
|
|||
$this->titre = $donnees['titre'];
|
||||
$this->niveau = $donnees['niveau'] ?? null;
|
||||
$this->dureeMin = $donnees['duree_min'] ?? null;
|
||||
$this->competences = $donnees['competences'] ?? [];
|
||||
$this->reseaux = $donnees['reseaux'];
|
||||
$this->machines = array_map(
|
||||
fn (array $m) => [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue