remove spaces
This commit is contained in:
@@ -155,12 +155,12 @@ class TasksController extends Controller
|
|||||||
$event = Event::findOrFail($task->events_id);
|
$event = Event::findOrFail($task->events_id);
|
||||||
|
|
||||||
Notification::send($task->users, new TaskDateUpdated(
|
Notification::send($task->users, new TaskDateUpdated(
|
||||||
task: $task,
|
task: $task,
|
||||||
event: $event,
|
event: $event,
|
||||||
oldStart: FormatDate::formatDate($task->start),
|
oldStart: FormatDate::formatDate($task->start),
|
||||||
oldEnd: FormatDate::formatDate($task->end),
|
oldEnd: FormatDate::formatDate($task->end),
|
||||||
newStart: FormatDate::formatDate($request['start']),
|
newStart: FormatDate::formatDate($request['start']),
|
||||||
newEnd: FormatDate::formatDate($request['end']),
|
newEnd: FormatDate::formatDate($request['end']),
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -43,13 +43,13 @@ class TaskDateUpdated extends Notification implements ShouldBroadcast
|
|||||||
public function toDatabase($notifiable): array
|
public function toDatabase($notifiable): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'message' => "La date de la tâche {$this->task->name} de l'événement {$this->event->name} a été mise à jour. Cette tâche aura maintenant lieu du {$this->newStart} au {$this->newEnd}.",
|
'message' => "La date de la tâche {$this->task->name} de l'événement {$this->event->name} a été mise à jour. Cette tâche aura maintenant lieu du {$this->newStart} au {$this->newEnd}.",
|
||||||
'task_id' => $this->task->id,
|
'task_id' => $this->task->id,
|
||||||
'event_id' => $this->event->id,
|
'event_id' => $this->event->id,
|
||||||
'old_start' => $this->oldStart,
|
'old_start' => $this->oldStart,
|
||||||
'old_end' => $this->oldEnd,
|
'old_end' => $this->oldEnd,
|
||||||
'new_start' => $this->newStart,
|
'new_start' => $this->newStart,
|
||||||
'new_end' => $this->newEnd,
|
'new_end' => $this->newEnd,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -61,13 +61,13 @@ class TaskDateUpdated extends Notification implements ShouldBroadcast
|
|||||||
public function toMail($notifiable): void
|
public function toMail($notifiable): void
|
||||||
{
|
{
|
||||||
Mail::to($notifiable->email)->send(new TaskDateUpdateMail([
|
Mail::to($notifiable->email)->send(new TaskDateUpdateMail([
|
||||||
'name' => $notifiable->name,
|
'name' => $notifiable->name,
|
||||||
'lastname' => $notifiable->lastname,
|
'lastname' => $notifiable->lastname,
|
||||||
'taskName' => $this->task->name,
|
'taskName' => $this->task->name,
|
||||||
'oldStart' => $this->oldStart,
|
'oldStart' => $this->oldStart,
|
||||||
'oldEnd' => $this->oldEnd,
|
'oldEnd' => $this->oldEnd,
|
||||||
'newStart' => $this->newStart,
|
'newStart' => $this->newStart,
|
||||||
'newEnd' => $this->newEnd,
|
'newEnd' => $this->newEnd,
|
||||||
'eventName' => $this->event->name,
|
'eventName' => $this->event->name,
|
||||||
]));
|
]));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -39,8 +39,8 @@ class TaskDeleted extends Notification implements ShouldBroadcast
|
|||||||
public function toDatabase($notifiable): array
|
public function toDatabase($notifiable): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'message' => "La tâche {$this->task->name} pour l'événement {$this->event->name} a été supprimée. Vous n'y participez donc plus.",
|
'message' => "La tâche {$this->task->name} pour l'événement {$this->event->name} a été supprimée. Vous n'y participez donc plus.",
|
||||||
'task_id' => $this->task->id,
|
'task_id' => $this->task->id,
|
||||||
'event_id' => $this->event->id,
|
'event_id' => $this->event->id,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
@@ -53,11 +53,11 @@ class TaskDeleted extends Notification implements ShouldBroadcast
|
|||||||
public function toMail($notifiable): void
|
public function toMail($notifiable): void
|
||||||
{
|
{
|
||||||
Mail::to($notifiable->email)->send(new TaskParticipationCancelledMail([
|
Mail::to($notifiable->email)->send(new TaskParticipationCancelledMail([
|
||||||
'name' => $notifiable->name,
|
'name' => $notifiable->name,
|
||||||
'lastname' => $notifiable->lastname,
|
'lastname' => $notifiable->lastname,
|
||||||
'taskName' => $this->task->name,
|
'taskName' => $this->task->name,
|
||||||
'start' => $this->event->start,
|
'start' => $this->event->start,
|
||||||
'end' => $this->task->end,
|
'end' => $this->task->end,
|
||||||
'eventName' => $this->event->name,
|
'eventName' => $this->event->name,
|
||||||
]));
|
]));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,9 +49,9 @@ class UserRegistered extends Notification implements ShouldBroadcast
|
|||||||
public function toMail($notifiable): MailMessage
|
public function toMail($notifiable): MailMessage
|
||||||
{
|
{
|
||||||
Mail::to($notifiable->email)->send(new RegisterMail([
|
Mail::to($notifiable->email)->send(new RegisterMail([
|
||||||
'adminName' => $notifiable->name,
|
'adminName' => $notifiable->name,
|
||||||
'adminLastname'=> $notifiable->lastname,
|
'adminLastname'=> $notifiable->lastname,
|
||||||
'userName' => $this->user->name,
|
'userName' => $this->user->name,
|
||||||
'userLastname' => $this->user->lastname,
|
'userLastname' => $this->user->lastname,
|
||||||
]));
|
]));
|
||||||
|
|
||||||
|
|||||||
@@ -39,8 +39,8 @@ class VolunteerAssignedToTask extends Notification implements ShouldBroadcast
|
|||||||
public function toDatabase($notifiable): array
|
public function toDatabase($notifiable): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'message' => "Vous avez été assigné à la tâche {$this->task->name} de l'événement {$this->event->name}.",
|
'message' => "Vous avez été assigné à la tâche {$this->task->name} de l'événement {$this->event->name}.",
|
||||||
'task_id' => $this->task->id,
|
'task_id' => $this->task->id,
|
||||||
'event_id' => $this->event->id,
|
'event_id' => $this->event->id,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
@@ -53,11 +53,11 @@ class VolunteerAssignedToTask extends Notification implements ShouldBroadcast
|
|||||||
public function toMail($notifiable): void
|
public function toMail($notifiable): void
|
||||||
{
|
{
|
||||||
Mail::to($notifiable->email)->send(new VolunteerAssignToTaskMail([
|
Mail::to($notifiable->email)->send(new VolunteerAssignToTaskMail([
|
||||||
'name' => $notifiable->name,
|
'name' => $notifiable->name,
|
||||||
'lastname' => $notifiable->lastname,
|
'lastname' => $notifiable->lastname,
|
||||||
'taskName' => $this->task->name,
|
'taskName' => $this->task->name,
|
||||||
'start' => $this->task->start,
|
'start' => $this->task->start,
|
||||||
'end' => $this->task->end,
|
'end' => $this->task->end,
|
||||||
'eventName' => $this->event->name,
|
'eventName' => $this->event->name,
|
||||||
]));
|
]));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -47,9 +47,9 @@ class VolunteerRoleUpdated extends Notification implements ShouldBroadcast
|
|||||||
public function toMail($notifiable): void
|
public function toMail($notifiable): void
|
||||||
{
|
{
|
||||||
Mail::to($notifiable->email)->send(new UpdateRoleMail([
|
Mail::to($notifiable->email)->send(new UpdateRoleMail([
|
||||||
'name' => $notifiable->name,
|
'name' => $notifiable->name,
|
||||||
'lastname' => $notifiable->lastname,
|
'lastname' => $notifiable->lastname,
|
||||||
'role' => $this->role,
|
'role' => $this->role,
|
||||||
]));
|
]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,8 +40,8 @@ class VolunteerUnassignedFromTask extends Notification implements ShouldBroadcas
|
|||||||
public function toDatabase($notifiable): array
|
public function toDatabase($notifiable): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'message' => "Vous avez été désassigné de la tâche {$this->task->name} de l'événement {$this->event->name}.",
|
'message' => "Vous avez été désassigné de la tâche {$this->task->name} de l'événement {$this->event->name}.",
|
||||||
'task_id' => $this->task->id,
|
'task_id' => $this->task->id,
|
||||||
'event_id' => $this->event->id,
|
'event_id' => $this->event->id,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
@@ -54,11 +54,11 @@ class VolunteerUnassignedFromTask extends Notification implements ShouldBroadcas
|
|||||||
public function toMail($notifiable): void
|
public function toMail($notifiable): void
|
||||||
{
|
{
|
||||||
Mail::to($notifiable->email)->send(new VolunteerUnassignToTaskMail([
|
Mail::to($notifiable->email)->send(new VolunteerUnassignToTaskMail([
|
||||||
'name' => $notifiable->name,
|
'name' => $notifiable->name,
|
||||||
'lastname' => $notifiable->lastname,
|
'lastname' => $notifiable->lastname,
|
||||||
'taskName' => $this->task->name,
|
'taskName' => $this->task->name,
|
||||||
'start' => $this->task->start,
|
'start' => $this->task->start,
|
||||||
'end' => $this->task->end,
|
'end' => $this->task->end,
|
||||||
'eventName' => $this->event->name,
|
'eventName' => $this->event->name,
|
||||||
]));
|
]));
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user