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
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');
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue