From b126a49c548b787447a852a46c3af7102663e5ea Mon Sep 17 00:00:00 2001 From: Michal Feher Date: Fri, 21 Jul 2023 13:56:07 +0200 Subject: [PATCH] no message --- be/app/Mail/MasterTaskEdited.php | 6 +++++- be/app/Mail/MasterTaskReopened.php | 6 +++++- be/app/Mail/NewTask.php | 6 +++++- be/app/Mail/SubTaskDeleted.php | 6 +++++- be/app/Mail/SubTaskEdited.php | 6 +++++- .../views/emails/task/master_task_edited.blade.php | 11 ++++++++--- .../views/emails/task/master_task_reopened.blade.php | 7 ++++++- .../views/emails/task/sub_task_created.blade.php | 6 +++++- .../views/emails/task/sub_task_deleted.blade.php | 6 +++++- .../views/emails/task/sub_task_edited.blade.php | 8 ++++++-- 10 files changed, 55 insertions(+), 13 deletions(-) diff --git a/be/app/Mail/MasterTaskEdited.php b/be/app/Mail/MasterTaskEdited.php index 5e2dece..e249342 100644 --- a/be/app/Mail/MasterTaskEdited.php +++ b/be/app/Mail/MasterTaskEdited.php @@ -16,6 +16,7 @@ class MasterTaskEdited extends Mailable public $mastertask; public $difference; + public $creator; /** * Create a new message instance. @@ -24,8 +25,11 @@ class MasterTaskEdited extends Mailable */ public function __construct(MasterTask $mastertask, $difference) { + $creator = \App\Models\User::find($mastertask->created_by); + $this->mastertask = $mastertask; $this->difference = $difference; + $this->creator = ($creator) ? $creator->firstname . ' ' . $creator->lastname : ''; } /** @@ -36,7 +40,7 @@ class MasterTaskEdited extends Mailable public function envelope() { return new Envelope( - subject: 'Master Task Edited', + subject: 'Bol editovaný Task ' . $this->mastertask->project->code . ' - ' . $this->mastertask->title, ); } diff --git a/be/app/Mail/MasterTaskReopened.php b/be/app/Mail/MasterTaskReopened.php index 0efe114..df27b09 100644 --- a/be/app/Mail/MasterTaskReopened.php +++ b/be/app/Mail/MasterTaskReopened.php @@ -15,6 +15,7 @@ class MasterTaskReopened extends Mailable use Queueable, SerializesModels; public $mastertask; + public $creator; /** * Create a new message instance. @@ -23,7 +24,10 @@ class MasterTaskReopened extends Mailable */ public function __construct(MasterTask $mastertask) { + $creator = \App\Models\User::find($mastertask->created_by); + $this->mastertask = $mastertask; + $this->creator = ($creator) ? $creator->firstname . ' ' . $creator->lastname : ''; } /** @@ -34,7 +38,7 @@ class MasterTaskReopened extends Mailable public function envelope() { return new Envelope( - subject: 'Master Task ' . $this->mastertask->title . ' was reopened', + subject: 'Bol znovuotvorený Master Task ' . $this->mastertask->project->code . ' - ' . $this->mastertask->title, ); } diff --git a/be/app/Mail/NewTask.php b/be/app/Mail/NewTask.php index c4c412c..ed271ca 100644 --- a/be/app/Mail/NewTask.php +++ b/be/app/Mail/NewTask.php @@ -15,6 +15,7 @@ class NewTask extends Mailable use Queueable, SerializesModels; public $subtask; + public $creator; /** * Create a new message instance. @@ -23,6 +24,9 @@ class NewTask extends Mailable */ public function __construct(Subtask $subtask) { + $creator = \App\Models\User::find($subtask->created_by); + + $this->creator = ($creator) ? $creator->firstname . ' ' . $creator->lastname : ''; $this->subtask = $subtask; } @@ -34,7 +38,7 @@ class NewTask extends Mailable public function envelope() { return new Envelope( - subject: 'New Task', + subject: 'Bol vytvorený Sub Task ' . $this->subtask->mastertask->project->code . ' - ' . ($this->subtask->title) ?: $this->subtask->mastertask->title, ); } diff --git a/be/app/Mail/SubTaskDeleted.php b/be/app/Mail/SubTaskDeleted.php index 46487f4..0382834 100644 --- a/be/app/Mail/SubTaskDeleted.php +++ b/be/app/Mail/SubTaskDeleted.php @@ -15,6 +15,7 @@ class SubTaskDeleted extends Mailable use Queueable, SerializesModels; public $subtask; + public $creator; /** * Create a new message instance. @@ -23,6 +24,9 @@ class SubTaskDeleted extends Mailable */ public function __construct(SubTask $subtask) { + $creator = \App\Models\User::find($subtask->created_by); + $this->creator = ($creator) ? $creator->firstname . ' ' . $creator->lastname : ''; + $this->subtask = $subtask; } @@ -34,7 +38,7 @@ class SubTaskDeleted extends Mailable public function envelope() { return new Envelope( - subject: 'Sub Task ' . $this->subtask->mastertask->title . ' was deleted', + subject: 'Bol vytvorený Sub Task ' . $this->subtask->mastertask->project->code . ' - ' . ($this->subtask->title) ?: $this->subtask->mastertask->title, ); } diff --git a/be/app/Mail/SubTaskEdited.php b/be/app/Mail/SubTaskEdited.php index 22f3de4..fd2a36a 100644 --- a/be/app/Mail/SubTaskEdited.php +++ b/be/app/Mail/SubTaskEdited.php @@ -16,6 +16,7 @@ class SubTaskEdited extends Mailable public $subtask; public $difference; + public $creator; /** * Create a new message instance. @@ -24,6 +25,9 @@ class SubTaskEdited extends Mailable */ public function __construct(SubTask $subtask, array $difference) { + $creator = \App\Models\User::find($subtask->created_by); + $this->creator = ($creator) ? $creator->firstname . ' ' . $creator->lastname : ''; + $this->subtask = $subtask; $this->difference = $difference; } @@ -36,7 +40,7 @@ class SubTaskEdited extends Mailable public function envelope() { return new Envelope( - subject: 'Sub Task Edited', + subject: 'Bol editovaný Sub Task ' . $this->subtask->mastertask->project->code . ' - ' . ($this->subtask->title) ?: $this->subtask->mastertask->title, ); } diff --git a/be/resources/views/emails/task/master_task_edited.blade.php b/be/resources/views/emails/task/master_task_edited.blade.php index de1f886..218f086 100644 --- a/be/resources/views/emails/task/master_task_edited.blade.php +++ b/be/resources/views/emails/task/master_task_edited.blade.php @@ -1,6 +1,11 @@ -Master Task edited.

- -Edited fields:

+Task založil: {{$creator}}
+Job number: {{$mastertask->project->code}}
+Názov Tasku: {{$mastertask->title}}
+Deadline do: {{$mastertask->deadline}}
+Odkaz na Task: {{ url( env( 'APP_URL_FE' ) . '/#/app/dashboard/projects?mastertask=' . $mastertask->id) }}
+Čo sa stalo v tasku:
@foreach($difference as $key => $diff) {{ $key }}: {{ $diff }}
@endforeach + + diff --git a/be/resources/views/emails/task/master_task_reopened.blade.php b/be/resources/views/emails/task/master_task_reopened.blade.php index 27c794c..d5f411a 100644 --- a/be/resources/views/emails/task/master_task_reopened.blade.php +++ b/be/resources/views/emails/task/master_task_reopened.blade.php @@ -1 +1,6 @@ -Master Task {{$mastertask->title}} was reopened.

+Task založil: {{$creator}}
+Job number: {{$mastertask->project->code}}
+Názov Tasku: {{$mastertask->title}}
+Deadline do: {{$mastertask->deadline}}
+Odkaz na Task: {{ url( env( 'APP_URL_FE' ) . '/#/app/dashboard/projects?mastertask=' . $mastertask->id) }}
+ diff --git a/be/resources/views/emails/task/sub_task_created.blade.php b/be/resources/views/emails/task/sub_task_created.blade.php index dd2f5c3..75c198c 100644 --- a/be/resources/views/emails/task/sub_task_created.blade.php +++ b/be/resources/views/emails/task/sub_task_created.blade.php @@ -1 +1,5 @@ -New task created: {{ $subtask->mastertask->title }} +Task založil: {{$creator}}
+Job number: {{$subtask->mastertask->project->code}}
+Názov Tasku: {{($subtask->title) ?: $subtask->mastertask->title}}
+Deadline do: {{$subtask->deadline}}
+Odkaz na Task: {{ url( env( 'APP_URL_FE' ) . '/#/app/dashboard/tasks?subtask=' . $subtask->id) }}
diff --git a/be/resources/views/emails/task/sub_task_deleted.blade.php b/be/resources/views/emails/task/sub_task_deleted.blade.php index d2bd471..75c198c 100644 --- a/be/resources/views/emails/task/sub_task_deleted.blade.php +++ b/be/resources/views/emails/task/sub_task_deleted.blade.php @@ -1 +1,5 @@ -Sub Task {{$subtask->mastertask->title}} was deleted.

+Task založil: {{$creator}}
+Job number: {{$subtask->mastertask->project->code}}
+Názov Tasku: {{($subtask->title) ?: $subtask->mastertask->title}}
+Deadline do: {{$subtask->deadline}}
+Odkaz na Task: {{ url( env( 'APP_URL_FE' ) . '/#/app/dashboard/tasks?subtask=' . $subtask->id) }}
diff --git a/be/resources/views/emails/task/sub_task_edited.blade.php b/be/resources/views/emails/task/sub_task_edited.blade.php index f6d8f5e..0198f50 100644 --- a/be/resources/views/emails/task/sub_task_edited.blade.php +++ b/be/resources/views/emails/task/sub_task_edited.blade.php @@ -1,6 +1,10 @@ -Sub Task edited.

+Task založil: {{$creator}}
+Job number: {{$subtask->mastertask->project->code}}
+Názov Tasku: {{($subtask->title) ?: $subtask->mastertask->title}}
+Deadline do: {{$subtask->deadline}}
+Odkaz na Task: {{ url( env( 'APP_URL_FE' ) . '/#/app/dashboard/tasks?subtask=' . $subtask->id) }}
-Edited fields:

+Čo sa stalo v tasku:
@foreach($difference as $key => $diff) {{ $key }}: {{ $diff }}
@endforeach