From ec76ca981a37c35a967b3711c2211c6476e1af9d Mon Sep 17 00:00:00 2001 From: Giovanni-Josserand Date: Thu, 19 Mar 2026 18:01:55 +0100 Subject: [PATCH] add information in notifications --- app/Http/Controllers/TasksController.php | 12 ++++++------ app/Http/Controllers/UserController.php | 5 +++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/TasksController.php b/app/Http/Controllers/TasksController.php index c5b7936..e08bd52 100644 --- a/app/Http/Controllers/TasksController.php +++ b/app/Http/Controllers/TasksController.php @@ -99,14 +99,14 @@ class TasksController extends Controller $task->users()->attach($id); $notification = Notification::create([ - 'content' => "Vous avez été assigné à la tâche {$task->name} de l'événement {$task->event->name}." + 'content' => "Vous avez été assigné à la tâche {$task->name} de l'événement {$event->name}." ]); $notification->users()->attach($user->id); broadcast(new VolunteerAssignedToTask( $user->id, $task, - $event + $event, )); $data = [ @@ -161,7 +161,7 @@ class TasksController extends Controller if (Carbon::now()->lessThanOrEqualTo($task->end)) { if ($participants->isNotEmpty()) { $notification = Notification::create([ - 'content' => "La tâche '{$task->name}' pour l'événement '{$task->event->name}' a été supprimée. Vous n'y participez donc plus." + 'content' => "La tâche '{$task->name}' pour l'événement '{$event->name}' a été supprimée. Vous n'y participez donc plus." ]); $notification->users()->attach($participants->pluck('id')); } @@ -170,7 +170,7 @@ class TasksController extends Controller broadcast(new TaskParticipationCancelled( $user->id, $task, - $event + $event, )); $data = [ @@ -299,13 +299,13 @@ class TasksController extends Controller if ($user && Carbon::now()->lessThanOrEqualTo($task->end)) { $task->users()->detach($id); $notification = Notification::create([ - 'content' => "Vous avez été désassigné de la tâche {$task->name} de l'événement {$task->event->name}." + 'content' => "Vous avez été désassigné de la tâche {$task->name} de l'événement {$event->name}." ]); $notification->users()->attach($user->id); broadcast(new VolunteerUnassignedFromTask( $user->id, $task, - $event + $event, )); $data = [ diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index f58ba6b..58e6772 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -12,6 +12,7 @@ use App\Mail\UpdateRoleMail; use App\Mail\ValidateMail; use App\Models\Notification; use App\Models\User; +use App\Services\GetRole; use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; @@ -253,10 +254,10 @@ class UserController extends Controller $user->role = $request['role']; $user->save(); - $role = \App\Services\GetRole::getRole($request['role']); + $role = GetRole::getRole($request['role']); $notification = Notification::create([ - 'content' => "Votre rôle à changé pour : {$role} !", + 'content' => "Votre rôle à changé pour : {$role}", ]); $notification->users()->attach($user->id);